优化及修复

common/js/request.js

@@ -12,7 +12,7 @@ export default {
 				})
 				// request 触发前拼接 url 
 				args.url = 'https://www.opsoul.com:8881' + args.url;
-				// args.url = 'http://192.168.2.12:80' + args.url;
+				// args.url = 'http://192.168.2.54:80' + args.url;
 				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
 					args.data.deptId = globalData.deptId;

pages/index/home.vue

@@ -25,10 +25,10 @@
 			</view>
 			<!-- 区域筛选picker -->
 			<view class="action">
-				<picker :mode="'multiSelector'" @change="regionChange" @columnchange="regionColChange"
+				<picker class="text-black text-bold" :mode="'multiSelector'" @change="regionChange" @columnchange="regionColChange"
 					:value="areaMultiIndex" :range-key="'areaName'" :range="areaList">
 					<text>{{searchInfo.area && searchInfo.area.length ? searchInfo.area[1].areaName : areaList[1][0].areaName}}</text>
-					<text class="cuIcon-location"></text>
+					<text class="text-xl"><text class="cuIcon-triangledownfill"></text></text>
 				</picker>
 			</view>
 		</view>

pages/index/my-home.vue

@@ -348,6 +348,9 @@
 					}, {
 						type: 5,
 						name: '已完成'
+					}, {
+						type: 6,
+						name: '已取消'
 					}
 				],
 				servOrderType: 0,

pages/my/b-account-bind.vue

@@ -29,7 +29,7 @@
 				</view>
 				<view class="margin-top">
 					<view class="margin-bottom-sm">身份证号</view>
-					<input type="text" placeholder="请输入身份证号" placeholder-style="color:#989898" v-model="formData.certId">
+					<input type="idcard" placeholder="请输入身份证号" placeholder-style="color:#989898" v-model="formData.certId">
 				</view>
 				<view class="margin-top">
 					<view class="margin-bottom-sm">手机号</view>

pages/my/my-order.vue

@@ -4,7 +4,18 @@
 		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">我的订单</block>
-		</cu-custom>
+		</cu-custom>
+		
+		<view class="padding-tb bg-white solid-bottom">
+			<view class="flex justify-between align-center margin-top-xs padding-left">
+				<input class="line-input radius-input margin-right-sm" v-model="formData.orderKeywords"
+					placeholder="请输入订单号或标题或关键词"></input>
+				<view class="text-xl text-bold">
+					<text class="cuIcon-search margin-right-sm" @click="searchOrderPage"></text>
+				</view>
+			</view>
+		</view>
+		
 		<!-- tab -->
 		<view class="sticky-bar" :style="[{top: stickyTop + 'px'}]">
 			<scroll-view scroll-x class="bg-white nav text-center" :scroll-with-animation="true"
@@ -155,6 +166,11 @@
 				// this.myOrders = await this.$api.data(mainProcess);
 				this.loadOrderPage();
 			},
+			searchOrderPage(keyWords) {
+				this.reloadOrderPage({
+					keyWords: keyWords
+				})
+			},
 			reloadOrderPage(params = {}) {
 				this.pageParams = [];
 				for(let i = 0; i < this.tabHeaderList.length; i++) {

pages/my/serv-detail.vue

@@ -44,12 +44,14 @@
 			</view> -->
 			<view class="margin-top-sm">
 				<text class="cuIcon-location text-main-color margin-right-xs"></text>
-				<text>{{servDetail.address}}</text>
+				<text>{{servDetail.address}}</text>
+				<text class="margin-left-sm text-xl text-main-color" @click="showAddress2Choose"><text class="cuIcon-edit"></text></text>
 			</view>
 			<view class="margin-top-sm">
 				<text class="cuIcon-people text-main-color margin-right-xs"></text>
 				<text class="margin-right-sm">{{servDetail.workerName}}</text>
-				<text>{{servDetail.workerPhone}}</text>
+				<text>{{servDetail.workerPhone}}</text>
+				<text class="margin-left-sm text-xl text-main-color" @click="makePhoneCall(servDetail.workerPhone)"><text class="cuIcon-phone"></text></text>
 			</view>
 			<view class="margin-top-sm">
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
@@ -102,7 +104,7 @@
 			</view>
 			<view class="margin-top-sm">
 				<view>师傅：{{item.workerName}}</view>
-				<view class="margin-top-sm">联系方式：{{item.workerPhone}}</view>
+				<view class="margin-top-sm">联系方式：{{item.workerPhone}}<text class="margin-left-sm text-xl text-main-color" @click="makePhoneCall(item.workerPhone)"><text class="cuIcon-phone"></text></text></view>
 				<view class="margin-top-sm" v-if="item.expectTimeEndFront">预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}</view>
 				<view class="margin-top-sm" v-else>预约时间：{{item.expectTimeStartFront}}</view>
 				<view class="margin-top-sm" v-if="servDetail.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view>
@@ -363,9 +365,19 @@
 			if (options && options.order) {
 				this.order = JSON.parse(decodeURIComponent(options.order));
 			}
-			this.loadData(this.order.orderMasterId);
+			this.loadData(this.order.orderMasterId);
+			this.bindEvent();
+		},
+		onUnload() {
+			this.offBindEvent();
 		},
