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

apis/interfaces/vip.js

@@ -39,13 +39,6 @@ const vipCont = (id, data) =>{
 	})
 }
 
-// 会员开通协议
-const userAgree = () =>{
-	return request({
-		url		: 'articles/agreement/openvip'
-	})
-}
-
 // 上传打款凭证
 const vipVoucher = (data) =>{
 	return request({
@@ -55,11 +48,18 @@ const vipVoucher = (data) =>{
 	})
 }
 
+// 用户协议
+const userAgree = (apiUrl) => {
+  return request({
+    url: apiUrl
+  })
+}
+
 export {
 	identities,
 	vipOrder,
 	vipWechatPay,
     vipCont,
-    userAgree,
+    vipVoucher,
-    vipVoucher
+    userAgree
 }

manifest.json

@@ -5,6 +5,12 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
+	"h5": {
+		"title": "链商星球",
+		"router": {
+			"mode": "history"
+		}
+	},
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

pages.json

@@ -8,189 +8,210 @@
 		}
 	}, {
 		"path": "pages/found/index",
-		"name": "Found",
+		"name": "Found",
+		"aliasPath": "/found",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "发现更多"
 		}
 	}, {
 		"path": "pages/user/index",
-		"name": "User",
+		"name": "User",
+		"aliasPath": "/user",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "节点中心"
 		}
 	}, {
 		"path": "pages/user/code",
-		"name": "userCode",
+		"name": "userCode",
+		"aliasPath": "/user/code",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "邀请好友"
 		}
 	}, {
 		"path": "pages/user/help",
-		"name": "userHelp",
+		"name": "userHelp",
+		"aliasPath": "/user/help",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "帮助中心"
 		}
 	}, {
 		"path": "pages/user/partner",
-		"name": "userPartner",
+		"name": "userPartner",
+		"aliasPath": "/user/partner",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "我的伙伴"
 		}
 	}, {
 		"path": "pages/user/clause",
-		"name": "userClause",
+		"name": "userClause",
+		"aliasPath": "/user/clause",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "服务条款"
 		}
 	}, {
 		"path": "pages/user/followOfficial",
-		"name": "Official",
+		"name": "Official",
+		"aliasPath": "/user/followOfficial",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "关注公众号"
 		}
 	}, {
 		"path": "pages/vip/vip",
-		"name": "vipIndex",
+		"name": "vipIndex",
+		"aliasPath": "/vip",
 		"style": {
 			"navigationBarTitleText": "开通节点"
 		}
 	}, {
 		"path": "pages/vip/agree",
-		"name": "vipAgree",
+		"name": "vipAgree",
+		"aliasPath": "/vip/agree",
 		"style": {
-			"navigationBarTitleText": "服务条款"
+			"navigationBarTitleText": "用户协议"
 		}
 	}, {
-		"path": "pages/vip/examine",
+		"path": "pages/vip/examine",
-		"name": "Examine",
+		"name": "Examine",
+		"aliasPath": "/vip/examine",
 		"style": {
 			"navigationBarTitleText": "提交成功"
 		}
 	}, {
 		"path": "pages/setting/setting",
-		"name": "setting",
+		"name": "setting",
+		"aliasPath": "/setting",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "设置中心"
 		}
 	}, {
 		"path": "pages/goods/management",
-		"name": "goodsManagement",
+		"name": "goodsManagement",
+		"aliasPath": "/goods/management",
 		"style": {
 			"navigationBarTitleText": "商品权证管理"
 		}
 	}, {
 		"path": "pages/goods/addClassify",
-		"name": "goodsaddClassify",
+		"name": "goodsaddClassify",
+		"aliasPath": "/goods/add-classify",
 		"style": {
 			"navigationBarTitleText": "发布商品类目"
 		}
 	}, {
 		"path": "pages/goods/add",
-		"name": "goodsAdd",
+		"name": "goodsAdd",
+		"aliasPath": "/goods/add",
 		"style": {
 			"navigationBarTitleText": "商品权证创建"
 		}
 	}, {
 		"path": "pages/goods/goodsAuth",
-		"name": "goodsAddAuth",
+		"name": "goodsAddAuth",
+		"aliasPath": "/goods/goods-auth",
 		"style": {
 			"navigationBarTitleText": "商品权证认证"
 		}
 	}, {
 		"path": "pages/coupons/management",
-		"name": "couponsManagement",
+		"name": "couponsManagement",
+		"aliasPath": "/coupons/management",
 		"style": {
 			"navigationBarTitleText": "创建优惠券"
 		}
 	}, {
 		"path": "pages/coupons/add",
-		"name": "couponsAdd",
+		"name": "couponsAdd",
+		"aliasPath": "/coupons/add",
 		"style": {
 			"navigationBarTitleText": "创建优惠券"
 		}
 	}, {
 		"path": "pages/coupons/magDetails",
-		"name": "couponsDetails",
+		"name": "couponsDetails",
+		"aliasPath": "/coupons/mag-details",
 		"style": {
 			"navigationBarTitleText": "优惠券详情"
 		}
 	}, {
 		"path": "pages/coupons/selectGoods",
-		"name": "couponsSelectGoods",
+		"name": "couponsSelectGoods",
+		"aliasPath": "/coupons/select-goods",
 		"style": {
 			"navigationBarTitleText": "关联产品"
 		}
 	}, {
 		"path": "pages/login/login",
-		"name": "Login",
+		"name": "Login",
+		"aliasPath": "/login",
 		"style": {
 			"navigationBarTitleText": "登录"
 		}
 	}, {
 		"path": "pages/login/guide",
-		"name": "loginGuide",
+		"name": "loginGuide",
+		"aliasPath": "/login/guide",
 		"style": {
 			"navigationBarTitleText": "引导页"
 		}
 	}, {
 		"path": "pages/login/agreement",
-		"name": "agreement",
+		"name": "agreement",
+		"aliasPath": "/login/agreement",
 		"style": {
 			"navigationBarTitleText": "用户隐藏协议"
 		}
 	}, {
 		"path": "pages/certification/personal",
-		"name": "Personal",
+		"name": "Personal",
+		"aliasPath": "/personal",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "个人认证"
 		}
