[...]

manifest.json

@@ -16,6 +16,11 @@
             "autoclose" : true,
             "delay" : 0
         },
+		"safearea": {
+			"bottom": {
+				"offset": "none"
+			}
+		},
         /* 模块配置 */
         "modules" : {},
         /* 应用发布信息 */

pages.json

@@ -20,9 +20,15 @@
 			"path": "pages/user/index",
 			"name": "User",
 			"auth": true,
+<<<<<<< HEAD
 			"style": {
 				"navigationBarTitleText": "节点中心",
 				"navigationStyle": "custom"
+=======
+			"style": {
+				"navigationBarTitleText": "节点中心",
+				"navigationStyle":"custom"
+>>>>>>> 7ee3ddee638ee97b563a70fde8a6fe769589f72c
 			}
 		}, {
 			"path": "pages/user/code",
@@ -195,7 +201,8 @@
 			"style": {
 				"navigationBarTitleText": "能量钱包",
 				"enablePullDownRefresh": false,
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor":"#976dff"
 			}
 		}, {
 			"path": "pages/wallet/extract",
@@ -203,7 +210,7 @@
 			"style": {
 				"navigationBarTitleText": "提现能量",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#774ffd",
+				"navigationBarBackgroundColor": "#976dff",
 				"navigationBarTextStyle": "white"
 			}
 		}, {
@@ -312,7 +319,9 @@
 		}
 	],
 	"globalStyle": {
-		"backgroundColor": "#F5F5F5"
+		"backgroundColor": "#F5F5F5",
+		"navigationBarBackgroundColor":"#FFFFFF",
+		"navigationBarTextStyle":"black"
 	},
 	"tabBar": {
 		"borderStyle": "white",

pages/goods/management.vue

@@ -47,10 +47,9 @@
 				<view class="btn" @click="additionalOrBurning">确认</view>
 			</view>
 		</uni-popup>
-        
-        <view class="basisc-btn">
+        <!-- <view class="basisc-btn">
         	<button class="btn" type="default" @click="$Router.push({name: 'goodsaddClassify'})">添加商品权证</button>
-        </view>
+        </view> -->
 	</view>
 </template>
 

pages/user/index.vue

@@ -25,205 +25,185 @@
 		    <image class="newCont-close" src="/static/user/order-cancelPay.png" mode="aspectFill" @click="newEject()"></image>
 		</view>
 		<!-- 消息列表弹出 end -->
-		<!--  @scrolltoupper="onScrolltoupper" -->
-		<scroll-view class="content-scroll" scroll-y="true">
-			<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>
+		<!-- ios安全区 -->
+		<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">
+					<image class="user-portrait-head" :src="userData.avatar ? userData.avatar : '/static/user/user-portrait.png'" mode="aspectFill"></image>
 				</view>
-				<!-- 用户信息 -->
-				<view class="user-info">
-				    <view class="user-portrait">
-				        <image class="user-portrait-head" :src="userData.avatar ? userData.avatar : '/static/user/user-portrait.png'" mode="aspectFill"></image>
-				    </view>
-				    <view class="user-head">
-				        <view class="user-name">
-				            {{userData.nickname}}
-				            <image v-if="userData.identity" class="user-name-identity" :src="userData.identity.cover"></image>
-				        </view>
-				        <view class="user-status">
-				            邀请码：{{userData.invite}}
-				            <view class="user-status-copy" @click="copyCenter(userData.invite)">
-				                <text>复制</text>
-				            </view>
-				        </view>
-				    </view>
-				</view>
-				<!-- 会员卡 -->
-				<view class="userVip" :class="{ animated: animatedShow }">
-				    <view class="userVip-top">
-				        <view class="userVip-top-name" v-if="userIdentity.right">
-				            {{ userData.identity.id == 1 ? '开通' + userIdentity.right.name : '到期时间：' + userIdentity.times.ended_at}}
-				        </view>
-				        <view class="userVip-top-btn" v-if="userData.identity.id != 5" @click="openVip(userIdentity.right.identity_id)">
-				             {{ userData.identity.id == 1 ? '去开通' : '去升级'}}<image class="userVip-top-arrow" src="/static/user/userVip_arrow.png"></image>
-				        </view>
-				        <view class="userVip-top-btn" v-else>
-				           已达成满级
-				        </view>
-				    </view>
-				    
-				    <!-- 未认证后显示 -->
-				    <!-- <view class="userVip-tips">
-				        <view class="userVip-tips-title">
-				            加入链商星球
-				        </view>
-				        <view class="userVip-tips-text">
-				            和众多精英一样，用另一种方式改变你的生活姿态。
-				            以人为本，锐意进取，追求卓越。
-				            诚信立足创新致远。
-				        </view>
-				    </view> -->
-				    
-				    <!-- 已认证后显示 -->
-				    <view class="userVip-rights">
-				        <view class="userVip-rightst-title">
-				            <view class="userVip-rightst-title-name">查看会员专属权益</view>
-				            <view class="userVip-rightst-more" @click="$Router.push({name: 'vipIndex', params:{identity_id: userIdentity.right.identity_id}})">全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png"></image></view>
-				        </view>
-				        <view class="userVip-rightst-list" v-if="userIdentity.right">
-				            <view v-for="(item, index) in userIdentity.right.rights" :key="index" class="userVip-rightst-label">
-				                <block v-if="index <= 3">
-				                    <image class="userVip-rightst-img" :src="item.cover"></image>
-				                    <view class="nowrap userVip-rightst-name">{{item.name}}</view>
-				                </block>
-				            </view>
-				            <view class="userVip-rightst-label">
-				                <image class="userVip-rightst-img" src="/static/user/userRightst_icon_more.png"></image>
-				                <view class="nowrap userVip-rightst-name">敬请期待</view>
-				            </view>
-				        </view>
-				    </view>
+				<view class="user-head">
+					<view class="user-name">
+						{{userData.nickname}}
+						<image v-if="userData.identity" class="user-name-identity" :src="userData.identity.cover"></image>
+					</view>
+					<view class="user-status">
+						邀请码：{{userData.invite}}
+						<view class="user-status-copy" @click="copyCenter(userData.invite)">
+							<text>复制</text>
+						</view>
+					</view>
 				</view>
 			</view>
-			<view
-				class="mian"
-				:style="[{
-					transform: coverTransform,
-					transition: coverTransition
-				}]"
-				@touchstart="coverTouchstart"
-				@touchmove="coverTouchmove"
-				@touchend="coverTouchend">
-				<!-- 消息中心  -->
-				<view class="userNew">
-				    <image class="userNew-icon" src="/static/user/userNew_icon.png"></image>
-				    <swiper class="userNew-banner" disable-touch circular autoplay interval="3000" vertical>
-				        <swiper-item class="ellipsis" v-for="(item, index) in newList" :key="index" @click="newEject(index)">
-				            {{item.title}}
-				        </swiper-item>
-				    </swiper>
+			<!-- 会员卡 -->
+			<view class="userVip" :class="{ animated: animatedShow }">
+				<view class="userVip-top">
+					<view class="userVip-top-name" v-if="userIdentity.right">
+						{{ userData.identity.id == 1 ? '开通' + userIdentity.right.name : '到期时间：' + userIdentity.times.ended_at}}
+					</view>
+					<view class="userVip-top-btn" v-if="userData.identity.id != 5" @click="openVip(userIdentity.right.identity_id)">
+						 {{ userData.identity.id == 1 ? '去开通' : '去升级'}}<image class="userVip-top-arrow" src="/static/user/userVip_arrow.png"></image>
+					</view>
+					<view class="userVip-top-btn" v-else>
+					   已达成满级
+					</view>
 				</view>
