From bcc07479067795433a7efd8d448aa095d51a2b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 6 Dec 2022 14:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/App.vue | 2 - .../uni-app/components/couponWindow/index.vue | 2 +- .../components/cusPreviewImg/index.vue | 301 ++--- .../uni-app/components/goodClass/index.vue | 1 - template/uni-app/components/menuIcon.vue | 1 - .../uni-app/components/orderGoods/index.vue | 2 - .../uni-app/components/pageFooter/index.vue | 3 +- .../components/shareRedPackets/index.vue | 1 - .../uni-app/components/update/app-update.vue | 2 - .../verify/verifyPoint/verifyPoint.vue | 1081 ++++++++--------- template/uni-app/libs/chat.js | 2 - template/uni-app/mixins/sharePoster.js | 19 +- .../goods_combination_details/index.vue | 6 +- .../activity/goods_seckill_details/index.vue | 7 +- .../pages/activity/presell_details/index.vue | 4 - .../uni-app/pages/admin/orderDetail/index.vue | 14 +- .../uni-app/pages/admin/orderList/index.vue | 1 - .../uni-app/pages/admin/statistics/index.vue | 1 - .../pages/annex/applicationRecord/index.vue | 2 - .../uni-app/pages/annex/settled/index.vue | 2 - .../uni-app/pages/annex/special/index.vue | 3 - .../pages/extension/customer_list/chat.vue | 1 - .../pages/goods/goods_return/index.vue | 5 + .../uni-app/pages/goods_cate/goods_cate1.vue | 2 +- .../uni-app/pages/goods_cate/goods_cate2.vue | 1 - .../uni-app/pages/goods_cate/goods_cate3.vue | 2 - .../uni-app/pages/goods_details/index.vue | 20 +- .../index/diy/components/articleList.vue | 1 - template/uni-app/pages/index/diy/index.vue | 9 +- .../pages/index/visualization/index.vue | 2 - .../pages/order_addcart/order_addcart.vue | 13 +- .../points_mall/integral_goods_details.vue | 2 - template/uni-app/pages/user/index.vue | 3 +- .../verify/verifyPoint/verifyPoint.vue | 1080 ++++++++-------- .../users/message_center/messageDetail.vue | 1 - .../pages/users/payment_on_behalf/index.vue | 1 - .../users/payment_on_behalf/pay_status.vue | 1 - .../pages/users/promoter-order/index.vue | 3 - .../uni-app/pages/users/staff_list/index.vue | 1 - .../pages/users/user_address/index.vue | 1 - .../pages/users/user_address_list/index.vue | 2 - .../uni-app/pages/users/user_cash/index.vue | 1 - .../users/user_distribution_level/index.vue | 1 - .../users/user_goods_collection/index.vue | 5 - .../uni-app/pages/users/user_info/index.vue | 1 - .../pages/users/user_pwd_edit/index.vue | 1 - .../pages/users/wechat_login/index.vue | 51 +- template/uni-app/utils/util.js | 2 - 48 files changed, 1320 insertions(+), 1350 deletions(-) diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue index 58463e559..c863fb258 100644 --- a/template/uni-app/App.vue +++ b/template/uni-app/App.vue @@ -188,7 +188,6 @@ const startParamObj = wx.getEnterOptionsSync(); if (wx.canIUse('getUpdateManager') && startParamObj.scene != 1154) { const updateManager = wx.getUpdateManager() - console.log(updateManager); updateManager.onCheckForUpdate(function(res) { // 请求完新版本信息的回调 // console.log(res.hasUpdate) @@ -234,7 +233,6 @@ that.globalData.navH = menuButtonInfo.top * 2 + menuButtonInfo.height / 2; const version = uni.getSystemInfoSync().SDKVersion if (Routine.compareVersion(version, '2.21.3') >= 0) { - console.log(version) that.$Cache.set('MP_VERSION_ISNEW', true) } else { that.$Cache.set('MP_VERSION_ISNEW', false) diff --git a/template/uni-app/components/couponWindow/index.vue b/template/uni-app/components/couponWindow/index.vue index 9b8756627..f8b5e7129 100644 --- a/template/uni-app/components/couponWindow/index.vue +++ b/template/uni-app/components/couponWindow/index.vue @@ -15,7 +15,7 @@ - {{$t(`立即领取`)}} + {{$t(`立即领取`)}} diff --git a/template/uni-app/components/cusPreviewImg/index.vue b/template/uni-app/components/cusPreviewImg/index.vue index de537d64c..fe644b169 100644 --- a/template/uni-app/components/cusPreviewImg/index.vue +++ b/template/uni-app/components/cusPreviewImg/index.vue @@ -1,143 +1,160 @@ - - - - - diff --git a/template/uni-app/components/goodClass/index.vue b/template/uni-app/components/goodClass/index.vue index 179c193ff..afee5c143 100644 --- a/template/uni-app/components/goodClass/index.vue +++ b/template/uni-app/components/goodClass/index.vue @@ -89,7 +89,6 @@ this.$emit('ChangeCartNumDan', false, index, item); }, CartNumAdd(index, item) { - console.log('2') if (this.addIng) return this.addIng = true this.$emit('ChangeCartNumDan', true, index, item); diff --git a/template/uni-app/components/menuIcon.vue b/template/uni-app/components/menuIcon.vue index e4b3729c6..b17b657da 100644 --- a/template/uni-app/components/menuIcon.vue +++ b/template/uni-app/components/menuIcon.vue @@ -104,7 +104,6 @@ // #ifdef MP this.menuButton = uni.getMenuButtonBoundingClientRect(); const query = uni.createSelectorQuery().in(this); - console.log(this.menuButton) query .select('#home') .boundingClientRect(data => { diff --git a/template/uni-app/components/orderGoods/index.vue b/template/uni-app/components/orderGoods/index.vue index 657cf0897..2205dcd70 100644 --- a/template/uni-app/components/orderGoods/index.vue +++ b/template/uni-app/components/orderGoods/index.vue @@ -174,7 +174,6 @@ nVal.forEach((item, index) => { num += item.cart_num }) - console.log(num) this.totalNmu = num } }, @@ -184,7 +183,6 @@ this.cartInfo.forEach((item, index) => { num += item.cart_num }) - console.log(num) this.$set(this, 'totalNmu', num) }) diff --git a/template/uni-app/components/pageFooter/index.vue b/template/uni-app/components/pageFooter/index.vue index dd82cd7de..a7c8360d3 100644 --- a/template/uni-app/components/pageFooter/index.vue +++ b/template/uni-app/components/pageFooter/index.vue @@ -103,7 +103,6 @@ let that = this uni.hideTabBar() this.newData = this.$store.state.app.pageFooter - console.log(this.newData) if (this.isLogin) { this.getCartNum() } @@ -169,7 +168,7 @@ justify-content: center; flex-direction: column; position: relative; - + width: 100%; .count-num { position: absolute; display: flex; diff --git a/template/uni-app/components/shareRedPackets/index.vue b/template/uni-app/components/shareRedPackets/index.vue index 559044fba..8de1f9135 100644 --- a/template/uni-app/components/shareRedPackets/index.vue +++ b/template/uni-app/components/shareRedPackets/index.vue @@ -50,7 +50,6 @@ this.$emit('closeChange'); }, goShare: function() { - console.log(this.isAnimate) if (this.isAnimate) { this.$emit('listenerActionSheet'); } else { diff --git a/template/uni-app/components/update/app-update.vue b/template/uni-app/components/update/app-update.vue index 62bf4cd2c..97cc04905 100644 --- a/template/uni-app/components/update/app-update.vue +++ b/template/uni-app/components/update/app-update.vue @@ -121,7 +121,6 @@ //向后台发起请求，获取最新版本号 getUpdateInfo(this.platform === "ios" ? 2 : 1) .then((res) => { - console.log(res) if(Array.isArray(res.data)){ return this.$emit('isNew') } @@ -146,7 +145,6 @@ }) .catch((err) => { vm.popup_show = false - console.log(err); }); }, // 检查是否更新 diff --git a/template/uni-app/components/verify/verifyPoint/verifyPoint.vue b/template/uni-app/components/verify/verifyPoint/verifyPoint.vue index 9adc43209..c0cdc9397 100644 --- a/template/uni-app/components/verify/verifyPoint/verifyPoint.vue +++ b/template/uni-app/components/verify/verifyPoint/verifyPoint.vue @@ -1,542 +1,541 @@ - - - - diff --git a/template/uni-app/libs/chat.js b/template/uni-app/libs/chat.js index c81d70d2e..118b5c4d9 100644 --- a/template/uni-app/libs/chat.js +++ b/template/uni-app/libs/chat.js @@ -40,8 +40,6 @@ Socket.prototype = { }, onOpen() { this.init(); - console.log('创建连接了!') - this.send({ type: "login", data: $store.state.app.token diff --git a/template/uni-app/mixins/sharePoster.js b/template/uni-app/mixins/sharePoster.js index 853d57805..0f97f005c 100644 --- a/template/uni-app/mixins/sharePoster.js +++ b/template/uni-app/mixins/sharePoster.js @@ -11,8 +11,12 @@ import { imageBase64 } from "@/api/public"; import { - getProductCode + getProductCode, // 普通商品小程序code } from "@/api/store.js"; +import { + scombinationCode, // 拼团code + seckillCode // 秒杀 +} from '@/api/activity.js'; import i18n from '../utils/lang.js'; let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; export const sharePoster = { @@ -148,14 +152,15 @@ export const sharePoster = { /** * 生成海报 */ - async goPoster() { + async goPoster(type) { let that = this; that.posters = false; that.$set(that, "canvasStatus", true); let arr2 // #ifdef MP - getProductCode(that.id) - .then((res) => { + let met = type === 'scombination' ? scombinationCode(that.id) : type === 'seckill' ? seckillCode(that + .id) : getProductCode(that.id) + met.then((res) => { uni.downloadFile({ url: that.setDomain(res.data.code), success: function(res) { @@ -182,16 +187,12 @@ export const sharePoster = { // #endif // #ifdef H5 || APP-PLUS arr2 = [that.posterbackgd, that.storeImageBase64, that.PromotionCode]; - console.log(arr2) if (!that.storeImageBase64) return that.$util.Tips({ title: i18n.t(`正在下载海报,请稍后再试`), }); that.initPoster(arr2) // #endif - console.log(arr2, 'arr2s') - - }, //替换安全域名 setDomain(url) { @@ -266,4 +267,4 @@ export const sharePoster = { // #endif }, } -}; +}; 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 c7fbbc06e..d0decf712 100644 --- a/template/uni-app/pages/activity/goods_combination_details/index.vue +++ b/template/uni-app/pages/activity/goods_combination_details/index.vue @@ -230,7 +230,7 @@ {{$t(`微信朋友圈`)}} - @@ -418,7 +418,7 @@ isLogin: { handler: function(newV, oldV) { if (newV) { - this.downloadFilePromotionCode(); + // this.downloadFilePromotionCode(); this.combinationDetail(); } }, @@ -647,7 +647,7 @@ // #endif // #ifdef MP that.downloadFilestoreImage(); - that.downloadFilePromotionCode(); + // that.downloadFilePromotionCode(); // #endif // that.setProductSelect(); that.DefaultSelect(); 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 6b1a5daba..fdbce49b2 100644 --- a/template/uni-app/pages/activity/goods_seckill_details/index.vue +++ b/template/uni-app/pages/activity/goods_seckill_details/index.vue @@ -195,7 +195,7 @@ {{$t(`微信朋友圈`)}} - @@ -577,7 +577,7 @@ // #endif // #ifndef H5 || APP-PLUS that.downloadFilestoreImage(); - that.downloadFilePromotionCode(); + // that.downloadFilePromotionCode(); // #endif that.DefaultSelect(); setTimeout(() => { @@ -596,7 +596,6 @@ // wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0); // wxh.time(that.data.time, that); }).catch(err => { - console.log(err) that.$util.Tips({ title: err }) @@ -1092,11 +1091,9 @@ }, //滑动轮播图选择商品 changeSwitch(e) { - console.log(this.skuArr[e]) let productSelect = this.skuArr[e]; this.$set(this, "selectSku", productSelect); var skuList = productSelect.suk.split(","); - console.log(this.attribute.productAttr) this.$set(this.attribute.productAttr[0], "index", skuList[0]); if (skuList.length == 2) { this.$set(this.attribute.productAttr[0], "index", skuList[0]); diff --git a/template/uni-app/pages/activity/presell_details/index.vue b/template/uni-app/pages/activity/presell_details/index.vue index 225bb5fbf..61ae08336 100644 --- a/template/uni-app/pages/activity/presell_details/index.vue +++ b/template/uni-app/pages/activity/presell_details/index.vue @@ -630,7 +630,6 @@ * */ ChangeAttr: function(res) { - console.log(this.productValue[res]) let productSelect = this.productValue[res]; this.$set(this, "selectSku", productSelect); if (productSelect && productSelect.stock > 0) { @@ -1058,7 +1057,6 @@ }, // 授权关闭 authColse: function(e) { - console.log(e, 'eeeee'); this.isShowAuth = e; }, /** @@ -1311,12 +1309,10 @@ }, //滑动轮播图选择商品 changeSwitch(e) { - console.log(this.skuArr, e) let productSelect = this.skuArr[e]; this.$set(this, "selectSku", productSelect); var skuList = productSelect.suk.split(","); this.$set(this.attr.productAttr[0], "index", skuList[0]); - console.log(this.skuList) if (skuList.length == 2) { this.$set(this.attr.productAttr[0], "index", skuList[0]); this.$set(this.attr.productAttr[1], "index", skuList[1]); diff --git a/template/uni-app/pages/admin/orderDetail/index.vue b/template/uni-app/pages/admin/orderDetail/index.vue index b4011574d..736747115 100644 --- a/template/uni-app/pages/admin/orderDetail/index.vue +++ b/template/uni-app/pages/admin/orderDetail/index.vue @@ -26,7 +26,7 @@ {{$t(`复制`)}} - + {{$t(`复制`)}} @@ -73,7 +73,7 @@ {{$t(`复制`)}} - + {{$t(`复制`)}} @@ -150,7 +150,7 @@ {{$t(`复制`)}} - + {{$t(`复制`)}} @@ -238,7 +238,6 @@ } }, onShow() { - console.log('111') this.getIndex(); }, onLoad(option) { @@ -308,7 +307,6 @@ ); }, agreeExpress(id) { - console.log(3333) let that = this; agreeExpress({ id @@ -426,7 +424,7 @@ } ); }, - // #ifdef MP + // #ifndef H5 copyNum(id) { uni.setClipboardData({ @@ -667,7 +665,9 @@ padding: 25upx 30upx 30upx 30upx; } - .order-details .address .name { + .order-details .address .name { + display: flex; + align-items: center; font-size: 30upx; color: #282828; margin-bottom: 0.1rem; diff --git a/template/uni-app/pages/admin/orderList/index.vue b/template/uni-app/pages/admin/orderList/index.vue index deaff8aff..79f5b94eb 100644 --- a/template/uni-app/pages/admin/orderList/index.vue +++ b/template/uni-app/pages/admin/orderList/index.vue @@ -326,7 +326,6 @@ } }, agreeExpress(item) { - console.log(3333) let that = this; agreeExpress({ id: item.id diff --git a/template/uni-app/pages/admin/statistics/index.vue b/template/uni-app/pages/admin/statistics/index.vue index 756682eb1..4fca25e4a 100644 --- a/template/uni-app/pages/admin/statistics/index.vue +++ b/template/uni-app/pages/admin/statistics/index.vue @@ -208,7 +208,6 @@ let tempDay = [] let tempNum = [] var that = this; - console.log('ffff',that.where); getStatisticsTime(that.where).then( res => { var _info = res.data.chart, diff --git a/template/uni-app/pages/annex/applicationRecord/index.vue b/template/uni-app/pages/annex/applicationRecord/index.vue index b2ecd49a9..2680c9ad3 100644 --- a/template/uni-app/pages/annex/applicationRecord/index.vue +++ b/template/uni-app/pages/annex/applicationRecord/index.vue @@ -66,7 +66,6 @@ title: this.$t(`正在加载中`), }); getApplicationRecordList(this.pageData).then(res => { - console.log(res) this.count = res.data.count this.listData = this.listData.concat(res.data.list) uni.hideLoading(); @@ -75,7 +74,6 @@ }, // 跳转逻辑 jump(item) { - console.log(item) if ([0, 2].includes(item.status)) { uni.navigateTo({ url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}` diff --git a/template/uni-app/pages/annex/settled/index.vue b/template/uni-app/pages/annex/settled/index.vue index a9ea22828..b2bb0a204 100644 --- a/template/uni-app/pages/annex/settled/index.vue +++ b/template/uni-app/pages/annex/settled/index.vue @@ -222,7 +222,6 @@ }, computed: mapGetters(['isLogin']), onLoad(options) { - console.log(options) if (this.isLogin) { this.$nextTick(function() { this.getGoodsDetails() @@ -313,7 +312,6 @@ // 获取历史提交数据详情 getGoodsDetails() { getGoodsDetails().then(res => { - console.log(res) this.status = res.data.status let resData = res.data if (res.data.status !== -1) { diff --git a/template/uni-app/pages/annex/special/index.vue b/template/uni-app/pages/annex/special/index.vue index 161623df5..5bb1ffd85 100644 --- a/template/uni-app/pages/annex/special/index.vue +++ b/template/uni-app/pages/annex/special/index.vue @@ -191,7 +191,6 @@ }; }, onLoad(options) { - console.log(options) let that = this this.$nextTick(function() { uni.getSystemInfo({ @@ -351,7 +350,6 @@ // #endif // 对象转数组 objToArr(data) { - console.log(data) if (!data) return const keys = Object.keys(data) keys.sort((a, b) => a - b) @@ -382,7 +380,6 @@ title: res.data.title }) let temp = [] - console.log(res.data) let lastArr = that.objToArr(res.data.value) lastArr.forEach((item, index, arr) => { if (item.name == 'pageFoot') { diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue index 7076f04f7..cb0a6084b 100644 --- a/template/uni-app/pages/extension/customer_list/chat.vue +++ b/template/uni-app/pages/extension/customer_list/chat.vue @@ -240,7 +240,6 @@ // #endif // 初始化 if (app.globalData.isWsOpen) { - console.log('2222') this.$socket.send({ data: { token: this.$store.state.app.token, diff --git a/template/uni-app/pages/goods/goods_return/index.vue b/template/uni-app/pages/goods/goods_return/index.vue index a94011d11..245bdf7a8 100644 --- a/template/uni-app/pages/goods/goods_return/index.vue +++ b/template/uni-app/pages/goods/goods_return/index.vue @@ -200,6 +200,9 @@ * 申请退货 */ subRefund: function(e) { + uni.showLoading({ + title: this.$t(`申请中`) + }); let that = this, value = e.detail.value; //收集form表单 @@ -221,6 +224,7 @@ uni: that.orderId, cart_ids: this.cartIds }).then(res => { + uni.hideLoading(); return this.$util.Tips({ title: this.$t(`申请成功`), icon: 'success' @@ -229,6 +233,7 @@ url: '/pages/users/user_return_list/index?isT=1' }); }).catch(err => { + uni.hideLoading(); return this.$util.Tips({ title: err }); diff --git a/template/uni-app/pages/goods_cate/goods_cate1.vue b/template/uni-app/pages/goods_cate/goods_cate1.vue index a432e3089..9b9d1180b 100644 --- a/template/uni-app/pages/goods_cate/goods_cate1.vue +++ b/template/uni-app/pages/goods_cate/goods_cate1.vue @@ -422,7 +422,7 @@ justify-content: center; flex-direction: column; position: relative; - + width: 100%; .count-num { position: absolute; display: flex; diff --git a/template/uni-app/pages/goods_cate/goods_cate2.vue b/template/uni-app/pages/goods_cate/goods_cate2.vue index 2f4d2dd01..661eb1fcf 100644 --- a/template/uni-app/pages/goods_cate/goods_cate2.vue +++ b/template/uni-app/pages/goods_cate/goods_cate2.vue @@ -595,7 +595,6 @@ getAttrs(id) { let that = this; getAttr(id, 0).then(res => { - console.log(res.data) uni.hideLoading(); that.$set(that.attr, 'productAttr', res.data.productAttr); that.$set(that, 'productValue', res.data.productValue); diff --git a/template/uni-app/pages/goods_cate/goods_cate3.vue b/template/uni-app/pages/goods_cate/goods_cate3.vue index 1f1c47f25..69070c8f3 100644 --- a/template/uni-app/pages/goods_cate/goods_cate3.vue +++ b/template/uni-app/pages/goods_cate/goods_cate3.vue @@ -163,7 +163,6 @@ // } }, onLoad() { - console.log('aaaa') this.$nextTick(() => { uni.createSelectorQuery().select('#cart').boundingClientRect(res => { const { @@ -297,7 +296,6 @@ let that = this; getCartCounts().then(res => { that.cartCount = res.data.count; - console.log(that.$refs.goodClass) that.$refs.goodClass.addIng = false }); }, diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue index f534d1028..d13a27c11 100644 --- a/template/uni-app/pages/goods_details/index.vue +++ b/template/uni-app/pages/goods_details/index.vue @@ -1,8 +1,6 @@