chore(样式调整): 所有页面统一使用<view :style="themeColor"> 这种方式

pages/empty/index.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="empty" :style="themeColor">
-	<view class="empty">
 	</view>
 </template>
 

pages/index/index.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor +';' + { backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
 		<view class="site-info-box"
 			v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
 			<view class="site-info">

pages_goods/cart.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="container">
 			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true" :refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">

pages_goods/category.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<block v-if="diyData">
 			<block v-for="(item, index) in diyData.value" :key="index">

pages_goods/detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<!-- #ifndef H5 -->
 	<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">

pages_goods/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content" :style="themeColor"> 
-	<view class="content"> 
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">

pages_order/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
-	<view class="detail-container" :class="{ 'safe-area': isIphoneX }">
 		<!-- 订单状态 -->
 		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">

pages_order/detail_local_delivery.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>

pages_order/detail_pickup.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>

pages_order/detail_point.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
-	<view class="detail-container" :class="{ 'safe-area': isIphoneX }">
 		<!-- 订单状态 -->
 		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">

pages_order/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container" :style="themeColor">
-	<view class="order-container">
 		<view class="cate-search">
 			<view class="search-box">
 				<input class="uni-input" maxlength="50" v-model="searchText" confirm-type="search"

pages_order/payment.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<common-payment :api="api" create-data-key="orderCreateData" ref="payment"></common-payment>
 	</view>

pages_promotion/fenxiao/apply.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="apply" :style="themeColor">
-	<view class="apply">
 		<!-- 导航栏 -->
 		<!-- #ifdef H5 -->
 		<view class="head-nav color-base-bg"></view>

pages_promotion/fenxiao/bill.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="bill" :style="themeColor">
-	<view class="bill" >
 		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8">
 			<block slot="list">
 				<view class="balances" v-if="accountList.length" v-for="item in accountList" :key="item.id">

pages_promotion/fenxiao/child_fenxiao.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" class="member-point" :size="8" v-if="storeToken">
 			<block slot="list">

pages_promotion/fenxiao/goods_list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content" :style="themeColor">
-	<view class="content">
 		<mescroll-uni ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">

pages_promotion/fenxiao/index.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="fenxiao-index" :style="themeColor + ';' + { background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')',backgroundRepeat: 'no-repeat',backgroundSize:'100%' }">
-	<view class="fenxiao-index" :style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')',backgroundRepeat: 'no-repeat',backgroundSize:'100%' }">
 		<block v-if="info.fenxiao_id > 0">
 			<!-- 头部 -->
 			<view class="fenxiao-index-header" :class="{ 'not-level': !levelList.length }" >

pages_promotion/fenxiao/level.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="level-top">
 			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
 		</view>

pages_promotion/fenxiao/order.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="withdraw-cate">
 			<block v-for="(item, index) in category" :key="index">

pages_promotion/fenxiao/order_detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="order-detail">
 			<view class="order-detail-box">

pages_promotion/fenxiao/promote.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="fenxiao-promote" :style="themeColor + ';' + { backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
-	<view class="fenxiao-promote" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
 		<view class="my-earnings">
 			<view class="earnings-head-wrap">
 				<view class="earnings-head">

pages_promotion/fenxiao/promote_code.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<swiper class="swiper" @change="getIndex">
 			<swiper-item v-for="(item, index) in poster" :key="index">
 				<view class="swiper-item">

pages_promotion/fenxiao/ranking_list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
 			<view slot="list">
 				<block v-if="list.length != 0">

pages_promotion/fenxiao/relation.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" top="20" class="member-point" :size="8" v-if="storeToken">
 			<view class="goods_list" slot="list">

pages_promotion/fenxiao/team.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="team-cate" v-if="storeToken && levelNum > 1">
 			<block v-for="(item, index) in levelList" :key="index">

pages_promotion/fenxiao/withdraw_apply.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="bank-account-wrap" @click="goAccount()">
 			<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type && !isBalance">
 				<text class="tx-to">提现到</text>

pages_promotion/fenxiao/withdraw_list.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni @getData="getData" class="member-point">
 			<view slot="list">

pages_promotion/fenxiao/withdrawal_detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="money-wrap">
 			<text>-{{ detail.money }}</text>

pages_promotion/merch/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content" :style="themeColor">
-	<view class="content">
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row" style="margin-bottom: 20rpx;">

pages_promotion/merch/merchcategory.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="category-page-wrap category-template-1" style="height: calc(-56px + 100vh);">
 

pages_promotion/point/detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
 			<view class="goods-container">

pages_promotion/point/goods_list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content" :style="themeColor">
-	<view class="content">
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">

pages_promotion/point/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="conteiner" :style="themeColor">
-	<view class="conteiner">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="point-navbar"
 			:style="{'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">

pages_promotion/point/order_list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container" :style="themeColor">
-	<view class="order-container">
 		<view class="order-nav" v-if="storeToken">
 			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
 				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">

pages_promotion/point/payment.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container" :style="themeColor" :class="{ 'safe-area': isIphoneX }">
-	<view class="order-container" :class="{ 'safe-area': isIphoneX }">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="payment-navbar" :style="{
 				'padding-top': menuButtonBounding.top + 'px',

pages_promotion/point/result.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="image-wrap">
 			<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix"></image>
 		</view>

pages_tool/agreement/contenr.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view style="padding: 20rpx;" :style="themeColor">
-	<view style="padding: 20rpx;">
 		<rich-text :nodes="content"></rich-text>
 	</view>
 </template>

pages_tool/article/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page" :style="themeColor">
-	<view class="page">
 		<view class="help-title">{{ detail.article_title }}</view>
 		<view class="help-meta" v-if="detail.is_show_release_time == 1">
 			<text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>

pages_tool/article/list.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni @getData="getData" ref="mescroll">
 			<block slot="list">

