From 161fd110090741e01f59f6abd7d91b816dbfd9c2 Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Mon, 20 Dec 2021 16:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 3 +- commons/hengmei.css | 5 +- components/auth-userInfo-mobile.vue | 229 ++++ components/cate-items/cate-pu.vue | 2 +- components/empower.vue | 45 +- components/list-pu.vue | 16 +- components/shop-list.vue | 26 +- components/swiper-pu.vue | 23 +- jsFile/config.js | 2 +- jsFile/requst.js | 3 +- jsFile/tools.js | 26 +- main.js | 6 +- pages/tabbar/cate/cate.vue | 15 +- pages/tabbar/my/staffDuan.vue | 15 +- pages/tabbar/pagehome/pagehome.vue | 24 +- pages/tabbar/shop/shop.vue | 13 +- pagesA/activityTask/activityTask.vue | 2 + pagesA/coupon/coupon.vue | 4 + pagesA/getReadyDan/getReadyDan.vue | 54 +- pagesA/integralManage/integralManage.vue | 2 +- pagesA/myOrder/myOrder.vue | 48 +- pagesA/peacockCoin/peacockCoin.vue | 2 +- pagesA/pointsMall/pointsMall.vue | 2 +- pagesA/ppointmentEv/ppointmentEv.vue | 3 +- pagesA/shopCart/shopCart.vue | 2 +- pagesA/signIn/signIn.vue | 2 +- pagesA/suggestions/suggestions.vue | 42 +- pagesB/articleDetail/articleDetail.vue | 2 +- pagesB/customerCheck/customerCheck.vue | 67 +- pagesB/doctorDetail/doctorDetail.vue | 43 +- pagesB/messagecenter/messagecenter.vue | 11 +- pagesB/myCollection/myCollection.vue | 191 ++-- pagesB/orderDetail/orderDetail.vue | 3 +- pagesB/personalPoster/personalPoster.vue | 1 + pagesB/problemDetail/problemDetail.vue | 992 ++++++++---------- pagesB/searchPage/searchPage.vue | 9 +- pagesB/shopDetail/shopDetail.vue | 245 ++--- pagesB/shopSearch/shopSearch.vue | 4 +- pagesB/userFootprint/userFootprint.vue | 2 +- pagesB/video/playVideo.nvue | 6 +- static/public/back-home-02.png | Bin 0 -> 21393 bytes static/public/set-icon.png | Bin 0 -> 1170 bytes .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../mp-weixin/common/runtime.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/components/backTop.js.map | 2 +- .../components/cate-items/cate-pu.js.map | 2 +- .../mp-weixin/components/empower.js.map | 2 +- .../mp-weixin/components/foot-tab.js.map | 2 +- .../mp-weixin/components/list-pu.js.map | 2 +- .../mp-weixin/components/nothing-page.js.map | 2 +- .../components/public-customer.js.map | 2 +- .../simple-address/simple-address.js.map | 2 +- .../mp-weixin/components/status-nav.js.map | 2 +- .../mp-weixin/components/swiper-pu.js.map | 2 +- .../mp-weixin/components/wfalls-flow.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../mp-weixin/pages/tabbar/cate/cate.js.map | 2 +- .../pages/tabbar/pageHome/pageHome.js.map | 2 +- .../mp-weixin/pages/tabbar/shop/shop.js.map | 2 +- .../pagesA/nodifyData/nodifyData.js.map | 2 +- .../pagesA/ppointmentEv/ppointmentEv.js.map | 2 +- .../pagesA/suggestions/suggestions.js.map | 2 +- .../pagesB/articleDetail/articleDetail.js.map | 2 +- .../pagesB/doctorDetail/doctorDetail.js.map | 2 +- .../pagesB/messagecenter/messagecenter.js.map | 2 +- .../pagesB/myCollection/myCollection.js.map | 2 +- .../personalPoster/personalPoster.js.map | 2 +- .../pagesB/problemDetail/problemDetail.js.map | 2 +- .../pagesB/searchPage/searchPage.js.map | 2 +- .../pagesB/userFootprint/userFootprint.js.map | 2 +- .../mp-weixin/pagesB/video/playVideo.js.map | 2 +- 72 files changed, 1287 insertions(+), 965 deletions(-) create mode 100644 components/auth-userInfo-mobile.vue create mode 100644 static/public/back-home-02.png create mode 100644 static/public/set-icon.png diff --git a/App.vue b/App.vue index c12ffb2..37af683 100644 --- a/App.vue +++ b/App.vue @@ -1,6 +1,5 @@ + + diff --git a/components/cate-items/cate-pu.vue b/components/cate-items/cate-pu.vue index ee3507e..6ce0e6f 100644 --- a/components/cate-items/cate-pu.vue +++ b/components/cate-items/cate-pu.vue @@ -2,7 +2,7 @@ - - - - - - 恒美植发客服代表提醒您： - 您当前是游客身份 - 是否选择授权登录 - + + + + + + 恒美植发客服代表提醒您： + 您当前是游客身份 + 是否选择授权登录 - 申请 获取你的昵称、头像、地区及性别 - - 暂不授权 - - 立即授权 - - + + 申请 获取你的昵称、头像、地区及性别 + + 暂不授权 + + 立即授权 + @@ -146,6 +144,19 @@ diff --git a/components/list-pu.vue b/components/list-pu.vue index 79f67bd..336d461 100644 --- a/components/list-pu.vue +++ b/components/list-pu.vue @@ -16,7 +16,7 @@ {{item.title}} - 视频 + 视频 {{item.content}} @@ -26,7 +26,7 @@ {{item.name}} - + @@ -44,7 +44,7 @@ {{item.title}} - 视频 + 视频 {{item.content}} @@ -55,13 +55,13 @@ {{item.name}} - + - 暂无内容 + @@ -111,7 +111,8 @@ isShowT:false, pu_content:'是否需要取消收藏？', current:'-1', - jieDuan:false + jieDuan:false, + isVedio:uni.getStorageSync('isVedio') }; }, methods:{ @@ -123,7 +124,6 @@ let isAuth = this.$toolAll.tools.returnAuth() if(!isAuth){ uni.navigateTo({ - // url:'/pagesB/problemDetail/problemDetail?isCate='+this.list[index].isCate url:'/pagesB/problemDetail/problemDetail?id='+this.list[index].id+'&category_id='+this.list[index].category_id }) } else this.jieDuan = true @@ -134,7 +134,6 @@ if(this.jieDuan==false){ let isAuth = this.$toolAll.tools.returnAuth() if(!isAuth){ - // this.$emit('chooseLike',this.list[index].id) this.$emit('chooseLike',index) this.current = index if(this.list[index].is_collected==1) { @@ -152,7 +151,6 @@ }, comfirmev(){ // console.log('取消收藏成功'); - // this.$emit('comfirmev',this.list[this.current].id) this.$emit('comfirmev',this.current) this.isShowT = false }, diff --git a/components/shop-list.vue b/components/shop-list.vue index 74aab72..804c9de 100644 --- a/components/shop-list.vue +++ b/components/shop-list.vue @@ -86,20 +86,7 @@ dataList:{ type:Array, default:function(){ - return [ - { - imgSrc:'/static/public/wen-one.png',//商品图片 - title:'【99皮皮节】【种植发际 线】1000单位FUE技术...',//标题 - zhePrice:'3888',//折扣价 - yuanPrice:'4205',//原价 - integral:'2888',//积分 - isTuan:false,//是否团购 - isPing:false,//是否拼团 - isXian:false,//是否限时促销 - isIntegral:false,//是否是积分 - grade:0,//等级 - } - ] + return [] } }, iswhere:{ @@ -155,12 +142,19 @@ methods:{ destroyev(){ uni.clearInterval(this.timer); - console.log(12); this.$emit('destroyEv') }, goPage(id,index){//进入商品详情事件 + let is_activity = 0; + let shopId = 0; + if(this.dataList[index].isTuan==true || this.dataList[index].isPing==true || this.dataList[index].isXian==true) { + is_activity = 1; + shopId = this.dataList[index].activity_id; + } else { + shopId = id; + } uni.navigateTo({ - url:`/pagesB/shopDetail/shopDetail?id=${id}&isIntegral=${this.dataList[index].isIntegral}` + url:`/pagesB/shopDetail/shopDetail?id=${shopId}&isIntegral=${this.dataList[index].isIntegral}&is_activity=${is_activity}` }) }, } diff --git a/components/swiper-pu.vue b/components/swiper-pu.vue index f965a19..4515b98 100644 --- a/components/swiper-pu.vue +++ b/components/swiper-pu.vue @@ -5,7 +5,7 @@ - + @@ -60,6 +60,7 @@ bcurrent:0, isShowVideo:false, autoplay:false, + isVedio:uni.getStorageSync('isVedio') }; }, methods:{ @@ -70,11 +71,21 @@ let imgList = [] this.bannerList.forEach(item=>{ let nurl = '' - item.url=='' ? nurl = item.imgSrc : nurl = item.url - let obj = { - url:nurl, - type:item.isVideo?'video':'image', - poster:item.poster + let obj = {} + if(this.isVedio) { + item.url=='' ? nurl = item.imgSrc : nurl = item.url + obj = { + url:nurl, + type:item.isVideo?'video':'image', + poster:item.poster + } + } else { + nurl = item.imgSrc + obj = { + url:nurl, + type:'image', + poster:item.poster + } } imgList.push(obj) }) diff --git a/jsFile/config.js b/jsFile/config.js index 5214f82..41fb3da 100644 --- a/jsFile/config.js +++ b/jsFile/config.js @@ -4,7 +4,7 @@ console.log('当前环境', process.env.NODE_ENV) const apiHub = { //开发环境 development: { - BASE_URL: "https://hengmei.scdxtc.cn/api/", + BASE_URL: this.$hostapi, // BASE_URL: "https://hm.hmzfyy.cn/api/", IMG_URL: "https://xx", BASE_UPLOAD_URL: "", diff --git a/jsFile/requst.js b/jsFile/requst.js index 3288998..8c9fa42 100644 --- a/jsFile/requst.js +++ b/jsFile/requst.js @@ -1,4 +1,5 @@ -const domainName = 'https://hengmei.scdxtc.cn/api/'//域名配置 +// const domainName = 'https://hengmei.scdxtc.cn/api/'//域名配置 +const domainName = 'https://hm.hmzfyy.cn/api/'//域名配置 // 统一给参数 const dataObj = (url, params) => { let options = params diff --git a/jsFile/tools.js b/jsFile/tools.js index 8e48423..5cb867f 100644 --- a/jsFile/tools.js +++ b/jsFile/tools.js @@ -202,7 +202,7 @@ const tools = { }, escape2Html(str) {//富文本 var arrEntities = { 'lt': '<', 'gt': '>', 'nbsp': ' ', 'amp': '&', 'quot': '"' }; - return str.replace(/&(lt|gt|nbsp|amp|quot|src);/ig, function (all, t) { return arrEntities[t]; }).replace(' { + if(res.data.code==0){ + if(res.data.data.v==0) { + uni.setStorageSync('isVedio',false); + } else { + uni.setStorageSync('isVedio',true); + } + // console.log(uni.getStorageSync('isVedio/')); + } + } + }) + } } diff --git a/main.js b/main.js index ec71eb2..3e3c589 100644 --- a/main.js +++ b/main.js @@ -20,6 +20,8 @@ import authPhone from './components/auth-phone.vue'//引入手机授权组件 Vue.component('auth-phone',authPhone)//全局注册手机授权组件 import empower from './components/empower.vue'//引入用户授权组件 Vue.component('empower',empower)//全局注册用户授权组件 +import authUserInfoMobile from './components/auth-userInfo-mobile.vue'//引入授权用户信息，授权手机号组件 +Vue.component('auth-userInfo-mobile',authUserInfoMobile)//全局注册授权用户信息，授权手机号组件 // 常用工具 @@ -30,7 +32,9 @@ import requst from '@/jsFile/requst.js' Vue.prototype.$requst = requst; // 域名，专治后台仔没有返回http/https的图片 // Vue.prototype.$http = 'https://hm.hmzfyy.cn' -Vue.prototype.$http = 'https://oss.hmzfyy.cn' +Vue.prototype.$http = 'https://oss.hmzfyy.cn'; +// Vue.prototype.$newUrl = 'https://hengmei.scdxtc.cn/api/'; +Vue.prototype.$hostapi = 'https://hm.hmzfyy.cn/api/'; const {log} = console; Vue.prototype.$log = log diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue index 10c469c..05203b0 100644 --- a/pages/tabbar/cate/cate.vue +++ b/pages/tabbar/cate/cate.vue @@ -312,7 +312,13 @@ } } // 获取列表 - if(this.page==1) this.dataList = [] + if(this.page==1) { + this.dataList = []; + uni.pageScrollTo({ + scrollTop:0, + duration:0 + }) + } if(res.data.list.list.length!=0){ this.total = res.data.list.total res.data.list.list.forEach(item=>{ @@ -332,10 +338,7 @@ name:item.published_by || '恒美植发',//发布者昵称 isVideo:item.video.includes(".mp4")//是否是视频 } - if(this.newCurrent==0 && item.category_id==32) this.dataList.push(tObj) - if(this.newCurrent==1 && item.category_id==33) this.dataList.push(tObj) - if(this.newCurrent==2 && item.category_id==34) this.dataList.push(tObj) - if(this.newCurrent==3 && item.category_id==38) this.dataList.push(tObj) + this.dataList.push(tObj); }) } } @@ -409,7 +412,7 @@ is_hot:1 } uni.request({ - url:'https://hengmei.scdxtc.cn/api/spu/list', + url:`${this.$hostapi}spu/list`, data:params, method:'post', header:{ diff --git a/pages/tabbar/my/staffDuan.vue b/pages/tabbar/my/staffDuan.vue index 3ec9f71..e31e79b 100644 --- a/pages/tabbar/my/staffDuan.vue +++ b/pages/tabbar/my/staffDuan.vue @@ -28,7 +28,8 @@ - + + @@ -146,10 +147,10 @@ - {{contentVal}} + @@ -161,7 +162,6 @@ components:{empower}, data() { return { - vision:false, statusHNH:uni.getStorageSync('statusHNH'), publicColor:uni.getStorageSync('publicColor'), tongList:[ @@ -215,7 +215,6 @@ isQian:false, bannerList:[], guangImg:'', - isAuth:'', guanggao:'', userToken:'', contentVal:'',//扫码后的提示内容 @@ -227,6 +226,7 @@ customerInfo:'', times:0, openSettingBtnHidden: true,//是否授权 + optionObj:{} } }, onUnload: function() { @@ -283,7 +283,8 @@ onUnload() { this.closeqr(); }, - onLoad() { + onLoad(options) { + this.optionObj = options; if(uni.getStorageSync('gao')==''){ const query = wx.createSelectorQuery() query.select('.gao').boundingClientRect((rect) => { @@ -472,9 +473,6 @@ } }) }, - cancleEv(e){ - if(e==0) this.vision = false - }, checkGM(){//查询个人二维码事件 uni.showToast({ title:'正在生成二维码', @@ -499,6 +497,7 @@ if(res.code==0 && res.data.length!=0) { this.userInfo = res.data; uni.setStorageSync('userId',res.data.id); + uni.setStorageSync('phone',this.userInfo.mobile); this.userPhone = this.$toolAll.tools.hideMPhone(this.userInfo.mobile) this.tongList[0].num = res.data.score;//个人积分 this.tongList[1].num = res.data.coin;//个人孔雀币 diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue index 6ab9241..f41f1b2 100644 --- a/pages/tabbar/pagehome/pagehome.vue +++ b/pages/tabbar/pagehome/pagehome.vue @@ -158,7 +158,6 @@ onShow() { log('输出的解构') this.checkNet() - this.$toolAll.tools.overdue() this.$toolAll.tools.isLogin() let maiOjb = { e:6,//进入首页 @@ -173,7 +172,6 @@ this.isAutoPlay = true; }, onShareAppMessage(res) { - console.log(uni.getStorageSync('invite_code')); var ya = this; let maiOjb = { e:6,//内容分享 @@ -182,16 +180,30 @@ this.$toolAll.tools.maiDian(maiOjb) var shareObj = { 　　　　 title: '成都恒美毛发', // 默认是小程序的名称(可以写slogan等) - 　　　　 path: `/pages/tabbar/pagehome/pagehome?invite_code=${uni.getStorageSync('invite_code')}}` // 默认是当前页面，必须是以‘/’开头的完整路径 + 　　　　 path: `/pages/tabbar/pagehome/pagehome?invite_code=${uni.getStorageSync('invite_code')}` // 默认是当前页面，必须是以‘/’开头的完整路径 　 }; 　　return shareObj; }, onLoad(options) { if(options.source_code!='' && options.source_code!=undefined){ this.loginEv(options); - } - if(options.invite_code!='' && options.invite_code!=undefined){ + } else if(options.q!=undefined){ + let newInvite = options.q.slice(options.q.indexOf('invite_code%')+14); + uni.login({ + provider: 'weixin', + success: (res)=> { + var params = { + code:res.code, + invite_code:newInvite,//用户邀请码 + } + console.log(newInvite,'邀请码'); + this.$requst.post('user/login',params).then(res => {console.log('调用成功');},error => {}) + }, + }); + } else if(options.invite_code!='' && options.invite_code!=undefined){ this.loginEv(options); + } else { + this.$toolAll.tools.overdue() } const query = wx.createSelectorQuery() query.select('.statusHNH').boundingClientRect((rect) => { @@ -213,6 +225,7 @@ }, methods: { loginEv(option){ + console.log(option,'option'); uni.login({ provider: 'weixin', success: (res)=> { @@ -222,6 +235,7 @@ source_code:option.source_code || '', channel:option.channel || '' } + console.log(option.invite_code); this.$requst.post('user/login',params).then(res => {console.log('调用成功');},error => {}) }, }); diff --git a/pages/tabbar/shop/shop.vue b/pages/tabbar/shop/shop.vue index b657b0b..ebc9544 100644 --- a/pages/tabbar/shop/shop.vue +++ b/pages/tabbar/shop/shop.vue @@ -304,7 +304,7 @@ disease_id:this.disease_id//病种ID } uni.request({ - url:'https://hengmei.scdxtc.cn/api/spu/list', + url:`${this.$hostapi}spu/list`, data:params, method:'post', header:{ @@ -349,6 +349,7 @@ activity_end_at:item.activity_end_at,//限时结束时间 activity_group_cover:group_cover,//参团人的头像 activity_group_num:item.activity_group_num,//已经参团人数 + activity_id:item.activity_id } this.zanArr.push(obj) }) @@ -399,8 +400,16 @@ }) }, goPage(id,index){//进入商品详情事件 + let is_activity = 0; + let shopId = 0; + if(this.dataList[index].isTuan==true || this.dataList[index].isPing==true || this.dataList[index].isXian==true) { + is_activity = 1; + shopId = this.dataList[index].activity_id; + } else { + shopId = id; + } uni.navigateTo({ - url:`/pagesB/shopDetail/shopDetail?id=${id}&isIntegral=${this.dataList[index].isIntegral}` + url:`/pagesB/shopDetail/shopDetail?id=${shopId}&isIntegral=${this.dataList[index].isIntegral}&is_activity=${is_activity}` }) }, chooseBing(index){//小分类选择事件 diff --git a/pagesA/activityTask/activityTask.vue b/pagesA/activityTask/activityTask.vue index 4f360e0..9e0aa14 100644 --- a/pagesA/activityTask/activityTask.vue +++ b/pagesA/activityTask/activityTask.vue @@ -16,6 +16,7 @@ 活动要求：{{item.description}} 获得奖励：{{item.amount}} 积分孔雀币 会员：暂无 + 开始时间：{{item.startTime}} 结束时间：{{item.endTime}} @@ -213,6 +214,7 @@ account_status:item.account_status, member:'',//会员 isStatus:item.status, + startTime:item.start_at,//开始时间 endTime:item.end_at,//结束时间 isIcon:nIcon,//什么类型的任务 0签到 1孔雀币 2积分 3分享截图 ntype:item.type//签到类型 diff --git a/pagesA/coupon/coupon.vue b/pagesA/coupon/coupon.vue index cc00486..cf9a146 100644 --- a/pagesA/coupon/coupon.vue +++ b/pagesA/coupon/coupon.vue @@ -150,6 +150,9 @@ } }) } + if(this.dataList[index].isTiyan==false && this.dataList[index].statusNum==0) { + uni.navigateTo({url:'/pages/tabbar/shop/shop'}) + } if(this.dataList[index].isTiyan==true && this.dataList[index].statusNum==0){ this.tyImg = this.dataList[index].cover; this.$requst.post('user/exhibition-experience-coupon',{coupon_id:this.dataList[index].id}).then(res=>{ @@ -172,6 +175,7 @@ }) },3000) } + }, closeQuanEv(){ this.isTY = false; diff --git a/pagesA/getReadyDan/getReadyDan.vue b/pagesA/getReadyDan/getReadyDan.vue index 1abe2e0..c2ed6f6 100644 --- a/pagesA/getReadyDan/getReadyDan.vue +++ b/pagesA/getReadyDan/getReadyDan.vue @@ -161,6 +161,18 @@ + + + + + 立即完成拼单? + 点击下方分享给朋友，完成拼单 + + 分享给朋友 + + + + @@ -213,10 +225,29 @@ ntype:'money',//默认money孔雀币转钱 coin钱转孔雀币 times:0,//点击次数 isCurrent:2, - vision:true, + vision:false, isShowP:false, + isfen:false, + checkGrounpId:0, } }, + onShareAppMessage(res) { + var ya = this; + this.$requst.post('user/record',{type:'content',action:'share',id:this.orderList[0].id}).then(res=>{console.log('分享成功：',res);},error=>{}) + let maiOjb = { + e:4,//内容分享 + c:this.orderList[0].id*1, + t:new Date().getTime()//当前时间戳 + } + this.$toolAll.tools.maiDian(maiOjb); + if(ya.addressInfo.share_img==null) ya.addressInfo.share_img = ya.addressInfo.cover; + var shareObj = { + 　　　　 title: `${ya.orderList[0].title}`, // 默认是小程序的名称(可以写slogan等) + 　　　　 path: `/pagesB/shopDetail/shopDetail?id=${this.orderList[0].id}&category_id=${this.orderList[0].category_id}&share_id=${this.checkGrounpId}&invite_code=${uni.getStorageSync('invite_code')}&shareCate=${this.orderList[0].cateNum}&checkGrounpId=${this.orderList[0].checkGrounpId}`, // 默认是当前页面，必须是以‘/’开头的完整路径 + 　　　　 imageUrl: ya.orderList[0].imgSrc//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4 + 　 }; + 　　return shareObj; + }, onShow() { this.$toolAll.tools.isLogin(); this.checkChoose();//检测地址 @@ -480,7 +511,7 @@ this.$toolAll.tools.showToast('正在调起支付','loading',1500); } uni.request({ - url:'https://hengmei.scdxtc.cn/api/order/create', + url:`${this.$hostapi}order/create`, data:parmas, method:'post', header:{ @@ -518,8 +549,7 @@ success:(res)=> { this.$requst.post('order/paid',{order_coding:info.coding}).then(res=>{ if(res.code==0){ - uni.removeStorageSync('chooseAddress') - this.isSuccess = true; + this.suseeceEv(info.coding); } else this.$toolAll.tools.showToast(res.msg); }) @@ -534,10 +564,20 @@ } else { this.$requst.post('order/paid',{order_coding:info.coding}).then(res=>{ if(res.code==0){ - uni.removeStorageSync('chooseAddress') - this.isSuccess = true; + this.suseeceEv(info.coding); } else this.$toolAll.tools.showToast(res.msg); - + }) + } + }, + suseeceEv(coding){ + uni.removeStorageSync('chooseAddress') + this.isSuccess = true; + if(this.orderList[0].cateNum==1 && this.orderList.pin_user_id!=0){ + this.isfen = true; + this.$requst.post('order/get-group-id',{order_coding:coding}).then(res=>{ + if(res.code==0){ + this.checkGrounpId = res.data.group_id; + } }) } }, diff --git a/pagesA/integralManage/integralManage.vue b/pagesA/integralManage/integralManage.vue index fdaad23..33e0477 100644 --- a/pagesA/integralManage/integralManage.vue +++ b/pagesA/integralManage/integralManage.vue @@ -77,7 +77,7 @@ isZanw:true, ntype:'in', isHave:false, - vision:true, + vision:false, isShowP:false, } }, diff --git a/pagesA/myOrder/myOrder.vue b/pagesA/myOrder/myOrder.vue index 09debe2..e83392d 100644 --- a/pagesA/myOrder/myOrder.vue +++ b/pagesA/myOrder/myOrder.vue @@ -48,12 +48,19 @@ --> 合计：{{item.total}}{{item.total}} +{{item.coin}}孔雀币合计积分：{{item.total}} - - 直接免拼 - 取消订单 - 付款 - - 确认收货 + + + + 分享给朋友 + + + + 直接免拼 + 取消订单 + 付款 + + 确认收货 + @@ -139,9 +146,29 @@ colorLight: '#ffffff', timer:null, zanArr:[], - timeList:[] + timeList:[], + orderInfo:{}, + checkGrounpId:0 } }, + onShareAppMessage(res) { + var ya = this; + let orderIndex = res.target.dataset.id; + this.orderInfo = this.orderList[orderIndex]; + this.$requst.post('user/record',{type:'content',action:'share',id:this.orderInfo.childrenList[0].spu_id}).then(res=>{console.log('分享成功：',res);},error=>{}) + let maiOjb = { + e:4,//内容分享 + c:this.orderInfo.childrenList[0].spu_id*1, + t:new Date().getTime()//当前时间戳 + } + this.$toolAll.tools.maiDian(maiOjb); + var shareObj = { + 　　　　 title: `${ya.orderInfo.childrenList[0].title}`, // 默认是小程序的名称(可以写slogan等) + 　　　　 path: `/pagesB/shopDetail/shopDetail?id=${ya.orderInfo.childrenList[0].spu_activity_id}&category_id=0&share_id=${ya.orderInfo.group_id}&invite_code=${uni.getStorageSync('invite_code')}&shareCate=1&checkGrounpId=${ya.orderInfo.childrenList[0].spu_activity_id}&is_activity=1`, // 默认是当前页面，必须是以‘/’开头的完整路径 + 　　　　 imageUrl: ya.orderInfo.childrenList[0].imgSrc//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4 + 　 }; + 　　return shareObj; + }, onReachBottom() { if(this.total!=this.orderList.length){ this.page++ @@ -264,7 +291,9 @@ not_check_num:items.not_check_num, check_type:items.check_type, is_virtual:items.is_virtual, - activity_type:items.activity_type + activity_type:items.activity_type, + spu_id:items.spu_id, + spu_activity_id:items.spu_activity_id } nchildren.push(objs); }) @@ -282,7 +311,8 @@ open_one:item.open_one, is_group_make:item.is_group_make, open_one_success:item.open_one_success, - group_make_end_at:item.group_make_end_at + group_make_end_at:item.group_make_end_at, + group_id:item.group_id } this.zanArr.push(obj); }) diff --git a/pagesA/peacockCoin/peacockCoin.vue b/pagesA/peacockCoin/peacockCoin.vue index b03d01f..2790da6 100644 --- a/pagesA/peacockCoin/peacockCoin.vue +++ b/pagesA/peacockCoin/peacockCoin.vue @@ -87,7 +87,7 @@ size:10, total:'',//总数 isZanw:true, - vision:true, + vision:false, isShowP:false, } }, diff --git a/pagesA/pointsMall/pointsMall.vue b/pagesA/pointsMall/pointsMall.vue index bf6d042..69a9b3c 100644 --- a/pagesA/pointsMall/pointsMall.vue +++ b/pagesA/pointsMall/pointsMall.vue @@ -66,7 +66,7 @@ sort_value:'asc',//排序值 asc=升序 desc=降序 cishu:0, cartNum:0, - vision:true, + vision:false, isShowP:false, } }, diff --git a/pagesA/ppointmentEv/ppointmentEv.vue b/pagesA/ppointmentEv/ppointmentEv.vue index a85a69a..62007cd 100644 --- a/pagesA/ppointmentEv/ppointmentEv.vue +++ b/pagesA/ppointmentEv/ppointmentEv.vue @@ -115,7 +115,8 @@ onLoad() { this.category = this.xialone[0] this.categoryT = this.xialTwo[0] - this.checkZParmas() + this.checkZParmas(); + this.lphone = uni.getStorageSync('phone'); // this.$toolAll.tools.weekDate() }, methods: { diff --git a/pagesA/shopCart/shopCart.vue b/pagesA/shopCart/shopCart.vue index 87831a1..ff2ce52 100644 --- a/pagesA/shopCart/shopCart.vue +++ b/pagesA/shopCart/shopCart.vue @@ -80,7 +80,7 @@ page:1, size:10, isScore:'', - vision:true, + vision:false, isShowP:false, } }, diff --git a/pagesA/signIn/signIn.vue b/pagesA/signIn/signIn.vue index 0c9d441..27fa00f 100644 --- a/pagesA/signIn/signIn.vue +++ b/pagesA/signIn/signIn.vue @@ -67,7 +67,7 @@ isZanw:true, isSigin:0, loading:false, - vision:true, + vision:false, isShowP:false, } }, diff --git a/pagesA/suggestions/suggestions.vue b/pagesA/suggestions/suggestions.vue index 5ed3c04..17e0f25 100644 --- a/pagesA/suggestions/suggestions.vue +++ b/pagesA/suggestions/suggestions.vue @@ -9,16 +9,29 @@ 问题类型 - + + + + + + + {{iteml.title}} - + --> @@ -27,7 +40,7 @@