diff --git a/mallplusui-uniapp-app/App.vue b/mallplusui-uniapp-app/App.vue index 5a51bb5..504fe16 100644 --- a/mallplusui-uniapp-app/App.vue +++ b/mallplusui-uniapp-app/App.vue @@ -61,18 +61,18 @@ console.log(cid != undefined, cid != "undefined", cid) console.log("cid>>>>>>>>>>", cid) if (cid != null || cid != "null") { + that.pushCid(cid); uni.setStorageSync('cid', cid); clearInterval(t1); - that.pushCid(); return } }, 130); // #endif }, - async pushCid() { - console.log('pushCid1111111>>>>>') + async pushCid(val) { + console.log('pushCid1111111>>>>>', val) let params = { - cid: uni.getStorageSync('cid') + cid: val }; console.log("pushCid>>>>", params); let data = await Api.apiCall('post', Api.index.pushCid, params); @@ -112,7 +112,7 @@ title: '请先登录', icon: 'none' }); - + uni.switchTab({ url: '/pages/index/messageList' }) @@ -175,11 +175,11 @@ console.log('hasLogin>>>', index.state.hasLogin) } - - if(userInfo){ + + if (userInfo) { index.state.hasVip = userInfo.memberLevelId == 1 ? false : true; } - + let isWeiXin = this.$common.isWeiXinBrowser() if (isWeiXin) { diff --git a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue index 983ee05..71a31cb 100644 --- a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue +++ b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue @@ -143,7 +143,7 @@ .coupon-money { padding: 15px; - width: 520upx; + width: 523upx; height: auto; display: flex; flex-direction: column; @@ -161,7 +161,7 @@ line-height: 30upx; font-size: $font-sm; color: #ffaa00; - font-size: 20px; + font-size: 18px; } /* .tit { diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json index 080fa62..f9ad71e 100644 --- a/mallplusui-uniapp-app/manifest.json +++ b/mallplusui-uniapp-app/manifest.json @@ -2,8 +2,8 @@ "name" : "汇融云链", "appid" : "__UNI__FB2C9C4", "description" : "", - "versionName" : "1.0.1.2", - "versionCode" : 1012, + "versionName" : "1.0.1.3", + "versionCode" : 1013, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue index df88993..e8569bb 100644 --- a/mallplusui-uniapp-app/pages/index/index.vue +++ b/mallplusui-uniapp-app/pages/index/index.vue @@ -1194,19 +1194,14 @@ } .get-btn { - width: 146upx; - height: 52upx; - line-height: 50upx; - position: absolute; - top: 50%; - right: 36upx; - margin-top: -53upx; + width: 80px; + line-height: 45upx; + margin-right: 10px; text-align: center; border-radius: 60upx; color: #ff9000; border: 1px solid #ff9000; font-size: $font-sm; - float: right; } .icon-you {