shish hai 7 meses
pai
achega
df6aaa1ba2

+ 12 - 2
ghsApp/src/admin/item/detail.vue

@@ -273,6 +273,13 @@
             </view>
             </view>
           </tui-list-cell>
           </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>
 
 
       <view class="app-footer">
       <view class="app-footer">
@@ -449,6 +456,7 @@ import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
 import ModalModule from "@/components/plugin/modal"
 import ModalModule from "@/components/plugin/modal"
 import { getAllStaff } from "@/api/shop-admin";
 import { getAllStaff } from "@/api/shop-admin";
 import { partItem } from "@/api/part";
 import { partItem } from "@/api/part";
+import { CURRENT_ENV } from '@/config'
 export default {
 export default {
   name: "item-detail",
   name: "item-detail",
   components: {
   components: {
@@ -538,7 +546,8 @@ export default {
       ],
       ],
       partAcceptItem:0,
       partAcceptItem:0,
       partAcceptItemName:'',
       partAcceptItemName:'',
-      partAcceptItemModify:0
+      partAcceptItemModify:0,
+      currentEnv:'production'
     };
     };
   },
   },
 	computed:{
 	computed:{
@@ -565,7 +574,8 @@ export default {
 				this.staffData = res.data.list ? res.data.list : []
 				this.staffData = res.data.list ? res.data.list : []
 			}
 			}
 		})
 		})
-
+		//当前环境
+		this.currentEnv = CURRENT_ENV
   },
   },
   onShow(){
   onShow(){
     let that = this
     let that = this

+ 1 - 1
ghsApp/src/pagesClient/member/detail.vue

@@ -96,7 +96,7 @@
               </view>
               </view>
               
               
               <!-- 地址信息 -->
               <!-- 地址信息 -->
-              <view class="address-info" style="background: #f8f9fa; border-radius: 12upx; padding: 20upx; border-left: 4upx solid #3385ff;">
+              <view class="address-info" style="background: #f8f9fa; border-radius: 12upx; padding: 20upx; border-left: 4upx solid #3385ff;" v-if="userInfo.address!=''">
                 <view class="main-address" style="font-size: 30upx; color: #333; line-height: 1.5; margin-bottom: 8upx;">
                 <view class="main-address" style="font-size: 30upx; color: #333; line-height: 1.5; margin-bottom: 8upx;">
                   <text v-if="!$util.isEmpty(userInfo.city) || !$util.isEmpty(userInfo.dist)" style="color: #666; margin-right: 8upx;">{{userInfo.city}}{{userInfo.dist}}</text>
                   <text v-if="!$util.isEmpty(userInfo.city) || !$util.isEmpty(userInfo.dist)" style="color: #666; margin-right: 8upx;">{{userInfo.city}}{{userInfo.dist}}</text>
                   {{userInfo.address}}{{userInfo.floor}}
                   {{userInfo.address}}{{userInfo.floor}}

+ 13 - 2
ghsApp/src/pagesOrder/detail.vue

@@ -434,7 +434,15 @@
 				</div>
 				</div>
 			</view>
 			</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>
 		</view>
+
 		<div class="app-footer">
 		<div class="app-footer">
 			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com middle blue" :class="active">取消</button>
 			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com middle blue" :class="active">取消</button>
 			<button @click="bookOrderCancel(detailInfo)" v-if="detailInfo.status == 2 && detailInfo.book == 1" class="admin-button-com middle blue" :class="active">取消</button>
 			<button @click="bookOrderCancel(detailInfo)" v-if="detailInfo.status == 2 && detailInfo.book == 1" class="admin-button-com middle blue" :class="active">取消</button>
@@ -606,7 +614,7 @@ import { cloudPrintOrder, cancelOrder,cancelBookOrderInfo,confirmReachFn,changeS
 import { hasHitNavigate } from "@/api/map";
 import { hasHitNavigate } from "@/api/map";
 import { getWeixinId } from "@/api/invite";
 import { getWeixinId } from "@/api/invite";
 import { refundMoney } from "@/api/refund";
 import { refundMoney } from "@/api/refund";
-import { IMGHOST } from '@/config'
+import { IMGHOST,CURRENT_ENV } from '@/config'
 import { partItem } from "@/api/part"
 import { partItem } from "@/api/part"
 import { delItem,updateRemarkItemFn } from "@/api/order-item";
 import { delItem,updateRemarkItemFn } from "@/api/order-item";
 import { getAllStaff } from "@/api/shop-admin"
 import { getAllStaff } from "@/api/shop-admin"
@@ -685,7 +693,8 @@ export default {
 				'30': { text: '骑手已到店', color: '#3385ff' },
 				'30': { text: '骑手已到店', color: '#3385ff' },
 				'40': { text: '申请取消中', color: '#ff2842' },
 				'40': { text: '申请取消中', color: '#ff2842' },
 				'50': { text: '客服介入处理中', color: '#ff2842' }
 				'50': { text: '客服介入处理中', color: '#ff2842' }
-			}
+			},
+			currentEnv:'production'
 		};
 		};
 	},
 	},
 	onPullDownRefresh() {
 	onPullDownRefresh() {
@@ -715,6 +724,8 @@ export default {
 			}
 			}
       	})
       	})
 
 
+		//当前环境
+		this.currentEnv = CURRENT_ENV
 	},
 	},
 	computed: {
 	computed: {
 		...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" }),
 		...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" }),