shish 7 месяцев назад
Родитель
Сommit
a59b3340d3

+ 15 - 2
hdApp/src/admin/order/detail.vue

@@ -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: {
     /**
      * 获取配送平台

+ 6 - 1
hdApp/src/pagesPurchase/gatherResult.vue

@@ -25,7 +25,8 @@ export default {
   name: "AppResult",
 	data() {
 		return {
-			id:0
+			id:0,
+      currentEnv:'production'
 		}
 	},
   methods: {
@@ -40,6 +41,10 @@ export default {
     },
     init(){
       this.id = this.option.id ? this.option.id : 0
+
+      //当前环境
+      this.currentEnv = CURRENT_ENV
+
     }
   },
 };

+ 5 - 2
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){

+ 9 - 3
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})
     },

+ 5 - 2
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