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

pages.json

@@ -19,7 +19,7 @@
 			"name": "User",
 			"aliasPath": "/user",
 			"auth": true,
-			"style": {
+			"style": {
 				"navigationBarTitleText": "节点中心"
 			}
 		}, {
@@ -336,6 +336,14 @@
             "path" : "pages/wxAuth/wxAuth",
 			"name" : "wxAuth",
 			"aliasPath": "/wechat-auth"
+        },{
+            "path" : "pages/clearOpen/clearOpen",
+            "style" : {
+                "navigationBarTitleText": "提现记录",
+                "enablePullDownRefresh": false
+            },
+			"name": "clearOpen",
+			"aliasPath": "/inside/clear-open"
         }
     ],
 	"globalStyle": {

pages/clearOpen/clearOpen.vue

@@ -0,0 +1,35 @@
+<template>
+	<view class="vertical content">
+		<view class="text">{{text}}</view>
+		<button class="btn" type="default" :disabled="text != '清理完成'" size="mini" @click="$Router.pushTab({name: 'Index'})">返回首页</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				text: 'Opneid清理中...'
+			};
+		},
+		created() {
+			this.$store.commit('setCode', '')
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		text-align: center;
+		height: 100vh;
+		background: white;
+	}
+	.text{
+		color: gray;
+		padding-bottom: $padding*2;
+	}
+	.btn{
+		background: $mian-color;
+		color: white;
+	}
+</style>

pages/found/index.vue

@@ -131,6 +131,7 @@
             showHelp() {
             	uni.showModal({
             	    title:  '能量碎片',
+                    confirmColor: '#8b64fd',
             	    content: this.energyShard.description,
             		showCancel: false
             	})

pages/user/code.vue

@@ -70,7 +70,7 @@
 				inviteData: [] ,//二维码信息
                 codeIndex : 0,
                 posterImg : '',
-                defaultImg: '/static/dev/WechatIMG9663.png',
+                defaultImg: '',
                 loaded    : false,
                 posterShow: false
 			};