-				<!-- 我的资产 -->
-				<view class="userAssets">
-				    <view class="userAssets-top">
-				        <view class="withdraw-name" v-if="userData.account">
-				            当前能量球价值<view class="withdraw-number">￥{{userData.account.stone_value || 0}}</view>
-				        </view>
-				        <view class="withdraw-btn" @click="$Router.push({name: 'Extract'})">
-				            去提现
-				        </view>
-				    </view>
-				    <view class="userAssets-show">
-				        <view class="assets-title">
-				            我的资产
-				        </view>
-				        <view class="assets-list" v-if="userData.account">
-				            <view class="assets-label" @click="$Router.push({name:'walletProperty'})">
-				                <view class="assets-label-name">能量球钱包<image @click.stop="showHelp('wallet')" class="assets-label-icon" src="/static/user/userAssets_tips.png"></image></view>
-				                <view class="assets-label-number">{{userData.account.stone || 0}}</view>
-				            </view>
-				            <view class="assets-label" @click="$Router.push({name:'Fragment'})">
-				                <view class="assets-label-name">能量碎片<image @click.stop="showHelp('chip')" class="assets-label-icon" src="/static/user/userAssets_tips.png"></image></view>
-				                <view class="assets-label-number">{{userData.account.score || 0}}</view>
-				            </view>
-				        </view>
-				    </view>
-				</view>
-				<!-- 我的伙伴 -->
-				<view class="userPartner">
-				    <view class="partner-title">
-				        我的伙伴
-				    </view>
-				    <view class="partner-list" v-if="userData.relation_count">
-				        <view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:''}})">
-				            <view class="partner-label-name">伙伴总数</view>
-				            <view class="partner-label-number">{{userData.relation_count.all || 0}}</view>
-				        </view>
-				        <view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:1}})">
-				            <view class="partner-label-name">直接伙伴</view>
-				            <view class="partner-label-number">{{userData.relation_count.one || 0}}</view>
-				        </view>
-				        <view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:2}})">
-				            <view class="partner-label-name">间接伙伴</view>
-				            <view class="partner-label-number">{{userData.relation_count.two || 0}}</view>
-				        </view>
-				    </view>
-				</view>
-				<!-- 企业工具 -->
-				<view class="userPartner" v-if="userData.is_company">
-				    <view class="partner-title">
-				        企业工具
-				    </view>
-				    <view class="tool-list">
-				        <view class="tool-label" @click="$Router.push({name: 'goodsManagement'})">
-				            <image class="tool-label-img" src="/static/user/userTool-00.png" mode=""></image>
-				            <view class="tool-label-name">商品权证</view>
-				        </view>
-				        <view class="tool-label" @click="$Router.push({name: 'couponsManagement'})">
-				            <image class="tool-label-img" src="/static/user/userTool-01.png" mode=""></image>
-				            <view class="tool-label-name">优惠券管理</view>
-				        </view>
-				        <view class="tool-label" @click="$Router.push({name: 'instrumentSpread'})">
-				            <image class="tool-label-img" src="/static/user/userTool-02.png" mode=""></image>
-				            <view class="tool-label-name">营销推广码</view>
-				        </view>
-				        <view class="tool-label" @click="$Router.push({name: 'instrumentBasics'})">
-				            <image class="tool-label-img" src="/static/user/userTool-03.png" mode=""></image>
-				            <view class="tool-label-name">基础信息</view>
-				        </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>
-				        <view class="tool-label" @click="$Router.push({name: 'employeesList'})">
-				            <image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
-				            <view class="tool-label-name">员工管理</view>
-				        </view>
-						<!-- <view class="tool-label" @click="$Router.push({name: 'verificationIndex'})">
-						    <image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
-						    <view class="tool-label-name">扫码核销</view>
-						</view> -->
-				    </view>
-				</view>
-				<!-- 我的服务 -->
-				<view class="userPartner">
-				    <view class="partner-title">
-				        我的服务
-				    </view>
-				    <view class="tool-list">
-				        <view class="tool-label" @click="custEject">
-				            <image class="tool-label-img" src="/static/user/userServe-00.png" mode=""></image>
-				            <view class="tool-label-name">专属客服</view>
-				        </view>
-				        <view class="tool-label" @click="$Router.push({name: 'userCode'})">
-				            <image class="tool-label-img" src="/static/user/userServe-01.png" mode=""></image>
-				            <view class="tool-label-name">邀请好友</view>
-				        </view>
-				        <view class="tool-label" @click="$Router.push({name: 'userHelp'})">
-				            <image class="tool-label-img" src="/static/user/userServe-02.png" mode=""></image>
-				            <view class="tool-label-name">帮助中心</view>
-				        </view>
-				        <view class="tool-label" @click="$Router.push({name: 'userClause'})">
-				            <image class="tool-label-img" src="/static/user/userServe-03.png" mode=""></image>
-				            <view class="tool-label-name">服务条款</view>
-				        </view>
-				    </view>
+				<!-- 已认证后显示 -->
+				<view class="userVip-rights">
+					<view class="userVip-rightst-title">
+						<view class="userVip-rightst-title-name">查看会员专属权益</view>
+						<view class="userVip-rightst-more" @click="$Router.push({name: 'vipIndex', params:{identity_id: userIdentity.right.identity_id}})">全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png"></image></view>
+					</view>
+					<view class="userVip-rightst-list" v-if="userIdentity.right">
+						<view v-for="(item, index) in userIdentity.right.rights" :key="index" class="userVip-rightst-label">
+							<block v-if="index <= 3">
+								<image class="userVip-rightst-img" :src="item.cover"></image>
+								<view class="nowrap userVip-rightst-name">{{item.name}}</view>
+							</block>
+						</view>
+						<view class="userVip-rightst-label">
+							<image class="userVip-rightst-img" src="/static/user/userRightst_icon_more.png"></image>
+							<view class="nowrap userVip-rightst-name">敬请期待</view>
+						</view>
+					</view>
 				</view>
 			</view>
