Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

ghsApp/src/admin/home/order.vue

@@ -240,11 +240,11 @@ export default {
   methods: {
     directFh(info) {
       let that = this;
-      that.$util.confirmModal({ content: '确认发货？' }, () => {
+      that.$util.confirmModal({ content: '确认自配送？' }, () => {
         orderFh({ id: info.id, fhType: 0 }).then((res) => {
           if (res.code == 1) {
             that.$refs[`orderRef${info.id}`][0].currentStatus = 3;
-            that.$msg('发货成功');
+            that.$msg('已发货');
           }
         });
       });

ghsApp/src/admin/item/detail.vue

@@ -273,13 +273,6 @@
             </view>
           </tui-list-cell>
 
-          <!-- #ifdef MP-WEIXIN -->
-          <view style="padding-bottom:20upx;padding-top:30upx;">
-          <ad-custom unit-id="adunit-daad4bab1bdb10d7" v-if="currentEnv=='production'" binderror="adError" style="margin:0 auto;"></ad-custom>
-          <ad-custom unit-id="adunit-cf3a346a77b5208d" v-else style="margin:0 auto;" binderror="adError"></ad-custom>
-          </view>
-          <!-- #endif -->
-
       </view>
 
       <view class="app-footer">

ghsApp/src/components/app-area-sel.vue

@@ -8,6 +8,7 @@
 				</div>
 				<div class="map-search">
 					<app-search-module ref="aaaaa" fontSize="30" height="120" placeholder="请输入地址搜索" :focus="false" @input="searchFn" />
+					<view style="width:100%;font-size:28upx;text-align:center;padding:10upx 0 15upx 0;color:green;">建议只搜索店名、建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
 				</div>
 				<scroll-view class="near-list" scroll-y>
 					<view v-for="(item,index) in nearListData" :key="index" @click="switchAddress(item,index)" class="near-item">

ghsApp/src/pagesOrder/detail.vue

@@ -182,9 +182,20 @@
 						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com" style="border:1upx solid red;color:red;">全部赊账</button>
 					</view>
 				</view>
-				<view class="order-info_box">
+				<view class="order-info_box" style="margin-top:38upx;">
 					<view>订单状态：</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
+
+					<view class="price" style="font-weight:normal;">
+						<block v-if="detailInfo.status == 2 && detailInfo.book == 0">
+							<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">自配送</button>
+							<button class="admin-button-com bule" style="margin-left:30upx;" @click.stop="fillNoFh(detailInfo)">物流单发货</button>
+						</block>
+						<block v-else>
+							<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">自配送</button>
+							<button disabled="true" class="admin-button-com bule active" style="margin-left:30upx;border:1rpx solid #ccc;">物流单发货</button>
+						</block>
+					</view>
 				</view>
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 					<view>物流名称：</view>
@@ -228,26 +239,23 @@
 			</view>
 			<view class="flex-space title">
 				商品信息
-				<view class="flex" style="font-weight:normal;">
-					<block v-if="detailInfo.status == 2 && detailInfo.book == 0">
-						<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">发货</button>
-						<button class="admin-button-com bule" style="margin-left:50upx;" @click.stop="fillNoFh(detailInfo)">填单发货</button>
-					</block>
-					<block v-else>
-						<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">发货</button>
-						<button disabled="true" class="admin-button-com bule active" style="margin-left:50upx;border:1rpx solid #ccc;">填单发货</button>
-					</block>
+				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="(detailInfo.status == 3 || detailInfo.status == 2) && detailInfo.book == 0">
+					<button class="admin-button-com bule" @click.stop="confirmReach(detailInfo,0)">确认送达</button>
+				</view>
+				<view v-else>
+					<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">确认送达</button>
 				</view>
-				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 4">
+
+				<view class="flex" style="color: #3385ff;" v-if="detailInfo.status == 4">
 					<button class="admin-button-com bule" @click.stop="goRefund()">发起售后</button>
 				</view>
 				<view v-else>
 					<block v-if="detailInfo.status == 1 || detailInfo.status == 5">
 						<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">发起售后</button>
 					</block>
-				</view>
-				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="(detailInfo.status == 3 || detailInfo.status == 2) && detailInfo.book == 0">
-					<button class="admin-button-com bule" @click.stop="confirmReach(detailInfo)">确认送达</button>
+					<block v-else>
+						<button class="admin-button-com bule" @click.stop="readyGoRefund(detailInfo)">发起售后</button>
+					</block>
 				</view>
 			</view>
 			<view class="module-com content-box">
@@ -434,13 +442,6 @@
 				</div>
 			</view>
 
-			<!-- #ifdef MP-WEIXIN -->
-			<view style="padding-bottom:20upx;background-color: white;">
-			<ad-custom unit-id="adunit-daad4bab1bdb10d7" v-if="currentEnv=='production'" binderror="adError" style="margin:0 auto;"></ad-custom>
-			<ad-custom unit-id="adunit-cf3a346a77b5208d" v-else style="margin:0 auto;" binderror="adError"></ad-custom>
-			</view>
-			<!-- #endif -->
-
 		</view>
 
 		<div class="app-footer">
@@ -1015,11 +1016,11 @@ export default {
 		},
 		directFh(info){
 			let that = this
-			that.$util.confirmModal({content:'确认发货？'},() => {
+			that.$util.confirmModal({content:'确认自配送？'},() => {
 				orderFh({id:info.id,fhType:0}).then(res=>{
 					if(res.code == 1){
 						that.init()
-						that.$msg('发货成功')
+						that.$msg('已发货')
 					}
 				})
 			})
@@ -1225,23 +1226,29 @@ export default {
 				}
 			})
 		},
-		confirmReach(info){
+		confirmReach(info,type){
 			let that = this
-
-
-			if(![-1, -4].includes(that.detailInfo.sendStatus)){
-				that.$msg('已使用跑腿配送')
+			if(![-1, -2,-4].includes(that.detailInfo.sendStatus)){
+				that.$msg('等跑腿送完再操作')
 				return
 			}
-			that.$util.confirmModal({content:'确认已经送达？'},() => {
+			let remind = type == 0 ? '确认已送达？' : '确认订单完成？'
+			that.$util.confirmModal({content:remind},() => {
 				confirmReachFn({id:info.id}).then(res=>{
 					if(res.code == 1){
-						that.init()
-						that.$msg('已确认')
+						if(type == 0){
+							that.init()
+							that.$msg('已确认')
+						}else{
+							that.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
+						}
 					}
 				})
             })
 		},
+		readyGoRefund(info){
+			this.confirmReach(info,1)
+		},
 		goRefund(){
 			this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
 		},

ghsApp/src/pagesPurchase/info.vue

@@ -250,14 +250,6 @@
 				</div>
 			</view>
 
-			<!-- #ifdef MP-WEIXIN -->
-			<view style="width:710upx;height:20upx;background-color: #ece5e5;"></view>
-				<ad-custom unit-id="adunit-3a7cda7bc692514a" v-if="currentEnv=='production'" style="width:710upx;"></ad-custom>
-				<ad-custom unit-id="adunit-9b10b36dbe2f56b3" v-else style="width:710upx;"></ad-custom>
-			<view style="width:710upx;height:20upx;background-color: #ece5e5;"></view>
-			<!-- #endif -->
-
-
 		</view>
 
 		<block v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">

hdApp/src/admin/order/detail.vue

@@ -352,13 +352,6 @@
         </view>
       </view>
 
-      <!-- #ifdef MP-WEIXIN -->
-      <view style="padding-bottom:20upx;">
-      <ad-custom unit-id="adunit-22b6fe92acad433e" v-if="currentEnv=='production'" binderror="adError" style="margin:0 auto;"></ad-custom>
-      <ad-custom unit-id="adunit-13c9d1954d809a16" v-else style="margin:0 auto;" binderror="adError"></ad-custom>
-      </view>
-      <!-- #endif -->
-
     </view>
 
     <!-- 底部操作按钮 -->

hdApp/src/components/app-area-sel.vue

@@ -9,6 +9,7 @@
 				<!-- 搜索 -->
 				<div class="map-search">
 					<app-search-module ref="aaaaa" placeholder="请填写地址搜索" :focus="false" @input="searchFn"/>
+					<view style="width:100%;font-size:28upx;text-align:center;padding:10upx 0 15upx 0;color:green;">建议只搜索店名、建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
 				</div>
 				<!-- 地图 -->
 				<!-- <div class="map-box">

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -1,19 +1,19 @@
 <template>
   <view class="model" v-if="hasNoShop">
     <image :src="`${constant.hostUrl}/image/ghs/home/deserve.png`" class="noData_img"></image>
-    <view style="margin:45upx 0;color:white;font-size:35upx;">首次下单，请填写门店信息</view>
+    <view style="margin:45upx 0;color:white;font-size:35upx;">如首次下单，请填写门店信息</view>
     <view class="freeApply" @click="apply">填写</view>
-    <view style="margin:65upx 0 0 0;color:white;font-size:40upx;" @click="goLogin()">
-      <text style="text-decoration:underline;">已填过，直接登录</text>
+    <view style="margin:50upx 0 45upx 0;color:white;font-size:35upx;">
+      <text>如已经填写过，请直接登录</text>
     </view>
-    <view style="margin:55upx 0;color:white;font-size:29upx;" >如您的伙伴需要买花，请联系批发店添加员工</view>
+    <view class="freeApply" @click="goLogin()">登录</view>
   </view>
   <block v-else>
     <view class="model-pass" v-if="check == false">
       <image :src="`${constant.hostUrl}/image/ghs/home/deserve.png`" class="noData_img"></image>
-      <view style="margin:80upx 0;color:white;font-size:34upx;">审核中</view>
+      <view style="margin:80upx 0;color:white;font-size:36upx;">审核中</view>
       <view class="freeApply" @click="refresh">刷新</view>
-      <view style="margin:80upx 0 0 0;text-decoration:underline;color:white;font-size:34upx;" @click="contactShop()">联系商家</view>
+      <view style="margin:80upx 0 0 0;text-decoration:underline;color:white;font-size:36upx;" @click="contactShop()">联系商家</view>
     </view>
   </block>
 </template>
@@ -100,8 +100,8 @@ export default {
   overflow: hidden;
   text-align: center;
   & > .noData_img {
-    width: 280upx;
-    height: 280upx;
+    width: 240upx;
+    height: 240upx;
     margin: 50upx auto 0;
   }
   & > .no_data_text {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -521,7 +521,18 @@ export default {
 			this.$util.pageTo({url: "/admin/ghsProduct/detail",query: {id: item.id, ghsId:this.option.id, shopId:this.shopId}})
 		},
 		toRefresh(){
+			// #ifdef APP-PLUS
 			this.init()
+			// #endif
+			// #ifdef MP-WEIXIN
+			if(Number(this.ghsId)>0){
+				uni.reLaunch({url: '/pagesPurchase/ghsProduct?id='+this.ghsId})
+			}else{
+				this.$util.confirmModal({content:'没有登录，请先登录'},() => {
+					this.pageTo({url: '/admin/home/login'})
+				})
+			}
+			// #endif
 		},
 		contactShop(){
 			let ghs = this.ghsInfo

hdApp/src/pagesPurchase/purDetails.vue

@@ -304,13 +304,6 @@
         </div>
       </view>
 
-      <!-- #ifdef MP-WEIXIN -->
-      <view style="padding-bottom:20upx;">
-      <ad-custom unit-id="adunit-22b6fe92acad433e" v-if="currentEnv=='production'" binderror="adError" style="margin:0 auto;"></ad-custom>
-      <ad-custom unit-id="adunit-13c9d1954d809a16" v-else style="margin:0 auto;" binderror="adError"></ad-custom>
-      </view>
-      <!-- #endif -->
-
     </view>
 
     <view class="app-footer open_btn">

hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.7",
-    "versionCode" : 187,
+    "versionName" : "1.8.8",
+    "versionCode" : 188,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

mallApp/src/components/app-area-sel.vue

@@ -8,6 +8,7 @@
         </div>
         <div class="map-search">
           <app-search-module ref="aaaaa" height="100" fontSize="32" placeholder="请输入收货地址" :focus="isFocus" @input="searchFn" />
+	        <view style="width:100%;font-size:28upx;text-align:center;padding:10upx 0 15upx 0;color:green;">建议只搜索建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
         </div>
         <scroll-view class="near-list" scroll-y>
           <view v-for="(item,index) in nearListData" :key="index" @click="switchAddress(item,index)" class="near-item" >

mallApp/src/pages/billing/affirmGhs.vue

@@ -683,6 +683,16 @@ export default {
 			console.log('selectDelivery -- isFreeDelivery: ',isFreeDelivery)
 		},
 		confirmForm(){
+
+			let hdId = this.option.hdId ? this.option.hdId : 0
+			let account = this.option.account ? this.option.account : 0
+			if(Number(hdId)<=0 || Number(account)<=0){
+				this.$util.confirmModal({content:'网络异常，请重新提交'},() => {
+					uni.reLaunch({url:'/pages/home/recent'})
+				})
+				return false
+			}
+
 			if(this.form.sendType == 0 || this.form.sendType == 2){
 				if(this.$util.isEmpty(this.form.receiveMobile)){
 					this.$msg('请填写收花人手机号')

mallApp/src/pages/order/buy.vue

@@ -200,6 +200,16 @@ export default {
       this.createOrderFn()
     },
     createOrderFn() {
+      let hdId = this.option.hdId?this.option.hdId:0
+      let account = this.option.account?this.option.account:0
+
+		if(Number(hdId)<=0 || Number(account)<=0){
+			this.$util.confirmModal({content:'网络异常，请重新提交'},() => {
+				uni.reLaunch({url:'/pages/home/recent'})
+			})
+			return false
+		}
+
       let form = {}
       if (this.form.sendType == 2) {
         if(this.form.hasMap == 0 || this.openIntraCity == 2) {
@@ -229,9 +239,6 @@ export default {
         }
       }
       uni.showLoading({mask:true})
-      let hdId = this.option.hdId?this.option.hdId:0
-      let account = this.option.account?this.option.account:0
-      
       const params = {
         ...form,
         ...this.form,

mallApp/src/pages/order/detail.vue

@@ -45,14 +45,18 @@
             </view>
             <view class="msg-list">
               <view class="label">地址信息</view>
-              <view class="value">{{ data.fullAddress }}<block v-if="!$util.isEmpty(data.showAddress)">（{{data.showAddress}}）</block></view>
+              <view class="value">
+                <view style="text-align:right;">{{ data.address+data.floor }}</view>
+                <view v-if="data.fullAddress!=data.showAddress && data.showAddress!=''" style="color:#a7a0a0;text-align:right;">{{data.showAddress}}</view>
+              </view>
             </view>
           </view>
           <view class="order-msg-blo">
             <view class="msg-list">
-              <view class="label">送达时间</view>
-              <view v-if="data.reachDate == '0000-00-00'" class="value"></view>
-              <view v-else class="value">{{ data.reachDate ? data.reachDate+' '+reachPeriodInfo : '' }}</view>
+              <view class="label">配送时间</view>
+              <view class="value">
+                {{ data.reachDate ? data.reachDate : '' }} {{data.reachPeriod?data.reachPeriod:''}}
+              </view>
             </view>
             <view class="msg-list">
               <view class="label">贺卡内容</view>

mallApp/src/pages/user/address.vue

@@ -6,7 +6,7 @@
 				<tui-list-cell class="line-cell" :hover="false" v-if="hasMap == 1">
 					<view class="tui-title">地址类型</view>
 					<button :class="[couldNavigation==1?'blue':'default']" class="admin-button-com middle" @click.stop="setStyle(1)" style="width:180upx;">支持导航</button>
-					<button :class="[couldNavigation==0?'blue':'default']" class="admin-button-com middle" style="width:180upx;margin-left:70upx;" @click.stop="setStyle(0)">不用导航</button>
+					<!-- <button :class="[couldNavigation==0?'blue':'default']" class="admin-button-com middle" style="width:180upx;margin-left:70upx;" @click.stop="setStyle(0)">不用导航</button> -->
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">

开发http/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.7",
-    "versionCode" : 187,
+    "versionName" : "1.8.8",
+    "versionCode" : 188,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.7",
-    "versionCode" : 187,
+    "versionName" : "1.8.8",
+    "versionCode" : 188,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.7",
-    "versionCode" : 187,
+    "versionName" : "1.8.8",
+    "versionCode" : 188,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {