diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index edd96e619..5d861817a 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -171,6 +171,7 @@ class StoreOrderServices extends BaseServices $data['refunded_count'] = (string)$storeOrderRefundServices->count($refund_where + ['refund_type' => 6]); $data['refund_count'] = bcadd(bcadd($data['refunding_count'], $data['refunded_count'], 0), $data['no_refund_count'], 0); $data['yue_pay_status'] = (int)sys_config('balance_func_status') && (int)sys_config('yue_pay_status') == 1 ? (int)1 : (int)2;//余额支付 1 开启 2 关闭 + $data['pc_order_count'] = $data['order_count'] + $data['refunding_count'] + $data['refunded_count']; $data['pay_weixin_open'] = sys_config('pay_weixin_open', '0') != '0';//微信支付 1 开启 0 关闭 $data['ali_pay_status'] = sys_config('ali_pay_status', '0') != '0';//支付包支付 1 开启 0 关闭 $data['friend_pay_status'] = (int)sys_config('friend_pay_status') ?? 0;//好友代付 1 开启 0 关闭 diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue index 0c06a2fa0..c7c4baedb 100644 --- a/template/admin/src/pages/product/productAdd/index.vue +++ b/template/admin/src/pages/product/productAdd/index.vue @@ -660,7 +660,7 @@ - + diff --git a/template/admin/src/pages/product/productList/index.vue b/template/admin/src/pages/product/productList/index.vue index f900b14af..54234602e 100644 --- a/template/admin/src/pages/product/productList/index.vue +++ b/template/admin/src/pages/product/productList/index.vue @@ -55,6 +55,7 @@ 添加自评 diff --git a/template/uni-app/components/indexGoods/index.vue b/template/uni-app/components/indexGoods/index.vue index 21bf844d0..980bb8b54 100644 --- a/template/uni-app/components/indexGoods/index.vue +++ b/template/uni-app/components/indexGoods/index.vue @@ -129,8 +129,8 @@ margin-bottom: 8rpx; display: flex; flex-direction: column; - justify-content: space-between; - + justify-content: space-between; + /deep/image, /deep/.easy-loadimage, /deep/uni-image { @@ -149,6 +149,7 @@ .title { font-size: 28rpx; height: 76rpx; + line-height: 38rpx; } .tag { diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json index 8866c9208..b80554efb 100644 --- a/template/uni-app/pages.json +++ b/template/uni-app/pages.json @@ -364,7 +364,7 @@ { "path": "user_cancellation/index", "style": { - "navigationBarTitleText": "注销说明", + "navigationBarTitleText": "注销协议", "app-plus": { // #ifdef APP-PLUS "titleNView": { diff --git a/template/uni-app/pages/goods/goods_return/index.vue b/template/uni-app/pages/goods/goods_return/index.vue index dfbadfc48..a18ceaad1 100644 --- a/template/uni-app/pages/goods/goods_return/index.vue +++ b/template/uni-app/pages/goods/goods_return/index.vue @@ -55,7 +55,7 @@ {{$t(`上传图片`)}} - {{$t(`上传图片`)}} + diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue index 56a5d8957..d6628cd12 100644 --- a/template/uni-app/pages/goods_cate/goods_cate.vue +++ b/template/uni-app/pages/goods_cate/goods_cate.vue @@ -40,11 +40,9 @@ } }, onLoad() {}, - onReady() { - this.getCategoryVersion() - }, + onReady() {}, onShow() { - + this.getCategoryVersion() }, methods: { getCategoryVersion() { @@ -58,7 +56,6 @@ } this.classStyle(); }) - }, jumpIndex() { if (this.is_diy) {} diff --git a/template/uni-app/pages/goods_cate/goods_cate1.vue b/template/uni-app/pages/goods_cate/goods_cate1.vue index 0ab4ee40b..704773ee3 100644 --- a/template/uni-app/pages/goods_cate/goods_cate1.vue +++ b/template/uni-app/pages/goods_cate/goods_cate1.vue @@ -112,7 +112,7 @@ cartNum: state => state.indexData.cartNum }) }, - mounted() { + mounted() { console.log(this.version) let that = this // #ifdef H5 @@ -127,6 +127,13 @@ this.activeRouter = '/' + curRoute this.getAllCategory(); }, + watch: { + isNew(newVal) { + if (newVal) { + this.getAllCategory(); + } + } + }, methods: { getNav() { getNavigation().then(res => { @@ -179,9 +186,9 @@ this.$set(this, 'lock', true); }, getAllCategory: function() { - let that = this; - console.log(this.version,'1',uni.getStorageSync('CAT_VERSION')) - if (this.version !== uni.getStorageSync('CAT_VERSION')) { + let that = this; + console.log(this.version, '1', uni.getStorageSync('CAT_VERSION')) + if (this.isNew || !uni.getStorageSync('CAT1_DATA')) { getCategoryList().then(res => { uni.setStorageSync('CAT1_DATA', res.data) that.productList = res.data; diff --git a/template/uni-app/pages/goods_cate/goods_cate2.vue b/template/uni-app/pages/goods_cate/goods_cate2.vue index 539136e78..68f69c87c 100644 --- a/template/uni-app/pages/goods_cate/goods_cate2.vue +++ b/template/uni-app/pages/goods_cate/goods_cate2.vue @@ -115,6 +115,13 @@ default: false } }, + watch: { + isNew(newVal) { + if (newVal) { + this.getAllCategory(); + } + } + }, computed: mapGetters(['isLogin', 'uid']), components: { productWindow, @@ -631,7 +638,7 @@ }, getAllCategory: function() { let that = this; - if (this.isNew) { + if (this.isNew || !uni.getStorageSync('CAT2_DATA')) { getCategoryList().then(res => { uni.setStorageSync('CAT2_DATA', res.data) let data = res.data; diff --git a/template/uni-app/pages/goods_cate/goods_cate3.vue b/template/uni-app/pages/goods_cate/goods_cate3.vue index 1eb2ef40e..2e6ae5b38 100644 --- a/template/uni-app/pages/goods_cate/goods_cate3.vue +++ b/template/uni-app/pages/goods_cate/goods_cate3.vue @@ -119,6 +119,13 @@ default: false } }, + watch: { + isNew(newVal) { + if (newVal) { + this.getAllCategory(); + } + } + }, data() { return { categoryList: [], @@ -667,7 +674,7 @@ }, getAllCategory: function() { let that = this; - if (this.isNew) { + if (this.isNew || !uni.getStorageSync('CAT3_DATA')) { getCategoryList().then(res => { let data = res.data; uni.setStorageSync('CAT3_DATA', data) diff --git a/template/uni-app/pages/index/diy/index.vue b/template/uni-app/pages/index/diy/index.vue index 4840f4e40..5a30cc41e 100644 --- a/template/uni-app/pages/index/diy/index.vue +++ b/template/uni-app/pages/index/diy/index.vue @@ -659,7 +659,8 @@ }, diyData() { let that = this; - getDiy(0).then(res => { + getDiy(0).then(res => { + uni.hideLoading() uni.setStorageSync('DIY_DATA', res.data) setTimeout(() => { this.isNodes++; @@ -696,7 +697,6 @@ } temp.sort(sortNumber) that.styleConfig = temp; - uni.hideLoading() setTimeout(() => { this.showSkeleton = false }, 300) diff --git a/template/uni-app/pages/users/user_spread_code/index.vue b/template/uni-app/pages/users/user_spread_code/index.vue index a26631855..b7011e3b8 100644 --- a/template/uni-app/pages/users/user_spread_code/index.vue +++ b/template/uni-app/pages/users/user_spread_code/index.vue @@ -219,8 +219,8 @@ arr2 = [img.code || this.codeSrc, img.image] // #endif // #ifdef APP-PLUS - img = await this.downloadFilestoreImage(res.data.spread[i].pic) - arr2 = [this.codeSrc, img] + img = await this.imgToBase(res.data.spread[i].pic, res.data.qrcode) + arr2 = [img.code || this.codeSrc, img.image] // #endif that.$util.userPosterCanvas(arr2, res.data.nickname, res.data.site_name, i, this.wd, this.hg, ( tempFilePath) => {