调整区块链电商App兼容优化

manifest.json

@@ -22,26 +22,30 @@
             }
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Payment" : {},
+            "OAuth" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
@@ -49,7 +53,49 @@
             "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "oauth" : {
+                    "univerify" : {}
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },

pages.json

@@ -14,7 +14,8 @@
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "发现更多",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
 			}
 		}, {
 			"path": "pages/user/index",
@@ -22,7 +23,23 @@
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "节点中心",
-				"navigationStyle":"custom"
+				"navigationStyle":"custom",
+				"navigationBarTextStyle": "white",
+				"app-plus":{
+					"titleNView": {
+						"type": "transparent",
+						"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)",
+						"buttons": [{
+							"text": "\ue601",
+							"fontSrc":"/static/iconfont.ttf",
+							"background": "rgba(0,0,0,0)"
+						},{
+							"text": "\ue602",
+							"fontSrc":"/static/iconfont.ttf",
+							"background": "rgba(0,0,0,0)"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/user/code",
@@ -92,7 +109,17 @@
 			"path": "pages/goods/management",
 			"name": "goodsManagement",
 			"style": {
-				"navigationBarTitleText": "商品权证管理"
+				"navigationBarTitleText": "商品权证管理",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "发布",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/goods/addClassify",
@@ -116,13 +143,33 @@
 			"path": "pages/coupons/management",
 			"name": "couponsManagement",
 			"style": {
-				"navigationBarTitleText": "创建优惠券"
+				"navigationBarTitleText": "优惠券管理",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "创建",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/coupons/add",
 			"name": "couponsAdd",
 			"style": {
-				"navigationBarTitleText": "创建优惠券"
+				"navigationBarTitleText": "创建优惠券",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "发布",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/coupons/magDetails",
@@ -248,28 +295,58 @@
 			"name": "shopLists",
 			"auth": true,
 			"style": {
-				"navigationBarTitleText": "部门/门店"
+				"navigationBarTitleText": "门店管理",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "添加",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/shop/create",
 			"name": "shopCreate",
 			"auth": true,
 			"style": {
-				"navigationBarTitleText": "创建部门/门店"
+				"navigationBarTitleText": "创建门店"
 			}
 		}, {
 			"path": "pages/employees/list",
 			"name": "employeesList",
 			"auth": true,
 			"style": {
-				"navigationBarTitleText": "员工管理"
+				"navigationBarTitleText": "员工管理",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "添加",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/employees/add",
 			"name": "employeesAdd",
 			"auth": true,
 			"style": {
-				"navigationBarTitleText": "添加员工"
+				"navigationBarTitleText": "添加员工",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "保存",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/instrument/Spread",
@@ -283,7 +360,17 @@
 			"name": "instrumentBasics",
 			"auth": true,
 			"style": {
-				"navigationBarTitleText": "基础信息"
+				"navigationBarTitleText": "基础信息",
+				"app-plus":{
+					"titleNView": {
+						"buttons": [{
+							"text": "保存",
+							"width": "78px",
+							"fontSize": "15px",
+							"color":"#8b64fd"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/wallet/fragment",

pages/certification/personal.vue

@@ -75,7 +75,7 @@
 				}).then(res=>{
 					uni.showModal({
 						title: '提示',
-						content: '个人认证信息已提交，请耐心等待审核',
+						content: '个人认证已完成',
 						showCancel: false,
 						confirmColor: '#8b64fd',
 						success: modalRes => {

pages/coupons/add.vue

@@ -113,9 +113,6 @@
 			<label>使用规则</label>
 			<textarea :maxlength="-1" v-model="description" placeholder="输入使用规则说明" />
 		</view>
-		<view class="add-btn ios-bottom">
-			<button type="default" @click="updComponent">发布优惠券</button>
-		</view>
 	</view>
 </template>
 
@@ -159,6 +156,9 @@
 			})
 			this.coupongoods = this.$store.getters.getCoupongoods
 		},
+		onNavigationBarButtonTap() {
+			this.updComponent()
+		},
 		methods:{
 			// 发券数量
 			quantityChange(value){
@@ -250,21 +250,6 @@
 </script>
 
 <style lang="scss" scoped>
-	.add-btn{
-		padding: $padding;
-		button{
-			height: 90rpx;
-			line-height: 90rpx;
-			background: $text-price;
-			color: white;
-			font-size: $title-size;
-			font-weight: bold;
-			border-radius: 0;
-			&::after{
-				border: none;
-			}
-		}
-	}
 	// 优惠券详情
 	.add-textarea{
 		background: white;
@@ -365,7 +350,7 @@
 		.cover{
 			position: relative;
 			border-right: dashed 3rpx $border-color;
-			width: 148rpx;
+			width: 218rpx;
 			text-align: center;
 			.cover-img{
 				width: 148rpx;
@@ -411,7 +396,7 @@
 		}
 		.mian{
 			justify-content: center;
-			width: calc(100% - 148rpx - #{$padding*2});
+			width: calc(100% - 218rpx);
 			box-sizing: border-box;
 			@extend .vertical;
 			.title{

pages/coupons/management.vue

@@ -25,7 +25,6 @@
 						</view>
 						<image v-else class="cover-img" :src="item.cover" mode="aspectFill" />
 					</view>
-					
 					<view class="item mian">
 						<view class="title nowrap">{{item.title}}</view>
 						<view class="time nowrap">
@@ -48,9 +47,6 @@
 				<no-list name='no-counpon' txt="没有任何相关优惠券~" />
 			</view>
 		</block>
-		<view class="basisc-btn">
-			<button class="btn" type="default" @click="$Router.push({name: 'couponsAdd'})">添加优惠券</button>
-		</view>
 	</view>
 </template>
 
@@ -68,6 +64,9 @@
 		onShow() {
 			this.getCoupons()
 		},
+		onNavigationBarButtonTap() {
+			this.$Router.push({name: 'couponsAdd'})
+		},
 		methods:{
 			// 选择类型
 			onTabs(value){
@@ -102,34 +101,6 @@
 </script>
 
 <style lang="scss" scoped>
-    .basics-content{
-    	padding-bottom: ($padding*3) + 90;
-    }
-    
-	// 按钮组
-	.basisc-btn{
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		padding: $padding;
-		background: white;
-		box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
-		.btn {
-			background: $mian-color;
-			color: white;
-			border-radius: 0;
-			font-size: $title-size-lg;
-			line-height: 88rpx;
-			height: 88rpx;
-			&::after {
-				border: none;
-			}
-			&[disabled] {
-				background: rgba($color: $mian-color, $alpha: .6);
-			}
-		}
-	}
 	// tabs
 	.header{
 		position: fixed;
@@ -207,7 +178,7 @@
 			.cover{
 				position: relative;
 				border-right: dashed 3rpx $border-color;
-				width: 148rpx;
+				width: 218rpx;
 				text-align: center;
 				.cover-img{
 					width: 148rpx;
@@ -253,7 +224,7 @@
 			}
 			.mian{
 				justify-content: center;
-				width: calc(100% - 148rpx - #{$padding*2});
+				width: calc(100% - 218rpx);
 				box-sizing: border-box;
 				@extend .vertical;
 				.title{

pages/employees/add.vue

@@ -55,10 +55,6 @@
 				</view>
 			</checkbox-group>
 		</view>
-		<!-- 按钮 -->
-        <view class="basisc-btn">
-            <button class="btn" size="default" @click="onAddEmployees">{{type === 'PUT' ? '修改': '添加'}}</button>
-        </view>
 	</view>
 </template>
 
@@ -84,6 +80,12 @@
 				isPosition	 : false
 			};
 		},
+		onNavigationBarButtonTap() {
+			this.onAddEmployees()
+			// <view class="basisc-btn">
+			//     <button class="btn" size="default" @click="onAddEmployees">{{type === 'PUT' ? '修改': '添加'}}</button>
+			// </view>
+		},
 		created() {
 			if(this.$Route.query.type === 'PUT'){
 				this.type = 'PUT'
@@ -93,16 +95,8 @@
 			}
 			employeesConfig().then(res => {
 				this.section 	 = res.store
-				
-				console.log(res)
-				
 				if(this.$Route.query.type === 'PUT'){
-					
-					console.log(111)
-					
 					employeesInfo(this.$Route.query.id).then(res => {
-						console.log(11111)
-						console.log(res)
 						let permissionIds = []
 						for(let val of res.permission){
 							if(val.check){
@@ -225,8 +219,6 @@
     }
     
 	.content{
-		// min-height: 100vh;
-        padding-bottom: ($padding*3) + 90;
 		@extend .ios-bottom;
 		.title{
 			padding: ($padding/2) $padding;

pages/employees/list.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="ios-bottom" v-if="!loding">
-		<view class="header-flex">
-			员工数量 {{total}} 人
-			<view class="add-btn" @click="addEmployees">添加员工</view>
-		</view>
 		<!-- 员工列表 -->
 		<uni-collapse v-if="lists.length > 0">
 			<block v-for="(listItem, listIndex) in lists" :key="listIndex">
@@ -77,6 +73,9 @@
 				this.loding = false
 			})
 		},
+		onNavigationBarButtonTap() {
+			this.$Router.push({name: 'employeesAdd'})
+		},
 		methods:{
 			// 编辑，删除
 			onEmployees(e, upIndex, index){

pages/goods/management.vue

@@ -47,9 +47,6 @@
 				<view class="btn" @click="additionalOrBurning">确认</view>
 			</view>
 		</uni-popup>
-        <!-- <view class="basisc-btn">
-        	<button class="btn" type="default" @click="$Router.push({name: 'goodsaddClassify'})">添加商品权证</button>
-        </view> -->
 	</view>
 </template>
 
@@ -173,7 +170,7 @@
 			}
 		},
 		onNavigationBarButtonTap() {
-			// this.$Router.push({name: 'addClassify'})
+			this.$Router.push({name: 'goodsaddClassify'})
 		}
 	}
 </script>
@@ -210,7 +207,6 @@
     
 	.content{
 		padding-top: 90rpx;
-        padding-bottom: ($padding*3) + 90;
 	}
 	// tabs
 	.tabs{

pages/instrument/basics.vue

@@ -95,10 +95,7 @@
 				<view class="module-hint">点击查看封面/视频，长按删除封面/视频</view>
 			</view>
 		</block>
-		<view class="basisc-btn">
+		<view @click="addModule" class="add-modules"><uni-icons class="icon" color="#8b64fd" size="20" type="plus"></uni-icons>添加模块</view>
-			<view class="add-modules" @click="addModule">添加模块</view>
-			<button class="btn" type="default" @click="onBasicsInfo">保存</button>
-		</view>
 	</view>
 </template>
 
@@ -130,6 +127,9 @@
 				})
 			})
 		},
+		onNavigationBarButtonTap(){
+			this.onBasicsInfo()
+		},
 		methods:{
 			// 图片预览
 			openImg(paths, index, type){
@@ -336,7 +336,7 @@
 
 <style lang="scss" scoped>
 	.basics-content{
-		padding-bottom: ($padding*3) + 90;
+		
 	}
 	// 基础信息
 	.info{
@@ -399,48 +399,19 @@
 			}
 		}
 	}
-	// 按钮组
+	// 添加模块
-	.basisc-btn{
+	.add-modules{
-		position: fixed;
+		margin: $margin 0;
-		bottom: 0;
+		line-height: 88rpx;
-		left: 0;
+		height: 88rpx;
-		right: 0;
+		text-align: center;
-		padding: $padding;
+		color: $text-price;
 		background: white;
-		margin-top: $margin - 10;
+		box-sizing: border-box;
-		display: flex;
+		font-size: $title-size-lg;
-		justify-content: space-between;
+		.icon{
-		box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
+			vertical-align: middle;
-		.add-modules{
+			margin-right: $margin/3;
-			line-height: 86rpx;
-			height: 88rpx;
-			text-align: center;
-			color: $text-price;
-			background: white;
-			width: calc(50% - 15rpx);
-			margin-right: 30rpx;
-			border:solid 1rpx $mian-color;
-			box-sizing: border-box;
-			font-size: $title-size-lg;
-			.icon{
-				margin-right: $margin/3;
-			}
-		}
-		.btn {
-			background: $mian-color;
-			color: white;
-			border-radius: 0;
-			font-size: $title-size-lg;
-			line-height: 88rpx;
-			height: 88rpx;
-			width: calc(50% - 15rpx);
-			&::after {
-				border: none;
-			}
-		
-			&[disabled] {
-				background: rgba($color: $mian-color, $alpha: .6);
-			}
 		}
 	}
 	// 展示模块

pages/shop/create.vue

@@ -211,22 +211,9 @@
 </script>
 
 <style lang="scss" scoped>
-    .basics-content{
-    	padding-bottom: ($padding*3) + 90;
-    }
-    
     // 按钮组
     .basisc-btn{
-    	position: fixed;
-    	bottom: 0;
-    	left: 0;
-    	right: 0;
     	padding: $padding;
-    	background: white;
-    	margin-top: $margin - 10;
-    	display: flex;
-    	justify-content: space-between;
-    	box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
     	.add-modules{
     		line-height: 86rpx;
     		height: 88rpx;

pages/shop/lists.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="lists">
 		<block v-if="lists.length > 0">
-			<view class="header-flex">
+			<!-- <view class="header-flex">
 				门店数量{{total}}
 				<view class="add-btn" @click="$Router.push({name: 'shopCreate'})">添加门店</view>
-			</view>
+			</view> -->
 			<view class="lists-item" v-for="(item, index) in lists" :key="index" @click="$Router.push({name: 'shopCreate', params: { id: item.store_id }})">
 				<view class="header">
 					<image class="logo" :src="item.cover" mode="aspectFill"></image>
@@ -41,6 +41,9 @@
 				this.lists = res.data
 				this.total = res.page.total
 			})
+		},
+		onNavigationBarButtonTap() {
+			this.$Router.push({name: 'shopCreate'})
 		}
 	}
 </script>

pages/user/code.vue

@@ -4,7 +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>
+						<view class="code-lay" @click="coverCode"></view>
 						<image class="code-back-image" :src="item.cover" mode="aspectFill"></image>
 						<view class="codDate">
 						    <view class="codDate-year">
@@ -39,7 +39,7 @@
 				<view class="title">邀请码 : {{inviteData[0].invite}}</view>
                 <view class="value" @click="copyCenter(inviteData[0].invite)">复制邀请码</view>
 			</view>
-			<view class="button" @click="coverCode">生成分享海报</view>
+			<!-- <view class="button" @click="coverCode">生成分享海报</view> -->
 		</view>
         <canvas class="my-canvas" canvas-id="myCanvas" id="myCanvas"/>
         <view v-if="posterShow">
@@ -49,8 +49,8 @@
                     <image class="img" :src="posterImg" mode="widthFix" />
                 </view>
                 <view class="poster-btn">
-                    <view class="operate">长按图片保存</view>
+                    <view class="operate operate-cancel" @click="saveImage">保存图片至相册</view>
-                    <view class="operate operate-cancel" @tap="posterShow = false">取消</view>
+                    <view class="operate" @tap="posterShow = false">取消</view>
                 </view>
             </view>
         </view>
@@ -61,7 +61,6 @@
     import { userInvite } from '@/apis/interfaces/user'
     import { saveImageToPhotosAlbum, showToast, downloadFile } from '@/uni_modules/sakura-canvas/js_sdk/util'
     import Draw from '@/uni_modules/sakura-canvas/js_sdk/draw'
-    import h5Copy from '@/js_sdk/junyi-h5-copy/junyi-h5-copy/junyi-h5-copy'
     let draw = null
 	export default {
 		data() {
@@ -264,24 +263,21 @@
                 let { posterImg } = this
                 let res = await saveImageToPhotosAlbum(posterImg)
             	if (!res.success) return
-                showToast('保存成功')
+                showToast('保存成功,去相册分享给朋友吧')
             	this.posterShow = false
             },
             
             // 复制邀请码
             copyCenter(e) {
-                let copyNo = e
+				uni.setClipboardData({
-                const result = h5Copy(copyNo)
+					data: e,
-                    if (result === false) {
+					success(){
-                    uni.showToast({
+						uni.showToast({
-                        title:'不支持',
+							title: '邀请码已复制',
-                    })
+							icon : 'none'
-                } else {
+						})
-                    uni.showToast({
+					}
-                        title:'复制成功',
+				})
-                        icon:'none'
-                    })
-                }
             },
             
             // 切换海报背景index

pages/user/index.vue

@@ -31,13 +31,6 @@
 		<view class="ios-top"></view>
 		<!-- header -->
 		<view class="header">
-			<!-- 工具 -->
-			<view class="user-tool">
-				<image class="user-tool-icon" src="/static/user/user-top-00.png" mode="aspectFill"
-					@click="$Router.push({name: 'setting'})"></image>
-				<image class="user-tool-icon" src="/static/user/user-top-01.png" mode="aspectFill"
-					@click="$Router.push({name: 'news'})"></image>
-			</view>
 			<!-- 用户信息 -->
 			<view class="user-info">
 				<view class="user-portrait">
@@ -195,7 +188,7 @@
 					</view>
 					<view class="tool-label" @click="$Router.push({name: 'shopLists'})">
 						<image class="tool-label-img" src="/static/user/userTool-04.png" mode=""></image>
-						<view class="tool-label-name">部门门店</view>
+						<view class="tool-label-name">门店管理</view>
 					</view>
 					<view class="tool-label" @click="$Router.push({name: 'employeesList'})">
 						<image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
@@ -280,7 +273,7 @@
 			this.animatedShow = false
 		},
 		onPageScroll(e) {
-			if (e.scrollTop <= 0 && !this.shoeCardType) {
+			if (e.scrollTop <= -60 && !this.shoeCardType) {
 				this.shoeCardType = true
 				return
 			}
@@ -288,6 +281,16 @@
 				this.shoeCardType = false
 			}
 		},
+		onNavigationBarButtonTap(e){
+			switch(e.index){
+				case 0:
+					this.$Router.push({name: 'news'})
+					break
+				case 1:
+					this.$Router.push({name: 'setting'})
+					break
+			}
+		},
 		methods: {
 			// 开通VIP
 			openVip(identityId) {
@@ -374,18 +377,6 @@
 						})
 					}
 				})
-
-				// const result = h5Copy(copyNo)
-				//     if (result === false) {
-				//     uni.showToast({
-				//         title:'不支持',
-				//     })
-				// } else {
-				//     uni.showToast({
-				//         title:'复制成功',
-				//         icon:'none'
-				//     })
-				// }
 			},
 			// 友情提示信息
 			showHelp(type) {
@@ -666,36 +657,15 @@
 		left: 0;
 		width: 100%;
 		background-image: linear-gradient(to right, #7c52fc, #976dff);
-
+		overflow: hidden;
-		// user工具
+		@extend .ios-top;
-		.user-tool {
-			text-align: right;
-			line-height: 40px;
-			@extend .ios-top;
-
-			.user-tool-name {
-				flex: 1;
-				line-height: 40px;
-				text-align: left;
-				color: #fff;
-				font-size: 28rpx;
-			}
-
-			.user-tool-icon {
-				padding-right: $padding;
-				margin-top: 10px;
-				width: $uni-img-size-sm;
-				height: $uni-img-size-sm;
-				vertical-align: top;
-			}
-		}
-
 		// 用户信息
 		.user-info {
 			position: relative;
 			width: 100%;
 			height: 70px;
 			box-sizing: border-box;
+			margin-top: 40px;
 			padding-left: $padding;
 			padding-right: $padding;
 			color: $uni-text-color-inverse;

pages/vip/vip.vue

@@ -233,89 +233,12 @@
 					return;
 				}
 				if (can.on_line) {
-					// #ifdef H5
+					console.log("微信pay")
-						this.wxPayH5Config()
-					// #endif
-					//#ifdef APP-PLUS
-					  this.wxPayAppConfig()
-					//#endif
 				} else {
 					this.canClick()
 				}
 				return;
 			},
-			// 微信支付鉴权H5
-			wxPayH5Config() {
-				  wxConfig({
-				  	url: window.location.href,
-				  	jsApiList: ['chooseWXPay']
-				  }).then(res => {
-				  	let payConfig = JSON.parse(res)
-				  	let jweixin = require('jweixin-module')
-				  	jweixin.ready(() => {
-				  		// res
-				  	})
-				  	jweixin.error(err => {
-				  		uni.showToast({
-				  			title: err,
-				  			icon: 'none'
-				  		})
-				  	})
-				  	jweixin.config({
-				  		...payConfig
-				  	})
-				  	vipOrder(this.identitie[this.tabsIndex].identity_id, {
-				  		year: this.sumNumber
-				  	}).then(payId => {
-				  		this.wechatH5Pay(payId.id, jweixin);
-				  	}).catch(err => {
-				  		uni.showToast({
-				  			title: err.message,
-				  			icon: 'none'
-				  		})
-				  	})
-				  }).catch(err => {
-				  	uni.showToast({
-				  		title: err.message,
-				  		icon: 'none'
-				  	})
-				  })
-			},
-
-			// 微信支付 H5
-			wechatH5Pay(id, wx) {
-				vipWechatPay(id, {
-					type:'mp',
-					openid: this.$store.getters.getCode
-				}).then(payConfig => {
-					wx.chooseWXPay({
-						...payConfig,
-						success() {
-							uni.showModal({
-								title: '提示',
-								content: '支付成功，恭喜您成功开通',
-								showCancel: false,
-								confirmColor: '#8b64fd',
-								success: () => {
-									this.$Router.back()
-								}
-							})
-						},
-						fail(err) {
-							uni.showToast({
-								title: '支付被取消',
-								icon: 'none'
-							})
-						}
-					});
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon: 'none'
-					})
-				})
-			},
-			
 			// 支付创建订单APP
 			wxPayAppConfig(){
 				let data = {year:1}

unpackage/dist/dev/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1F65101","name":"BlockChainH5","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.9","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","backgroundColor":"#FFFFFF","selectedColor":"#774ffd","iconWidth":"26px","spacing":"0","height":"60px","list":[{"text":"发现能量","iconPath":"static/tabBar/tabBar_icon_00.png","selectedIconPath":"static/tabBar/tabBar_show_00.png","pagePath":"pages/index/index"},{"text":"发现更多","iconPath":"static/tabBar/tabBar_icon_01.png","selectedIconPath":"static/tabBar/tabBar_show_01.png","pagePath":"pages/found/index"},{"text":"节点中心","iconPath":"static/tabBar/tabBar_icon_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png","pagePath":"pages/user/index"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1F65101","name":"BlockChainH5","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Payment":{},"OAuth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"ad":{},"payment":{"weixin":{"__platform__":["ios","android"],"appid":"","UniversalLinks":""}},"oauth":{"univerify":{}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.9","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","backgroundColor":"#FFFFFF","selectedColor":"#774ffd","iconWidth":"26px","spacing":"0","height":"60px","list":[{"text":"发现能量","iconPath":"static/tabBar/tabBar_icon_00.png","selectedIconPath":"static/tabBar/tabBar_show_00.png","pagePath":"pages/index/index"},{"text":"发现更多","iconPath":"static/tabBar/tabBar_icon_01.png","selectedIconPath":"static/tabBar/tabBar_show_01.png","pagePath":"pages/found/index"},{"text":"节点中心","iconPath":"static/tabBar/tabBar_icon_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png","pagePath":"pages/user/index"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}