Преглед на файлове

Merge branch 'master' of https://gitee.com/pslsteins/smart-city-yinchuan-wx

 Conflicts:
	App.vue
lyqu преди 5 години
родител
ревизия
6007cbf73c

+ 2 - 3
App.vue

@@ -79,10 +79,9 @@
 			token: "j2qctr89u1xfmbjkp69hegfmqhwquycw",
 			//对接后台的api地址
 			//远程的
-			// apiurl: "https://community.58fo.com/api/app/",
+			apiurl: "https://community.58fo.com/api/app/",
 			// apiurl: "http://192.168.1.19:9082/app/",
-			apiurl: "http://192.168.1.218:9082/app/",
-			
+			// apiurl: "http://192.168.1.117:9082/app/",
 			member: null,
 			//用户信息--后台
 			userInfo: null,

+ 1 - 1
pages/authorize_record/authorize_record.vue

@@ -66,7 +66,7 @@
 	   </view>
   </view>
 </view>
-<view v-show="!showModal" @tap="addOpenPassword" class=" footer-fixed" style="z-index: 99;">
+<view v-show="!showModal" @tap="addOpenPassword" class=" footer-fixed " style="z-index: 99;">
 	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 		授权开门
 	</view>

+ 1 - 1
pages/authorize_record/openPass/openPass.vue

@@ -37,7 +37,7 @@
 <!-- <view class="submit_btn">
  <button class="ar_btn" @tap="getGuestAuthorize">获取开门密码</button>
 </view> -->
-<view @tap="getGuestAuthorize" class=" footer-fixed" style="z-index: 99;">
+<view @tap="getGuestAuthorize" class=" footer-fixed " style="z-index: 99;">
 	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 		确认授权
 	</view>

+ 1 - 1
pages/choosePlot/householdCert/householdCert.vue

@@ -126,7 +126,7 @@
 			  <u-action-sheet @click="photoChecked"  z-index="999999" :list="list" v-model="show"></u-action-sheet>
 			  <u-select z-index="999999" mode="single-column" :list="typeArry" v-model="typeShow" @confirm="typeConfirm"></u-select>
 			  <u-select z-index="999999" mode="single-column" :list="nationalityArry" v-model="nationalityShow" @confirm="nationalityConfirm"></u-select>
-			  <view  @click="showDialogBtn"  class=" footer-fixed" >
+			  <view  @click="showDialogBtn"  class=" footer-fixed " >
 			  	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 			  		提交认证
 			  	</view>

+ 2 - 4
pages/index/index.vue

@@ -33,9 +33,6 @@
 				<view  style="padding: 30rpx 30rpx 0 30rpx;">
 					<text class="text-bold text-lg">智慧社区</text>
 				</view>
-				
-			
-				
 				<view style="padding: 40rpx 10rpx 0rpx;" class="cu-list grid col-5 no-border" >
 					<view class="cu-item" :class="item.index==5?'img1-lg':''" @click="top(item.index)" v-for="(item,index) in gridList" :key="index">
 						<block v-if="item.index==5">
@@ -409,7 +406,8 @@
 			 */
 			async fetchGoodsList(){
 				let indexProduct = await this.$api.storeHomeProducts();
-				this.goodsList=indexProduct[1].products
+				console.log(indexProduct,"/****");
+				this.goodsList=indexProduct[0].products
 				this.$u.randomArray(this.goodsList)
 			},
 			//轮播圆点

+ 1 - 1
pages/myFamily/audit-detail/audit-detail.vue

@@ -95,7 +95,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="footer-fixed" style="padding-bottom: 50rpx;z-index: 99;">
+			<view class="footer-fixed " style="padding-bottom: 50rpx;z-index: 99;">
 				<view class="flex justify-around">
 					<view @click="auditBtn(1)" class="cu-btn round" style="padding: 40rpx;width: 45%;background-color: #61a300;color: #FFFFFF;">
 						通过

+ 1 - 1
pages/myFamily/editFamily/editFamily.vue

@@ -114,7 +114,7 @@
 	  <u-action-sheet @click="photoChecked"  z-index="999999" :list="list" v-model="show"></u-action-sheet>
 	  <u-select z-index="999999" mode="single-column" :default-value="defaultType" :list="typeArry" v-model="typeShow" @confirm="typeConfirm"></u-select>
 	  <u-select z-index="999999" mode="single-column" :default-value="nationality" :list="nationalityArry" v-model="nationalityShow" @confirm="nationalityConfirm"></u-select>
-	  <view  @click="editUser" class=" footer-fixed" >
+	  <view  @click="editUser" class=" footer-fixed " >
 	  	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 	  		确认修改
 	  	</view>

