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 0000000..b692920 Binary files /dev/null and b/static/images/posterbackgd.png differ diff --git a/utils/util.js b/utils/util.js index ccdebdc..4e9d922 100644 --- a/utils/util.js +++ b/utils/util.js @@ -576,60 +576,71 @@ export default { * @param callable errorCallback 失败执行方法 */ uploadImageOne: function(opt, successCallback, errorCallback) { + console.log(opt,"nmnm") let that = this; if (typeof opt === 'string') { let url = opt; opt = {}; opt.url = url; } + let count = opt.count || 1, sizeType = opt.sizeType || ['compressed'], sourceType = opt.sourceType || ['album', 'camera'], is_load = opt.is_load || true, uploadUrl = opt.url || '', inputName = opt.name || 'field'; - uni.chooseImage({ - 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) { - 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;