Merge branch 'master' into zhongqi-delivery

ghsApp/src/admin/billing/result.vue

@@ -18,7 +18,8 @@
 
   <!-- #ifdef MP-WEIXIN -->
   <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
-  <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" v-if="currentEnv=='production'" style="width:688upx;"></ad-custom>
+    <ad-custom unit-id="adunit-9523c840341ccb1f" v-else style="width:688upx;"></ad-custom>
   <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
   <!-- #endif -->
 
@@ -47,6 +48,7 @@ import { partItem } from "@/api/part"
 import { changeHalf } from "@/api/item"
 import { giveItem } from "@/api/order-item"
 import ModalModule from "@/components/plugin/modal"
+import { CURRENT_ENV } from "@/config"
 export default {
   name: "result",
   components: {
@@ -62,8 +64,13 @@ export default {
 			title:'新订单',
 			giveTargetId:0,
 			givePopShow:false,
-			giveNum:1
+			giveNum:1,
+      currentEnv:'production'
     };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
   },
 	computed: {
 		...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" }),

ghsApp/src/admin/shop/sk.vue

@@ -63,7 +63,7 @@
 
           <!-- 花材批发和零售 -->
           <view class="action-btn" style="border-top:2upx solid #2bb931;margin-top:20upx;">
-            <text style="font-size: 30upx;font-weight: bold;">【花材】跑腿费计算方式</text>
+            <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
           </view>
           <view style="display: flex; align-items: center; margin-left:30upx;">
             <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
@@ -92,7 +92,7 @@
           <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
 
           <!-- 花束 -->
-          <view class="section-title" style="border-top:2upx solid #2bb931;">【花束】跑腿费计算方式</view>
+          <view class="section-title" style="border-top:2upx solid #2bb931;">【零售-绿植花束】跑腿费计算方式</view>
 
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">包运费的</view>

ghsApp/src/pagesPurchase/info.vue

@@ -250,6 +250,14 @@
 				</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">
@@ -304,7 +312,7 @@ import ModalModule from "@/components/plugin/modal"
 import { print } from '@/api/product';
 import { getPrint } from "@/api/shop";
 import { mapGetters } from "vuex";
-import { IMGHOST } from '@/config'
+import { IMGHOST,CURRENT_ENV } from '@/config'
 import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 export default {
 	name: "info",
@@ -341,7 +349,8 @@ export default {
 			salt:'',
 			showSeat:1,
 			title:'',
-			imageUrl:''
+			imageUrl:'',
+      		currentEnv:'production'
 		};
 	},
 	onPullDownRefresh() {
@@ -362,6 +371,10 @@ export default {
 			prevPage.$vm.needRefresh = 0
 		}
 		this.imageUrl = IMGHOST+'/custom/cg_share.jpg'
+
+		//当前环境
+		this.currentEnv = CURRENT_ENV
+
 	},
 	onUnload(){
 		clearInterval(this.T)

hdApp/src/admin/home/components/order-item.vue

@@ -11,7 +11,7 @@
 					<view style="margin-top:3upx;">
 						<text>{{info.sendType==1?'取花':'配送'}}：</text>
 						<text>
-							{{info.reachDate.substr(5,5)}} {{info.reachPeriod}}前 
+							{{info.reachDate.substr(5,5)}} {{info.reachPeriod}} 
 							<text v-if="info.sendType==1" style="color:#3385FF;font-weight:bold;margin-left:20upx;border:1upx solid #3385FF;border-radius: 6upx;padding:0 6upx;font-size:24upx;">到店自取</text>
 						</text>
 					</view>

hdApp/src/admin/order/detail.vue

@@ -126,7 +126,7 @@
                 <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
                 <text v-else-if="orderInfo.reachDate == orderInfo.tomorrow">明天</text>
                 <text v-else>{{thisYear==orderInfo.reachDate.substr(0,4)?'':orderInfo.reachDate.substr(0,4)+'-'}}{{orderInfo.reachDate ? orderInfo.reachDate.substr(5,11):''}}</text>
-                <text class="ml-10">{{orderInfo.reachPeriod||''}}前</text>
+                <text class="ml-10">{{orderInfo.reachPeriod||''}}</text>
               </view>
               <view class="price" v-if="orderInfo.cardInfo!=''">
                 <button @click="copyCard(orderInfo)" class="admin-button-com">复制贺卡内容</button>
@@ -350,6 +350,14 @@
           </view>
         </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>
 
     <!-- 底部操作按钮 -->
@@ -430,6 +438,7 @@ import { expressDetail } from "@/api/express";
 import { cancelExpressOrder,mockNotify } from '@/api/shop-express'
 import { cancelDeliveryOrder, getCancelReason, addTip as addTipApi } from '@/api/express/delivery'
 import { needWork } from "@/api/work"
+import { CURRENT_ENV } from "@/config"
 export default {
   name: "detail",
   components: { 
@@ -452,7 +461,8 @@ export default {
       cancelReasonList: [],
       selectedCancelReasonCode: null,
       otherCancelReason: '',
-      currentExpressInfo: {}
+      currentExpressInfo: {},
+      currentEnv:'production'
     };
   },
   onLoad() {
@@ -460,6 +470,10 @@ export default {
     let pages = getCurrentPages();
     let prevPage = pages[pages.length - 2];
     prevPage.$vm.refreshPage = 0
+
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+
   },
   onShow() {
     if (this.refreshPage == 1) {
@@ -472,7 +486,6 @@ export default {
       uni.stopPullDownRefresh()
     })
   },
-  
   methods: {
     /**
      * 获取配送平台

hdApp/src/admin/shop/sk.vue

@@ -75,7 +75,7 @@
 
           <!-- 花材批发和零售 -->
           <view class="action-btn" style="border-top:2upx solid #2bb931;margin-top:20upx;">
-            <text style="font-size: 30upx;font-weight: bold;">【花材】跑腿费计算方式</text>
+            <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
           </view>
           <view style="display: flex; align-items: center; margin-left:30upx;">
             <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
@@ -104,7 +104,7 @@
           <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
 
           <!-- 花束 -->
-          <view class="section-title" style="border-top:2upx solid #2bb931;">【花束】跑腿费计算方式</view>
+          <view class="section-title" style="border-top:2upx solid #2bb931;">【零售-绿植花束】跑腿费计算方式</view>
 
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">包运费的</view>

hdApp/src/pagesPurchase/gatherResult.vue

@@ -1,13 +1,11 @@
 <template>
   <view class="app-content">
     <view class="billing_box_bg">
-      <view class="top-view"> </view>
       <view class="result-view">
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">支付成功</view>
         <button class="admin-button-com big" @click="getDetail()">订单详情</button>
         <button class="admin-button-com big" @click="goBack()" style="margin-top:30upx;">返回</button>
-        <view style="margin-top:50upx;font-size:36upx;text-decoration:underline;" @click="goClearRemind()">如何查看我还有多少待结账</view>
       </view>
 
       <!-- #ifdef MP-WEIXIN -->
@@ -25,7 +23,8 @@ export default {
   name: "AppResult",
 	data() {
 		return {
-			id:0
+			id:0,
+      currentEnv:'production'
 		}
 	},
   methods: {
@@ -40,6 +39,10 @@ export default {
     },
     init(){
       this.id = this.option.id ? this.option.id : 0
+
+      //当前环境
+      this.currentEnv = CURRENT_ENV
+
     }
   },
 };
@@ -47,7 +50,7 @@ export default {
 <style lang="scss" scoped>
 .billing_box_bg {
   position: relative;
-  padding: 60upx 30upx;
+  padding: 60upx 30upx 0upx 30upx;
   display: flex;
   flex-direction: column;
   background-color: #f5f5f5;
@@ -65,13 +68,13 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 70upx;
+    padding: 50upx 70upx 30upx 70upx;
     width: 100%;
     background: #ffffff;
     border-radius: 20upx;
     z-index: 1;
     .iconchenggong {
-      font-size: 150upx;
+      font-size: 120upx;
       color: $mainColor1;
     }
     .result-title {

hdApp/src/pagesPurchase/particulars.vue

@@ -17,7 +17,7 @@
       </view>
       <!-- #ifdef MP-WEIXIN -->
       <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
-      <ad-custom unit-id="adunit-b3f48f1b6c1a39ff" v-if="CURRENT_ENV=='production'"></ad-custom>
+      <ad-custom unit-id="adunit-b3f48f1b6c1a39ff" v-if="currentEnv=='production'"></ad-custom>
       <ad-custom unit-id="adunit-bb3f5872f1a5d549" v-else></ad-custom>
       <!-- #endif -->
     </view>
@@ -34,7 +34,7 @@ export default {
     return {
       hasInit:false,
       ghsCgScene:'',
-
+      currentEnv:'production',
       fromCg:0,
       flowersList:[],
       onlyCg:1
@@ -57,6 +57,9 @@ export default {
 
     this.getCgItemFn()
 
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+
   },
   onShow () {
     if(this.hasInit == false){

hdApp/src/pagesPurchase/purDetails.vue

@@ -306,8 +306,8 @@
 
       <!-- #ifdef MP-WEIXIN -->
       <view style="padding-bottom:20upx;">
-      <ad-custom unit-id="adunit-22b6fe92acad433e" v-if="CURRENT_ENV=='production'" style="margin:0 auto;"></ad-custom>
-      <ad-custom unit-id="adunit-13c9d1954d809a16" v-else style="margin:0 auto;"></ad-custom>
+      <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 -->
 
@@ -397,7 +397,8 @@ export default {
 				'30': { text: '骑手已到店', color: '#3385ff' },
 				'40': { text: '申请取消中', color: '#ff2842' },
 				'50': { text: '客服介入处理中', color: '#ff2842' }
-			}
+			},
+      currentEnv:'production'
     };
   },
   onShareAppMessage(res) {
@@ -449,8 +450,13 @@ export default {
 		let prevPage = pages[ pages.length - 2 ];
 		prevPage.$vm.refreshPage = 0
 
+    //当前环境
+    this.currentEnv = CURRENT_ENV
   },
   methods: {
+    adError(err) {
+      console.error('原生模板广告加载失败', err)
+    },
     affirmTake(){
         this.pageTo({url: '/pagesPurchase/confirmTake?id='+this.detailInfo.id})
     },

hdApp/src/pagesPurchase/refundResult.vue

@@ -7,7 +7,7 @@
       <!-- #ifdef MP-WEIXIN -->
       <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
 	  <view style="width:690upx;">
-      	<ad-custom unit-id="adunit-b3f48f1b6c1a39ff" v-if="CURRENT_ENV=='production'"></ad-custom>
+      	<ad-custom unit-id="adunit-b3f48f1b6c1a39ff" v-if="currentEnv=='production'"></ad-custom>
 		<ad-custom unit-id="adunit-bb3f5872f1a5d549" v-else></ad-custom>
 	  </view>
       <!-- #endif -->
@@ -25,11 +25,14 @@ export default {
 	},
 	data(){
 		return {
-            id:0
+            id:0,
+      		currentEnv:'production'
 		}
 	},
 	methods: {
 		init(){
+			//当前环境
+			this.currentEnv = CURRENT_ENV
 		},
 		gotoDetail() {
             this.id = this.option.id?this.option.id:0

mallApp/src/pages/billing/affirmGhs.vue

@@ -771,7 +771,7 @@ export default {
 	border-radius: 20upx 20upx 0 0;
 	display: flex;
 	flex-direction: column;
-	max-height: 90vh;
+	max-height: 99vh;
 	padding: 0;
 }
 
@@ -867,7 +867,7 @@ export default {
 
 .time-button {
 	width: calc(25% - 6upx);
-	height: 60upx;
+	height: 75upx;
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -901,7 +901,7 @@ export default {
 	
 	.footer-button {
 		flex: 1;
-		height: 70upx;
+		height: 90upx;
 		display: flex;
 		align-items: center;
 		justify-content: center;

mallApp/src/pages/order/components/app-delivery.vue

@@ -574,7 +574,7 @@ export default {
   border-radius: 20upx 20upx 0 0;
   display: flex;
   flex-direction: column;
-  max-height: 94vh;
+  max-height: 99vh;
   padding: 0;
   padding-bottom:135upx;
 }
@@ -671,7 +671,7 @@ export default {
 
 .time-button {
   width: calc(25% - 6upx);
-  height: 60upx;
+  height: 75upx;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -705,7 +705,7 @@ export default {
   
   .footer-button {
     flex: 1;
-    height: 70upx;
+    height: 90upx;
     display: flex;
     align-items: center;
     justify-content: center;