@@ -96,7 +96,6 @@
             
 			// 生成海报
 			async coverCode(){
-                // let { img, title, price, head, tips } = this
                 let img     = this.inviteData[this.codeIndex].code
                 let back    = this.inviteData[this.codeIndex].cover
                 let name    = this.inviteData[this.codeIndex].user_info.nickname
@@ -105,14 +104,14 @@
                 let date    = this.inviteData[this.codeIndex].date
                 draw = new Draw({
                     width: 375,
-                 	height: 745,
+                 	height: 667,
                  	canvasId:'myCanvas',
                  	_this: this,
                  	background: {
                  		type: 'color',
                  		color: 'white',
                  		w: 375,
-                 		h: 745,
+                 		h: 667,
                  	},
                 })
                  let res = await draw.createdSharePoster(({ bgObj }) => {
@@ -127,7 +126,7 @@
                              y: 0,
                              src: back,
                              w: 375,
-                             h: 745,
+                             h: 667,
                              zIndex: 0,
                         },
                         
@@ -135,7 +134,7 @@
                         {
                             type: 'rect',
                             x: 280,
-                            y: 20,
+                            y: 10,
                             w: 60, // 宽度 必填
                             h: 80, // 高度 必填
                             zIndex: 99,
@@ -149,7 +148,7 @@
                             type: 'line',
                             zIndex: 99,
                             x: 280,
-                            y: 74,
+                            y: 62,
                             w: 60, // 宽度 默认整个画布的宽度 - x轴的距离
                             color: '#ffffff', // 颜色 默认#000000 在不考虑字节跳动小程序的前提下可简写(#000)
                             alpha: 1, // 透明度 默认1 取值范围 0~1
@@ -162,7 +161,7 @@
                         {
                             type: 'text',
                             x: 284,
-                            y: 28,
+                            y: 18,
                             zIndex: 99,
                             w: width - (20 * 2),
                             text: date.solar.month,
@@ -175,14 +174,14 @@
                         // 日历-日
                         {
                             type: 'text',
-                            x: 296,
+                            x: 298,
-                            y: 50,
+                            y: 40,
                             zIndex: 99,
                             w: width - (20 * 2),
                             text: date.solar.day,
                             color: '#ffffff',
                             font: {
-                                size: 20,
+                                size: 18,
                                 weight: 'bold'
                             }
                         },
@@ -191,7 +190,7 @@
                         {
                             type: 'text',
                             x: 282,
-                            y: 80,
+                            y: 70,
                             zIndex: 99,
                             w: width - (20 * 2),
                             text: date.lunar,
@@ -204,39 +203,39 @@
                         // 用户昵称
                         {
                             type: 'text',
-                            x: 90,
+                            x: 86,
-                            y: 650,
+                            y: 600,
                             zIndex: 99,
                             w: width - (20 * 2),
                             text: name,
                             color: '#ffffff',
                             font: {
-                                size: 18
+                                size: 16
                             }
                         },
                         
                         // 邀请码
                         {
                             type: 'text',
-                            x: 90,
+                            x: 86,
-                            y: 685,
+                            y: 630,
                             zIndex: 99,
                             w: width - (20 * 2),
                             text: '邀请码：' + invite,
                             color: '#c4a1cb',
                             font: {
-                                size: 16
+                                size: 14
                             }
                         },
                         
                         // 用户头像
                         {
                             type: 'image',
-                            x: 20,
+                            x: 24,
-                            y: 650,
+                            y: 598,
                             src: avatar,
-                            w: 54,
+                            w: 46,
-                            h: 54,
+                            h: 46,
                             drawType: 'arc',
                             zIndex: 99,
                             borderWidth: 5, // 图片边框大小 默认0
@@ -246,10 +245,10 @@
                         // 二维码
                         {
                             type: 'image',
-                            x: 270,
+                            x: 280,
-                            y: 630,
+                            y: 585,
-                            w: 90,
+                            w: 72,
-                            h: 90,
+                            h: 72,
                             zIndex: 99,
                             src: img
                         }
@@ -305,7 +304,7 @@
 	.code{
 		position: relative;
 		width: 100%;
-		padding-top: calc(199% - 280rpx - #{$padding * 2});
+		padding-top: calc(183% - 280rpx - #{$padding * 2});
 		.code-swiper{
 			position: absolute;
 			top: 0;
@@ -373,11 +372,10 @@
     // 头像昵称
     .codeCont {
         position: absolute;
-        left: 0;
+        left: 10rpx;
         bottom: 0;
         width: 100%;
-        left: 0;
+        padding: 10rpx 30rpx 20rpx;
-        padding: 10rpx 30rpx 50rpx;
         box-sizing: border-box;
         z-index: 9;
         .codeCont-avatar {
@@ -391,7 +389,7 @@
             width: 100%;
             left: 0;
             top: 0;
-            padding: 10rpx 40rpx 0 150rpx;
+            padding: 10rpx 40rpx 0 140rpx;
             box-sizing: border-box;
             .codeCont-name {
                 color: #FFFFFF;
@@ -405,17 +403,17 @@
             }
         }
         .codeCont-img {
-            width: 140rpx;
+            width: 120rpx;
-            height: 140rpx;
+            height: 120rpx;
             position: absolute;
-            right: 30rpx;
+            right: 50rpx;
-            bottom: 30rpx;
+            bottom: 10rpx;
         }
     }
 	// 日历
     .codDate {
         position: absolute;
-        top: 30rpx;
+        top: 15rpx;
         right: 70rpx;
         z-index: 9;
         color: #FFFFFF;
@@ -441,7 +439,7 @@
     // canvas
     .my-canvas{
         width: 375px;
-        height: 745px;
+        height: 667px;
         position: fixed;
         top: -99999999999rpx;
         left: -99999999999rpx;

pages/user/partner.vue

@@ -6,23 +6,30 @@
         	<view class="item" :class="{'show': larer == '1'}" @click="onTabs('1')">直接</view>
         	<view class="item" :class="{'show': larer == '2'}" @click="onTabs('2')">间接</view>
         </view>
-        
+        <block v-if="lists.length > 0">
-        <view class="partner-list">
+			<view class="partner-list">
-            <view class="partner-label" v-for="(item, index) in lists" :key="index" :larer='larer'>
+				<view class="partner-label" v-for="(item, index) in lists" :key="index" :larer='larer'>
-                <image class="partner-avatar" :src="item.avatar ? item.avatar : '/static/user/user-portrait.png'" mode="aspectFill"></image>
+					<image class="partner-avatar" :src="item.avatar ? item.avatar : '/static/user/user-portrait.png'" mode="aspectFill"></image>
-                <view class="partner-cont">
+					<view class="partner-cont">
-                    <view class="partner-name">
+						<view class="partner-name">
-                        <view class="partner-nickname">
+							<view class="partner-nickname">
-                            {{item.nickname}}
+								{{item.nickname}}
-                        </view>
+							</view>
-                        <image v-if="item.identity" class="partner-identity" :src="item.identity.cover" mode="widthFix"></image>
+							<image v-if="item.identity" class="partner-identity" :src="item.identity.cover" mode="widthFix"></image>
-                    </view>
+						</view>
-                    <view class="partner-tel">
+						<view class="partner-tel">
-                        {{item.username}}
+							{{item.username}}
-                    </view>
+						</view>
-                </view>
+					</view>
-            </view>
+				</view>
-        </view>
+			</view>
+		</block>
+		<block v-else>
+			<view class="list-null">
+				<image class="icon" src="@/static/icons/approve-icon.png" mode="widthFix"></image>
+				<view class="sub-title">暂未数据</view>
+			</view>
+		</block>
     </view>
 </template>
 
@@ -66,6 +73,34 @@
 	.content{
 		padding-top: 90rpx;
 	}
+	
+	// 空提示
+	.list-null{
+		width: 100vw;
+		height: 100vh;
+		padding-bottom: 20vh;
+		box-sizing: border-box;
+		background: white;
+		text-align: center;
+		@extend .vertical;
+		.sub-title{
+			color: $text-gray;
+			font-size: $title-size-m;
+		}
+		.icon{
+			width: 288rpx;
+		}
+		.sub-btn{
+			width: 200rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			text-align: center;
+			background: $mian-color;
+			color: white;
+			display: inline-block;
+			margin-top: $margin*2;
+		}
+	}
     
     // tabs
     .tabs{

pages/vip/vip.vue

@@ -231,7 +231,7 @@ export default {
 		},
 
 		// 微信支付
-		wechatPay(id, wx) {
+		wechatPay(id, wx) {
 			vipWechatPay(id, {
 				openid: this.$store.getters.getCode
 			}).then(payConfig => {
@@ -253,7 +253,12 @@ export default {
 						})
 					}
 				});
-			});
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
 		},
 
 		// 勾选协议

router/index.js

@@ -24,11 +24,11 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	const token  = store.getters.getToken || uni.getStorageSync('token')
 	// 检查是否需要微信授权
-	// if(store.getters.getCode === '' && to.name != 'wxAuth'){
+	if(store.getters.getCode === '' && to.name != 'wxAuth'){
-	// 	next({
+		next({
-	// 		name: 'wxAuth'
+			name: 'wxAuth'
-	// 	})
+		})
-	// }
+	}
 	// 检查是否需要登录
 	if(to.auth && token === ''){
 		next({

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>链商星球</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.61332aa4.js></script><script src=/static/js/index.75ad1224.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.61332aa4.js></script><script src=/static/js/index.c1da6ab1.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-clearOpen-clearOpen.c3863e5e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-clearOpen-clearOpen"],{"25c2":function(e,t,n){"use strict";n.r(t);var i=n("c804"),a=n("4d4a");for(var o in a)"default"!==o&&function(e){n.d(t,e,(function(){return a[e]}))}(o);n("7fc1");var s,r=n("f0c5"),d=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"e49e5628",null,!1,i["a"],s);t["default"]=d.exports},"49d0":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i={data:function(){return{text:"Opneid清理中..."}},created:function(){var e=this;uni.removeStorage({key:"wxCode",success:function(t){setTimeout((function(){e.text="清理完成"}),1e3)}})}};t.default=i},"4d4a":function(e,t,n){"use strict";n.r(t);var i=n("49d0"),a=n.n(i);for(var o in i)"default"!==o&&function(e){n.d(t,e,(function(){return i[e]}))}(o);t["default"]=a.a},7667:function(e,t,n){var i=n("24fb");t=i(!1),t.push([e.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/**\n * Web唐明明\n * 匆匆数载恍如梦，岁月迢迢华发增。\n * 碌碌无为枉半生，一朝惊醒万事空。\n */.ios-bottom[data-v-e49e5628]{padding-bottom:env(safe-area-inset-bottom);padding-bottom:constant(safe-area-inset-bottom)}.ios-left[data-v-e49e5628]{padding-left:env(safe-area-inset-left);padding-left:constant(safe-area-inset-left)}.ios-right[data-v-e49e5628]{padding-right:env(safe-area-inset-right);padding-right:constant(safe-area-inset-right)}.ios-top[data-v-e49e5628]{padding-top:0}.vertical[data-v-e49e5628]{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-pack:center}.nowrap[data-v-e49e5628]{max-width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ellipsis[data-v-e49e5628]{max-width:100%;display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical;-webkit-line-clamp:2}.ellipsis-3[data-v-e49e5628]{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical;-webkit-line-clamp:3}.ellipsis-4[data-v-e49e5628]{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical;-webkit-line-clamp:4}.ellipsis-5[data-v-e49e5628]{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical;-webkit-line-clamp:5}\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */.content[data-v-e49e5628]{text-align:center;height:100vh;background:#fff}.text[data-v-e49e5628]{color:grey;padding-bottom:%?60?%}.btn[data-v-e49e5628]{background:#8b64fd;color:#fff}',""]),e.exports=t},"7fc1":function(e,t,n){"use strict";var i=n("953e"),a=n.n(i);a.a},"953e":function(e,t,n){var i=n("7667");"string"===typeof i&&(i=[[e.i,i,""]]),i.locals&&(e.exports=i.locals);var a=n("4f06").default;a("47a4eaf7",i,!0,{sourceMap:!1,shadowMode:!1})},c804:function(e,t,n){"use strict";var i;n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){return i}));var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("v-uni-view",{staticClass:"vertical content"},[n("v-uni-view",{staticClass:"text"},[e._v(e._s(e.text))]),n("v-uni-button",{staticClass:"btn",attrs:{type:"default",disabled:"清理完成"!=e.text,size:"mini"},on:{click:function(t){arguments[0]=t=e.$handleEvent(t),e.$Router.pushTab({name:"Index"})}}},[e._v("返回首页")])],1)},o=[]}}]);