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