diff --git a/template/uni-app/components/couponListWindow/index.vue b/template/uni-app/components/couponListWindow/index.vue index 9ebc94d6..e3231f4c 100644 --- a/template/uni-app/components/couponListWindow/index.vue +++ b/template/uni-app/components/couponListWindow/index.vue @@ -1,286 +1,286 @@ - - - - - diff --git a/template/uni-app/components/easy-loadimage/easy-loadimage.vue b/template/uni-app/components/easy-loadimage/easy-loadimage.vue index 4a769dea..32b27030 100644 --- a/template/uni-app/components/easy-loadimage/easy-loadimage.vue +++ b/template/uni-app/components/easy-loadimage/easy-loadimage.vue @@ -1,227 +1,227 @@ - - + + diff --git a/template/uni-app/components/eidtUserModal/index.vue b/template/uni-app/components/eidtUserModal/index.vue index b3115290..fbb1ddac 100644 --- a/template/uni-app/components/eidtUserModal/index.vue +++ b/template/uni-app/components/eidtUserModal/index.vue @@ -1,314 +1,314 @@ - - - - - + diff --git a/template/uni-app/components/guide/index.vue b/template/uni-app/components/guide/index.vue index bcb695e5..312caa8f 100644 --- a/template/uni-app/components/guide/index.vue +++ b/template/uni-app/components/guide/index.vue @@ -1,156 +1,156 @@ - - - - diff --git a/template/uni-app/components/indexGoods/index.vue b/template/uni-app/components/indexGoods/index.vue index 0bf0adb6..21bf844d 100644 --- a/template/uni-app/components/indexGoods/index.vue +++ b/template/uni-app/components/indexGoods/index.vue @@ -1,188 +1,188 @@ - - - - - diff --git a/template/uni-app/components/kefuIcon/index.vue b/template/uni-app/components/kefuIcon/index.vue index 52ffe67f..b9051b0b 100644 --- a/template/uni-app/components/kefuIcon/index.vue +++ b/template/uni-app/components/kefuIcon/index.vue @@ -1,84 +1,84 @@ - - - - - diff --git a/template/uni-app/components/payment/index.vue b/template/uni-app/components/payment/index.vue index 1ca87f92..b4235c15 100644 --- a/template/uni-app/components/payment/index.vue +++ b/template/uni-app/components/payment/index.vue @@ -1,508 +1,508 @@ - - - - - diff --git a/template/uni-app/components/productWindow/index.vue b/template/uni-app/components/productWindow/index.vue index b42f406f..bdcd5758 100644 --- a/template/uni-app/components/productWindow/index.vue +++ b/template/uni-app/components/productWindow/index.vue @@ -1,412 +1,412 @@ - - - - - diff --git a/template/uni-app/components/promotionGood/index.vue b/template/uni-app/components/promotionGood/index.vue index 073b4398..c358565e 100644 --- a/template/uni-app/components/promotionGood/index.vue +++ b/template/uni-app/components/promotionGood/index.vue @@ -1,120 +1,120 @@ - - - - diff --git a/template/uni-app/components/recommend/index.vue b/template/uni-app/components/recommend/index.vue index 23f8d451..37acd10b 100644 --- a/template/uni-app/components/recommend/index.vue +++ b/template/uni-app/components/recommend/index.vue @@ -1,135 +1,135 @@ - - - - - diff --git a/template/uni-app/config/app.js b/template/uni-app/config/app.js index 8c506a0e..6c3a4c7b 100644 --- a/template/uni-app/config/app.js +++ b/template/uni-app/config/app.js @@ -1,33 +1,33 @@ -module.exports = { - // 小程序配置 - // #ifdef MP || APP-PLUS - // 请求域名 格式: https://您的域名 - HTTP_REQUEST_URL: `https://demo.crmeb.com`, - // #endif - - // H5配置 - // #ifdef H5 - //H5接口是浏览器地址,非单独部署不用修改 - HTTP_REQUEST_URL: window.location.protocol + "//" + window.location.host, - // #endif - - // 以下配置在不做二开的前提下,不需要做任何的修改 - HEADER: { - 'content-type': 'application/json', - //#ifdef H5 - 'Form-type': navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 ? 'wechat' : 'h5', - //#endif - //#ifdef MP - 'Form-type': 'routine', - //#endif - //#ifdef APP-VUE - 'Form-type': 'app', - //#endif - }, - // 回话密钥名称 请勿修改此配置 - TOKENNAME: 'Authori-zation', - // 缓存时间 0 永久 - EXPIRE: 0, - //分页最多显示条数 - LIMIT: 10 +module.exports = { + // 小程序配置 + // #ifdef MP || APP-PLUS + // 请求域名 格式: https://您的域名 + HTTP_REQUEST_URL: `https://demo.crmeb.com`, + // #endif + + // H5配置 + // #ifdef H5 + //H5接口是浏览器地址,非单独部署不用修改 + HTTP_REQUEST_URL: window.location.protocol + "//" + window.location.host, + // #endif + + // 以下配置在不做二开的前提下,不需要做任何的修改 + HEADER: { + 'content-type': 'application/json', + //#ifdef H5 + 'Form-type': navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 ? 'wechat' : 'h5', + //#endif + //#ifdef MP + 'Form-type': 'routine', + //#endif + //#ifdef APP-VUE + 'Form-type': 'app', + //#endif + }, + // 回话密钥名称 请勿修改此配置 + TOKENNAME: 'Authori-zation', + // 缓存时间 0 永久 + EXPIRE: 0, + //分页最多显示条数 + LIMIT: 10 } 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 bad56021..d2d15da9 100644 --- a/template/uni-app/pages/activity/goods_combination_details/index.vue +++ b/template/uni-app/pages/activity/goods_combination_details/index.vue @@ -1,1810 +1,1810 @@ - - - - - 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 b49e7136..515dab4d 100644 --- a/template/uni-app/pages/activity/goods_seckill_details/index.vue +++ b/template/uni-app/pages/activity/goods_seckill_details/index.vue @@ -1,1651 +1,1651 @@ - - - - - diff --git a/template/uni-app/pages/activity/poster-poster/index.vue b/template/uni-app/pages/activity/poster-poster/index.vue index 738e707b..4c03fbe7 100644 --- a/template/uni-app/pages/activity/poster-poster/index.vue +++ b/template/uni-app/pages/activity/poster-poster/index.vue @@ -1,430 +1,430 @@ - - - - - diff --git a/template/uni-app/pages/admin/components/PriceChange/index.vue b/template/uni-app/pages/admin/components/PriceChange/index.vue index 8a3ce989..deafe808 100644 --- a/template/uni-app/pages/admin/components/PriceChange/index.vue +++ b/template/uni-app/pages/admin/components/PriceChange/index.vue @@ -1,232 +1,232 @@ - + - diff --git a/template/uni-app/pages/annex/components/verify/verify.vue b/template/uni-app/pages/annex/components/verify/verify.vue index a13413fa..2c613309 100644 --- a/template/uni-app/pages/annex/components/verify/verify.vue +++ b/template/uni-app/pages/annex/components/verify/verify.vue @@ -1,520 +1,520 @@ - - - - + diff --git a/template/uni-app/pages/annex/components/verify/verifyPoint/verifyPoint.vue b/template/uni-app/pages/annex/components/verify/verifyPoint/verifyPoint.vue index 90433dbc..c0cdc939 100644 --- a/template/uni-app/pages/annex/components/verify/verifyPoint/verifyPoint.vue +++ b/template/uni-app/pages/annex/components/verify/verifyPoint/verifyPoint.vue @@ -1,541 +1,541 @@ - - - - diff --git a/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue b/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue index 061ca851..e1338bc1 100644 --- a/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue +++ b/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue @@ -1,745 +1,745 @@ - - - diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue index c3e0e4d9..96da60d0 100644 --- a/template/uni-app/pages/extension/customer_list/chat.vue +++ b/template/uni-app/pages/extension/customer_list/chat.vue @@ -1,993 +1,993 @@ - - - - - - + + diff --git a/template/uni-app/pages/goods/goods_comment_list/index.vue b/template/uni-app/pages/goods/goods_comment_list/index.vue index 5e3b755b..bae58379 100644 --- a/template/uni-app/pages/goods/goods_comment_list/index.vue +++ b/template/uni-app/pages/goods/goods_comment_list/index.vue @@ -1,226 +1,226 @@ - - - - - diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue index 6b5dcd68..c249865c 100644 --- a/template/uni-app/pages/goods/order_confirm/index.vue +++ b/template/uni-app/pages/goods/order_confirm/index.vue @@ -338,14 +338,6 @@ title: this.$t(`找微信好友支付`), payStatus: 1, }, - { - "name": this.$t(`通联支付`), - "icon": "icon-tonglianzhifu1", - value: 'allinpay', - title: this.$t(`使用通联支付付款`), - payStatus: 1, - } - ], virtual_type: 0, formContent: '', @@ -869,7 +861,6 @@ that.cartArr[1].payStatus = res.data.ali_pay_status || 0; //#ifdef MP that.cartArr[1].payStatus = 0; - that.cartArr[5].payStatus = res.data.pay_allin_open || 0; //#endif //余额支付是否开启 // that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money; diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue index 378cb8d3..a8d8c7f6 100644 --- a/template/uni-app/pages/goods/order_details/index.vue +++ b/template/uni-app/pages/goods/order_details/index.vue @@ -540,13 +540,6 @@ value: 'friend', title: this.$t(`找微信好友支付`), payStatus: 1, - }, - { - "name": this.$t(`通联支付`), - "icon": "icon-tonglianzhifu1", - value: 'allinpay', - title: this.$t(`使用通联支付付款`), - payStatus: 1, } ], pay_close: false, @@ -960,9 +953,6 @@ } if (item.value == 'friend') { item.payStatus = res.data.friend_pay_status == 1 ? true : false; - } - if (item.value == 'allinpay') { - item.payStatus = res.data.pay_allin_open == 1 ? true : false; } }); diff --git a/template/uni-app/pages/goods/order_pay_status/index.vue b/template/uni-app/pages/goods/order_pay_status/index.vue index 305f9e64..fc8d95ff 100644 --- a/template/uni-app/pages/goods/order_pay_status/index.vue +++ b/template/uni-app/pages/goods/order_pay_status/index.vue @@ -1,404 +1,404 @@ - - - - - diff --git a/template/uni-app/pages/index/diy/components/promotionList.vue b/template/uni-app/pages/index/diy/components/promotionList.vue index 8d9c1e1b..c5b1bca9 100644 --- a/template/uni-app/pages/index/diy/components/promotionList.vue +++ b/template/uni-app/pages/index/diy/components/promotionList.vue @@ -1,227 +1,227 @@ - - - - - diff --git a/template/uni-app/pages/index/diy/index.vue b/template/uni-app/pages/index/diy/index.vue index ce33ef45..b2bb2abf 100644 --- a/template/uni-app/pages/index/diy/index.vue +++ b/template/uni-app/pages/index/diy/index.vue @@ -1,1130 +1,1130 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/activity.vue b/template/uni-app/pages/index/visualization/components/activity.vue index 99da5bc1..8328aab9 100644 --- a/template/uni-app/pages/index/visualization/components/activity.vue +++ b/template/uni-app/pages/index/visualization/components/activity.vue @@ -1,203 +1,203 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/menus.vue b/template/uni-app/pages/index/visualization/components/menus.vue index 13fd5176..d2221115 100644 --- a/template/uni-app/pages/index/visualization/components/menus.vue +++ b/template/uni-app/pages/index/visualization/components/menus.vue @@ -1,159 +1,159 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/newGoods.vue b/template/uni-app/pages/index/visualization/components/newGoods.vue index 945689dd..e20ee77f 100644 --- a/template/uni-app/pages/index/visualization/components/newGoods.vue +++ b/template/uni-app/pages/index/visualization/components/newGoods.vue @@ -1,334 +1,334 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/popular.vue b/template/uni-app/pages/index/visualization/components/popular.vue index 17078133..2e7ebaa9 100644 --- a/template/uni-app/pages/index/visualization/components/popular.vue +++ b/template/uni-app/pages/index/visualization/components/popular.vue @@ -1,393 +1,393 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/recommend.vue b/template/uni-app/pages/index/visualization/components/recommend.vue index 4e4221b2..2179085f 100644 --- a/template/uni-app/pages/index/visualization/components/recommend.vue +++ b/template/uni-app/pages/index/visualization/components/recommend.vue @@ -1,392 +1,392 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/scrollBox.vue b/template/uni-app/pages/index/visualization/components/scrollBox.vue index 6b53c678..eaace4d0 100644 --- a/template/uni-app/pages/index/visualization/components/scrollBox.vue +++ b/template/uni-app/pages/index/visualization/components/scrollBox.vue @@ -1,249 +1,249 @@ - - - - - diff --git a/template/uni-app/pages/points_mall/logistics_details.vue b/template/uni-app/pages/points_mall/logistics_details.vue index 1443425a..3c5a792c 100644 --- a/template/uni-app/pages/points_mall/logistics_details.vue +++ b/template/uni-app/pages/points_mall/logistics_details.vue @@ -1,299 +1,299 @@ - - - - - diff --git a/template/uni-app/pages/users/auth/index.vue b/template/uni-app/pages/users/auth/index.vue index e0406889..9540e783 100644 --- a/template/uni-app/pages/users/auth/index.vue +++ b/template/uni-app/pages/users/auth/index.vue @@ -1,291 +1,291 @@ - - - - - - - + + + + + + + diff --git a/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue b/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue index 061ca851..e1338bc1 100644 --- a/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue +++ b/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue @@ -1,745 +1,745 @@ - - - diff --git a/template/uni-app/pages/users/login/index.vue b/template/uni-app/pages/users/login/index.vue index 749e60ba..b6ab79ab 100644 --- a/template/uni-app/pages/users/login/index.vue +++ b/template/uni-app/pages/users/login/index.vue @@ -90,7 +90,7 @@ {{copyRight}} - © 2014-2022 + © 2014-2023 www.crmeb.com diff --git a/template/uni-app/pages/users/payment_on_behalf/index.vue b/template/uni-app/pages/users/payment_on_behalf/index.vue index c2e9dc35..4cc04ef7 100644 --- a/template/uni-app/pages/users/payment_on_behalf/index.vue +++ b/template/uni-app/pages/users/payment_on_behalf/index.vue @@ -1,473 +1,473 @@ - - - - - diff --git a/template/uni-app/pages/users/user_coupon/index.vue b/template/uni-app/pages/users/user_coupon/index.vue index 542ddc31..f14b960a 100644 --- a/template/uni-app/pages/users/user_coupon/index.vue +++ b/template/uni-app/pages/users/user_coupon/index.vue @@ -1,277 +1,277 @@ - - - - - - - + + diff --git a/template/uni-app/pages/users/user_vip/index.vue b/template/uni-app/pages/users/user_vip/index.vue index e35effef..c71385f8 100644 --- a/template/uni-app/pages/users/user_vip/index.vue +++ b/template/uni-app/pages/users/user_vip/index.vue @@ -1,1091 +1,1091 @@ - - - - -