pages_tool/contact/contact.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="about w100">
 			<view class="bg border-top"></view>
@@ -146,9 +145,9 @@
 			</uni-popup>
 		</view>
 		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<hover-nav></hover-nav>
+		<diy-bottom-nav></diy-bottom-nav>		
 	</view>
-	<hover-nav></hover-nav>
-	<diy-bottom-nav></diy-bottom-nav>
 </template>
 
 <script>

pages_tool/form/form.vue

@@ -1,6 +1,5 @@
 <template>
-    <page-meta :page-style="themeColor"></page-meta>
+    <view :style="themeColor">
-    <view>
         <view class="page" v-if="detail">
             <view class="form-banner">
                 <image :src="$util.img('public/uniapp/form/banner.png')" mode="widthFix"></image>

pages_tool/goods/coupon.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="cf-container color-line-border">
 			<view class="tab">

pages_tool/goods/coupon_receive.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="content">
 			<view class="wx-code">
 				<image :src="$util.img(path)" />

pages_tool/goods/evaluate.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="goods-evaluate" :style="themeColor">
-	<view class="goods-evaluate">
 		<view class="evaluate-tab">
 			<view v-for="(item, index) in evaluateList" :key="index" :class="evaluateTab == item.value ? 'active-tab' : ''" @click="onEvaluateTab(item.value)">
 				{{ item.name }}({{ item.count }})

pages_tool/goods/not_exist.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page" :style="themeColor">
-	<view class="page">
 		<view class="closeBox">
 			<image :src="$util.img('public/uniapp/goods/not_exist.png')" mode="widthFix"></image>
 			<text class="close-title">您查看的商品不存在，可能已下架或被删除</text>

pages_tool/goods/search.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="content">
 			<view class="cate-search">

pages_tool/help/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page" :style="themeColor">
-	<view class="page">
 		<view class="help-title">{{ detail.title }}</view>
 		<view class="help-content"><rich-text :nodes="content"></rich-text></view>
 		<view class="help-meta">

pages_tool/help/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="help" :style="themeColor">
-	<view class="help">
 		<block v-if="dataList.length">
 			<view class="help-item" v-for="(item, index) in dataList" :key="index">
 				<view :class="['item-title', item.child_list.length == 0 ? 'empty' : '']">{{ item.class_name }}</view>

