{{cartNum > 99 ? '99+' : cartNum}}
diff --git a/template/uni-app/components/payment/index.vue b/template/uni-app/components/payment/index.vue
index 29fea253f..b4235c153 100644
--- a/template/uni-app/components/payment/index.vue
+++ b/template/uni-app/components/payment/index.vue
@@ -1,498 +1,508 @@
-
-
-
-
- {{$t(`选择付款方式`)}}
-
-
-
-
-
- {{item.name}}
-
- {{item.title}} {{$t(`¥`)}}{{ item.number }}
-
- {{item.title}}
-
-
-
-
- {{$t(`支付`)}}{{$t(`¥`)}}{{totalPrice}}
- {{$t(`去付款`)}}
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/components/productWindow/index.vue b/template/uni-app/components/productWindow/index.vue
index c3f241feb..bdcd5758c 100644
--- a/template/uni-app/components/productWindow/index.vue
+++ b/template/uni-app/components/productWindow/index.vue
@@ -1,404 +1,412 @@
-
-
-
-
-
-
-
-
-
- {{ attr.productSelect.store_name }}
-
-
-
- {{$t(`¥`)}}{{ attr.productSelect.price }}
- {{$t(`¥`)}}{{attr.productSelect.vip_price}}
-
-
-
-
- {{$t(`库存`)}}: {{ attr.productSelect.stock }}
- {{type ? $t(`库存`) : $t(`限量`)}}: {{attr.productSelect.quota}}
-
-
-
-
-
-
-
- {{ $t(item.attr_name) }}
-
-
- {{ $t(itemn.attr) }}
-
-
-
-
-
- {{$t(`数量`)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
-
-
-
- {{$t(`我要参团`)}}
-
- {{$t(`已售罄`)}}
-
- {{$t(`确定`)}}
- {{$t(`已售罄`)}}
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index e4d52096c..b63d890cf 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -185,6 +185,9 @@
"desc" : "你的位置信息将用于和门店的距离长度"
}
},
+ "optimization" : {
+ "subPackages" : true
+ },
"usingComponents" : true,
"requiredPrivateInfos" : [
"getLocation",
@@ -221,7 +224,8 @@
"optimization" : {
"treeShaking" : {
"enable" : true
- }
+ },
+ "subPackages" : true
},
"async" : {
"timeout" : 200000
@@ -233,7 +237,8 @@
"immersed" : true
}
},
- "_spaceID" : "679f0930-8f60-425c-9033-8c135f397ea5"
+ "_spaceID" : "679f0930-8f60-425c-9033-8c135f397ea5",
+ "lazyCodeLoading" : "requiredComponents"
}
/* ios打包配置 */
diff --git a/template/uni-app/mixins/sharePoster.js b/template/uni-app/mixins/sharePoster.js
index 0f97f005c..535bbe5ce 100644
--- a/template/uni-app/mixins/sharePoster.js
+++ b/template/uni-app/mixins/sharePoster.js
@@ -60,10 +60,12 @@ export const sharePoster = {
},
getImageBase64() {
let that = this;
- imageBase64(that.storeImage, '')
+ imageBase64(that.storeImage, this.storeInfo.wechat_code)
.then((res) => {
that.storeImageBase64 = res.data.image;
- // that.PromotionCode = res.data.code;
+ if (this.storeInfo.wechat_code) {
+ that.PromotionCode = res.data.code;
+ }
})
.catch(() => {});
},
@@ -158,7 +160,8 @@ export const sharePoster = {
that.$set(that, "canvasStatus", true);
let arr2
// #ifdef MP
- let met = type === 'scombination' ? scombinationCode(that.id) : type === 'seckill' ? seckillCode(that
+ let met = type === 'scombination' ? scombinationCode(that.id) : type === 'seckill' ? seckillCode(
+ that
.id) : getProductCode(that.id)
met.then((res) => {
uni.downloadFile({
@@ -186,7 +189,8 @@ export const sharePoster = {
});
// #endif
// #ifdef H5 || APP-PLUS
- arr2 = [that.posterbackgd, that.storeImageBase64, that.PromotionCode];
+ arr2 = [that.posterbackgd, that.storeImageBase64, that.PromotionCode];
+ console.log(arr2)
if (!that.storeImageBase64)
return that.$util.Tips({
title: i18n.t(`正在下载海报,请稍后再试`),
diff --git a/template/uni-app/pages/activity/goods_combination_details/index.vue b/template/uni-app/pages/activity/goods_combination_details/index.vue
index 1de9f5735..d2d15da94 100644
--- a/template/uni-app/pages/activity/goods_combination_details/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_details/index.vue
@@ -134,7 +134,8 @@
class='iconfont icon-xiangxia'>
- {{$t(`收起`)}}
+ {{$t(`收起`)}}
+
@@ -462,7 +463,6 @@
});
//扫码携带参数处理
// #ifdef MP
-
if (options.scene) {
let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
if (value.id) options.id = value.id;
@@ -509,14 +509,7 @@
})
}
};
- // #ifdef H5
- this.codeVal = window.location.origin + '/pages/activity/goods_combination_details/index?id=' + this.id +
- '&spid=' + this.$store.state.app.uid
- // #endif
- // #ifdef APP-PLUS
- this.codeVal = HTTP_REQUEST_URL + '/pages/activity/goods_combination_details/index?id=' + this.id +
- '&spid=' + this.$store.state.app.uid
- // #endif
+
},
onNavigationBarButtonTap(e) {
this.currentPage = !this.currentPage
@@ -608,7 +601,7 @@
combinationDetail() {
var that = this;
var data = that.id;
- getCombinationDetail(data).then(function(res) {
+ getCombinationDetail(data).then((res)=> {
that.dataShow = 1;
uni.setNavigationBarTitle({
title: res.data.storeInfo.title.substring(0, 16)
@@ -627,7 +620,20 @@
that.replyChance = res.data.replyChance;
that.attribute.productAttr = res.data.productAttr;
that.productValue = res.data.productValue;
- // that.PromotionCode = res.data.storeInfo.code_base;
+ if (!this.storeInfo.wechat_code) {
+ // #ifdef H5
+ this.codeVal = window.location.origin +
+ '/pages/activity/goods_combination_details/index?id=' + this.id +
+ '&spid=' + this.$store.state.app.uid
+ // #endif
+ // #ifdef APP-PLUS
+ this.codeVal = HTTP_REQUEST_URL + '/pages/activity/goods_combination_details/index?id=' +
+ this.id +
+ '&spid=' + this.$store.state.app.uid
+ // #endif
+ } else {
+ that.$set(that, "PromotionCode", this.storeInfo.wechat_code);
+ }
that.routineContact = Number(res.data.routine_contact_type);
for (let key in res.data.productValue) {
let obj = res.data.productValue[key];
@@ -658,7 +664,8 @@
that.infoScroll();
}, 500);
- }).catch(function(err) {
+ }).catch(function(err) {
+ console.log(err)
that.$util.Tips({
title: err
}, {
diff --git a/template/uni-app/pages/activity/goods_seckill_details/index.vue b/template/uni-app/pages/activity/goods_seckill_details/index.vue
index 36697b97a..515dab4d9 100644
--- a/template/uni-app/pages/activity/goods_seckill_details/index.vue
+++ b/template/uni-app/pages/activity/goods_seckill_details/index.vue
@@ -560,9 +560,23 @@
that.storeImage = that.storeInfo.image
that.getImageBase64();
// #endif
+ if (!this.storeInfo.wechat_code) {
+ // #ifdef H5
+ this.codeVal = window.location.origin +
+ '/pages/activity/goods_seckill_details/index?id=' +
+ that.id + '&spid=' + that.storeInfo.uid
+ // #endif
+ // #ifdef APP-PLUS
+ this.codeVal = HTTP_REQUEST_URL + '/pages/activity/goods_seckill_details/index?id=' +
+ that
+ .id + '&spid=' + that.storeInfo.uid
+ // #endif
+ } else {
+ that.$set(that, "PromotionCode", this.storeInfo.wechat_code);
+ }
// #ifdef APP-PLUS
uni.downloadFile({
- url: that.setDomain(res.data.storeInfo.code_base),
+ url: that.setDomain(res.data.storeInfo.wechat_code),
success: function(res) {
that.PromotionCode = res.tempFilePath;
},
@@ -572,7 +586,8 @@
});
},
});
- // that.PromotionCode = res.data.storeInfo.code_base
+
+
that.downloadFilestoreImage();
// #endif
// #ifdef H5
@@ -586,14 +601,7 @@
setTimeout(() => {
that.infoScroll();
}, 500);
- // #ifdef H5
- this.codeVal = window.location.origin + '/pages/activity/goods_seckill_details/index?id=' +
- that.id + '&spid=' + that.storeInfo.uid
- // #endif
- // #ifdef APP-PLUS
- this.codeVal = HTTP_REQUEST_URL + '/pages/activity/goods_seckill_details/index?id=' + that
- .id + '&spid=' + that.storeInfo.uid
- // #endif
+
app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
'&spid=' + that.storeInfo.uid;
// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
diff --git a/template/uni-app/pages/activity/poster-poster/index.vue b/template/uni-app/pages/activity/poster-poster/index.vue
index 046ed9852..4c03fbe76 100644
--- a/template/uni-app/pages/activity/poster-poster/index.vue
+++ b/template/uni-app/pages/activity/poster-poster/index.vue
@@ -1,431 +1,430 @@
-
-
-
- {{$t(`提示:点击图片即可保存至手机相册`)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/admin/components/PriceChange/index.vue b/template/uni-app/pages/admin/components/PriceChange/index.vue
index 2e9eac6f1..deafe808f 100644
--- a/template/uni-app/pages/admin/components/PriceChange/index.vue
+++ b/template/uni-app/pages/admin/components/PriceChange/index.vue
@@ -1,167 +1,232 @@
-
-
-
-
- {{ status == 0 ? $t(`一键改价`) : status == 1 ? $t(`订单备注`) : $t(`立即退款`) }}
-
-
-
-
- {{$t(`商品总价`)}}({{$t(`¥`)}})
-
- {{ orderInfo.total_price }}
-
-
-
- {{$t(`原始邮费`)}}({{$t(`¥`)}})
-
- {{ orderInfo.pay_postage }}
-
-
-
- {{$t(`实际支付`)}}({{$t(`¥`)}})
-
-
-
-
-
- {{$t(`实际支付`)}}({{$t(`¥`)}})
-
- {{ orderInfo.pay_price }}
-
-
-
- {{$t(`退款金额`)}}({{$t(`¥`)}})
-
-
-
-
-
-
-
-
-
- {{
- status == 1 || orderInfo.refund_status == 0 ? $t(`立即修改`) : $t(`确认退款`)
- }}
-
-
- {{$t(`拒绝退款`)}}
-
-
-
-
-
+
+
+
+
+ {{ status == 0 ? $t(`一键改价`) : status == 1 ? $t(`订单备注`) : $t(`立即退款`) }}
+
+
+
+
+ {{$t(`商品总价`)}}({{$t(`¥`)}})
+
+ {{ orderInfo.total_price }}
+
+
+
+ {{$t(`原始邮费`)}}({{$t(`¥`)}})
+
+ {{ orderInfo.pay_postage }}
+
+
+
+ {{$t(`实际支付`)}}({{$t(`¥`)}})
+
+
+
+
+
+ {{$t(`实际支付`)}}({{$t(`¥`)}})
+
+ {{ orderInfo.pay_price }}
+
+
+
+ {{$t(`退款金额`)}}({{$t(`¥`)}})
+
+
+
+
+
+
+
+
+
+ {{
+ status == 1 || orderInfo.refund_status == 0 ? $t(`立即修改`) : $t(`确认退款`)
+ }}
+
+
+ {{$t(`拒绝退款`)}}
+
+
+
+
+
-
diff --git a/template/uni-app/pages/admin/delivery/index.vue b/template/uni-app/pages/admin/delivery/index.vue
index 8659a5f19..2ee4d2bdc 100644
--- a/template/uni-app/pages/admin/delivery/index.vue
+++ b/template/uni-app/pages/admin/delivery/index.vue
@@ -81,7 +81,7 @@
range-key="title">
{{expTemp[expIndex].title}}
- {{$t(`preview`)}}
+ {{$t(`预览`)}}