+ 1 - 1
pages/myFamily/myFamily.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="container ">
 		<view class="tabs flex flex-direction u-border-bottom" >
 			<view class="flex">
 				<scroll-view scroll-x class="bg-white nav" :style="current==0?'width: 90%':''">

+ 1 - 1
pages/myFamily/user-card.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<view class="data" v-for="(item, index) in list" :key="index" >
+		<view class="data " v-for="(item, index) in list" :key="index" >
 			<view class="top">
 				<view class="left">
 					<u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>

+ 1 - 1
pages/myhome/myhome.vue

@@ -32,7 +32,7 @@
 				</view>
 			</view>
 		</mescroll-body>
-		<view @tap="choosePlot" class="footer-fixed" >
+		<view @tap="choosePlot" class="footer-fixed " >
 			<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 				添加房屋认证
 			</view>

+ 1 - 1
pages/services/delivery/delivery.vue

@@ -84,7 +84,7 @@
 			
 		</view>
 		
-		<view  class=" footer-fixed" >
+		<view  class=" footer-fixed " >
 			<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 				确认下单
 			</view>

+ 1 - 1
pages/services/demand/publish.vue

@@ -52,7 +52,7 @@
 			
 		</view>
 		
-		<view  class=" footer-fixed" >
+		<view  class=" footer-fixed " >
 			<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 				确认下单
 			</view>

+ 1 - 1
pages/services/property/comment.vue

@@ -4,7 +4,7 @@
 			<textarea maxlength="120" v-model="comment"  placeholder="请输入您的评价"/>
 			<text class="text-gray font-num-view">{{comment.length}} / 120字</text>
 		</view>
-		<view @click="save" style="padding: 46rpx;" class="cu-btn lg  flex  bg-blue  footer-fixed">
+		<view @click="save" style="padding: 46rpx;" class="cu-btn lg  flex  bg-blue   footer-fixed">
 			确认保存
 		</view>
 	</view>

+ 1 - 1
pages/services/property/detail.vue

@@ -65,7 +65,7 @@
 			</view>
 		</view>
 		
-		<view  class="footer-fixed  padding-sm bg-white flex justify-end margin-right-30" style="box-sizing: border-box;z-index: 999;padding: 20rpx;">
+		<view  class="footer-fixed   padding-sm bg-white flex justify-end margin-right-30" style="box-sizing: border-box;z-index: 999;padding: 20rpx;">
 			<!-- 待处理,取消工单 -->
 			<view class="cu-btn sm lineBlue round " v-if="dataDetail.handleStatus==0" @click="cancelItem()">
 				取消工单

+ 1 - 1
pages/wode/feedback/feedback.vue

@@ -52,7 +52,7 @@
 				
 			</view>
 		</view>
-		<view class="bg-white margin-top-20 footer-fixed" @click="sumit">
+		<view class="bg-white margin-top-20 footer-fixed  " @click="sumit">
 			<view class="flex flex-direction padding-sm">
 				<button class="radius cu-btn base-bg-color" style="padding: 45rpx;">提交反馈</button>
 			</view>

+ 49 - 47
pages/wode/wode.vue

@@ -1,6 +1,5 @@
 <template>
-<view class="">
-	<view class="pageBg">
+	<view >
 		<view  class="header">
 			<DtCustomBar title="我的"></DtCustomBar>
 			<view  style="display: flex;align-items: center;margin: 0 30upx;">
@@ -38,57 +37,55 @@
 					<view style="font-size: 24upx;color: #fff;margin-top: 10upx;">浏览记录</view>
 				</view>
 			</view>
-		</view>
-		<!-- todo -->
-		<view class="mine_order_statue">
-			<view class="cu-list grid col-5 no-border margin-top-sm" >
-				<view class="cu-item" @click="tapToMenu(item.index)" v-for="(item,index) in gridList" :key="index">
-					<view class="grid-icon ">
-						<image style="width: 56rpx;height: 56rpx;"  :src="item.icon"/>
+			<view class="mine_order_statue">
+				<view class="cu-list grid col-5 no-border margin-top-sm" >
+					<view class="cu-item" @click="tapToMenu(item.index)" v-for="(item,index) in gridList" :key="index">
+						<view class="grid-icon ">
+							<image style="width: 56rpx;height: 56rpx;"  :src="item.icon"/>
+						</view>
+						<view class="cu-tag bg-orange badge" v-if="item.badge>0">{{item.badge}}</view>
+						<text style="font-size: 22rpx;font-family:Sans-serif">{{item.title}}</text>
 					</view>
-					<view class="cu-tag bg-orange badge" v-if="item.badge>0">{{item.badge}}</view>
-					<text style="font-size: 22rpx;font-family:Sans-serif">{{item.title}}</text>
 				</view>
 			</view>