-		</scroll-view>
+		</view>
+		<!-- mian -->
+		<view class="mian" :class="{'shoeCard': shoeCardType}">
+			<!-- 消息中心  -->
+			<view class="userNew">
+				<image class="userNew-icon" src="/static/user/userNew_icon.png"></image>
+				<swiper class="userNew-banner" disable-touch circular autoplay interval="3000" vertical>
+					<swiper-item class="ellipsis" v-for="(item, index) in newList" :key="index" @click="newEject(index)">
+						{{item.title}}
+					</swiper-item>
+				</swiper>
+			</view>
+			<!-- 我的资产 -->
+			<view class="userAssets">
+				<view class="userAssets-top">
+					<view class="withdraw-name" v-if="userData.account">
+						当前能量球价值<view class="withdraw-number">￥{{userData.account.stone_value || 0}}</view>
+					</view>
+					<view class="withdraw-btn" @click="$Router.push({name: 'Extract'})">
+						去提现
+					</view>
+				</view>
+				<view class="userAssets-show">
+					<view class="assets-title">
+						我的资产
+					</view>
+					<view class="assets-list" v-if="userData.account">
+						<view class="assets-label" @click="$Router.push({name:'walletProperty'})">
+							<view class="assets-label-name">能量球钱包<image @click.stop="showHelp('wallet')" class="assets-label-icon" src="/static/user/userAssets_tips.png"></image></view>
+							<view class="assets-label-number">{{userData.account.stone || 0}}</view>
+						</view>
+						<view class="assets-label" @click="$Router.push({name:'Fragment'})">
+							<view class="assets-label-name">能量碎片<image @click.stop="showHelp('chip')" class="assets-label-icon" src="/static/user/userAssets_tips.png"></image></view>
+							<view class="assets-label-number">{{userData.account.score || 0}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 我的伙伴 -->
+			<view class="userPartner">
+				<view class="partner-title">
+					我的伙伴
+				</view>
+				<view class="partner-list" v-if="userData.relation_count">
+					<view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:''}})">
+						<view class="partner-label-name">伙伴总数</view>
+						<view class="partner-label-number">{{userData.relation_count.all || 0}}</view>
+					</view>
+					<view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:1}})">
+						<view class="partner-label-name">直接伙伴</view>
+						<view class="partner-label-number">{{userData.relation_count.one || 0}}</view>
+					</view>
+					<view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:2}})">
+						<view class="partner-label-name">间接伙伴</view>
+						<view class="partner-label-number">{{userData.relation_count.two || 0}}</view>
+					</view>
+				</view>
+			</view>
+			<!-- 企业工具 -->
+			<view class="userPartner" v-if="userData.is_company">
+				<view class="partner-title">
+					企业工具
+				</view>
+				<view class="tool-list">
+					<view class="tool-label" @click="$Router.push({name: 'goodsManagement'})">
+						<image class="tool-label-img" src="/static/user/userTool-00.png" mode=""></image>
+						<view class="tool-label-name">商品权证</view>
+					</view>
+					<view class="tool-label" @click="$Router.push({name: 'couponsManagement'})">
+						<image class="tool-label-img" src="/static/user/userTool-01.png" mode=""></image>
+						<view class="tool-label-name">优惠券管理</view>
+					</view>
+					<view class="tool-label" @click="$Router.push({name: 'instrumentSpread'})">
+						<image class="tool-label-img" src="/static/user/userTool-02.png" mode=""></image>
+						<view class="tool-label-name">营销推广码</view>
+					</view>
+					<view class="tool-label" @click="$Router.push({name: 'instrumentBasics'})">
+						<image class="tool-label-img" src="/static/user/userTool-03.png" mode=""></image>
+						<view class="tool-label-name">基础信息</view>
+					</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>
+					<view class="tool-label" @click="$Router.push({name: 'employeesList'})">
+						<image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
+						<view class="tool-label-name">员工管理</view>
+					</view>
+					<!-- <view class="tool-label" @click="$Router.push({name: 'verificationIndex'})">
+						<image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
+						<view class="tool-label-name">扫码核销</view>
+					</view> -->
+				</view>
+			</view>
+			<!-- 我的服务 -->
+			<view class="userPartner">
+				<view class="partner-title">
+					我的服务
+				</view>
+				<view class="tool-list">
+					<view class="tool-label" @click="custEject">
+						<image class="tool-label-img" src="/static/user/userServe-00.png" mode=""></image>
+						<view class="tool-label-name">专属客服</view>
+					</view>
+					<view class="tool-label" @click="$Router.push({name: 'userCode'})">
+						<image class="tool-label-img" src="/static/user/userServe-01.png" mode=""></image>
+						<view class="tool-label-name">邀请好友</view>
+					</view>
+					<view class="tool-label" @click="$Router.push({name: 'userHelp'})">
+						<image class="tool-label-img" src="/static/user/userServe-02.png" mode=""></image>
+						<view class="tool-label-name">帮助中心</view>
+					</view>
+					<view class="tool-label" @click="$Router.push({name: 'userClause'})">
+						<image class="tool-label-img" src="/static/user/userServe-03.png" mode=""></image>
+						<view class="tool-label-name">服务条款</view>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -247,14 +227,8 @@ export default {
 			    customerShow: false,  // 专属客服弹出
 			    customerCode: '',     // 专属客服二维码
 			},