-	}, {
-		"path": "pages/setting/setting",
-		"name": "setting",
-		"auth": true,
-		"style": {
-			"navigationBarTitleText": "设置中心"
-		}
 	}, {
 		"path": "pages/setting/aboutUs",
-		"name": "aboutUs",
+		"name": "aboutUs",
+		"aliasPath": "/setting/about-us",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "关于我们"
 		}
 	}, {
 		"path": "pages/company/approve",
-		"name": "companyApprove",
+		"name": "companyApprove",
+		"aliasPath": "/company/approve",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "企业认证"
 		}
 	}, {
 		"path": "pages/news/index",
-		"name": "news",
+		"name": "news",
+		"aliasPath": "/news/index",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "消息中心"
 		}
 	}, {
 		"path": "pages/news/detail",
-		"name": "newsDetail",
+		"name": "newsDetail",
+		"aliasPath": "/news/detail",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "消息列表"
 		}
 	}, {
 		"path": "pages/wallet/property",
-		"name": "walletProperty",
+		"name": "walletProperty",
+		"aliasPath": "/wallet/property",
 		"style": {
 			"navigationBarTitleText": "能量钱包",
 			"enablePullDownRefresh": false,
@@ -198,7 +219,8 @@
 		}
 	}, {
 		"path": "pages/wallet/extract",
-		"name": "Extract",
+		"name": "Extract",
+		"aliasPath": "/wallet/extract",
 		"style": {
 			"navigationBarTitleText": "提现能量",
 			"enablePullDownRefresh": false,
@@ -207,69 +229,78 @@
 		}
 	},{
 		"path": "pages/verification/index",
-		"name": "verificationIndex",
+		"name": "verificationIndex",
+		"aliasPath": "/verification/index",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "扫码核销"
 		}
 	},{
 		"path": "pages/verification/history",
-		"name": "verificationHistory",
+		"name": "verificationHistory",
+		"aliasPath": "/verification/history",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "核销记录"
 		}
 	},{
 		"path": "pages/shop/lists",
-		"name": "shopLists",
+		"name": "shopLists",
+		"aliasPath": "/shop/lists",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "部门/门店"
 		}
 	},{
 		"path": "pages/shop/create",
-		"name": "shopCreate",
+		"name": "shopCreate",
+		"aliasPath": "/shop/create",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "创建部门/门店"
 		}
 	},{
 		"path": "pages/employees/list",
-		"name": "employeesList",
+		"name": "employeesList",
+		"aliasPath": "/employees/list",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "员工管理"
 		}
 	},{
 		"path": "pages/employees/add",
-		"name": "employeesAdd",
+		"name": "employeesAdd",
+		"aliasPath": "/employees/add",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "添加员工"
 		}
 	},{
 		"path": "pages/instrument/Spread",
-		"name": "instrumentSpread",
+		"name": "instrumentSpread",
+		"aliasPath": "/instrument/spread",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "营销推广码"
 		}
 	},{
 		"path": "pages/instrument/basics",
-		"name": "instrumentBasics",
+		"name": "instrumentBasics",
+		"aliasPath": "/instrument/basics",
 		"auth": true,
 		"style": {
 			"navigationBarTitleText": "基础信息"
 		}
 	}, {
 		"path": "pages/wallet/fragment",
+		"name": "Fragment",
+		"aliasPath": "/wallet/fragment",
 		"style": {
 			"navigationBarTitleText": "能量碎片记录",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#774ffd",
 			"navigationBarTextStyle": "white"
-		},
+		}
-		"name": "Fragment"
 	},
 	{
 		"path": "pages/wallet/addBank",
@@ -279,7 +310,8 @@
 			"navigationBarBackgroundColor": "#774ffd",
 			"navigationBarTextStyle": "white"
 		},
