Merge branch 'main' of https://git.yuzhankeji.cn/TmOct5/BlockChainH5

pages/found/index.vue

@@ -38,12 +38,16 @@
             <view class="sign-record">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个能量碎片</view>
         </view>
         <view class="signBtn">
-            <view class="signBtn-go" v-if="sign.signCan" @click="signClick" style="cursor:pointer" >
-                签到领取能量碎片
-            </view>
-            <view class="signBtn-go" v-else @click="$Router.push({name:'Fragment'})">
-                能量碎片记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
-            </view>
+            <block v-if="sign.signCan">
+                <view class="signBtn-go" @tap="signClick" style="cursor:pointer" >
+                    签到领取能量碎片
+                </view>
+            </block>
+            <block v-else>
+                <view class="signBtn-go" @click="$Router.push({name:'Fragment'})">
+                    能量碎片记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
+                </view>
+            </block>
         </view>
         <!-- 水晶任务 -->
         <view class="task">
@@ -323,6 +327,7 @@
 		z-index: 2;
         .signBtn-go {
             width: 100%;
+            height: 100rpx;
             line-height: 100rpx;
             border-radius: 80rpx;
             background-color: #f9dc4a;

pages/goods/addClassify.vue

@@ -26,9 +26,13 @@
 		},
 		created() {
 			managesCategory().then(res => {
-				console.log(res)
 				this.loding   = false
 				this.category = res
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
 			})
 		},
 		methods:{

pages/user/code.vue

@@ -4,6 +4,7 @@
 			<swiper class="code-swiper" previous-margin="70rpx" next-margin="70rpx" @change="swiperChange">
 				<swiper-item v-for="(item, index) in inviteData" :key="index">
 					<view class="code-item">
+						<view class="code-lay"></view>
 						<image class="code-back-image" :src="item.cover" mode="aspectFill"></image>
 						<view class="codDate">
 						    <view class="codDate-year">
@@ -315,6 +316,12 @@
 				height: 100%;
 				width: 100%;
 				padding: 0 $padding/2;
+				.code-lay{
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					z-index: 10;
+				}
 				.code-back-image{
 					width: 100%;
 					height: 100%;

pages/user/index.vue

@@ -479,8 +479,8 @@
         position: fixed;
         background-color: $uni-bg-color;
         border-radius: $radius;
-        left: 60rpx;
-        right: 60rpx;
+        left: 80rpx;
+        right: 80rpx;
         top: 30%;
         z-index: 1002;
         font-size: $uni-font-size-sm;
@@ -494,11 +494,11 @@
             font-weight: 600;
         }
         .newCont-text {
-            padding: 0 40rpx;
+            padding: 50rpx 40rpx;
             box-sizing: border-box;
             line-height: 48rpx;
             text-align: justify;
-            height: 260rpx;
+            max-height: 400rpx;
             overflow: hidden;
             overflow-y: scroll;
         }

pages/vip/vip.vue

@@ -236,12 +236,15 @@ export default {
 				openid: this.$store.getters.getCode
 			}).then(payConfig => {
 				wx.chooseWXPay({...payConfig,
-					success: ()=> {
-						uni.showToast({
-							title: '支付成功',
-							icon: "success"
-						})
-						this.idenInfo();
+					success() {
+						uni.showModal({
+							title	: '提示',
+							content	: '支付成功，恭喜您成功开通',
+							cancelColor: '#8b64fd',
+							success() {
+								this.$Router.back()
+							}
+						})
 					},
 					fail(err) {
 						uni.showToast({