pages_tool/index/diy.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor + ';' + { backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
 		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
 			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true"/>
 		</view>

pages_tool/login/find.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="find" :style="themeColor">
-	<view class="find">
 		<view class="iconfont icon-close" @click="navigateBack()"></view>
 		<view class="header-wrap">
 			<block v-if="stepShow == 0">

pages_tool/login/login.vue

@@ -1,482 +1,498 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<scroll-view scroll-y="false" class="container">
+		<scroll-view scroll-y="false" class="container">
-		<view class="header-wrap" :style="{backgroundImage: 'url('+$util.img('public/uniapp/member/head.png')+')'}">
+			<view class="header-wrap" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
-			 <view class="t-b">
+				<view class="t-b">
-				<div v-html="$lang('welcomeText')"></div>
+					<div v-html="$lang('welcomeText')"></div>
+				</view>
 			</view>
-		</view>
+			<view class="body-wrap">
-		<view class="body-wrap">
+				<view class="form-wrap">
-			<view class="form-wrap">
+					<view class="input-wrap" v-show="loginMode == 'mobile'">
-				<view class="input-wrap" v-show="loginMode == 'mobile'">
+						<view class="content">
-					<view class="content">
+							<!-- 	<view class="area-code">+86</view> -->
-					<!-- 	<view class="area-code">+86</view> -->
+							<input type="number" :placeholder="$lang('mobileInputPlaceholder')"
-						<input type="number" :placeholder="$lang('mobileInputPlaceholder')" placeholder-class="input-placeholder" class="input" maxlength="11" v-model="formData.mobile" />
+								placeholder-class="input-placeholder" class="input" maxlength="11"
+								v-model="formData.mobile" />
+						</view>
 					</view>
-				</view>
+					<view class="input-wrap" v-show="loginMode == 'account'">
-				<view class="input-wrap" v-show="loginMode == 'account'">
+						<view class="content">
-					<view class="content">
+							<input type="text" :placeholder="$lang('accountInputPlaceholder')"
-						<input type="text" :placeholder="$lang('accountInputPlaceholder')" placeholder-class="input-placeholder" class="input" v-model="formData.account" />
+								placeholder-class="input-placeholder" class="input" v-model="formData.account" />
+						</view>
 					</view>
-				</view>
+					<view class="input-wrap" v-show="loginMode == 'account'">
-				<view class="input-wrap" v-show="loginMode == 'account'">
+						<view class="content">
-					<view class="content">
+							<input type="password" :placeholder="$lang('passwordInputPlaceholder')"
-						<input type="password" :placeholder="$lang('passwordInputPlaceholder')" placeholder-class="input-placeholder" class="input" v-model="formData.password" />
+								placeholder-class="input-placeholder" class="input" v-model="formData.password" />
-						<view class="align-right" v-show="loginMode == 'account'">
+							<view class="align-right" v-show="loginMode == 'account'">
-							<text @click="forgetPassword">{{ $lang('forgetPasswordText') }}</text>
+								<text @click="forgetPassword">{{ $lang('forgetPasswordText') }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="input-wrap" v-show="loginMode == 'mobile'">
+						<view class="content">
+							<input type="text" :placeholder="$lang('dynacodeInputPlaceholder')"
+								placeholder-class="input-placeholder" class="input" v-model="formData.dynacode" />
+							<view class="dynacode"
+								:class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'"
+								@click="sendMobileCode">{{ dynacodeData.codeText }}</view>
 						</view>
 					</view>
 				</view>
-				<view class="input-wrap" v-show="loginMode == 'mobile'">
+
-					<view class="content">
+				<view class="btn_view">
-						<input type="text" :placeholder="$lang('dynacodeInputPlaceholder')" placeholder-class="input-placeholder" class="input" v-model="formData.dynacode" />
+					<button type="primary" @click="login" class="login-btn color-base-border color-base-bg"
-						<view class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'"
+						style="background: #2796f2 !important;border: none;">{{ $lang('loginButtonText') }}</button>
-							@click="sendMobileCode">{{ dynacodeData.codeText }}</view>
+				</view>
-					</view>
+				<view class="regisiter-agreement"
+					style="margin: 0 50rpx;padding-top: 40rpx;line-height: 1.5;display: flex;">
+					<view style="" class="iconfont"
+						:class="isAgree ? 'icon-fuxuankuang1 color-base-text' : 'icon-fuxuankuang2'"
+						@click="isAgree = !isAgree"></view>
+					<view style="text-align: left;margin-left: 10rpx;padding-top: 2rpx;">{{
+						$lang('registerAgreementText') }} <text @click="tourl('/pages_tool/agreement/contenr?type=0')"
+							style="color:#4395ff">{{ $lang('privacyPolicyText') }}</text> <text
+							@click="tourl('/pages_tool/agreement/contenr?type=1')" style="color:#4395ff">{{
+								$lang('userServiceAgreementText') }}</text></view>
 				</view>
 			</view>
-			
+			<loading-cover ref="loadingCover"></loading-cover>
-			<view class="btn_view">
+			<register-reward ref="registerReward"></register-reward>
-				<button type="primary" @click="login" class="login-btn color-base-border color-base-bg" style="background: #2796f2 !important;border: none;">{{ $lang('loginButtonText') }}</button>
+		</scroll-view>
-			</view>
+	</view>
-			<view class="regisiter-agreement" style="margin: 0 50rpx;padding-top: 40rpx;line-height: 1.5;display: flex;">
-				<view style="" class="iconfont" :class=" isAgree ? 'icon-fuxuankuang1 color-base-text' : 'icon-fuxuankuang2' " @click="isAgree = !isAgree"></view>
-				<view style="text-align: left;margin-left: 10rpx;padding-top: 2rpx;">{{ $lang('registerAgreementText') }} <text  @click="tourl('/pages_tool/agreement/contenr?type=0')" style="color:#4395ff">{{ $lang('privacyPolicyText') }}</text> <text  @click="tourl('/pages_tool/agreement/contenr?type=1')" style="color:#4395ff">{{ $lang('userServiceAgreementText') }}</text></view>
-			</view>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<register-reward ref="registerReward"></register-reward>
-	</scroll-view>
 </template>
 
 <script>
-	import validate from 'common/js/validate.js';
+import validate from 'common/js/validate.js';
-	import registerReward from '@/components/register-reward/register-reward.vue';
+import registerReward from '@/components/register-reward/register-reward.vue';
 
-	export default {
+export default {
-		data() {
+	data() {
-			return {
+		return {
-				isAgree: false,
+			isAgree: false,
-				// loginMode: 'account',
+			// loginMode: 'account',
-				loginMode: 'mobile',
+			loginMode: 'mobile',
-				formData: {
+			formData: {
-					mobile: '',
+				mobile: '',
-					account: '',
+				account: '',
-					password: '',
+				password: '',
-					vercode: '',
+				vercode: '',
-					dynacode: '',
+				dynacode: '',
-					key: ''
+				key: ''
-				},
+			},
-				captcha: {
+			captcha: {
-					id: '',
+				id: '',
-					img: ''
+				img: ''
-				},
+			},
-				isSub: false, // 提交防重复
+			isSub: false, // 提交防重复
-				back: '', // 返回页
+			back: '', // 返回页
-				redirect: 'redirectTo', // 跳转方式
+			redirect: 'redirectTo', // 跳转方式
-				dynacodeData: {
+			dynacodeData: {
-					seconds: 120,
+				seconds: 120,
-					timer: null,
+				timer: null,
-					codeText: this.$lang('getDynacode'),
+				codeText: this.$lang('getDynacode'),
-					isSend: false
+				isSend: false
-				},
+			},
-				registerConfig: {
+			registerConfig: {
-					register: 'mobile',
+				register: 'mobile',
-					login: ''
+				login: ''
-				},
+			},
-				captchaConfig: 0,
+			captchaConfig: 0,
-				authInfo: null
+			authInfo: null
-			};
+		};
-		},
+	},
-		components: {
+	components: {
-			registerReward
+		registerReward
-		},
+	},
-		onLoad(option) {
+	onLoad(option) {
-			if (option.back) this.back = option.back;
+		if (option.back) this.back = option.back;
-			this.getRegisterConfig();
+		this.getRegisterConfig();
-			// this.getCaptchaConfig();
+		// this.getCaptchaConfig();
-			this.authInfo = uni.getStorageSync('authInfo');
+		this.authInfo = uni.getStorageSync('authInfo');
-		},
+	},
-		onShow() {},
+	onShow() { },
-		onReady() {
+	onReady() {
-			if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-		},
+	},
-		methods: {
+	methods: {
-			/**
+		/**
-			 * 获取验证码配置
+		 * 获取验证码配置
-			 */
+		 */
-			getCaptchaConfig() {
+		getCaptchaConfig() {
-				this.$api.sendRequest({
+			this.$api.sendRequest({
-					url: '/api/config/getCaptchaConfig',
+				url: '/api/config/getCaptchaConfig',
-					success: res => {
+				success: res => {
-						if (res.code >= 0) {
+					if (res.code >= 0) {
-							this.captchaConfig = res.data.shop_reception_login;
+						this.captchaConfig = res.data.shop_reception_login;
-							if (this.captchaConfig == 1) this.getCaptcha();
+						if (this.captchaConfig == 1) this.getCaptcha();
-						}
 					}
-				});
-			},
-			/**
-			 * 获取注册配置
-			 */
-			getRegisterConfig() {
-				this.$api.sendRequest({
-					url: '/api/register/config',
-					success: res => {
-						if (res.code >= 0) {
-							// this.registerConfig = res.data.value;
-							// if (this.registerConfig.login.indexOf('mobile') != -1) this.loginMode = 'mobile';
-							// else this.loginMode = 'account';
-						}
-					}
-				});
-			},
-			/**
-			 * 切换登录方式
-			 */
-			switchLoginMode() {
-				this.loginMode = this.loginMode == 'mobile' ? 'account' : 'mobile';
-			},
-			/**
-			 * 获取验证码
-			 */
-			getCaptcha() {
-				if (this.captchaConfig == 0) return;
-				this.$api.sendRequest({
-					url: '/api/captcha/captcha',
-					data: {
-						captcha_id: this.captcha.id
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.captcha = res.data;
-							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
-						}
-					}
-				});
-			},
-			/**
-			 * 去注册
-			 */
-			toRegister() {
-				if (this.back) this.$util.redirectTo('/pages_tool/login/register', {
-					back: encodeURIComponent(this.back)
-				});
-				else this.$util.redirectTo('/pages_tool/login/register');
-			},
-			/**
-			 * 忘记密码
-			 */
-			forgetPassword() {
-				if (this.back) this.$util.redirectTo('/pages_tool/login/find', {
-					back: encodeURIComponent(this.back)
-				});
-				else this.$util.redirectTo('/pages_tool/login/find');
-			},
-			tourl(url){
-				this.$util.redirectTo(url);
-			},
-			/**
-			 * 登录
-			 */
-			login() {
-				if (!this.isAgree) {
-					this.$util.showToast({
-						title: this.$lang('agreeAgreementTip')
-					});
-					return false;
 				}
-				if (this.loginMode == 'account') {
+			});
-					var url = '/api/login/login';
+		},
+		/**
+		 * 获取注册配置
+		 */
+		getRegisterConfig() {
+			this.$api.sendRequest({
+				url: '/api/register/config',
+				success: res => {
+					if (res.code >= 0) {
+						// this.registerConfig = res.data.value;
+						// if (this.registerConfig.login.indexOf('mobile') != -1) this.loginMode = 'mobile';
+						// else this.loginMode = 'account';
+					}
+				}
+			});
+		},
+		/**
+		 * 切换登录方式
+		 */
+		switchLoginMode() {
+			this.loginMode = this.loginMode == 'mobile' ? 'account' : 'mobile';
+		},
+		/**
+		 * 获取验证码
+		 */
+		getCaptcha() {
+			if (this.captchaConfig == 0) return;
+			this.$api.sendRequest({
+				url: '/api/captcha/captcha',
+				data: {
+					captcha_id: this.captcha.id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.captcha = res.data;
+						this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+					}
+				}
+			});
+		},
+		/**
+		 * 去注册
+		 */
+		toRegister() {
+			if (this.back) this.$util.redirectTo('/pages_tool/login/register', {
+				back: encodeURIComponent(this.back)
+			});
+			else this.$util.redirectTo('/pages_tool/login/register');
+		},
+		/**
+		 * 忘记密码
+		 */
+		forgetPassword() {
+			if (this.back) this.$util.redirectTo('/pages_tool/login/find', {
+				back: encodeURIComponent(this.back)
+			});
+			else this.$util.redirectTo('/pages_tool/login/find');
+		},
+		tourl(url) {
+			this.$util.redirectTo(url);
+		},
+		/**
+		 * 登录
+		 */
+		login() {
+			if (!this.isAgree) {
+				this.$util.showToast({
+					title: this.$lang('agreeAgreementTip')
+				});
+				return false;
+			}
+			if (this.loginMode == 'account') {
+				var url = '/api/login/login';
+				data = {
+					username: this.formData.account,
+					password: this.formData.password
+				};
+			} else {
+				var url = '/api/login/mobile',
 					data = {
-						username: this.formData.account,
+						mobile: this.formData.mobile,
-						password: this.formData.password
+						key: this.formData.key,
+						code: this.formData.dynacode
 					};
-				} else {
+			}
-					var url = '/api/login/mobile',
+			if (this.captcha.id != '') {
-						data = {
+				data.captcha_id = this.captcha.id;
-							mobile: this.formData.mobile,
+				data.captcha_code = this.formData.vercode;
-							key: this.formData.key,
+			}
-							code: this.formData.dynacode
+			if (this.authInfo) Object.assign(data, this.authInfo);
-						};
+			if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-				}
-				if (this.captcha.id != '') {
-					data.captcha_id = this.captcha.id;
-					data.captcha_code = this.formData.vercode;
-				}
-				if (this.authInfo) Object.assign(data, this.authInfo);
-				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
 
-				if (this.verify(data)) {
+			if (this.verify(data)) {
-					if (this.isSub) return;
+				if (this.isSub) return;
-					this.isSub = true;
+				this.isSub = true;
-					this.$api.sendRequest({
+				this.$api.sendRequest({
-						url,
+					url,
-						data,
+					data,
-						success: res => {
+					success: res => {
-							if (res.code >= 0) {
+						if (res.code >= 0) {
-								var can_receive_registergift = res.data.can_receive_registergift;
+							var can_receive_registergift = res.data.can_receive_registergift;
-								this.$store.commit('setToken', res.data.token);
+							this.$store.commit('setToken', res.data.token);
-								this.$store.dispatch('getCartNumber');
+							this.$store.dispatch('getCartNumber');
-								this.getMemberInfo(() => {
+							this.getMemberInfo(() => {
-									if (can_receive_registergift == 1) {
+								if (can_receive_registergift == 1) {
-										this.$util.showToast({
+									this.$util.showToast({
-											title: this.$lang('loginSuccessTip')
+										title: this.$lang('loginSuccessTip')
-										});
+									});
-										let back = this.back ? this.back : '/pages/member/index';
+									let back = this.back ? this.back : '/pages/member/index';
-										if(this.$refs.registerReward) this.$refs.registerReward.open(back);
+									if (this.$refs.registerReward) this.$refs.registerReward.open(back);
+								} else {
+									if (this.back != '') {
+										this.$util.redirectTo(decodeURIComponent(this.back), {}, 'reLaunch');
 									} else {
-										if (this.back != '') {
+										this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-											this.$util.redirectTo(decodeURIComponent(this.back), {}, 'reLaunch');
-										} else {
-											this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-										}
 									}
-								});
+								}
-							} else {
+							});
-								this.isSub = false;
+						} else {
-								this.getCaptcha();
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						},
-						fail: res => {
 							this.isSub = false;
 							this.getCaptcha();
-						}
-					});
-				}
-			},
-			/**
-			 * 登录验证
-			 * @param {Object} data
-			 */
-			verify(data) {
-				let rule = [];
-				// 手机号验证
-				if (this.loginMode == 'mobile') {
-					rule = [{
-						name: 'mobile',
-						checkType: 'required',
-						errorMsg: this.$lang('enterMobileTip')
-					}, {
-						name: 'mobile',
-						checkType: 'phoneno',
-						errorMsg: this.$lang('enterCorrectMobileTip')
-					}];
-					if (this.captchaConfig == 1) {
-						if (this.captcha.id != '') rule.push({
-							name: 'captcha_code',
-							checkType: 'required',
-							errorMsg: this.$lang('captchaPlaceholder')
-						});
-					}
-					rule.push({
-						name: 'code',
-						checkType: 'required',
-						errorMsg: this.$lang('dynacodePlaceholder')
-					});
-				}
-
-				// 账号验证
-				if (this.loginMode == 'account') {
-					rule = [{
-							name: 'username',
-							checkType: 'required',
-							errorMsg: this.$lang('accountPlaceholder')
-						},
-						{
-							name: 'password',
-							checkType: 'required',
-							errorMsg: this.$lang('passwordPlaceholder')
-						}
-					];
-					if (this.captchaConfig == 1) {
-						if (this.captcha.id != '') rule.push({
-							name: 'captcha_code',
-							checkType: 'required',
-							errorMsg: this.$lang('captchaPlaceholder')
-						});
-					}
-				}
-
-				var checkRes = validate.check(data, rule);
-				if (checkRes) {
-					return true;
-				} else {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return false;
-				}
-			},
-			mobileAuthLogin(e) {
-				if (e.detail.errMsg == 'getPhoneNumber:ok') {
-					var data = {
-						iv: e.detail.iv,
-						encryptedData: e.detail.encryptedData
-					};
-					if (Object.keys(this.authInfo).length) {
-						Object.assign(data, this.authInfo);
-						if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
-						if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
-					}
-					if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-					if (this.isSub) return;
-					this.isSub = true;
-
-					this.$api.sendRequest({
-						url: '/api/tripartite/mobileauth',
-						data,
-						success: res => {
-							if (res.code >= 0) {
-								var can_receive_registergift = res.data.can_receive_registergift;
-								this.$store.commit('setToken', res.data.token);
-								this.$store.dispatch('getCartNumber');
-								this.getMemberInfo(() => {
-									if (can_receive_registergift == 1) {
-										let back = this.back ? this.back : '/pages/member/index';
-										if(this.$refs.registerReward) this.$refs.registerReward.open(back);
-									} else {
-										if (this.back != '') {
-											this.$util.redirectTo(decodeURIComponent(this.back), {}, this.redirect);
-										} else {
-											this.$util.redirectTo('/pages/member/index', {}, this.redirect);
-										}
-									}
-								})
-
-							} else {
-								this.isSub = false;
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						},
-						fail: res => {
-							this.isSub = false;
-							this.$util.showToast({
-						title: this.$lang('requestFailTip')
-					});
-						}
-					});
-				}
-			},
-			/**
-			 * 发送手机动态码
-			 */
-			sendMobileCode() {
-				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
-				var data = {
-					mobile: this.formData.mobile,
-					captcha_id: this.captcha.id,
-					captcha_code: this.formData.vercode
-				};
-				var rule = [{
-					name: 'mobile',
-					checkType: 'required',
-					errorMsg: '请输入手机号'
-				}, {
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				}];
-				if (this.captchaConfig == 1) {
-					rule.push({
-						name: 'captcha_code',
-						checkType: 'required',
-						errorMsg: this.$lang('enterCaptchaTip')
-					});
-				}
-				var checkRes = validate.check(data, rule);
-				if (!checkRes) {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return;
-				}
-				this.dynacodeData.isSend = true;
-				this.dynacodeData.timer = setInterval(() => {
-					this.dynacodeData.seconds--;
-					this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
-				}, 1000);
-
-				this.$api.sendRequest({
-					url: '/api/login/mobileCode',
-					data: data,
-					success: res => {
-						if (res.code >= 0) {
-							this.formData.key = res.data.key;
-						} else {
-							this.refreshDynacodeData();
 							this.$util.showToast({
 								title: res.message
 							});
 						}
 					},
-					fail: () => {
+					fail: res => {
-						this.$util.showToast({
+						this.isSub = false;
-							title: 'request:fail'
+						this.getCaptcha();
-						});
-						this.refreshDynacodeData();
-					}
-				});
-			},
-			refreshDynacodeData() {
-				this.getCaptcha();
-				clearInterval(this.dynacodeData.timer);
-				this.dynacodeData = {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				};
-			},
-			getMemberInfo(callback) {
-				this.$api.sendRequest({
-					url: '/api/member/info',
-					success: (res) => {
-						if (res.code >= 0) {
-							// 登录成功，存储会员信息
-							this.$store.commit('setMemberInfo', res.data);
-							if (callback) callback();
-						}
 					}
 				});
 			}
 		},
-		watch: {
+		/**
-			'dynacodeData.seconds': {
+		 * 登录验证
-				handler(newValue, oldValue) {
+		 * @param {Object} data
-					if (newValue == 0) {
+		 */
+		verify(data) {
+			let rule = [];
+			// 手机号验证
+			if (this.loginMode == 'mobile') {
+				rule = [{
+					name: 'mobile',
+					checkType: 'required',
+					errorMsg: this.$lang('enterMobileTip')
+				}, {
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: this.$lang('enterCorrectMobileTip')
+				}];
+				if (this.captchaConfig == 1) {
+					if (this.captcha.id != '') rule.push({
+						name: 'captcha_code',
+						checkType: 'required',
+						errorMsg: this.$lang('captchaPlaceholder')
+					});
+				}
+				rule.push({
+					name: 'code',
+					checkType: 'required',
+					errorMsg: this.$lang('dynacodePlaceholder')
+				});
+			}
+
+			// 账号验证
+			if (this.loginMode == 'account') {
+				rule = [{
+					name: 'username',
+					checkType: 'required',
+					errorMsg: this.$lang('accountPlaceholder')
+				},
+				{
+					name: 'password',
+					checkType: 'required',
+					errorMsg: this.$lang('passwordPlaceholder')
+				}
+				];
+				if (this.captchaConfig == 1) {
+					if (this.captcha.id != '') rule.push({
+						name: 'captcha_code',
+						checkType: 'required',
+						errorMsg: this.$lang('captchaPlaceholder')
+					});
+				}
+			}
+
+			var checkRes = validate.check(data, rule);
+			if (checkRes) {
+				return true;
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return false;
+			}
+		},
+		mobileAuthLogin(e) {
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
+				var data = {
+					iv: e.detail.iv,
+					encryptedData: e.detail.encryptedData
+				};
+				if (Object.keys(this.authInfo).length) {
+					Object.assign(data, this.authInfo);
+					if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
+					if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
+				}
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+				if (this.isSub) return;
+				this.isSub = true;
+
+				this.$api.sendRequest({
+					url: '/api/tripartite/mobileauth',
+					data,
+					success: res => {
+						if (res.code >= 0) {
+							var can_receive_registergift = res.data.can_receive_registergift;
+							this.$store.commit('setToken', res.data.token);
+							this.$store.dispatch('getCartNumber');
+							this.getMemberInfo(() => {
+								if (can_receive_registergift == 1) {
+									let back = this.back ? this.back : '/pages/member/index';
+									if (this.$refs.registerReward) this.$refs.registerReward.open(back);
+								} else {
+									if (this.back != '') {
+										this.$util.redirectTo(decodeURIComponent(this.back), {}, this.redirect);
+									} else {
+										this.$util.redirectTo('/pages/member/index', {}, this.redirect);
+									}
+								}
+							})
+
+						} else {
+							this.isSub = false;
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: res => {
+						this.isSub = false;
+						this.$util.showToast({
+							title: this.$lang('requestFailTip')
+						});
+					}
+				});
+			}
+		},
+		/**
+		 * 发送手机动态码
+		 */
+		sendMobileCode() {
+			if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
+			var data = {
+				mobile: this.formData.mobile,
+				captcha_id: this.captcha.id,
+				captcha_code: this.formData.vercode
+			};
+			var rule = [{
+				name: 'mobile',
+				checkType: 'required',
+				errorMsg: '请输入手机号'
+			}, {
+				name: 'mobile',
+				checkType: 'phoneno',
+				errorMsg: '请输入正确的手机号'
+			}];
+			if (this.captchaConfig == 1) {
+				rule.push({
+					name: 'captcha_code',
+					checkType: 'required',
+					errorMsg: this.$lang('enterCaptchaTip')
+				});
+			}
+			var checkRes = validate.check(data, rule);
+			if (!checkRes) {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return;
+			}
+			this.dynacodeData.isSend = true;
+			this.dynacodeData.timer = setInterval(() => {
+				this.dynacodeData.seconds--;
+				this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+			}, 1000);
+
+			this.$api.sendRequest({
+				url: '/api/login/mobileCode',
+				data: data,
+				success: res => {
+					if (res.code >= 0) {
+						this.formData.key = res.data.key;
+					} else {
 						this.refreshDynacodeData();
+						this.$util.showToast({
+							title: res.message
+						});
 					}
 				},
-				immediate: true,
+				fail: () => {
-				deep: true
+					this.$util.showToast({
-			}
+						title: 'request:fail'
+					});
+					this.refreshDynacodeData();
+				}
+			});
+		},
+		refreshDynacodeData() {
+			this.getCaptcha();
+			clearInterval(this.dynacodeData.timer);
+			this.dynacodeData = {
+				seconds: 120,
+				timer: null,
+				codeText: '获取动态码',
+				isSend: false
+			};
+		},
+		getMemberInfo(callback) {
+			this.$api.sendRequest({
+				url: '/api/member/info',
+				success: (res) => {
+					if (res.code >= 0) {
+						// 登录成功，存储会员信息
+						this.$store.commit('setMemberInfo', res.data);
+						if (callback) callback();
+					}
+				}
+			});
 		}
-	};
+	},
+	watch: {
+		'dynacodeData.seconds': {
+			handler(newValue, oldValue) {
+				if (newValue == 0) {
+					this.refreshDynacodeData();
+				}
+			},
+			immediate: true,
+			deep: true
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/common.scss';
+@import './public/css/common.scss';
-	.color-base-text{
+
-		color:#2796f2 !important
+.color-base-text {
-	}
+	color: #2796f2 !important
+}
 </style>
 
 <style lang="scss" scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
+/deep/ .reward-popup .uni-popup__wrapper-box {
-		background: none !important;
+	background: none !important;
-		max-width: unset !important;
+	max-width: unset !important;
-		max-height: unset !important;
+	max-height: unset !important;
-		overflow: unset !important;
+	overflow: unset !important;
-	}
+}
 
-	/deep/ uni-toast .uni-simple-toast__text {
+/deep/ uni-toast .uni-simple-toast__text {
-		background: red !important;
+	background: red !important;
-	}
+}
 </style>

pages_tool/member/account.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
 			<block slot="list">

pages_tool/member/account_edit.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="account-list-content" :style="themeColor">
-	<view class="account-list-content">
 		<view class="edit-item">
 			<text class="tit">{{ $lang('name') }}</text>
 			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name" v-model="formData.realname" />

pages_tool/member/address.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getListData" v-if="storeToken">
 			<block slot="list">

pages_tool/member/address_edit.vue

@@ -1,6 +1,5 @@
 <template>
-    <page-meta :page-style="themeColor"></page-meta>
+    <view class="address-edit-content" :style="themeColor">
-    <view class="address-edit-content">
         <view class="edit-wrap">
             <view class="tip">地址信息</view>
             <view class="edit-item">

pages_tool/member/apply_withdrawal.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="bank-account-wrap" @click="goAccount()">
 			<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type">
 				<text class="tx-to">提现到</text>

pages_tool/member/assets.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="assets-wrap">
 			<view class="assets-block">
 				<view class="assets-tips"><text>风险提示：确认申请后您的资产将被清空且不可找回!</text></view>

pages_tool/member/balance.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="balance" :style="themeColor">
-	<view class="balance">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="custom-navbar" :style="{
 				'padding-top': menuButtonBounding.top + 'px',

pages_tool/member/balance_detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<!-- 		<scroll-view id="tab-bar" class="order-nav" :scroll-x="true" :show-scrollbar="false" :scroll-into-view="scrollInto">
 			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">

pages_tool/member/cancellation.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="agreement-box">
 			<view class="agreement-intro">
 				<view class="align-center agreement-title">{{ agreement.title }}</view>

pages_tool/member/cancelrefuse.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="cancel-wrap">
 			<view class="cancel-img"><image :src="$util.img('public/uniapp/member/refuse.png')"></image></view>
 			<view class="cancel-title">您的申请已拒绝</view>

pages_tool/member/cancelstatus.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="cancelstatus-wrap">
 			<view class="cancelstatus-block">
 				<view class="cancelstatus-box">

pages_tool/member/cancelsuccess.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="cancel-wrap">
 			<view class="cancel-img">
 				<image :src="$util.img('public/uniapp/member/success.png')"></image>

pages_tool/member/card.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="member-level" :style="themeColor">
-	<view class="member-level">
 		<view class="level-top">
 			<image :src="$util.img('public/uniapp/level/card-top-bg.png')"></image>
 		</view>

pages_tool/member/card_agreement.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page" :style="themeColor">
-	<view class="page">
 		<view class="agreement-title">{{ title }}</view>
 		<view class="agreement-content"><rich-text :nodes="content"></rich-text></view>
 	</view>

pages_tool/member/card_buy.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="member-level" :style="themeColor">
-	<view class="member-level">
 		<block v-if="levelList.length">
 			<view class="level-top">
 				<image :src="$util.img('public/uniapp/level/card-top-bg.png')"></image>

pages_tool/member/collection.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh" v-if="storeToken">
 			<view class="goods_list" slot="list">

pages_tool/member/contact.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="contact" :style="themeColor">
-	<view class="contact">
 		<image :src="$util.img('public/uniapp/member/contact_service.png')" mode="widthFix"></image>
 		<!--<ns-contact><button type="primary">联系客服</button></ns-contact>-->
 	</view>

pages_tool/member/coupon.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" :class="isIphoneX ? 'iphone-x' : ''">
-	<view :class="isIphoneX ? 'iphone-x' : ''">
 		<view class="cf-container color-line-border" v-if="storeToken">
 			<view class="tab">
 				<view @click="changeState(1)"><text :class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>

pages_tool/member/footprint.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<view class="head-wrap" v-if="storeToken">
 			<text @click="manageFootprint">{{ manage ? '完成' : '管理' }}</text>
 		</view>

pages_tool/member/index.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor + ';' + { backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
 		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
 			:style="{ backgroundImage: bgImg }">
 			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />

pages_tool/member/info.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view v-if="indent == 'all' && memberInfo" class="info-wrap">
 			<!-- 头像@click="headImage" -->

pages_tool/member/info_edit.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<template v-if="memberInfo">
 			<!-- 修改用户名 -->

pages_tool/member/invite_friends.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view v-if="info" style="background-color: #fff;">
 

pages_tool/member/level.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="member-level">
-	<view class="member-level">
 		<view class="level-top">
 			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
 		</view>

pages_tool/member/level_growth_rules.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="member-level">
-	<view class="member-level">
 		<view class="grow-explain">
 			<view class="explain-title">
 				<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>

pages_tool/member/modify_face.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="nc-modify-content">
-	<view class="nc-modify-content">
 		<view class="modify">
 			<view>
 				<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head" @error="memberImg = $util.getDefaultImage().head" mode="aspectFill"/>

pages_tool/member/pay_password.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="container">
-	<view class="container">
 		<view class="tips" v-if="step != 0">请输入6位支付密码，建议不要使用重复或连续数字</view>
 		<view class="tips" v-else>验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码</view>
 		<view class="password-wrap">

pages_tool/member/point.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="point">
-	<view class="point">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="custom-navbar" :style="{
 				'padding-top': menuButtonBounding.top + 'px',

pages_tool/member/point_detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 	<!-- 	<view class="tab color-bg">
 			<view class="tab-left">

pages_tool/member/withdrawal.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni @getData="getData" class="member-point">
 			<view slot="list">

pages_tool/member/withdrawal_detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="money-wrap">
 			<text>-{{ detail.apply_money }}</text>

pages_tool/notice/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="page">
-	<view class="page">
 		<view class="notice-title">{{ detail.title }}</view>
 		<view class="notice-meta">
 			<text class="notice-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>

pages_tool/notice/list.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<mescroll-uni @getData="getData" ref="mescroll">
 			<block slot="list">

pages_tool/order/activist.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor" class="activist-container">
-	<view class="activist-container">
 		<mescroll-uni ref="mescroll" @getData="getListData">
 			<block slot="list">
 				<view class="container">

pages_tool/order/detail_virtual.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>

pages_tool/order/evaluate.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view>
 			<view class="page">

pages_tool/order/logistics.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<scroll-view class="order-nav" :scroll-x="true" :show-scrollbar="false">
 			<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item" @click="ontabtap(packageIndex)">

pages_tool/order/refund.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view>
 			<scroll-view scroll-y="true" class="refund-container">

pages_tool/order/refund_batch.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view>
 			<scroll-view scroll-y="true" class="refund-container">

pages_tool/order/refund_detail.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<scroll-view scroll-y="true" class="detail-container" :class="{ 'safe-area': isIphoneX }" v-if="detail">
 			<view v-show="action == ''">

pages_tool/order/refund_goods_select.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="goods-select" :style="themeColor">
-	<view class="goods-select">
 		<view class="top">
 			共<text class="color-base-text">{{refund_data.length}}</text>件商品
 		</view>

pages_tool/order/refund_type_select.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view>
 			<view class="refund-option">

pages_tool/pay/cashier.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="cashier" :style="themeColor">
-	<view class="cashier">
 		<block v-if="payInfo">
 			<block v-if="payInfo.pay_status == 0">
 				<text class="content">{{ payInfo.pay_body }}</text>

pages_tool/pay/index.vue

@@ -1,18 +1,19 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<scroll-view scroll-y="true" class="pay-container">
+		<scroll-view scroll-y="true" class="pay-container">
-		<view class="payment-amount">
+			<view class="payment-amount">
-			<text class="amount-tit">{{ $lang('paymentAmount') }}</text>
+				<text class="amount-tit">{{ $lang('paymentAmount') }}</text>
-			<view class="amount-num">
+				<view class="amount-num">
-				{{ $lang('common.currencySymbol') }}
+					{{ $lang('common.currencySymbol') }}
-				<text>{{ payInfo.pay_money }}</text>
+					<text>{{ payInfo.pay_money }}</text>
+				</view>
+				<view class="payment-name">{{ payInfo.pay_body }}</view>
 			</view>
-			<view class="payment-name">{{ payInfo.pay_body }}</view>
-		</view>
 
-		<loading-cover ref="loadingCover"></loading-cover>
+			<loading-cover ref="loadingCover"></loading-cover>
 
-	</scroll-view>
+		</scroll-view>
+	</view>
 </template>
 
 <script>
@@ -71,38 +72,45 @@ export default {
 	width: 100vw;
 	height: 100vh;
 }
+
 @mixin flex-column {
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 	align-items: center;
 }
+
 @mixin flex-row {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
 }
+
 .payment-amount {
 	@include flex-column;
 	margin: $margin-updown $margin-both;
 	border-radius: 8rpx;
 	padding: 20rpx 0 58rpx 0;
 	background-color: #fff;
+
 	.amount-tit {
 		font-size: $font-size-base;
 		color: #838383;
 		line-height: 1;
 		margin-top: 44rpx;
 	}
+
 	.amount-num {
 		color: #000;
 		margin-top: 36rpx;
 		line-height: 1;
+
 		text {
 			font-size: $font-size-toolbar;
 			color: #000;
 		}
 	}
+
 	.amount-desc {
 		font-size: $font-size-tag;
 		color: #838383;
@@ -111,6 +119,7 @@ export default {
 		box-sizing: border-box;
 		text-align: center;
 		line-height: 1;
+
 		text {
 			width: 100%;
 			display: block;
@@ -119,6 +128,7 @@ export default {
 			white-space: nowrap;
 		}
 	}
+
 	.payment-name {
 		width: 90%;
 		overflow: hidden;

pages_tool/pay/result.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="container" :style="themeColor">
-	<view class="container">
 		<template v-if="payInfo.pay_status != undefined">
 			<view class="result-box">
 				<template v-if="payInfo.pay_status">

pages_tool/pay/wx_pay.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="launch-mask" v-if="show == true" :style="themeColor">
-	<view class="launch-mask" v-if="show == true">
 		<view class="mask-img">
 			<image :src="$util.img('public/uniapp/pay/invite_friends_share.png')" mode="aspectFit"></image>
 		</view>

pages_tool/recharge/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="page" :style="themeColor">
-	<view class="page">
 		
 		<view>
 		<!-- 	<view class="recharge-title">充值</view>

pages_tool/recharge/order_list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="order-container" :style="themeColor">
-	<view class="order-container">
 		<mescroll-uni ref="mescroll" @getData="getListData">
 			<block slot="list">
 				<block v-if="orderList.length > 0">

pages_tool/storeclose/storeclose.vue

@@ -1,5 +1,4 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
 	<view :style="themeColor">
 		<view class="closeBox">
 			<image :src="$util.img('public/uniapp/store/storeclose.png')" mode="widthFix"></image>