From 70413d2940d796dd25f2bdd1d5563977b5486500 Mon Sep 17 00:00:00 2001 From: liudan <18634735655@163.com> Date: Sun, 21 Apr 2024 23:27:39 +0800 Subject: [PATCH] 1 --- components/orderGoods/index.vue | 4 +- components/plantConSwiper/index.vue | 2 +- components/productConSwiper/index.vue | 2 +- components/rightSlider.vue | 4 +- config/app.js | 2 +- manifest.json | 2 +- pages/activity/assist_detail/index.vue | 2 +- pages/activity/combination_details/index.vue | 6 +- .../activity/goods_seckill_details/index.vue | 6 +- pages/activity/presell_details/index.vue | 6 +- pages/admin/goods_details/index.vue | 2 +- pages/chat/customer_list/chat.vue | 6 + pages/goods_details/index.vue | 12 +- pages/huitong/huitongbao/index.vue | 4 +- pages/huitong/huitongbao/notice.vue | 9 +- pages/huitong/huitongbao/noticeItem.vue | 24 ++- pages/index/component/goodList.vue | 7 +- pages/order_details/index.vue | 10 +- pages/points_mall/integral_goods_details.vue | 2 +- pages/prize/index.vue | 16 +- pages/store/detail/index.vue | 6 +- pages/store/home/index.vue | 200 ++---------------- pages/user/index.vue | 15 +- pages/users/feedback/index.vue | 2 + pages/users/order_confirm/index.vue | 24 +-- pages/users/order_list/index.vue | 30 +-- pages/users/user_address/index.vue | 3 +- pages/users/user_cash/index.vue | 55 ++++- pages/users/user_integral1/benpiao.vue | 2 +- pages/users/user_integral1/index.vue | 10 +- pages/users/user_payment/index.vue | 29 ++- pages/users/user_spread_money/index.vue | 9 +- static/images/posterbackgd.png | Bin 0 -> 35565 bytes utils/util.js | 89 ++++---- 34 files changed, 277 insertions(+), 325 deletions(-) create mode 100644 static/images/posterbackgd.png diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index bbfed5d..b469201 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -25,7 +25,7 @@ {{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内 - 申请退款 + 退款中 x {{item.product_num - item.refund_num}} 已退款 x {{item.product_num - item.refund_num}} 去评价 @@ -73,7 +73,7 @@ 退款中 x {{item.product_num - item.refund_num}} 已退款 x {{item.product_num - item.refund_num}} - 申请退款 + 去评价 已评价 diff --git a/components/plantConSwiper/index.vue b/components/plantConSwiper/index.vue index 3f9c7db..790985e 100644 --- a/components/plantConSwiper/index.vue +++ b/components/plantConSwiper/index.vue @@ -4,7 +4,7 @@ :interval="interval" :duration="duration"> - + diff --git a/components/productConSwiper/index.vue b/components/productConSwiper/index.vue index 54aae69..93c0c56 100644 --- a/components/productConSwiper/index.vue +++ b/components/productConSwiper/index.vue @@ -31,7 +31,7 @@ - + diff --git a/components/rightSlider.vue b/components/rightSlider.vue index a8f4d27..53cf300 100644 --- a/components/rightSlider.vue +++ b/components/rightSlider.vue @@ -56,7 +56,7 @@ - + 重置 diff --git a/config/app.js b/config/app.js index 8aa738c..65e27b0 100644 --- a/config/app.js +++ b/config/app.js @@ -19,7 +19,7 @@ let httpApi = 'https://b3.njrenzhou.com' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' -let wsApi = 'wss://mer1.crmeb.net' +let wsApi = 'wss://b3.njrenzhou.com' module.exports = { // 请求域名 格式： https://您的域名 diff --git a/manifest.json b/manifest.json index 9d636fb..b76d1bf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "CRMEB", + "name" : "启橙易购", "appid" : "__UNI__241B89A", "description" : "", "versionName" : "1.0.4", diff --git a/pages/activity/assist_detail/index.vue b/pages/activity/assist_detail/index.vue index bbb248d..380fb9d 100644 --- a/pages/activity/assist_detail/index.vue +++ b/pages/activity/assist_detail/index.vue @@ -294,7 +294,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', + posterbackgd: '/static/images/posterbackgd.png', isDown: true, isCopy: false, copyUrl: '', diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index 0a8ed01..8917e25 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -4,7 +4,7 @@ - + @@ -433,7 +433,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', + posterbackgd: '/static/images/posterbackgd.png', sharePacket: { isState: true, //默认不显示 }, //分销商详细 @@ -2024,7 +2024,7 @@ display: flex; align-items: center; height: 58rpx; - width: 158rpx; + width: 58rpx; background: rgba(255,255,255,0.302); border: 2rpx solid rgba(0,0,0,0.0588); border-radius: 29rpx; diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index 2ceddb6..e8b4fae 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -4,7 +4,7 @@ - + @@ -345,7 +345,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', + posterbackgd: '/static/images/posterbackgd.png', // uid: 0, //用户uid circular: false, autoplay: false, @@ -1971,7 +1971,7 @@ display: flex; align-items: center; height: 58rpx; - width: 158rpx; + width: 58rpx; background: rgba(255,255,255,0.302); border: 2rpx solid rgba(0,0,0,0.0588); border-radius: 29rpx; diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue index 62198d7..06f8b63 100644 --- a/pages/activity/presell_details/index.vue +++ b/pages/activity/presell_details/index.vue @@ -4,7 +4,7 @@ - + @@ -447,7 +447,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', + posterbackgd: '/static/images/posterbackgd.png', sharePacket: { isState: true, //默认不显示 }, //分销商详细 @@ -2394,7 +2394,7 @@ display: flex; align-items: center; height: 58rpx; - width: 158rpx; + width: 58rpx; background: rgba(255,255,255,0.302); border: 2rpx solid rgba(0,0,0,0.0588); border-radius: 29rpx; diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue index 4a6497d..589f902 100644 --- a/pages/admin/goods_details/index.vue +++ b/pages/admin/goods_details/index.vue @@ -323,7 +323,7 @@ storeImage: '', //海报产品图 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', + posterbackgd: '/static/images/posterbackgd.png', source: '', domain: HTTP_REQUEST_URL, sharePacket: { diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue index f9665e9..1c8f65c 100644 --- a/pages/chat/customer_list/chat.vue +++ b/pages/chat/customer_list/chat.vue @@ -1035,11 +1035,17 @@ } }, uploadImg() { + console.log("777") + let self = this + self.$util.uploadImageOne('upload/image', function(res) { + console.log(res,"99") if(res.status == 200){ self.sendMsg(res.data.path, 3) } + },(err)=>{ + console.log("uu") }); }, /*长按事件*/ diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index f019397..1255ef8 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -4,7 +4,7 @@ - + @@ -41,7 +41,7 @@ {{storeInfo.store_name}} -
收藏 +
分享 @@ -61,7 +61,7 @@ -
收藏 +
分享 @@ -523,7 +523,8 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', + // https://b3.njrenzhou.com + posterbackgd: '/static/images/posterbackgd.png', source: '', sharePacket: { isState: true, //默认不显示 @@ -2167,6 +2168,7 @@ z-index: 399; top: 50%; margin-top: -500rpx; + background-color: #fff; } .poster-pop image { width: 100%; @@ -2420,7 +2422,7 @@ display: flex; align-items: center; height: 58rpx; - width: 158rpx; + width: 58rpx; background: rgba(255,255,255,0.302); border: 2rpx solid rgba(0,0,0,0.0588); border-radius: 29rpx; diff --git a/pages/huitong/huitongbao/index.vue b/pages/huitong/huitongbao/index.vue index 6423f97..4ee404c 100644 --- a/pages/huitong/huitongbao/index.vue +++ b/pages/huitong/huitongbao/index.vue @@ -447,8 +447,8 @@ getUserInfo() { let that = this; getUserInfo().then((res)=>{ - this.huitong = res.data.assets.integral_buy - this.huitong_frozen = res.data.assets.integral_withdraw;//提现积分 + this.huitong = Math.floor(Number(res.data.assets.integral_buy)) + this.huitong_frozen = Math.floor(Number(res.data.assets.integral_withdraw));//提现积分 this.mobilePhoneNum = res.data.phone this.getIntegralList() // getIntegralInfo().then(function(res) { diff --git a/pages/huitong/huitongbao/notice.vue b/pages/huitong/huitongbao/notice.vue index eedbbfb..a232b92 100644 --- a/pages/huitong/huitongbao/notice.vue +++ b/pages/huitong/huitongbao/notice.vue @@ -1,8 +1,11 @@ @@ -42,6 +45,8 @@ export default{ background: #fff; border-radius: 10px; margin:24rpx; + display: flex; + align-items: center; .noticeTitle{ font-weight: 400; diff --git a/pages/huitong/huitongbao/noticeItem.vue b/pages/huitong/huitongbao/noticeItem.vue index 9aac707..1f8098f 100644 --- a/pages/huitong/huitongbao/noticeItem.vue +++ b/pages/huitong/huitongbao/noticeItem.vue @@ -1,5 +1,11 @@ @@ -10,6 +16,8 @@ export default{ data(){ return{ content:'', + title:'', + time:'' } }, onLoad(option) { @@ -19,7 +27,9 @@ export default{ let list= res.data.list; list.forEach(item=>{ if(item.notice_id==option.id){ - this.content = item.notice_content + this.content = item.notice_content; + this.title = item.notice_title; + this.time = item.create_time } }) @@ -29,5 +39,13 @@ export default{ \ No newline at end of file diff --git a/pages/index/component/goodList.vue b/pages/index/component/goodList.vue index 568cc71..bd81998 100644 --- a/pages/index/component/goodList.vue +++ b/pages/index/component/goodList.vue @@ -27,7 +27,7 @@ {{item.rate}}评分 - + {{item.merchant.mer_name}} 进店 > @@ -150,6 +150,11 @@ export default { this.productslist(); }, methods: { + goStore(item){ + uni.navigateTo({ + url:'/pages/store/home/index?id='+item.merchant.mer_id + }) + }, productslist() { let data = {}; if (this.type == 1) { diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index c7cde39..fefc09d 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -262,24 +262,24 @@ 查看拼团 - 批量退款 + 查看物流 确认收货 - 批量退款 + 查看物流 再次购买 删除订单 - 批量退款 + 再次购买 - + diff --git a/pages/points_mall/integral_goods_details.vue b/pages/points_mall/integral_goods_details.vue index 4bdfc55..8200be7 100644 --- a/pages/points_mall/integral_goods_details.vue +++ b/pages/points_mall/integral_goods_details.vue @@ -5,7 +5,7 @@ - + diff --git a/pages/prize/index.vue b/pages/prize/index.vue index abbb2be..5e44b9b 100644 --- a/pages/prize/index.vue +++ b/pages/prize/index.vue @@ -26,7 +26,7 @@ - + 开始
抽奖 @@ -169,8 +169,16 @@ }, //发起抽奖 playReward(){ + setPrizeApi().then(res=>{ - let index = 3, duration = 3000 + let index, duration = 3000 + this.list.forEach((item,i)=>{ + + if(item.id==res.data.item.id){ + console.log("yy",i) + index=i + } + }) this.animation(index, duration) setTimeout(() => { this.type=res.data.item.type @@ -189,8 +197,8 @@ this.image = "https://b3.njrenzhou.com/static/images/1.png" } this.show = true; - this.btnDisabled = ''; - document.getElementById('zhuanpano').style='' + this.btnDisabled = ''; + // document.getElementById('zhuanpano').style='' }, duration + 1000) diff --git a/pages/store/detail/index.vue b/pages/store/detail/index.vue index a4f2887..dcfcfb8 100644 --- a/pages/store/detail/index.vue +++ b/pages/store/detail/index.vue @@ -10,12 +10,12 @@ {{ store.type_name }} 自营 - {{ store.care_count < 10000 ? store.care_count : (store.care_count / 10000).toFixed(2) + '万' }}人关注 + - +
@@ -370,11 +387,12 @@ title: res.message, icon: 'success' }); - setTimeout(function(){ - uni.navigateTo({ - url: '/pages/users/user_spread_user/index' - }); - },1000) + that.getUserInfo(); + // setTimeout(function(){ + // uni.navigateTo({ + // url: '/pages/users/user_spread_user/index' + // }); + // },1000) }).catch(err => { that.load = false; return that.$util.Tips({ @@ -617,4 +635,25 @@ text-align: center; color: #116636; } + .intruduce{ + + background: #FFFFFF; + border-radius: 10px; + padding:40rpx 30rpx; + margin: 20rpx 24rpx 0 24rpx; + .title{ + + font-weight: bold; + font-size: 30rpx; + color: #333333; + margin-bottom: 38rpx; + } + .textInfo{ + + font-weight: 400; + font-size: 24rpx; + color: #999999; + line-height: 40rpx; + } + } diff --git a/pages/users/user_integral1/benpiao.vue b/pages/users/user_integral1/benpiao.vue index ffd3956..88f846f 100644 --- a/pages/users/user_integral1/benpiao.vue +++ b/pages/users/user_integral1/benpiao.vue @@ -202,7 +202,7 @@ getUserInfo: function() { let that = this; getUserInfo().then((res)=>{ - this.contribution = res.data.assets.stock + this.contribution = Math.floor(Number(res.data.assets.stock)) // this.contribution_frozen = res.data.assets.contribution_frozen getIntegralInfo().then(function(res) { that.$set(that,'userInfo',res.data); diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue index 94a9ab0..970ab74 100644 --- a/pages/users/user_integral1/index.vue +++ b/pages/users/user_integral1/index.vue @@ -308,12 +308,12 @@ } if(this.huitongToConsumeNum>this.huitong){ uni.showToast({ - title: '积分不足', + title: '钻石不足', icon:'none' }); return; } - DiamondTostock({count:Number(this.huitongToConsumeNum).toFixed(2)}).then(res=>{ + DiamondTostock({count:Math.floor(Number(this.huitongToConsumeNum))}).then(res=>{ if(res.status==200){ this.getUserInfo() @@ -335,7 +335,7 @@ } if(this.zhuanrang.count>this.huitong){ uni.showToast({ - title: '积分不足', + title: '钻石不足', icon:'none' }); return; @@ -364,7 +364,7 @@ }); return; } - this.zhuanrang.count = Number(this.zhuanrang.count).toFixed(2) + this.zhuanrang.count = Math.floor(Number(this.zhuanrang.count)) sendDiamond(this.zhuanrang).then(res=>{ @@ -444,7 +444,7 @@ getUserInfo() { let that = this; getUserInfo().then((res)=>{ - this.huitong = res.data.assets.diamond; + this.huitong = Math.floor(Number(res.data.assets.diamond)); this.mobilePhoneNum = res.data.phone this.getIntegralList() diff --git a/pages/users/user_payment/index.vue b/pages/users/user_payment/index.vue index ad24042..98bb9ae 100644 --- a/pages/users/user_payment/index.vue +++ b/pages/users/user_payment/index.vue @@ -7,7 +7,8 @@ 预存金额 - {{ userinfo.now_money || 0 }} + + {{ deposit_total || 0 }} @@ -78,7 +79,8 @@ rechargeWechat, getRechargeApi, depositData, - rechargeBrokerage + rechargeBrokerage, + getUserInfo } from '@/api/user.js'; import { mapGetters } from "vuex"; import payment from '@/components/payment'; @@ -90,6 +92,7 @@ data() { let that = this; return { + deposit_total:0, content:'', otherValue: '其他', now_money: 0, @@ -139,6 +142,7 @@ payStatus: true } // #endif + ], }; }, @@ -146,7 +150,7 @@ onLoad(options) { this.delta = options.delta || 1; if (this.isLogin) { - // this.getUserInfo(); + this.getUserInfo(); this.getRecharge(); } else { toLogin() @@ -210,12 +214,17 @@ /** * 获取用户信息 */ - // getUserInfo: function() { - // let that = this; - // spreadInfo().then(res => { - // that.$set(that, 'userinfo', res.data); - // }) - // }, + getUserInfo: function() { + let that = this; + // spreadInfo().then(res => { + // that.$set(that, 'userinfo', res.data); + // }) + getUserInfo().then((res)=>{ + this.deposit_total = Math.floor(Number(res.data.assets.deposit_total)); + + }) + + }, payClose: function() { this.pay_close = false; }, @@ -447,7 +456,7 @@ ...jsConfig, success: function(res) { uni.hideLoading(); - // that.getUserInfo(); + that.getUserInfo(); that.getRecharge(); return that.$util.Tips({ title: '支付成功', diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue index 70b0085..add065b 100644 --- a/pages/users/user_spread_money/index.vue +++ b/pages/users/user_spread_money/index.vue @@ -10,18 +10,21 @@ - + 银行卡提现 微信提现 支付宝提现 提现到零钱 - + {{item.create_time}} + + {{item.status==-1?'未通过':item.status==0?'审核中':item.status==1?'已提现':'-'}} + -{{item.extract_price}} 冻结中 diff --git a/static/images/posterbackgd.png b/static/images/posterbackgd.png new file mode 100644 index 0000000000000000000000000000000000000000..b6929206c6783b38ac97d32ec8d45a9f0faaf530 GIT binary patch literal 35565 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 { - let image = []; - let filesLen = res.tempFiles.length; - let exceeded_list = []; - let uploadMaxSize = 10; - let imageList = []; - let urlPath = HTTP_REQUEST_URL + '/api/' + uploadUrl + '/' + inputName - if (count === 1) { - successCallback && successCallback(await that.uploadFile(urlPath, res.tempFilePaths[ - 0], opt, '图片上传中')) - } else { - for (let i = 0; i < res.tempFiles.length; i++) { - if (Math.ceil(res.tempFiles[i].size / 1024) < uploadMaxSize * 1024) { - image.push(res.tempFiles[i].path); - } else { - exceeded_list.push(i + 1); - filesLen = filesLen - 1; - // #ifdef APP-PLUS - plus.nativeUI.alert( - `第${[...new Set(exceeded_list)].join(',')}张图片超出限制${uploadMaxSize}MB,已过滤` - ); - // #endif - // #ifndef APP-PLUS - uni.showModal({ - content: `第${[...new Set(exceeded_list)].join(',')}张图片超出限制${uploadMaxSize}MB,已过滤` - }); - // #endif - continue; + setTimeout(()=>{ + + + // uni.chooseImage({ + uni.chooseMedia({ + count: count, //最多可以选择的图片总数 + sizeType: sizeType, // 可以指定是原图还是压缩图，默认二者都有 + sourceType: sourceType, // 可以指定来源是相册还是相机，默认二者都有 + success: async (res)=> { + + let image = []; + let filesLen = res.tempFiles.length; + let exceeded_list = []; + let uploadMaxSize = 10; + let imageList = []; + let urlPath = HTTP_REQUEST_URL + '/api/' + uploadUrl + '/' + inputName + if (count === 1) { + console.log(res,"bnbn") + successCallback && successCallback(await that.uploadFile(urlPath, res.tempFiles[0].tempFilePath, opt, '图片上传中')) + } else { + for (let i = 0; i < res.tempFiles.length; i++) { + if (Math.ceil(res.tempFiles[i].size / 1024) < uploadMaxSize * 1024) { + image.push(res.tempFiles[i].path); + } else { + exceeded_list.push(i + 1); + filesLen = filesLen - 1; + // #ifdef APP-PLUS + plus.nativeUI.alert( + `第${[...new Set(exceeded_list)].join(',')}张图片超出限制${uploadMaxSize}MB,已过滤` + ); + // #endif + // #ifndef APP-PLUS + uni.showModal({ + content: `第${[...new Set(exceeded_list)].join(',')}张图片超出限制${uploadMaxSize}MB,已过滤` + }); + // #endif + continue; + } } + for (const key in image) { + let data = await that.uploadFile(urlPath, image[key], opt, '图片上传中') + imageList.push(data.data.path) + } + successCallback && successCallback(imageList) } - for (const key in image) { - let data = await that.uploadFile(urlPath, image[key], opt, '图片上传中') - imageList.push(data.data.path) - } - successCallback && successCallback(imageList) + }, + fail:(err)=>{ + } - } - }) + }) + }) }, uploadFile(urlPath, localPath, opt, message) { let that = this;