-			// 滚动
-			coverTransform: 'translateY(0px)',
-			coverTransition: '0s',
-			startY: 0,  // 落点
-			moving: false,  //开启卡片
-			moveY: 0,
-			ScrollTop: false
-		};
+			shoeCardType	: false
+		}
 	},
 	onShow(){
 	    // 添加vip模块跳动样式
@@ -273,6 +247,15 @@ export default {
 	    // 移除vip模块跳动样式
 	    this.animatedShow = false
 	},
+	onPageScroll(e){
+		if(e.scrollTop <= 0 && !this.shoeCardType){
+			this.shoeCardType = true
+			return
+		}
+		if(e.scrollTop >= 1 && this.shoeCardType){
+			this.shoeCardType = false
+		}
+	},
 	methods: {
         // 开通VIP
         openVip(identityId){
@@ -343,17 +326,27 @@ export default {
 		// 复制邀请码
 		copyCenter(e) {
 		    let copyNo = e
-		    const result = h5Copy(copyNo)
-		        if (result === false) {
-		        uni.showToast({
-		            title:'不支持',
-		        })
-		    } else {
-		        uni.showToast({
-		            title:'复制成功',
-		            icon:'none'
-		        })
-		    }
+			uni.setClipboardData({
+				data: copyNo,
+				success() {
+					uni.showToast({
+						title: '邀请码已复制',
+						icon : 'none'
+					})
+				}
+			})
+			
+		    // const result = h5Copy(copyNo)
+		    //     if (result === false) {
+		    //     uni.showToast({
+		    //         title:'不支持',
+		    //     })
+		    // } else {
+		    //     uni.showToast({
+		    //         title:'复制成功',
+		    //         icon:'none'
+		    //     })
+		    // }
 		},
 		// 友情提示信息
 		showHelp(type) {
@@ -387,42 +380,6 @@ export default {
 		    } else {
 		        this.newnextShow = false
 		    }
-		},
-		// 滑动部分
-		onScrolltoupper(){
-			this.ScrollTop = true
-		},
-		coverTouchstart(e) {
-			this.coverTransition = 'transform .1s linear'
-			this.startY = e.touches[0].clientY
-		},
-		coverTouchmove(e) {
-			this.moveY = e.touches[0].clientY
-			let moveDistance = this.moveY - this.startY
-			if (this.moving && moveDistance < 0){
-				this.coverTransform = `translateY(0px)`
-				this.moving = false
-				return
-			}else{
-				if (moveDistance > 0 && moveDistance <= 130) {
-					this.coverTransform = `translateY(${moveDistance}px)`
-				}
-				this.moving = moveDistance >= 130
-			}
-		},
-		coverTouchend() {
-			if (this.moving) {
-				this.runRefresh()
-			} else {
-				this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)'
-				this.coverTransform = 'translateY(0px)'
-			}
-		},
-		runRefresh() {
-			this.coverTransition = 'transform .1s linear'
-			this.coverTransform = 'translateY(140px)'
-			this.playState = true
-			this.$emit('refresh')
 		}
 	}
 };
@@ -549,7 +506,7 @@ export default {
 	// 会员卡
 	.userVip {
 	    background-image:linear-gradient(to right, #4721bd, #885efe, #5d39b9);
-	    margin: 40rpx 40rpx 0;
+	    margin: 20px 40rpx 0;
 	    border-radius: 30rpx 30rpx 0 0;
 	    border: 3rpx solid #b197ff;
 	    color: #f6e9fa;
@@ -557,19 +514,19 @@ export default {
 		padding-bottom: 40rpx;
 	    .userVip-top {
 	        display: flex;
-			padding: 30rpx;
+			padding: 15px 30rpx;
 	        .userVip-top-name {
 	            font-size: 30rpx;
 	            flex: 1;
-	            line-height: 48rpx;
+	            line-height: 24px;
 	        }
 	        .userVip-top-btn {
 	            font-size: 26rpx;
 	            background-color: #977ae8;
 	            border-radius: 40rpx;
 	            padding: 0 20rpx 0 25rpx;
-	            height: 48rpx;
-	            line-height: 48rpx;
+	            height: 24px;
+	            line-height: 24px;
 	            display: flex;
 	            .userVip-top-arrow {
 	                width: 20rpx;
@@ -630,22 +587,22 @@ export default {
 					   vertical-align: top;
 					   margin-bottom: 15rpx;
 	               }
-				   
-				   // 255  + 140 + 80 + 40
-				   
 	            }
 	        }
 	    }
 	}
 	// 会员信息
 	.header {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
 		background-image: linear-gradient(to right, #7c52fc, #976dff);
-		height: 334px;
 		// user工具
 		.user-tool {
-			padding-top: 200rpx;
 			text-align: right;
 			line-height: 40px;
+			@extend .ios-top;
 		    .user-tool-name {
 		        flex: 1;
 		        line-height: 40px;
@@ -760,9 +717,15 @@ export default {
 	}
 	// 按钮内容
 	.mian {
-		margin-top: -150px;
+		position: relative;
+		z-index: 1;
+		margin-top: 184px;
 		padding: 15px 30rpx 5px;
 		background: #F5F5F5;
+		transition: margin .6s;
+		&.shoeCard{
+			margin-top: 320px;
+		}
 		// 我的资产模块
 		.userAssets {
 		    margin-bottom: 15px;

pages/wallet/extract.vue

@@ -228,7 +228,7 @@
 		.propery {
 			position: relative;
 			padding-top: var(--status-bar-height);
-			background-image: linear-gradient(to right, #7c52fc, #976dff);
+			background-image: linear-gradient(to top, #7c52fc, #976dff);
 			position: relative;
 			overflow: hidden;
 
@@ -246,7 +246,7 @@
 			.propery-content {
 				position: relative;
 				z-index: 1;
-				padding: $padding *3 $padding *1.4;
+				padding: $padding/2 $padding $padding*3;
 				text-align: center;
 
 				.currency {

pages/wallet/property.vue

@@ -162,17 +162,15 @@
 					showCancel:false,
 					success: (res) => {
 						if (res.confirm) {
-                            const result = h5Copy(this.balance.address)
-                                if (result === false) {
-                                uni.showToast({
-                                    title:'不支持',
-                                })
-                            } else {
-                                uni.showToast({
-                                    title:'复制成功',
-                                    icon:'none'
-                                })
-                            }
+							uni.setClipboardData({
+								data: this.balance.address,
+								success() {
+									uni.showToast({
+										title: '区块链地址已复制',
+										icon : 'none'
+									})
+								}
+							})
 						}
 					}
 				})
@@ -283,10 +281,9 @@
 	.propery {
 		position: relative;
 		padding-top: var(--status-bar-height);
-		background-image: linear-gradient(to right, #7c52fc, #976dff);
+		background-image: linear-gradient(to top, #7c52fc, #976dff);
 		position: relative;
 		overflow: hidden;
-
 		.record-bg {
 			position: absolute;
 			width: 100%;
@@ -315,7 +312,7 @@
 		.propery-content {
 			position: relative;
 			z-index: 1;
-			padding: $padding *3 $padding *1.4;
+			padding: $padding/2 $padding $padding*3;
 			text-align: center;
 
 			.currency {

unpackage/dist/build/app-plus/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      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>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/dist/build/app-plus/app-config-service.js

@@ -1,8 +0,0 @@
-
-var isReady=false;var onReadyCallbacks=[];
-var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/found/index","pages/user/index","pages/user/code","pages/user/help","pages/user/partner","pages/user/clause","pages/user/followOfficial","pages/vip/vip","pages/vip/agree","pages/vip/examine","pages/setting/setting","pages/goods/management","pages/goods/addClassify","pages/goods/add","pages/goods/goodsAuth","pages/coupons/management","pages/coupons/add","pages/coupons/magDetails","pages/coupons/selectGoods","pages/login/login","pages/login/guide","pages/login/agreement","pages/certification/personal","pages/setting/aboutUs","pages/company/approve","pages/news/index","pages/news/detail","pages/wallet/property","pages/wallet/extract","pages/verification/index","pages/verification/history","pages/shop/lists","pages/shop/create","pages/employees/list","pages/employees/add","pages/instrument/Spread","pages/instrument/basics","pages/wallet/fragment","pages/wallet/addBank","pages/wallet/bankList","pages/wallet/withdrawList","pages/wxAuth/wxAuth","pages/clearOpen/clearOpen"],"window":{"navigationStyle":"custom","backgroundColor":"#F5F5F5"},"tabBar":{"borderStyle":"white","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"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"BlockChainH5","compilerVersion":"3.2.9","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"发现能量"}},{"path":"/pages/found/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"发现更多"}},{"path":"/pages/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"节点中心"}},{"path":"/pages/user/code","meta":{},"window":{"navigationBarTitleText":"邀请好友"}},{"path":"/pages/user/help","meta":{},"window":{"navigationBarTitleText":"帮助中心"}},{"path":"/pages/user/partner","meta":{},"window":{"navigationBarTitleText":"我的伙伴"}},{"path":"/pages/user/clause","meta":{},"window":{"navigationBarTitleText":"服务条款"}},{"path":"/pages/user/followOfficial","meta":{},"window":{"navigationBarTitleText":"关注公众号"}},{"path":"/pages/vip/vip","meta":{},"window":{"navigationBarTitleText":"开通节点"}},{"path":"/pages/vip/agree","meta":{},"window":{"navigationBarTitleText":"用户协议"}},{"path":"/pages/vip/examine","meta":{},"window":{"navigationBarTitleText":"提交成功"}},{"path":"/pages/setting/setting","meta":{},"window":{"navigationBarTitleText":"设置中心"}},{"path":"/pages/goods/management","meta":{},"window":{"navigationBarTitleText":"商品权证管理"}},{"path":"/pages/goods/addClassify","meta":{},"window":{"navigationBarTitleText":"发布商品类目"}},{"path":"/pages/goods/add","meta":{},"window":{"navigationBarTitleText":"商品权证创建"}},{"path":"/pages/goods/goodsAuth","meta":{},"window":{"navigationBarTitleText":"商品权证认证"}},{"path":"/pages/coupons/management","meta":{},"window":{"navigationBarTitleText":"创建优惠券"}},{"path":"/pages/coupons/add","meta":{},"window":{"navigationBarTitleText":"创建优惠券"}},{"path":"/pages/coupons/magDetails","meta":{},"window":{"navigationBarTitleText":"优惠券详情"}},{"path":"/pages/coupons/selectGoods","meta":{},"window":{"navigationBarTitleText":"关联产品"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/login/guide","meta":{},"window":{"navigationBarTitleText":"引导页"}},{"path":"/pages/login/agreement","meta":{},"window":{"navigationBarTitleText":"用户隐藏协议"}},{"path":"/pages/certification/personal","meta":{},"window":{"navigationBarTitleText":"个人认证"}},{"path":"/pages/setting/aboutUs","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/company/approve","meta":{},"window":{"navigationBarTitleText":"企业认证"}},{"path":"/pages/news/index","meta":{},"window":{"navigationBarTitleText":"消息中心"}},{"path":"/pages/news/detail","meta":{},"window":{"navigationBarTitleText":"消息列表"}},{"path":"/pages/wallet/property","meta":{},"window":{"navigationBarTitleText":"能量钱包","enablePullDownRefresh":false,"navigationBarTextStyle":"white"}},{"path":"/pages/wallet/extract","meta":{},"window":{"navigationBarTitleText":"提现能量","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#774ffd","navigationBarTextStyle":"white"}},{"path":"/pages/verification/index","meta":{},"window":{"navigationBarTitleText":"扫码核销"}},{"path":"/pages/verification/history","meta":{},"window":{"navigationBarTitleText":"核销记录"}},{"path":"/pages/shop/lists","meta":{},"window":{"navigationBarTitleText":"部门/门店"}},{"path":"/pages/shop/create","meta":{},"window":{"navigationBarTitleText":"创建部门/门店"}},{"path":"/pages/employees/list","meta":{},"window":{"navigationBarTitleText":"员工管理"}},{"path":"/pages/employees/add","meta":{},"window":{"navigationBarTitleText":"添加员工"}},{"path":"/pages/instrument/Spread","meta":{},"window":{"navigationBarTitleText":"营销推广码"}},{"path":"/pages/instrument/basics","meta":{},"window":{"navigationBarTitleText":"基础信息"}},{"path":"/pages/wallet/fragment","meta":{},"window":{"navigationBarTitleText":"能量碎片记录","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#774ffd","navigationBarTextStyle":"white"}},{"path":"/pages/wallet/addBank","meta":{},"window":{"navigationBarTitleText":"添加银行卡","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#774ffd","navigationBarTextStyle":"white"}},{"path":"/pages/wallet/bankList","meta":{},"window":{"navigationBarTitleText":"银行卡列表","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#774ffd","navigationBarTextStyle":"white"}},{"path":"/pages/wallet/withdrawList","meta":{},"window":{"navigationBarTitleText":"提现记录","enablePullDownRefresh":false,"navigationBarBackgroundColor":"#774ffd","navigationBarTextStyle":"white"}},{"path":"/pages/wxAuth/wxAuth","meta":{},"window":{}},{"path":"/pages/clearOpen/clearOpen","meta":{},"window":{"navigationBarTitleText":"提现记录","enablePullDownRefresh":false}}];
-__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
-__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
-service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/dist/build/app-plus/app-config.js

@@ -1 +0,0 @@
-(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

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

@@ -1 +0,0 @@
-{"@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":"light","background":"#000000"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"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,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"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"}}