From ac869cfaf65388ad798c07ded36303ade4bfe48a Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Sat, 27 Jan 2024 17:11:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BA=86'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/orderGoods/index.vue | 6 +++--- pages/order_addcart/order_addcart.vue | 2 +- pages/order_details/index.vue | 2 +- pages/users/order_confirm/index.vue | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index 1394133..a0ace27 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -20,7 +20,7 @@ - + @@ -61,10 +61,10 @@ return 0; } } - }, + }, data() { return { - totalNmu: '' + totalNmu: '' }; }, watch: { diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue index e8ff2c4..6c33f3e 100644 --- a/pages/order_addcart/order_addcart.vue +++ b/pages/order_addcart/order_addcart.vue @@ -62,7 +62,7 @@ class='picTxt acea-row row-between-wrapper'> - + {{item.storeName}} diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 980428d..8c9f9c4 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -332,7 +332,7 @@ icon: "icon-weixinzhifu", value: 'weixin', title: '微信快捷支付', - payStatus: 1, + payStatus: 1, }, { name: "余额支付", diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 53a0b47..80fb6d8 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -55,7 +55,7 @@ - + From 4f617513276e9726b474691794e51d9e57bb284e Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Sat, 27 Jan 2024 17:13:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/images/llqlogo.png | Bin 0 -> 2591 bytes static/images/yilogo.png | Bin 0 -> 2510 bytes template.html | 29 +++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 static/images/llqlogo.png create mode 100644 static/images/yilogo.png create mode 100644 template.html diff --git a/static/images/llqlogo.png b/static/images/llqlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..f96bbe0de24a85a5b80a9137959312ed644944ae GIT binary patch literal 2591 zcmcIm4Nwzj8eXL^8frZMs)gRUjZ(F^+0ByQg@~9yK?n$B3fk(q+1-$oBpY@&Bw^+} z>dz@u&Y~6v#nuMe=9r?4#flUyM`7;Hv%*=6?b)Ns48>}5=t#w%Dz}>iu$|U(ZsvAo zci-Lb`JVTAfA&o()?~jhLlh$d0ANN&x;~G;=L+YvDE`{GYqgTUO?RfRWdR_1j&M!^ z_SY={fT&EXv5+e?WMKqtm*OOCqNE=cKC9=pxKVjis|$cyo|@EVqYK?ql@ zm81v`!9v3tP)9QqsFBJb0zqV;inruSRISl02T=q~fDt8(Dj*cW5E-UWfZ;>JyJJW* zmZwh(JL8|U5(~#UF&K8c-BNdglxB)xnMR|55fnyIh(|!I*TLZ)$iXfeXV6nD!C0M~ zm3DvvBW|KyoL0h14aH!0PS85oaGv;#!5-WR%cO`9(>Tyzcr?^*pFp!*YANp}toLV$ zS)Eu|dXqH$+V3(e82h5iL?6U#qRND>ncoi4@}ObG9Yf(9%@}FgHeRVU;~qg&Ax!|67FZo5?Piw=iozQxJlGC1gU_AL?6@CU}mCY+@#*O0Ga~1X9Um za)^-22}mtdB2WTFm`OQ;Q!0&YoGpj3@}CZFdze*FMe>X?g-K>6)Fedm2Bc8Sm5`bw zDTpwmDg}z8sDdOU;G|z2ZKD|jP4d}IkboqCnQ6w3^ZjGB<3$wgbQB5Q%(L@Rq+40O zbl&jykx!L`Et?e#HXVi&La%EjgivIPl!RYfeTb9ik-6J{?|m=2b#pwqt@MckOIq(N?unQG zJnQPTPp9pgx8T{~nX@CGT>RHm%h$t+e__`}@7}aw_kq}znxU2N-st1>VoyHyOJ}H z52#jFOkLvx_AUkDL?N>=G4Mg!JKwyzu+4el&i;{`8y5=;+|bz%28J49$Ns5&&@$x^ z@e$yUNhYe+SG4Mj&nLc;l5!@hq|U&Xxyyg2{xRmYg=>%Ii9dXBEW(io1JX8U>ESJ>T5?`4hsw3(Cl#lC zPnFfI2)yL=4fmY-Luv1}{Hnmm&4<&^3{JgNiLF`^eKOUjcx4NRe^^)6@kaB_Bb_m> z?)6vl$G(mQ3hV#q-xsN@2o&twFzr`S{`z6vk=B`6C-3`{ixuUl-o(6mnyu~q;`K@( z@WafiQ9{n1{?oGj%D$NVB?m?JZ_VI#Swv=SExMIPpK0GukS%H3s?`l^Q<~*}gY7%@ zbG$viniqZIv3=jyJ}A6Ak~pQQ-L?I~;QPlvKV=;JrXkwx$#`w+_3D_Y*EQRI!z_N& zb=j1Ao47u!P1k=(Q)WJ&b9t^&&7#)>k`L$<|`DhwU>Uk@$SV;{6tG- zd!JwQ{iU+gwJV)(KYupLm3>Dw)LF1Pi)~5!-Mu_~?&>qTh}&1^WK`U-j2Q1PD|rU% zdm(SYbL(H9m1R}3Y3)Z3ww>#rT6lD44ZEb{=}`?=i7=!6n`Qczqk+sTI%DRByVd_V zg?_bXV5leZ+}~$H6-ftUuXMiA=3MAs#O`Q1k~{TK*9x%(Zs=}JjgL#aKG<k=PG6swqZeNogSz+L zdgtHQG(hu-(ZoHQ#7PH#!rciiNWNME#eec3V(*Lu-*@L4M})s{8L8R&!>cxK{ttO! Bwu1lw literal 0 HcmV?d00001 diff --git a/static/images/yilogo.png b/static/images/yilogo.png new file mode 100644 index 0000000000000000000000000000000000000000..1d25399a041480af2fd7991b8dde4e6d0f628a19 GIT binary patch literal 2510 zcmcImd2ka|98Q~|6c`U$EhvaPfjThlW_NREX~fc0lhRFTNokdHv%5)`Cc8^^OOhfz zRM4W9saOwM4$le*UWGxCQ&38|*-$e2hdwL7$fs@t{Q&=EcESo<>wq7$Oy0ROxa+sF0Wn zW$=CmGOIC|LQxDdf|1UkF`3P&kOtLg5!8Ta^solSQ4H7Xq3A~i!ue@8o@aeD8Vo#H zR7H{`;0O{31k?eon)iDU%xpFzs0Pt!V1R(d5GRpAm=nkLGFTar^0R`(@*E^Hk}keP zvZ#R6$QgV>A1xULZl-8tU`)p+zZk0f-XSJ0P*>3<(U9$B2B1 zpJFl>Fq|~DH<(bwOT1Xb-$YyA@(l`UsxP2W;`fHrLsJOjWqg2J1XwJrPrx($3@Pz` zC(nC(D>bz@BBar)wb1wimZSNAI6+nv-N0B$iLt0a)pRh5!5X6z!*HDr*XmPH6ON)0 zC;^N>lM;D*V4h~(q1%BH1a9Xd3Gzu;0p4C2}U@{Sn{NJOw!VvWb%zM*{z_KGMS=0_Tz44A{XbY^(@M7mB_g)0p|uk(Y(S zro%}}_PRwy$wg*>-pDjNK=y7=XJmh%hykRxD1HPc@@^?W`k8bO$n<}j3%Qwikz89<$-|5180tyB@oc^J?+5tV!xL~b#Wq9FgQSAV^oOi;=uLyTXHo_{jw>CZ$zE{t)I zKH!TV>y}>cnDB~B6ItmC9U(&cDQ*ZAR(D-P>=g{UtUT=N@8F^D7lPry;ryWge>m** zR}~871iLle8La=M?%Vn2(YqgA&25a?_)O!Pl**TP)>dT2Cyz^hEkT|9OpRuXZS3Ic(tXs5mad1t{ijilu6S6#s_~z%2rF3O2FRwn5>MUy>G3A9_p*G};+@3UYbn@BN z;)~1js`=m3uuHRg>YFp{P16&rh8+qN9eN=3@Ow2~SkJ>|>hgAX*E*mq^e zn=1;>+dJW-8)hHhd!^~xshe&v0=CclR zo>KMFE2Ra;4qhfkEjkw0+PI@)XXDISds=Mo&s$xdbhc-+0^4#gZ+4b8k1#^j-)!kh z81!@fp0*B~<~KT&s&9Bhxp>os_te#0tFXP7n@1}@g+4uVYOOz1GVaT^?bF&jDjL=@ zEgPmB@KzpdnaLk6Oek)9r!H+hR>cRGOd2C5E$>-XQjjzK4ex%=ac%osJFu+{DHR@? zC{N#Z;XCfCvUdIGlY7qBeY5g&Zb)}+#>CdfEBS*reE(KM&DlRbBMX1%Tyf_y;@qK? zYZfk<*p>gwrn;BokJM^&ly!t_P)6p06N&rlUI{+bnSbJWBb>W<0ILmbz~0&8Pwo@j z&A$fTZJ+T;QdMmBn~LS*ca9s1R>l5&S{a) + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + + + + + + + + +
+ + + From 38b120d27026b49de8a75935883f6f0c70f66724 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Mon, 29 Jan 2024 11:21:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?'=E6=96=B0=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 12 ++--- api/public.js | 5 +- api/user.js | 2 +- config/cache.js | 3 +- libs/apps.js | 1 + libs/wechat.js | 1 + main.js | 9 +--- .../activity/goods_bargain_details/index.vue | 10 ++-- .../goods_combination_details/index.vue | 10 ++-- .../goods_combination_status/index.vue | 8 +++ .../activity/goods_seckill_details/index.vue | 52 +++++++++++++------ pages/activity/poster-poster/index.vue | 28 ++++++++++ pages/goods_details/index.vue | 13 ++++- pages/index/index.vue | 4 ++ pages/order_details/index.vue | 3 +- pages/users/login/index.vue | 14 +++-- pages/users/order_improves/index.vue | 4 +- pages/users/order_list/index.vue | 3 +- pages/users/pay_success/index.vue | 6 +-- pages/users/signin/index.vue | 3 +- pages/users/user_spread_code/index.vue | 2 +- pages/users/wechat_login/index.vue | 12 +++-- utils/util.js | 4 ++ 23 files changed, 143 insertions(+), 66 deletions(-) diff --git a/App.vue b/App.vue index c4a890f..3bcb583 100644 --- a/App.vue +++ b/App.vue @@ -18,13 +18,13 @@ mapActions } from 'vuex' import { - spread,copyrightApi,channelId + spread,copyrightApi } from "@/api/user"; // const app = getApp(); export default { globalData: { spread: 0, //推广人id - channelId:0, //通道id + code: 0, isLogin: false, userInfo: {}, @@ -117,14 +117,14 @@ let value = this.$util.getUrlParams(decodeURIComponent(option.query.scene)); that.globalData.spread = value.spread?value.spread:''; // 通道id - that.globalData.channelId = value.channelId?value.channelId:''; + that.globalData = this.$util.formatMpQrCodeData(value); break; } } if (option.spread) that.globalData.spread = option.spread; // 通道id - if (option.channelId) that.globalData.channelId = option.channelId; + // #endif // 获取导航高度； uni.getSystemInfo({ @@ -159,8 +159,7 @@ // 存储静默授权code uni.setStorageSync('snsapiCode', code); let spread = that.globalData.spread ? that.globalData.spread : 0; - // 通道id - let channelId = that.globalData.channelId ? that.globalData.channelId : 0; + Auth.auth(code, that.$Cache.get('SPREAD')) .then(res => { uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query @@ -195,6 +194,7 @@ location.replace(uni.getStorageSync('snRouter')); } } + // #endif // #ifdef MP diff --git a/api/public.js b/api/public.js index 713e4eb..556c282 100644 --- a/api/public.js +++ b/api/public.js @@ -19,11 +19,12 @@ export function getWechatConfig() { * 获取微信sdk配置 * @returns {*} */ -export function wechatAuth(code, spread) { +export function wechatAuth(code, spread,) { var reg=/^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 ，判断正整数用/^[1-9]+[0-9]*]*$/ spread = reg.test(spread) ? spread : 0; + return request.get( - "wechat/authorize/login?code=" + code + "&spread_spid=" + spread, {}, + "wechat/authorize/login?code=" + code + "&spread_spid=" + spread , {}, { noAuth: true } ); } diff --git a/api/user.js b/api/user.js index 4a71f76..3fbb5ef 100644 --- a/api/user.js +++ b/api/user.js @@ -119,7 +119,7 @@ export function getSignMonthList(data){ */ export function userActivity(){ return request.get('user/activity'); -} +} /* * 余额明细（types|2=全部,1=支出,2=收入） diff --git a/config/cache.js b/config/cache.js index 8489bea..e43f20f 100644 --- a/config/cache.js +++ b/config/cache.js @@ -26,7 +26,8 @@ module.exports = { TIPS_KEY: 'TIPS_KEY', - SPREAD: 'SPREAD', + + SPREAD: 'SPREAD', //缓存经度 CACHE_LONGITUDE: 'LONGITUDE', //缓存纬度 diff --git a/libs/apps.js b/libs/apps.js index c8739c4..2efedeb 100644 --- a/libs/apps.js +++ b/libs/apps.js @@ -33,5 +33,6 @@ class Apps{ .catch(reject); }); } + } export default new Apps(); \ No newline at end of file diff --git a/libs/wechat.js b/libs/wechat.js index 5d737c1..c4a9e74 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -232,6 +232,7 @@ class AuthWechat { }); } + /** * 获取跳转授权后的地址 * @param {Object} appId diff --git a/main.js b/main.js index 0e430f3..1582209 100644 --- a/main.js +++ b/main.js @@ -35,6 +35,7 @@ Vue.prototype.$wechat = Auth; let cookieName = "VCONSOLE", query = parseQuery(), urlSpread = query["spread"], + vconsole = query[cookieName.toLowerCase()], md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式 md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式 @@ -44,14 +45,8 @@ let cookieName = "VCONSOLE", name: 'spread', value: urlSpread, }) - // var spread = Cache.get(SPREAD); - // urlSpread = parseInt(urlSpread); - // if (!Number.isNaN(urlSpread) && spread !== urlSpread) { - // Cache.set("spread", urlSpread || 0); - // } else if (spread === 0 || typeof spread !== "number") { - // Cache.set("spread", urlSpread || 0); - // } } + if (vconsole !== undefined) { if (vconsole === md5UnCrmeb && Cache.has(cookieName)) Cache.clear(cookieName); diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue index 53d96de..0734138 100644 --- a/pages/activity/goods_bargain_details/index.vue +++ b/pages/activity/goods_bargain_details/index.vue @@ -342,7 +342,7 @@ import countDown from '@/components/countDown'; import parser from "@/components/jyf-parser/jyf-parser"; import { - silenceBindingSpread + silenceBindingSpread, } from "@/utils"; // #ifdef APP-PLUS import { @@ -494,8 +494,7 @@ // 链接进入获取绑定关系id if(options.spread) app.globalData.spread = options.spread; - // 通道id - // if(options.channelId) app.globalData.channelId = options.channelId; + var pages = getCurrentPages(); if (pages.length <= 1) { @@ -525,7 +524,7 @@ } else { this.$Cache.set(BACK_URL, '/pages/activity/goods_bargain_details/index?id=' + options.id + - '&startBargainUid=' + this.uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId + '&startBargainUid=' + this.uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId ); toLogin(); } @@ -535,6 +534,7 @@ if(this.isLogin && parseInt(app.globalData.spread)>0){ silenceBindingSpread() } + }, methods: { //去支付 @@ -586,7 +586,7 @@ "//" + window.location.host + '/pages/activity/goods_bargain_details/index?id=' + this.id + '&startBargainUid=' + this - .uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId, + .uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId, imgUrl: that.bargainInfo.image }; if (this.$wechat.isWeixin()) { diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue index 58238b0..8a13e20 100644 --- a/pages/activity/goods_combination_details/index.vue +++ b/pages/activity/goods_combination_details/index.vue @@ -494,6 +494,7 @@ //获取浏览器参数 if(options.spread) app.globalData.spread = options.spread; //推广码 + if (options.id) this.id = options.id; // 商品id // 仅仅小程序扫码进入获取商品id，商品类型 if (options.scene) { @@ -504,6 +505,7 @@ if (this.isLogin) { this.combinationDetail(); if(parseInt(app.globalData.spread)>0) silenceBindingSpread() + } else { this.$Cache.set('login_back_url', `/pages/activity/goods_combination_details/index?id=${options.id}&spread=${app.globalData.spread?app.globalData.spread:0}` @@ -616,6 +618,7 @@ getCombinationDetail(data).then(function(res) { //分享地址 that.openPages = '/pages/activity/goods_combination_details/index?id=' + that.id + '&spread=' + that.uid; + that.dataShow = 1; uni.setNavigationBarTitle({ title: res.data.storeCombination.storeName.substring(0, 16) @@ -1105,6 +1108,7 @@ // 生成二维码； make() { let href = location.href.split('?')[0] + "?id="+ this.id + "&spread=" + this.uid; + uQRCode.make({ canvasId: 'qrcode', text: href, @@ -1122,6 +1126,7 @@ } }) }, + /* * 保存到手机相册 */ @@ -1178,9 +1183,8 @@ if (this.$wechat.isWeixin()) { href = href.indexOf("?") === -1 ? - href + "?spread=" + this.uid : - href + "&spread=" + this.uid; - + href + "?spread=" + this.uid : href + "&spread=" + this.uid; + let configAppMessage = { desc: data.storeInfo, title: data.storeName, diff --git a/pages/activity/goods_combination_status/index.vue b/pages/activity/goods_combination_status/index.vue index 7b25681..d99c3fb 100644 --- a/pages/activity/goods_combination_status/index.vue +++ b/pages/activity/goods_combination_status/index.vue @@ -237,6 +237,7 @@ if (newV) { this.getCombinationPink(); if(parseInt(app.globalData.spread)>0)silenceBindingSpread() + } }, deep: true @@ -254,6 +255,7 @@ this.$set(this,'theme',this.$Cache.get('theme')); this.pinkId = options.id; if(options.spread) app.globalData.spread = options.spread; + switch (this.theme) { case 'theme1': this.posterbackgd = '../../../static/images/bargain_post1.png' // 因为跨域不能使用网络图片， @@ -275,10 +277,12 @@ this.timestamp = (new Date()).getTime(); this.getCombinationPink(); if(parseInt(app.globalData.spread)>0)silenceBindingSpread() + }else{ this.$Cache.set('login_back_url', `/pages/activity/goods_combination_status/index?id=${options.id}&spread=${app.globalData.spread?app.globalData.spread:0}` ); + toLogin(); } }, @@ -305,6 +309,7 @@ this.timestamp = (new Date()).getTime(); this.getCombinationPink(); silenceBindingSpread() + }else{ toLogin(); } @@ -658,6 +663,7 @@ } }) }, + //拼团信息 getCombinationPink: function() { var that = this; @@ -665,6 +671,7 @@ .then(res => { that.openPages = '/pages/activity/goods_combination_status/index?id=' + that.pinkId + "&spread=" + that.uid; + let storeCombination = res.data.storeCombination; res.data.pinkT.stop_time = parseInt(res.data.pinkT.stopTime); that.$set(that, 'storeCombination', storeCombination); @@ -708,6 +715,7 @@ desc: that.storeCombination.title, link: window.location.protocol + '//' + window.location.host + '/pages/activity/goods_combination_status/index?id=' + that.pinkId + "&spread=" + this.uid, + imgUrl: that.storeCombination.image }; if (this.$wechat.isWeixin()) { diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index 477da32..506a680 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -446,23 +446,15 @@ this.id = value.id ? value.id : ''; } if(options.spread) app.globalData.spread = options.spread; - // if (options.hasOwnProperty('id') || options.scene){ - // if (options.scene) { // 仅仅小程序扫码进入 - // let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene)); - // let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue); - // app.globalData.spread = mapeMpQrCodeValue.spread; - // this.id = mapeMpQrCodeValue.id; - // }else{ - // this.id = options.id; - // } - // } + if (this.isLogin) { this.getSeckillDetail(); } else { this.$Cache.set('login_back_url', - '/pages/activity/goods_seckill_details/index?id=' + this.id + '&spread=' + app.globalData.spread?app.globalData.spread:0); + '/pages/activity/goods_seckill_details/index?id=' + this.id + '&spread=' + app.globalData.spread?app.globalData.spread:0); + toLogin(); } this.$nextTick(() => { @@ -477,9 +469,10 @@ .exec(); // #endif }) - if(this.isLogin && parseInt(app.globalData.spread)>0){ + if(this.isLogin && parseInt(app.globalData.spread)>0){ silenceBindingSpread() } + }, methods: { // app分享 @@ -492,7 +485,8 @@ provider: "weixin", scene: scene, type: 0, - href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}`, + href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}}`, + title: that.storeInfo.storeName, summary:app.globalData.companyName, imageUrl: that.storeInfo.image, @@ -614,7 +608,8 @@ setTimeout(function() { that.infoScroll(); }, 1000); - that.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&spread=' + that.uid ; + that.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&spread=' + that.uid+ '&channelI=' + that.uid; + // that.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&channelI=' + that.uid ; setTimeout(() => { that.showSkeleton = false }, 1000) @@ -1068,7 +1063,7 @@ }, // 生成二维码； make() { - let href = location.href.split('?')[0] + "?id="+ this.id + "&spread=" + this.uid; + let href = location.href.split('?')[0] + "?id="+ this.id + "&spread=" + this.uid + "&channelI=" + this.uid; uQRCode.make({ canvasId: 'qrcode', text: href, @@ -1086,6 +1081,25 @@ } }) }, + // make() { + // let href = location.href.split('?')[0] + "?id="+ this.id + "&channelI=" + this.uid; + // uQRCode.make({ + // canvasId: 'qrcode', + // text: href, + // size: this.qrcodeSize, + // margin: 10, + // success: res => { + // this.PromotionCode = res; + // }, + // complete: (res) => { + // }, + // fail:res=>{ + // this.$util.Tips({ + // title: '海报二维码生成失败！' + // }); + // } + // }) + // }, // 图片预览； getpreviewImage: function() { if (this.posterImage) { @@ -1157,8 +1171,12 @@ if (this.$wechat.isWeixin()) { href = href.indexOf("?") === -1 ? - href + "?spread=" + this.uid : - href + "&spread=" + this.uid; + href + "?spread=" + this.uid+ "?channelI=" + this.uid : + href + "&spread=" + this.uid+"&channelI=" + this.uid; + // href = + // href.indexOf("?") === -1 ? + // href + "?channelI=" + this.uid : + // href + "&channelI=" + this.uid; let configAppMessage = { desc: app.globalData.companyName, diff --git a/pages/activity/poster-poster/index.vue b/pages/activity/poster-poster/index.vue index 1e4421f..a34da3d 100644 --- a/pages/activity/poster-poster/index.vue +++ b/pages/activity/poster-poster/index.vue @@ -145,6 +145,34 @@ } }) }, + make(uid) { + let href = location.protocol + '//' + window.location.host + '/pages/activity/goods_combination_status/index?id=' + this.id ; + uQRCode.make({ + canvasId: 'qrcode', + text: href, + size: this.qrcodeSize, + margin: 10, + success: res => { + this.PromotionCode = res; + let arrImages = [this.posterbackgd, this.imgTop, this.PromotionCode]; + let storeName = this.storeCombination.storeCombination.title; + let price = this.storeCombination.storeCombination.price; + let people = this.storeCombination.storeCombination.people; + let otPrice = this.storeCombination.storeCombination.otPrice; + let count = this.storeCombination.count; + setTimeout(() => { + this.PosterCanvas(arrImages, storeName, price, people,otPrice,count); + }, 300); + }, + complete: () => { + }, + fail:res=>{ + this.$util.Tips({ + title: '海报二维码生成失败！' + }); + } + }) + }, // 生成海报 PosterCanvas:function(arrImages, storeName, price, people,otPrice,count){ uni.showLoading({ diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 0ed7579..a18cb67 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -368,7 +368,8 @@ import shareRedPackets from '@/components/shareRedPackets'; import cusPreviewImg from '@/components/cus-previewImg/cus-previewImg.vue' import { - silenceBindingSpread + silenceBindingSpread, + } from "@/utils"; import parser from "@/components/jyf-parser/jyf-parser"; import { @@ -607,6 +608,7 @@ // #endif if (options.spread) app.globalData.spread = options.spread; + this.getGoodsDetails(); //商品详情 this.getCouponType(); //获取默认的 优惠券类型 @@ -645,6 +647,8 @@ title: that.productInfo.storeName || '', imageUrl: that.productInfo.image || '', path: '/pages/goods_details/index?id=' + that.id + '&spread=' + that.uid, + + } }, // #endif @@ -683,6 +687,7 @@ this.getCartCount(true); //购物车数量 //绑定关系 if (parseInt(app.globalData.spread) > 0) silenceBindingSpread(); + } }); }, @@ -696,6 +701,8 @@ scene: scene, type: 0, href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}`, + + title: that.productInfo.storeName, summary: app.globalData.companyName, imageUrl: that.productInfo.image, @@ -1424,6 +1431,7 @@ } }) }, + getImageBase64: function(images) { let that = this; imageBase64({ @@ -1576,7 +1584,8 @@ let data = this.productInfo; let href = location.href; if (this.$wechat.isWeixin()) { - href = href.indexOf("?") === -1 ? href + "?spread=" + this.uid : href + "&spread=" + this.uid; + href = href.indexOf("?") === -1 ? href + "?spread=" + this.uid: href + "&spread=" + this.uid; + let configAppMessage = { desc: app.globalData.companyName, title: data.storeName, diff --git a/pages/index/index.vue b/pages/index/index.vue index 26f9e4e..d2761e7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -418,8 +418,11 @@ let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene)); let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue); app.globalData.spread = mapeMpQrCodeValue.spread; + + } if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中 + // #endif // #ifndef MP || APP-PLUS this.navH = 0; @@ -431,6 +434,7 @@ if (this.isLogin && parseInt(app.globalData.spread) > 0) { silenceBindingSpread() } + }, onShow() { let self = this; diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 8c9f9c4..05533cf 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -130,7 +130,7 @@ - + 正在生成签署证书中... @@ -316,7 +316,6 @@ codeImg: '', qrcodeSize: 100, order_id: '', - logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d', evaluate: 0, cartInfo: [], //购物车产品 orderInfo: { diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue index ba9d1ca..85917f3 100644 --- a/pages/users/login/index.vue +++ b/pages/users/login/index.vue @@ -315,8 +315,9 @@ loginMobile({ phone: that.account, captcha: that.captcha, - spread_spid: that.$Cache.get("spread") - // spread_spid: uni.getStorageSync('spid') + spread_spid: that.$Cache.get("spread"), + + }) .then(res => { let data = res.data; @@ -358,8 +359,9 @@ account: that.account, captcha: that.captcha, password: that.password, - spread_spid: that.$Cache.get("spread") - // spread_spid: uni.getStorageSync('spid') || 0 + spread_spid: that.$Cache.get("spread"), + + }) .then(res => { that.$util.Tips({ @@ -420,7 +422,9 @@ loginH5({ account: that.account, password: that.password, - spread_spid: that.$Cache.get("spread") + spread_spid: that.$Cache.get("spread"), + + }).then(({data}) => { this.$store.commit("LOGIN", { 'token': data.token, diff --git a/pages/users/order_improves/index.vue b/pages/users/order_improves/index.vue index c7493c7..b5bccf1 100644 --- a/pages/users/order_improves/index.vue +++ b/pages/users/order_improves/index.vue @@ -160,7 +160,6 @@ export default { data() { return { - // 正面身份证 positiveImg: '', //自己图片路径 upLoadPositiveImg: 'https://tse1-mm.cn.bing.net/th/id/OIP-C.zrlmSg7klHyl3uDBB-nG3wAAAA?w=280&h=170&c=7&r=0&o=5&pid=1.7', // 反面身份证 reverseImg: '', //自己图片路径 @@ -787,12 +786,13 @@ display: flex; width: 100%; border-bottom: 1px solid #ccc; - text { margin-right: 80rpx; + width: 160rpx; } input { + width: 100%; height: 80rpx; line-height: 80rpx; font-size: 26rpx; diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 5284071..3b134a3 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -89,7 +89,7 @@ - + 正在生成签署证书中... @@ -151,7 +151,6 @@ orderStatus: 0, //订单状态 page: 1, limit: 20, - logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d', payMode: [{ name: "微信支付", icon: "icon-weixinzhifu", diff --git a/pages/users/pay_success/index.vue b/pages/users/pay_success/index.vue index d35e8d0..e9d4b5f 100644 --- a/pages/users/pay_success/index.vue +++ b/pages/users/pay_success/index.vue @@ -25,7 +25,7 @@ - + 正在生成订单中，请稍等... @@ -38,8 +38,6 @@ shopobj: {}, ordermo: '', logoflag:true, - logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d', - } }, onLoad(option) { @@ -47,7 +45,7 @@ this.timer = setInterval(() => { this.ordermo = this.$Cache.get('ordernobh') this.logoflag = false - console.log(this.ordermo) + // console.log(this.ordermo) }, 3000); // 定时器时间设置为1秒 }, onShow() { diff --git a/pages/users/signin/index.vue b/pages/users/signin/index.vue index 96358eb..db11385 100644 --- a/pages/users/signin/index.vue +++ b/pages/users/signin/index.vue @@ -28,7 +28,7 @@ - + 正在签约中，请稍等... @@ -49,7 +49,6 @@ flag: false, text: '失败', logoflag:true, - logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d', } }, onLoad(option) { diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue index 78f6518..19e205e 100644 --- a/pages/users/user_spread_code/index.vue +++ b/pages/users/user_spread_code/index.vue @@ -307,7 +307,7 @@ let configAppMessage = { desc: '分销海报', title: this.userInfo.nickname + '-分销海报', - link: '/pages/index/index?spread=' + this.uid, + link: '/pages/index/index?spread=' + this.uid , imgUrl: this.spreadList[0].pic }; this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue index 2b19b98..73616ca 100644 --- a/pages/users/wechat_login/index.vue +++ b/pages/users/wechat_login/index.vue @@ -46,8 +46,8 @@ @@ -85,7 +93,7 @@ page { position: relative; } - + .logobox { width: 100%; height: 100vh; @@ -96,11 +104,12 @@ opacity: 1; padding-top: 30%; box-sizing: border-box; - background-color:#000; + background-color: #000; text-align: center; z-index: 1; } - .logobox text{ + + .logobox text { display: block; color: #fff; font-size: 14px; @@ -110,6 +119,7 @@ left: 50%; transform: translateX(-50%); } + .logoicon { width: 80rpx; height: 140rpx; @@ -119,6 +129,7 @@ left: 50%; transform: translateX(-50%); } + .Pay_success { width: 100%; margin-top: 200rpx; diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue index 7f73674..26c5571 100644 --- a/pages/users/user_money/index.vue +++ b/pages/users/user_money/index.vue @@ -42,15 +42,15 @@ 充值记录 - +