-		"name": "addBank"
+		"name": "addBank",
+		"aliasPath": "/wallet/add-bank"
 	},{
 		"path": "pages/wallet/bankList",
 		"style": {
@@ -288,7 +320,8 @@
 			"navigationBarBackgroundColor": "#774ffd",
 			"navigationBarTextStyle": "white"
 		},
-		"name": "bankList"
+		"name": "bankList",
+		"aliasPath": "/wallet/bank/list"
 	},{
 		"path": "pages/wallet/withdrawList",
 		"style": {
@@ -297,7 +330,8 @@
 			"navigationBarBackgroundColor": "#774ffd",
 			"navigationBarTextStyle": "white"
 		},
-		"name": "withdrawList"
+		"name": "withdrawList",
+		"aliasPath": "/wallet/withdraw/list"
 	}],
 	"globalStyle": {
 		"navigationStyle": "custom",

pages/login/login.vue

@@ -26,8 +26,11 @@
 			</view>
 		</view>
 		<!-- 用户登录注册协议 -->
-		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="/pages/login/agreement?name=secret">用户隐私协议</navigator>和<navigator url="/pages/login/agreement?name=service">用户服务协议
+		<view class="agreement">
-			</navigator>
+			未注册的手机号验证后将自动创建账号，登录即表示同意接收
+			<view @click="$Router.push({name: 'agreement', params: {name : 'secret'}})">用户隐私协议</view>
+			和
+			<view @click="$Router.push({name: 'agreement', params: {name : 'service'}})">用户服务协议</view>
 		</view>
 	</view>
 </template>
@@ -253,8 +256,7 @@
 			padding-top: $padding * 2;
 			font-size: $title-size-sm;
 			color: $text-gray;
-
+			view {
-			navigator {
 				color: $text-price;
 				display: inline-block;
 				padding: 0 10rpx;

pages/setting/setting.vue

@@ -278,9 +278,7 @@
 			},
 			loginOut() {
 				this.$store.commit('setToken', '')
-				uni.reLaunch({
+				this.$Router.push({name: 'Login'})
-					url: '/pages/login/login'
-				})
 			},
 			// 上传头像
 			updImgs(type) {

pages/user/code.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="background">
         <view class="codeContent">
             <!-- 邀请码图 -->
             <view class="codeBack">
@@ -98,13 +98,14 @@
 	}
 </script>
 
-<style>
-    page {
-        background-image: linear-gradient(to top, #7c52fc, #976dff);
-    }
-</style>
-
 <style lang="scss">
+	
+	// 背景色
+	.background{
+		min-height: 100vh;
+		background: linear-gradient(to top, #7c52fc, #976dff);
+	}
+	
     // 背景
     .codeImg {
         width: 100%;

pages/user/index.vue

@@ -967,7 +967,7 @@
         width: 100%;
         z-index: 99;
         left: 0;
-        top: 196px;
+        top: 200px;
         // padding-top: var(--status-bar-height);
         background-color: #F8F8F8;
         transition: .5s;

pages/vip/agree.vue

@@ -15,7 +15,11 @@
 			}
 		},
         created() {
-        	userAgree().then(res => {
+            let newUrl = ''
+            if(this.$Route.query.type == 'vipAgree') newUrl = 'articles/agreement/openvip'
+            if(this.$Route.query.type == 'loginPrivacy') newUrl = 'articles/agreement/secret'
+            if(this.$Route.query.type == 'loginService') newUrl = 'articles/agreement/service'
+        	userAgree(newUrl).then(res => {
                 this.content = res.content
         	}).catch(err =>{
         		uni.showToast({

pages/vip/vip.vue

@@ -62,10 +62,15 @@
                 <view class="privilege-text">
                     <view class="privilege-name">
                         升级条件
-                    </view>
+                    </view>
-                    <view class="privilege-label" :class="{'active' : item.finish == true}" v-for="(item, index) in identitie[tabsIndex].get_condition" :key="index">
+					<block v-if="openCondition.energy_shard">
-                        &{{item.message}}
+						<view class="privilege-label" :class="{'active' : openCondition.energy_shard.finish}">{{openCondition.energy_shard.message}}<uni-icons v-if="openCondition.energy_shard.finish" type="checkmarkempty" size="17" color="#f6b338"></uni-icons></view>
-                    </view>
+						<view class="privilege-label" :class="{'active' : openCondition.price.finish}" v-if="!openCondition.energy_shard.finish">{{openCondition.price.message}}</view>
+						<view class="privilege-label" v-else>{{openCondition.service_charge.message}}</view>
+					</block>
+					<block v-else>
+						<view class="privilege-label" :class="{'active' : openCondition.price.finish}">{{openCondition.price.message}}</view>
+					</block>
                 </view>
             </view>
             <view class="privilege-list">
@@ -82,7 +87,7 @@
         </view>
         
         <!-- 用户协议 -->
-        <view class="agree">
+        <view class="agree">
             <view class="agree-tips" @click="$Router.push({name: 'vipAgree', params: {type : 'vipAgree'}})">
                 请仔细阅读并确认服务协议
             </view>
@@ -127,7 +132,8 @@
                 canForm     : false,      // 凭证弹出
                 canFromImg	: {
                 	showpath: '',
-                	path	: ''
+                	path	: ''
+                },
 				openCondition: {}
 			}
 		},
@@ -138,11 +144,23 @@
 		methods: {
             // 当前用户信息
             idenInfo(){
-                identities().then(res => {
+                identities().then(res => {
-                	this.loding		= false
+					res.identities.map(item => {
-                	this.identitie  = res.identities
+						item.obj_condition = new Object
-                	this.rights		= res.identities[this.tabsIndex].rights
+						for(let val of item.get_condition){
-                    this.total      = res.identities[this.tabsIndex].price
+							item.obj_condition[val.name] = {
+								message: val.message,
+								finish: val.finish
+							}
+						}
+						return item
+					})
+					
+					this.identitie 		= res.identities
+					this.openCondition	= res.identities[this.tabsIndex].obj_condition
+                	this.rights			= res.identities[this.tabsIndex].rights
+                    this.total      	= res.identities[this.tabsIndex].price
+                    this.canBtn    		= res.identities[this.tabsIndex].can
 					this.loding			= false
                 }).catch(err =>{
                 	uni.showToast({
@@ -153,7 +171,7 @@
             },
             
             // 切换开通身份
-            swiperChange(e) {
+            swiperChange(e) {
             	this.tabsIndex = e.detail.current
                 // 获取当前用户信息
                 this.idenInfo();
@@ -169,9 +187,7 @@
                         icon : 'none'
                     })
                     return
-                }
                 }
-                if(can.on_line) {
                 if(can.on_line) {
                     if(can.buy) {
                         // 开通vip提交
@@ -183,7 +199,6 @@
                         	icon : 'none'
                         })
                     }
-                } else {
                 } else {
                     if(can.buy) {
                         // 上传凭证
@@ -195,7 +210,6 @@
                         })
                     }
                 }
-                return
                 return
 			},
             // 开通vip提交

pages/wallet/extract.vue

@@ -171,9 +171,7 @@
 			},
 			// 选择银行卡
 			bankLists() {
-				uni.navigateTo({
+				this.$Router.push({name: 'bankList'})
-					url: '/pages/wallet/bankList'
-				})
 			},
 			// 提现记录
 			withdrawDetail() {

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>BlockChainH5</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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.fa7b169e.js></script><script src=/static/js/index.90de528e.js></script></body></html>