-		methods: {
+		methods: {
+			bindEvent() {
+				uni.$on(this.$globalFun.CHOOSE_ADDRESS, this.editAddress);
+			},
+			offBindEvent() {
+				uni.$off(this.$globalFun.CHOOSE_ADDRESS);
+			},
 			async loadData(orderMasterId) {
 				// this.servDetail = await this.$api.data('servDetail');
 				// this.finishList4Show = this.servDetail.finishRecord;
@@ -491,7 +503,20 @@
 						duration: 1000
 					})
 				}
-			},
+			},
+			showAddress2Choose() {
+				uni.navigateTo({
+					url: '/pages/my/my-address?chooseMode=true'
+				})
+			},
+			editAddress(addressInfo) {
+				console.log(addressInfo)
+			},
+			makePhoneCall(phoneNum) {
+				uni.makePhoneCall({
+					phoneNumber: phoneNum
+				})
+			}
 		}
 	}
 </script>

pages/product/product-detail.vue

@@ -15,8 +15,8 @@
 				<view class="padding" :class="curTopNav == 2 ? 'bg-blue' : ''" @click.stop="clickNav(2)">详情</view>
 			</view>
 		</uni-transition>
-		<!-- 轮播图，视频 -->
+		<!-- 轮播图，视频 :autoplay="!productVideoPlaying" interval="5000" duration="500"-->
-		<swiper :autoplay="true" interval="5000" duration="500" :class="changeSwiperHeight ? 'sm-screen-swiper' : 'sm-screen-swiper lg-screen-swiper'" @change="changeSwiper">
+		<swiper :class="changeSwiperHeight ? 'sm-screen-swiper' : 'sm-screen-swiper lg-screen-swiper'" @change="changeSwiper">
 			<swiper-item v-if="productDetail.goodsVideoUrl">
 				<video style="width: 100%; height: 100%;" id="productVideo" :src="productDetail.goodsVideoUrl" :controls="true" :autoplay="false"
 					:show-center-play-btn="true" :show-fullscreen-btn="true"></video>
@@ -65,6 +65,13 @@
 					<view class="text-xl">
 						<view class='cu-tag round bg-orange light' v-if="productDetail.servActivity">
 							<text>{{productDetail.servActivity}}</text>
+						</view>
+						<view class='cu-tag round light bg-blue padding-lr-sm' v-if="productDetail.deptGoodsCategoryName">
+							<text v-if="productDetail.parGoodsCategoryName">
+								{{productDetail.parGoodsCategoryName}}
+								<text class="margin-lr-xs">/</text>
+							</text>
+							<text>{{productDetail.deptGoodsCategoryName}}</text>
 						</view>
 						{{productDetail.goodsName}}
 					</view>
@@ -125,6 +132,16 @@
 				</view>
 				<text class="margin-lr-xs text-sm">{{productDetail.areaDesc}}</text>
 			</view>
+			<view>
+				<view class="cu-capsule margin-tb-xs">
+					<view class='cu-tag bg-red'>
+						<text class="cuIcon-noticefill"></text>
+					</view>
+					<view class="cu-tag line-red">
+						请核对下单地址与服务区域相匹配
+					</view>
+				</view>
+			</view>
 			<!-- <view v-if="productDetail.remark">
 				<view class="cu-capsule margin-tb-xs">
 					<view class='cu-tag bg-main-color'>

style/default.css

@@ -142,3 +142,7 @@
 	width: 100%;
 	height: 5rpx;
 }
+
+.line-input {
+	width: 100%;
+}