-		</view>
-		<view class="item_list" >
-			<view class="item">
-				<text style="font-size: 32rpx;">个人设置</text>
-			</view>
-			<view class="item" v-for="(item, index) in mineItemList" :key="index" @tap="tapToMenu(item.index)">
-				<view class="item_content">
-					<image :src="item.itemIcon"></image>
-					<text>{{ item.itemName }}</text>
+			<view class="item_list" >
+				<view class="item">
+					<text style="font-size: 32rpx;">个人设置</text>
 				</view>
-				<view class="">
-					<text v-if="index==0" style="padding-right: 16rpx;font-size: 26rpx;" class="text-red">{{authStatus}}</text>
-					<image src="http://139.9.103.171:1888/img/image/arrow.png"></image>
+				<view class="item" v-for="(item, index) in mineItemList" :key="index" @tap="tapToMenu(item.index)">
+					<view class="item_content">
+						<image :src="item.itemIcon"></image>
+						<text>{{ item.itemName }}</text>
+					</view>
+					<view class="">
+						<text v-if="index==0" style="padding-right: 16rpx;font-size: 26rpx;" class="text-red">{{authStatus}}</text>
+						<image src="http://139.9.103.171:1888/img/image/arrow.png"></image>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="item_list" >
-			<view class="item">
-				<text style="font-size: 32rpx;">系统设置</text>
-			</view>
-			<view class="item" v-for="(item, index) in systemItemList" :key="index" @tap="tapToMenu(item.index)">
-				<view class="item_content">
-					<image :src="item.itemIcon"></image>
-					<text>{{ item.itemName }}</text>
+			<view class="item_list" >
+				<view class="item">
+					<text style="font-size: 32rpx;">系统设置</text>
 				</view>
-				<view class="">
-					<image src="http://139.9.103.171:1888/img/image/arrow.png"></image>
+				<view class="item" v-for="(item, index) in systemItemList" :key="index" @tap="tapToMenu(item.index)">
+					<view class="item_content">
+						<image :src="item.itemIcon"></image>
+						<text>{{ item.itemName }}</text>
+					</view>
+					<view class="">
+						<image src="http://139.9.103.171:1888/img/image/arrow.png"></image>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="bg-white" style="height: 80rpx;">
-			
+			<view class="bg-white" style="80rpx">
+				
+			</view>
 		</view>
 		<!-- 微信客服 -->
 		<DtService />
-	
+
 		<DtLogin ref="dialogLogin" @signIn="onSignIn" />
 	</view>
-</view>
 </template>
 
 <script>
@@ -104,6 +101,7 @@ export default {
 	},
 	data() {
 		return {
+			height:'',
 			//todo
 			gridList:[
 				{
@@ -560,15 +558,21 @@ export default {
 	}
 };
 </script>
+
+<style>
+	page{
+		background-color: #FFFFFF;
+	}
+</style>
+
 <style lang="scss" scoped>
-	//todo
 	.pageBg {
-		background-color: #FFFFFF;
+		// background-color: #FFFFFF;
 	}
-button::after {
+   button::after {
 	  border: none;
 	}
-.header {
+ .header {
 	// border-bottom-left-radius: 20rpx;
 	border-bottom-right-radius: 60rpx;
 	//todo
@@ -726,7 +730,7 @@ button::after {
 .mine_order_statue {
 	//todo
 	box-shadow: 0 10rpx #e7f1fd ;
-	margin: -100upx 20upx 0;
+	margin: 40upx 20upx 0;
 	background: #fff;
 	padding: 10upx 20upx;
 	border-radius: 20rpx;
@@ -804,9 +808,7 @@ button::after {
 	display: flex;
 	flex-direction: column;
 	background: #fff;
-	margin-top: 20upx;
-    margin-left: 20rpx;
-	margin-right: 20rpx;
+	margin: 20rpx;
 	border-radius: 20rpx;
 	.item {
 		display: flex;

+ 0 - 3
pagesM/pages/goods_des.vue

@@ -751,9 +751,6 @@ export default {
 			}
 		},
 		showPoster() {
-			this.$u.toast('即将开放')
-			return
-			
 			if (this.isclick) {
 				return;
 			}

+ 0 - 3
pagesM/pages/order_pay.vue

@@ -79,9 +79,6 @@ export default {
     },
 
     async payOrder() {
-		this.$u.toast('即将开放')
-		return
-		
       if (this.prePayOrder.expireDate) {
         let time = (this.$util.createDate(this.prePayOrder.expireDate)).getTime();
         let now = new Date().getTime();

BIN
static/clock.png


BIN
static/kaimen.png