From 50072c45aba767452d772a62f0560e20da69629c Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Tue, 30 Dec 2025 18:30:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=B7=E5=BC=8F):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E4=BA=A7=E7=89=A9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   1 +
 common/js/config-external.js                  |   4 +-
 common/js/golbalConfig.js                     |  36 +-
 common/js/lang.js                             |   4 +-
 lang/zh-cn/goods/detail.js                    |   2 +-
 pages.json                                    |   2 +-
 pages_goods/cart.vue                          |   2 +-
 pages_goods/category.vue                      |   2 +-
 pages_goods/detail.vue                        |   2 +-
 pages_order/detail_local_delivery.vue         |   2 +-
 pages_order/detail_pickup.vue                 |   2 +-
 pages_order/payment.vue                       |   2 +-
 pages_promotion/fenxiao/child_fenxiao.vue     | 576 ++++++-------
 pages_promotion/fenxiao/order.vue             | 404 +++++-----
 pages_promotion/fenxiao/order_detail.vue      | 754 +++++++++---------
 pages_promotion/fenxiao/relation.vue          | 302 +++----
 pages_promotion/fenxiao/team.vue              | 708 ++++++++--------
 pages_promotion/fenxiao/withdraw_list.vue     | 416 +++++-----
 pages_promotion/fenxiao/withdrawal_detail.vue | 252 +++---
 pages_promotion/merch/merchcategory.vue       |   2 +-
 pages_promotion/point/detail.vue              |   4 +-
 pages_tool/article/list.vue                   |   2 +-
 pages_tool/contact/contact.vue                |   2 +-
 pages_tool/goods/coupon.vue                   |   2 +-
 pages_tool/goods/search.vue                   |   2 +-
 pages_tool/member/account.vue                 |   2 +-
 pages_tool/member/address.vue                 |   2 +-
 pages_tool/member/balance_detail.vue          |   2 +-
 pages_tool/member/collection.vue              |   2 +-
 pages_tool/member/info.vue                    |   2 +-
 pages_tool/member/info_edit.vue               |   2 +-
 pages_tool/member/invite_friends.vue          |   2 +-
 pages_tool/member/point_detail.vue            |   2 +-
 pages_tool/member/withdrawal.vue              |   2 +-
 pages_tool/member/withdrawal_detail.vue       |   2 +-
 pages_tool/notice/list.vue                    |   2 +-
 pages_tool/order/detail_virtual.vue           |   2 +-
 pages_tool/order/evaluate.vue                 | 170 ++--
 pages_tool/order/logistics.vue                |   2 +-
 pages_tool/order/refund.vue                   |   2 +-
 pages_tool/order/refund_batch.vue             |   2 +-
 pages_tool/order/refund_detail.vue            |   2 +-
 pages_tool/order/refund_type_select.vue       |   2 +-
 pages_tool/storeclose/storeclose.vue          | 196 ++---
 pages_tool/vr/index.vue                       | 102 +--
 pages_tool/webview/webview.vue                |   4 +-
 store/index.js                                |  35 +
 47 files changed, 2019 insertions(+), 2009 deletions(-)

diff --git a/App.vue b/App.vue
index 64d8e34..95bc6b6 100644
--- a/App.vue
+++ b/App.vue
@@ -67,6 +67,7 @@
 			// 主题风格
 			if (uni.getStorageSync('themeStyle')) {
 				this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle')));
+				this.$store.dispatch('themeColorSet');
 			}
 
 			// 插件是否存在
diff --git a/common/js/config-external.js b/common/js/config-external.js
index 3fd174e..26cc8f1 100644
--- a/common/js/config-external.js
+++ b/common/js/config-external.js
@@ -111,6 +111,7 @@ class ConfigExternal {
     try {
       // 动态加载主题配置
       const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+      console.log('sync themeData => ', themeData);
       this.loadedConfigs[`theme_${theme}`] = themeData;
       return themeData;
     } catch (error) {
@@ -136,7 +137,8 @@ class ConfigExternal {
     this.loadPromises[`theme_${theme}`] = new Promise((resolve, reject) => {
       try {
         // 动态加载主题配置
-        const themeData = require(`@/common/js/style_color.js`)[theme];
+        const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+        console.log('async themeData => ', themeData);
         this.loadedConfigs[`theme_${theme}`] = themeData;
         resolve(themeData);
       } catch (error) {
diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js
index 8363dbf..27a27d4 100644
--- a/common/js/golbalConfig.js
+++ b/common/js/golbalConfig.js
@@ -1,21 +1,8 @@
 export default {
-	data() {
-		return {
-			// 页面样式，动态设置主色调
-			themeColor: '' //''--base-color:#fa5d14;--base-help-color:#ff7e00;'
-		}
-	},
 	onLoad() { },
 	onShow() {
 		// 刷新多语言
 		this.$langConfig.refresh();
-		let time = setInterval(() => {
-			let theme = this.themeStyle;
-			if (theme && theme.main_color) {
-				this.themeColorSet();
-				clearInterval(time);
-			}
-		}, 50);
 	},
 	computed: {
 		// 是否是英文环境
@@ -24,6 +11,9 @@ export default {
 		},
 		themeStyle() {
 			return this.$store.state.themeStyle;
+		},		
+		themeColor() {
+			return this.$store.state.themeColor;
 		},
 		// 插件是否存在
 		addonIsExist() {
@@ -111,25 +101,7 @@ export default {
 		}
 	},
 	methods: {
-		themeColorSet() {
-			let theme = this.themeStyle;
-			this.themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
-			if (this.tabBarHeight != '56px') this.themeColor += `--tab-bar-height:${this.tabBarHeight};`
-			Object.keys(theme).forEach(key => {
-				let data = theme[key];
-				if (typeof (data) == "object") {
-					Object.keys(data).forEach(k => {
-						this.themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
-					});
-				} else if (typeof (key) == "string" && key) {
-					this.themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
-				}
-			});
-			for (let i = 9; i >= 5; i--) {
-				let color = this.$util.colourBlend(theme.main_color, '#ffffff', (i / 10));
-				this.themeColor += `--base-color-light-${i}:${color};`;
-			}
-		},
+
 		// 颜色变浅（>0）、变深函数（<0）
 		lightenDarkenColor(color, amount) {
 
diff --git a/common/js/lang.js b/common/js/lang.js
index 7d3ff47..bc03c0b 100644
--- a/common/js/lang.js
+++ b/common/js/lang.js
@@ -72,7 +72,7 @@ export default {
 			//当前页面语言包（同步加载）
 			let route = _this.route;
 			let langPath = processRoutePath(route);
-			console.log(`当前页面语言包路径: ${langPath}`);
+			// console.log(`当前页面语言包路径: ${langPath}`);
 			
 			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);
@@ -113,7 +113,7 @@ export default {
 		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
 
 		// 多语言调试，注释后可以关闭控制台输出
-		console.log(`字段: ${field}, 值: ${value}`)
+		// console.log(`字段: ${field}, 值: ${value}`)
 		return value;
 	},
 	/**
diff --git a/lang/zh-cn/goods/detail.js b/lang/zh-cn/goods/detail.js
index 24c57da..34efc9b 100644
--- a/lang/zh-cn/goods/detail.js
+++ b/lang/zh-cn/goods/detail.js
@@ -2,7 +2,7 @@ export const lang = {
 	//title为每个页面的标题
 	title: '',
 	select: '选择',
-	details:'商品详情',
+	details:'资源详情',
 	params: '参数',
 	service: '商品服务',
 	allGoods: '全部商品',
diff --git a/pages.json b/pages.json
index 19936b6..4e2c1e6 100644
--- a/pages.json
+++ b/pages.json
@@ -43,7 +43,7 @@
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "商品详情"
+						"navigationBarTitleText": "资源详情"
 					}
 				},
 				{
diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue
index 7a8eca5..87ddee9 100644
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<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">
 				<block v-if="hasData">
diff --git a/pages_goods/category.vue b/pages_goods/category.vue
index 387fcdd..d1792de 100644
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<block v-if="diyData">
 			<block v-for="(item, index) in diyData.value" :key="index">
 				<view v-if="item.componentName == 'GoodsCategory'">
diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue
index fe50330..fbc82c1 100644
--- a/pages_goods/detail.vue
+++ b/pages_goods/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<!-- #ifndef H5 -->
 	<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">
 			<ns-navbar :data="navbarData" :isBack="true"></ns-navbar>
diff --git a/pages_order/detail_local_delivery.vue b/pages_order/detail_local_delivery.vue
index 9a56aa7..f76958b 100644
--- a/pages_order/detail_local_delivery.vue
+++ b/pages_order/detail_local_delivery.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
diff --git a/pages_order/detail_pickup.vue b/pages_order/detail_pickup.vue
index 9a56aa7..f76958b 100644
--- a/pages_order/detail_pickup.vue
+++ b/pages_order/detail_pickup.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
diff --git a/pages_order/payment.vue b/pages_order/payment.vue
index d4610f4..ce464ba 100644
--- a/pages_order/payment.vue
+++ b/pages_order/payment.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<common-payment :api="api" create-data-key="orderCreateData" ref="payment"></common-payment>
 	</view>
 </template>
diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue
index 4fcf443..18a2276 100644
--- a/pages_promotion/fenxiao/child_fenxiao.vue
+++ b/pages_promotion/fenxiao/child_fenxiao.vue
@@ -1,289 +1,289 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<mescroll-uni ref="mescroll" @getData="getData" top="0" class="member-point" :size="8" v-if="storeToken">
-			<block slot="list">
-				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
-					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
-						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
-						<image v-else :src="$util.getDefaultImage().head"></image>
-						<view class="member-info">
-							<view class="member-name">
-								<view class="left">
-									<view class="flex-box">
-										<view class="name">{{ item.nickname }}</view>
-										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{ item.level_name }}</view>
-									</view>
-									<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
-								</view>
-								<view class="consume-info">
-									<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text> 人</view>
-									<view><text>{{ item.order_num }}</text> 单</view>
-									<view><text>{{ item.order_money|moneyFormat }}</text> 元</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<block v-if="teamList.length == 0 && emptyShow">
-					<ns-empty text="暂无数据" :isIndex="false"></ns-empty>
-				</block>
-			</block>
-		</mescroll-uni>
-
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-
-export default {
-	data() {
-		return {
-			teamList: [],
-			emptyShow: false,
-		};
-	},
-	mixins: [fenxiaoWords],
-	onShow() {
-		setTimeout( () => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		},1000);
-
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/childfenxiao');
-			});
-		}
-	},
-	methods: {
-		getData(mescroll) {
-			this.emptyShow = false;
-			if (mescroll.num == 1) {
-				this.teamList = [];
-			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/childfenxiao',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num
-				},
-				success: res => {
-					this.emptyShow = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.teamList = []; //如果是第一页需手动制空列表
-					this.teamList = this.teamList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		imageError(e) {
-			this.teamList[e].headimg = this.$util.getDefaultImage().head;
-			this.$forceUpdate();
-		},
-		toFenxiaoOrder(item) {
-			if (item.fenxiao_id) {
-				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { fenxiao_id: item.fenxiao_id });
-			} else {
-				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { sub_member_id: item.member_id });
-			}
-		}
-	},
-	watch: {
-		storeToken: function(nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.team-cate {
-	padding: 0 30rpx;
-	width: calc(100%);
-	height: 90rpx;
-	display: flex;
-	box-sizing: border-box;
-	background: #ffffff;
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-
-	.cate-li {
-		flex: 1;
-		justify-content: center;
-		text-align: center;
-		align-items: center;
-		display: inline-block;
-		line-height: 90rpx;
-		height: 100%;
-		font-size: 30rpx;
-
-		&.active {
-			box-sizing: border-box;
-			border-bottom: 4rpx solid;
-		}
-	}
-}
-
-.team-member {
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	color: $color-tip;
-	padding: 0 $padding;
-	box-sizing: border-box;
-}
-
-.team-li {
-	margin: $margin-updown $margin-both;
-	padding: $margin-both;
-	box-sizing: border-box;
-	background: #fff;
-	margin-bottom: 20rpx;
-	border-radius: 10rpx;
-
-	.li-box {
-		display: flex;
-		box-sizing: border-box;
-		align-items: center;
-
-		image {
-			width: 90rpx;
-			height: 90rpx;
-			border-radius: 50%;
-		}
-		
-		.member-info {
-			flex: 1;
-			padding-left: $padding;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-
-			.member-name {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: $font-size-base;
-
-				.left {
-					width: 0;
-					flex: 1;
-					
-					.flex-box {
-						display: flex;
-						align-items: center;
-						margin-bottom: 6rpx;
-					}
-
-					.name {
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						line-height: 1;
-					}
-
-					.title {
-						padding: 4rpx 16rpx;
-						justify-content: center;
-						align-items: center;
-						text-align: center;
-						font-size: $font-size-activity-tag;
-						border-radius: 4rpx;
-						margin-left: 10rpx;
-						line-height: 1;
-						border: 2rpx solid;
-						color: #fff;
-					}
-				}
-				
-				.consume-info {
-					text-align: right;
-					
-					text {
-						margin-right: 6rpx;
-					}
-					
-					view {
-						line-height: 1.5;
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.member-date {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: $padding;
-
-				view {
-					width: 50%;
-					height: 100%;
-					text-align: left;
-					line-height: 1;
-
-					text {
-						font-size: $font-size-tag;
-						color: $color-tip;
-					}
-
-					.tit {
-						color: $color-tip;
-					}
-				}
-			}
-		}
-
-		.btn-see {
-			display: flex;
-			flex-direction: row-reverse;
-		}
-	}
-	.order-box-btn {
-		display: inline-block;
-		line-height: 56rpx;
-		padding: 0 30rpx;
-		font-size: 26rpx;
-		color: #303133;
-		border: 2rpx solid #999;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		-webkit-border-radius: $border-radius;
-		border-radius: $border-radius;
-		margin-top: 30rpx;
-	}
-	.li-box.active {
-		border: none;
-	}
-}
-</style>
+	<view :style="themeColor">
+		<mescroll-uni ref="mescroll" @getData="getData" top="0" class="member-point" :size="8" v-if="storeToken">
+			<block slot="list">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
+					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
+						<image v-else :src="$util.getDefaultImage().head"></image>
+						<view class="member-info">
+							<view class="member-name">
+								<view class="left">
+									<view class="flex-box">
+										<view class="name">{{ item.nickname }}</view>
+										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{ item.level_name }}</view>
+									</view>
+									<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+								</view>
+								<view class="consume-info">
+									<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text> 人</view>
+									<view><text>{{ item.order_num }}</text> 单</view>
+									<view><text>{{ item.order_money|moneyFormat }}</text> 元</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<block v-if="teamList.length == 0 && emptyShow">
+					<ns-empty text="暂无数据" :isIndex="false"></ns-empty>
+				</block>
+			</block>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	data() {
+		return {
+			teamList: [],
+			emptyShow: false,
+		};
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/childfenxiao');
+			});
+		}
+	},
+	methods: {
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.teamList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/childfenxiao',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.teamList = []; //如果是第一页需手动制空列表
+					this.teamList = this.teamList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError(e) {
+			this.teamList[e].headimg = this.$util.getDefaultImage().head;
+			this.$forceUpdate();
+		},
+		toFenxiaoOrder(item) {
+			if (item.fenxiao_id) {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { fenxiao_id: item.fenxiao_id });
+			} else {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { sub_member_id: item.member_id });
+			}
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.team-cate {
+	padding: 0 30rpx;
+	width: calc(100%);
+	height: 90rpx;
+	display: flex;
+	box-sizing: border-box;
+	background: #ffffff;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+
+	.cate-li {
+		flex: 1;
+		justify-content: center;
+		text-align: center;
+		align-items: center;
+		display: inline-block;
+		line-height: 90rpx;
+		height: 100%;
+		font-size: 30rpx;
+
+		&.active {
+			box-sizing: border-box;
+			border-bottom: 4rpx solid;
+		}
+	}
+}
+
+.team-member {
+	width: 100%;
+	height: 70rpx;
+	line-height: 70rpx;
+	color: $color-tip;
+	padding: 0 $padding;
+	box-sizing: border-box;
+}
+
+.team-li {
+	margin: $margin-updown $margin-both;
+	padding: $margin-both;
+	box-sizing: border-box;
+	background: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 10rpx;
+
+	.li-box {
+		display: flex;
+		box-sizing: border-box;
+		align-items: center;
+
+		image {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+		}
+		
+		.member-info {
+			flex: 1;
+			padding-left: $padding;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+			.member-name {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-base;
+
+				.left {
+					width: 0;
+					flex: 1;
+					
+					.flex-box {
+						display: flex;
+						align-items: center;
+						margin-bottom: 6rpx;
+					}
+
+					.name {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						line-height: 1;
+					}
+
+					.title {
+						padding: 4rpx 16rpx;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+						font-size: $font-size-activity-tag;
+						border-radius: 4rpx;
+						margin-left: 10rpx;
+						line-height: 1;
+						border: 2rpx solid;
+						color: #fff;
+					}
+				}
+				
+				.consume-info {
+					text-align: right;
+					
+					text {
+						margin-right: 6rpx;
+					}
+					
+					view {
+						line-height: 1.5;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.member-date {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: $padding;
+
+				view {
+					width: 50%;
+					height: 100%;
+					text-align: left;
+					line-height: 1;
+
+					text {
+						font-size: $font-size-tag;
+						color: $color-tip;
+					}
+
+					.tit {
+						color: $color-tip;
+					}
+				}
+			}
+		}
+
+		.btn-see {
+			display: flex;
+			flex-direction: row-reverse;
+		}
+	}
+	.order-box-btn {
+		display: inline-block;
+		line-height: 56rpx;
+		padding: 0 30rpx;
+		font-size: 26rpx;
+		color: #303133;
+		border: 2rpx solid #999;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		-webkit-border-radius: $border-radius;
+		border-radius: $border-radius;
+		margin-top: 30rpx;
+	}
+	.li-box.active {
+		border: none;
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue
index 589d0c2..6d7f90e 100644
--- a/pages_promotion/fenxiao/order.vue
+++ b/pages_promotion/fenxiao/order.vue
@@ -1,203 +1,203 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="withdraw-cate">
-			<block v-for="(item, index) in category" :key="index">
-				<view @click="selectCate(item.id)" class="cate-li" :class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}</view>
-			</block>
-		</view>
-		<mescroll-uni ref="mescroll" @getData="getData" top="90" class="member-point" :size="8" v-if="storeToken">
-			<view class="goods_list" slot="list">
-				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
-						<view class="order-header">
-							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
-							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
-							<text class="status-name color-text-orange" v-else>待结算</text>
-						</view>
-
-						<view class="order-body">
-							<view class="goods-wrap">
-								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
-								</view>
-								<view class="goods-info">
-									<view class="top-wrap">
-										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
-										<view>
-											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color  price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
-											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
-										</view>
-									</view>
-									<view class="goods-sub-section">
-										<view class="goods-price">
-											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
-										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
-										</view>
-										<view>
-											<text>
-												<text class="iconfont icon-close"></text>
-												{{ orderItem.num }}
-											</text>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="order-footer">
-							<view class="order-base-info active">
-								<view class="order-type ">
-									<text class="color-tip">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
-									<!-- <text>返{{ fenxiaoWords.account }}金额：</text>
-									<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
-								</view>
-								<view class="total">
-									<text>合计：</text>
-									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
-									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="cart-empty">
-					<ns-empty text="暂无订单" :isIndex="false" v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已结算订单" :isIndex="false" v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
-				</view>
-			</view>
-		</mescroll-uni>
-
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-export default {
-	data() {
-		return {
-			category: [
-				{
-					id: 0,
-					name: '全部',
-					number: 2
-				},
-				{
-					id: 1,
-					name: '待结算',
-					number: 0
-				},
-				{
-					id: 2,
-					name: '已结算',
-					number: 0
-				},
-				{
-					id: 3,
-					name: '已退款',
-					number: 0
-				}
-			],
-			selectId: 0,
-			orderList: [],
-			emptyShow: false,
-			fenxiaoId: '',
-			subMemberId: ''
-		};
-	},
-	mixins: [fenxiaoWords],
-	onLoad(option) {
-		if (option.type != undefined) this.selectId = option.type;
-	},
-	onShow() {
-		setTimeout( () => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		},1000);
-
-		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
-
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/order');
-			});
-		}
-	},
-	methods: {
-		//获得列表数据
-		getData(mescroll) {
-			this.emptyShow = false;
-			if (mescroll.num == 1) {
-				this.orderList = [];
-			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/order/page',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size,
-					is_settlement: this.selectId
-				},
-				success: res => {
-					this.emptyShow = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data && res.data.list) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({ title: res.message });
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
-					this.orderList = this.orderList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		selectCate(e) {
-			this.selectId = e;
-			this.$refs.mescroll.refresh();
-		},
-		toDetail(e) {
-			this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
-				id: e
-			});
-		},
-		imageError(index) {
-			this.orderList[index].sku_image = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		}
-	},
-	watch: {
-		storeToken: function(nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-@import './public/css/order.scss';
-</style>
+	<view :style="themeColor">
+		<view class="withdraw-cate">
+			<block v-for="(item, index) in category" :key="index">
+				<view @click="selectCate(item.id)" class="cate-li" :class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}</view>
+			</block>
+		</view>
+		<mescroll-uni ref="mescroll" @getData="getData" top="90" class="member-point" :size="8" v-if="storeToken">
+			<view class="goods_list" slot="list">
+				<view class="order-list">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+						<view class="order-header">
+							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
+							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
+							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-orange" v-else>待结算</text>
+						</view>
+
+						<view class="order-body">
+							<view class="goods-wrap">
+								<view class="goods-img">
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+								</view>
+								<view class="goods-info">
+									<view class="top-wrap">
+										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
+										<view>
+											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
+											<text class="price-color  price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
+											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
+										</view>
+									</view>
+									<view class="goods-sub-section">
+										<view class="goods-price">
+											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+										</view>
+										<view>
+											<text>
+												<text class="iconfont icon-close"></text>
+												{{ orderItem.num }}
+											</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="order-footer">
+							<view class="order-base-info active">
+								<view class="order-type ">
+									<text class="color-tip">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
+									<!-- <text>返{{ fenxiaoWords.account }}金额：</text>
+									<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
+								</view>
+								<view class="total">
+									<text>合计：</text>
+									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
+									<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
+									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="cart-empty">
+					<ns-empty text="暂无订单" :isIndex="false" v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已结算订单" :isIndex="false" v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
+				</view>
+			</view>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	data() {
+		return {
+			category: [
+				{
+					id: 0,
+					name: '全部',
+					number: 2
+				},
+				{
+					id: 1,
+					name: '待结算',
+					number: 0
+				},
+				{
+					id: 2,
+					name: '已结算',
+					number: 0
+				},
+				{
+					id: 3,
+					name: '已退款',
+					number: 0
+				}
+			],
+			selectId: 0,
+			orderList: [],
+			emptyShow: false,
+			fenxiaoId: '',
+			subMemberId: ''
+		};
+	},
+	mixins: [fenxiaoWords],
+	onLoad(option) {
+		if (option.type != undefined) this.selectId = option.type;
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/order');
+			});
+		}
+	},
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.orderList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/order/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					is_settlement: this.selectId
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
+					this.orderList = this.orderList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		selectCate(e) {
+			this.selectId = e;
+			this.$refs.mescroll.refresh();
+		},
+		toDetail(e) {
+			this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
+				id: e
+			});
+		},
+		imageError(index) {
+			this.orderList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/order.scss';
+</style>
diff --git a/pages_promotion/fenxiao/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue
index 64b1888..36f5fb0 100644
--- a/pages_promotion/fenxiao/order_detail.vue
+++ b/pages_promotion/fenxiao/order_detail.vue
@@ -1,378 +1,378 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="order-detail">
-			<view class="order-detail-box">
-				<view class="header">
-					<view class="title">
-						<text>共{{ orderData.num }}件商品</text>
-					</view>
-					<text class="color-base-text font-size-tag" v-if="orderData.is_refund == 1">已退款</text>
-					<text class="color-base-text font-size-tag" v-else-if="orderData.is_settlement == 1">已结算</text>
-					<text class="color-base-text font-size-tag" v-else>待结算</text>
-				</view>
-				<view class="detail-body">
-					<view class="detail-body-box">
-						<view class="goods-image"><image :src="$util.img(orderData.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill"></image></view>
-						<view class="order-info">
-							<view class="goods-name">{{ orderData.sku_name }}</view>
-							<view class="goods-sub-section margin-top">
-								<view>
-									<text class="goods-price">
-										<text class="unit price-color">￥</text>
-										<text class="price-color font-size-toolbar" >{{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}</text>
-										<text class="unit price-color">.{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}</text>
-									</text>
-								</view>
-								<view>
-									<text>
-										<text class="iconfont icon-close"></text>
-										{{ orderData.num }}
-									</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="detail-footer">
-					<text></text>
-					<text>
-						<text>合计：</text>
-						<text class="price-color total">￥{{ orderData.real_goods_money }}</text>
-					</text>
-				</view>
-			</view>
-			<view class="order-detail-box commission">
-				<view class="header">
-					<view class="title color-base-bg-before"><text>返佣详情</text></view>
-					<text class="color-base-text">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</text>
-				</view>
-				<view class="detail-content">
-					<view class="order-info-item">
-						<text class="tit">订单编号：</text>
-						<text>{{ orderData.order_no }}</text>
-					</view>
-					<view class="order-info-item">
-						<text class="tit">分佣层级：</text>
-						<text>{{ orderData.commission_level }}级</text>
-					</view>
-					<view class="order-info-item">
-						<text class="tit">返佣金额：</text>
-						<text class="price-color font-size-toolbar">
-							<text class="font-size-goods-tag">￥</text>
-							{{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
-							<text class="font-size-goods-tag">.{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}</text>
-						</text>
-						
-					</view>
-				</view>
-			</view>
-		</view>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-export default {
-	data() {
-		return {
-			isIphoneX: false,
-			orderId: 0,
-			orderData: {
-				action: []
-			}
-		};
-	},
-	components: {},
-	onLoad(option) {
-		if (option.id) {
-			this.orderId = option.id;
-		} else {
-			uni.navigateBack({
-				delta: 1
-			});
-		}
-	},
-	mixins: [fenxiaoWords],
-	onShow() {
-		setTimeout( () => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		},1000);
-
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		if (this.storeToken) {
-			this.getOrderData();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/order_detail?id=' + this.orderId);
-			});
-		}
-	},
-	methods: {
-		getOrderData() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/order/info',
-				data: {
-					fenxiao_order_id: this.orderId
-				},
-				success: res => {
-					if (res.code >= 0) {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						this.orderData = res.data;
-					} else {
-						this.$util.showToast({
-							title: '未获取到订单信息！'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_promotion/fenxiao/order', {}, 'redirectTo');
-						}, 1500);
-					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		imageError() {
-			this.orderData.sku_image = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		}
-	},
-	watch: {
-		storeToken: function(nVal, oVal) {
-			if (nVal) {
-				this.getOrderData();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.order-detail {
-	width: 100%;
-	padding: 0 $padding;
-	box-sizing: border-box;
-	margin-top: $margin-updown;
-	.order-detail-box {
-		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-		background: #ffffff;
-		border-radius: $border-radius;
-		.header {
-			width: 100%;
-			padding: 30rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			box-sizing: border-box;
-			.title {
-				display: inline-block;
-				position: relative;
-				line-height: 1;
-			}
-		}
-		.detail-body {
-			width: 100%;
-			padding: 0 30rpx 30rpx 30rpx;
-			box-sizing: border-box;
-
-			.detail-body-box {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				.goods-image {
-					width: 180rpx;
-					height: 180rpx;
-					border-radius: $border-radius;
-					image {
-						width: 100%;
-						height: 100%;
-						border: 1rpx solid $color-line;
-						border-radius: $border-radius;
-					}
-				}
-				.order-info {
-					width: calc(100% - 200rpx);
-					height: 180rpx;
-					padding-left: $padding;
-					box-sizing: border-box;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-					.goods-name {
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						line-height: 1.5;
-						font-size: $font-size-base;
-					}
-
-					.goods-sub-section {
-						width: 100%;
-						line-height: 1.3;
-						display: flex;
-
-						.goods-price {
-							font-size: $font-size-base;
-						}
-
-						.unit {
-							font-weight: normal;
-							font-size: $font-size-tag;
-							margin-right: 2rpx;
-						}
-
-						view {
-							flex: 1;
-							line-height: 1.3;
-							&:last-of-type {
-								text-align: right;
-
-								.iconfont {
-									line-height: 1;
-									font-size: $font-size-base;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		.detail-content {
-			width: 100%;
-			padding: 0 30rpx 30rpx 30rpx;
-			box-sizing: border-box;
-			border-bottom: 1rpx solid $color-line;
-			text {
-				font-size: $font-size-base;
-			}
-			.order-info-item .tit {
-				display: inline-block;
-			}
-		}
-		.detail-footer {
-			width: 100%;
-			height: 100rpx;
-			padding: $padding;
-			box-sizing: border-box;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.total {
-				font-weight: 600;
-			}
-		}
-	}
-}
-.commission {
-	margin-top: 20rpx;
-	.detail-content {
-		border: 0 !important;
-	}
-}
-.order-money-detail {
-	width: 100%;
-	padding: 0 $padding;
-	box-sizing: border-box;
-	margin-top: $margin-updown;
-	.order-money-detail-box {
-		width: 100%;
-		height: 100%;
-		padding-top: $padding;
-		box-sizing: border-box;
-		background: #ffffff;
-		border-radius: $border-radius;
-		.header {
-			width: 100%;
-			height: 70rpx;
-			padding: 0 $padding;
-			border-bottom: 1rpx solid $color-line;
-			display: flex;
-			align-items: center;
-			box-sizing: border-box;
-			.title {
-				padding-left: 20rpx;
-				display: inline-block;
-				position: relative;
-				line-height: 1;
-				font-weight: 600;
-			}
-			.title::before {
-				content: '';
-				display: block;
-				width: 4rpx;
-				height: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				border-radius: 6rpx;
-			}
-		}
-		.money-detail-body {
-			width: 100%;
-			padding: $padding;
-			box-sizing: border-box;
-			.order-cell {
-				display: flex;
-				margin: 10rpx 0;
-				align-items: center;
-				background: #fff;
-				line-height: 40rpx;
-
-				.tit {
-					text-align: left;
-					display: inline-block;
-					width: 200rpx;
-				}
-
-				.box {
-					flex: 1;
-					line-height: inherit;
-
-					.textarea {
-						height: 40rpx;
-					}
-				}
-
-				.iconfont {
-					color: #bbb;
-					font-size: $font-size-base;
-				}
-
-				.order-pay {
-					padding: 0;
-
-					text {
-						display: inline-block;
-						margin-left: 6rpx;
-					}
-				}
-				text {
-					color: $color-tip;
-					font-size: $font-size-tag;
-				}
-			}
-		}
-	}
-}
-.price-color{
-	color: var(--price-color);
-}
-</style>
+	<view :style="themeColor">
+		<view class="order-detail">
+			<view class="order-detail-box">
+				<view class="header">
+					<view class="title">
+						<text>共{{ orderData.num }}件商品</text>
+					</view>
+					<text class="color-base-text font-size-tag" v-if="orderData.is_refund == 1">已退款</text>
+					<text class="color-base-text font-size-tag" v-else-if="orderData.is_settlement == 1">已结算</text>
+					<text class="color-base-text font-size-tag" v-else>待结算</text>
+				</view>
+				<view class="detail-body">
+					<view class="detail-body-box">
+						<view class="goods-image"><image :src="$util.img(orderData.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill"></image></view>
+						<view class="order-info">
+							<view class="goods-name">{{ orderData.sku_name }}</view>
+							<view class="goods-sub-section margin-top">
+								<view>
+									<text class="goods-price">
+										<text class="unit price-color">￥</text>
+										<text class="price-color font-size-toolbar" >{{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}</text>
+										<text class="unit price-color">.{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}</text>
+									</text>
+								</view>
+								<view>
+									<text>
+										<text class="iconfont icon-close"></text>
+										{{ orderData.num }}
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="detail-footer">
+					<text></text>
+					<text>
+						<text>合计：</text>
+						<text class="price-color total">￥{{ orderData.real_goods_money }}</text>
+					</text>
+				</view>
+			</view>
+			<view class="order-detail-box commission">
+				<view class="header">
+					<view class="title color-base-bg-before"><text>返佣详情</text></view>
+					<text class="color-base-text">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</text>
+				</view>
+				<view class="detail-content">
+					<view class="order-info-item">
+						<text class="tit">订单编号：</text>
+						<text>{{ orderData.order_no }}</text>
+					</view>
+					<view class="order-info-item">
+						<text class="tit">分佣层级：</text>
+						<text>{{ orderData.commission_level }}级</text>
+					</view>
+					<view class="order-info-item">
+						<text class="tit">返佣金额：</text>
+						<text class="price-color font-size-toolbar">
+							<text class="font-size-goods-tag">￥</text>
+							{{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
+							<text class="font-size-goods-tag">.{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}</text>
+						</text>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	data() {
+		return {
+			isIphoneX: false,
+			orderId: 0,
+			orderData: {
+				action: []
+			}
+		};
+	},
+	components: {},
+	onLoad(option) {
+		if (option.id) {
+			this.orderId = option.id;
+		} else {
+			uni.navigateBack({
+				delta: 1
+			});
+		}
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		if (this.storeToken) {
+			this.getOrderData();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/order_detail?id=' + this.orderId);
+			});
+		}
+	},
+	methods: {
+		getOrderData() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/order/info',
+				data: {
+					fenxiao_order_id: this.orderId
+				},
+				success: res => {
+					if (res.code >= 0) {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						this.orderData = res.data;
+					} else {
+						this.$util.showToast({
+							title: '未获取到订单信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_promotion/fenxiao/order', {}, 'redirectTo');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError() {
+			this.orderData.sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.getOrderData();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.order-detail {
+	width: 100%;
+	padding: 0 $padding;
+	box-sizing: border-box;
+	margin-top: $margin-updown;
+	.order-detail-box {
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+		background: #ffffff;
+		border-radius: $border-radius;
+		.header {
+			width: 100%;
+			padding: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			box-sizing: border-box;
+			.title {
+				display: inline-block;
+				position: relative;
+				line-height: 1;
+			}
+		}
+		.detail-body {
+			width: 100%;
+			padding: 0 30rpx 30rpx 30rpx;
+			box-sizing: border-box;
+
+			.detail-body-box {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				.goods-image {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: $border-radius;
+					image {
+						width: 100%;
+						height: 100%;
+						border: 1rpx solid $color-line;
+						border-radius: $border-radius;
+					}
+				}
+				.order-info {
+					width: calc(100% - 200rpx);
+					height: 180rpx;
+					padding-left: $padding;
+					box-sizing: border-box;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					.goods-name {
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						line-height: 1.5;
+						font-size: $font-size-base;
+					}
+
+					.goods-sub-section {
+						width: 100%;
+						line-height: 1.3;
+						display: flex;
+
+						.goods-price {
+							font-size: $font-size-base;
+						}
+
+						.unit {
+							font-weight: normal;
+							font-size: $font-size-tag;
+							margin-right: 2rpx;
+						}
+
+						view {
+							flex: 1;
+							line-height: 1.3;
+							&:last-of-type {
+								text-align: right;
+
+								.iconfont {
+									line-height: 1;
+									font-size: $font-size-base;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		.detail-content {
+			width: 100%;
+			padding: 0 30rpx 30rpx 30rpx;
+			box-sizing: border-box;
+			border-bottom: 1rpx solid $color-line;
+			text {
+				font-size: $font-size-base;
+			}
+			.order-info-item .tit {
+				display: inline-block;
+			}
+		}
+		.detail-footer {
+			width: 100%;
+			height: 100rpx;
+			padding: $padding;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.total {
+				font-weight: 600;
+			}
+		}
+	}
+}
+.commission {
+	margin-top: 20rpx;
+	.detail-content {
+		border: 0 !important;
+	}
+}
+.order-money-detail {
+	width: 100%;
+	padding: 0 $padding;
+	box-sizing: border-box;
+	margin-top: $margin-updown;
+	.order-money-detail-box {
+		width: 100%;
+		height: 100%;
+		padding-top: $padding;
+		box-sizing: border-box;
+		background: #ffffff;
+		border-radius: $border-radius;
+		.header {
+			width: 100%;
+			height: 70rpx;
+			padding: 0 $padding;
+			border-bottom: 1rpx solid $color-line;
+			display: flex;
+			align-items: center;
+			box-sizing: border-box;
+			.title {
+				padding-left: 20rpx;
+				display: inline-block;
+				position: relative;
+				line-height: 1;
+				font-weight: 600;
+			}
+			.title::before {
+				content: '';
+				display: block;
+				width: 4rpx;
+				height: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				border-radius: 6rpx;
+			}
+		}
+		.money-detail-body {
+			width: 100%;
+			padding: $padding;
+			box-sizing: border-box;
+			.order-cell {
+				display: flex;
+				margin: 10rpx 0;
+				align-items: center;
+				background: #fff;
+				line-height: 40rpx;
+
+				.tit {
+					text-align: left;
+					display: inline-block;
+					width: 200rpx;
+				}
+
+				.box {
+					flex: 1;
+					line-height: inherit;
+
+					.textarea {
+						height: 40rpx;
+					}
+				}
+
+				.iconfont {
+					color: #bbb;
+					font-size: $font-size-base;
+				}
+
+				.order-pay {
+					padding: 0;
+
+					text {
+						display: inline-block;
+						margin-left: 6rpx;
+					}
+				}
+				text {
+					color: $color-tip;
+					font-size: $font-size-tag;
+				}
+			}
+		}
+	}
+}
+.price-color{
+	color: var(--price-color);
+}
+</style>
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
index b1d5b9c..5e30f40 100644
--- a/pages_promotion/fenxiao/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -1,152 +1,152 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<mescroll-uni ref="mescroll" @getData="getData" top="20" class="member-point" :size="8" v-if="storeToken">
-			<view class="goods_list" slot="list">
-				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
-						<view class="order-header">
-							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
-							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
-							<text class="status-name color-text-orange" v-else>待结算</text>
-						</view>
-
-						<view class="order-body">
-							<view class="goods-wrap">
-								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
-								</view>
-								<view class="goods-info">
-									<view class="top-wrap">
-										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
-										<view>
-											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
-										</view>
-									</view>
-									<view class="goods-sub-section">
-										<view class="goods-price">
-											<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color font-size-toolbar">{{ orderItem.price }}</text>
-										</view>
-										<view>
-											<text>
-												<text class="iconfont icon-close"></text>
-												{{ orderItem.num }}
-											</text>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="order-footer">
-							<view class="order-base-info active">
-								<view class="order-type ">
-									<text class="color-tip">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
-									<!-- <text>返{{ fenxiaoWords.account }}金额：</text>
-									<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
-								</view>
-								<view class="total">
-									<text>合计：</text>
-									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
-									<text class="font-size-toolbar price-color">{{ orderItem.real_goods_money }}</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false" v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
-			</view>
-		</mescroll-uni>
-
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-
-export default {
-	data() {
-		return {
-			orderList: [],
-			emptyShow: false,
-			fenxiaoId: '',
-			subMemberId: ''
-		};
-	},
-	mixins: [fenxiaoWords],
-	onLoad(option) {
-		if (option.fenxiao_id) {
-			this.fenxiaoId = option.fenxiao_id;
-		}
-		if (option.sub_member_id) {
-			this.subMemberId = option.sub_member_id;
-		}
-	},
-	onShow() {
-		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
-	},
-	methods: {
-		//获得列表数据
-		getData(mescroll) {
-			this.emptyShow = false;
-			if (mescroll.num == 1) {
-				this.orderList = [];
-			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/getorder',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size,
-					fenxiao_id: this.fenxiaoId ? this.fenxiaoId : '',
-					sub_member_id: this.subMemberId ? this.subMemberId : ''
-				},
-				success: res => {
-					this.emptyShow = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data && res.data.list) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({ title: res.message });
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
-					this.orderList = this.orderList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		imageError(index) {
-			this.orderList[index].sku_image = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		toDetail(e) {
-			this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
-				id: e
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-@import './public/css/order.scss';
-.goods-wraps {
-	align-items: center;
-}
-.goods_list .order-item .order-body .goods-wraps .goods-img,
-.goods_list .order-item .order-body .goods-wraps .goods-info,
-.goods_list .order-item .order-footers {
-	padding: 0;
-}
-</style>
+	<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">
+				<view class="order-list">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+						<view class="order-header">
+							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
+							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
+							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-orange" v-else>待结算</text>
+						</view>
+
+						<view class="order-body">
+							<view class="goods-wrap">
+								<view class="goods-img">
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+								</view>
+								<view class="goods-info">
+									<view class="top-wrap">
+										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
+										<view>
+											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
+											<text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
+										</view>
+									</view>
+									<view class="goods-sub-section">
+										<view class="goods-price">
+											<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color font-size-toolbar">{{ orderItem.price }}</text>
+										</view>
+										<view>
+											<text>
+												<text class="iconfont icon-close"></text>
+												{{ orderItem.num }}
+											</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="order-footer">
+							<view class="order-base-info active">
+								<view class="order-type ">
+									<text class="color-tip">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
+									<!-- <text>返{{ fenxiaoWords.account }}金额：</text>
+									<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
+								</view>
+								<view class="total">
+									<text>合计：</text>
+									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
+									<text class="font-size-toolbar price-color">{{ orderItem.real_goods_money }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false" v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
+			</view>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	data() {
+		return {
+			orderList: [],
+			emptyShow: false,
+			fenxiaoId: '',
+			subMemberId: ''
+		};
+	},
+	mixins: [fenxiaoWords],
+	onLoad(option) {
+		if (option.fenxiao_id) {
+			this.fenxiaoId = option.fenxiao_id;
+		}
+		if (option.sub_member_id) {
+			this.subMemberId = option.sub_member_id;
+		}
+	},
+	onShow() {
+		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+	},
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.orderList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/getorder',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					fenxiao_id: this.fenxiaoId ? this.fenxiaoId : '',
+					sub_member_id: this.subMemberId ? this.subMemberId : ''
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({ title: res.message });
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.orderList = []; //如果是第一页需手动制空列表
+					this.orderList = this.orderList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError(index) {
+			this.orderList[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		toDetail(e) {
+			this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
+				id: e
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import './public/css/order.scss';
+.goods-wraps {
+	align-items: center;
+}
+.goods_list .order-item .order-body .goods-wraps .goods-img,
+.goods_list .order-item .order-body .goods-wraps .goods-info,
+.goods_list .order-item .order-footers {
+	padding: 0;
+}
+</style>
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
index 878cc7e..63dfed3 100644
--- a/pages_promotion/fenxiao/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -1,355 +1,355 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="team-cate" v-if="storeToken && levelNum > 1">
-			<block v-for="(item, index) in levelList" :key="index">
-				<view class="cate-li" :class="{ 'active color-base-text color-base-border': currentLevel == item.level }" @click="selectLevel(item.level)">{{ item.name }}</view>
-			</block>
-		</view>
-		<mescroll-uni ref="mescroll" @getData="getData" :top="levelNum > 1 ? 90 : 0" class="member-point" :size="8" v-if="storeToken">
-			<block slot="list">
-				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
-					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
-						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
-						<image v-else :src="$util.getDefaultImage().head"></image>
-						<view class="member-info">
-							<view class="member-name">
-								<block v-if="item.is_fenxiao">
-									<view class="left">
-										<view class="flex-box">
-											<view class="name">{{ item.nickname }}</view>
-											<view class="title  color-base-border color-base-text">{{ fenxiaoWords.fenxiao_name }}</view>
-										</view>
-										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
-									</view>
-									<view class="consume-info">
-										<view>
-											<text>{{ item.one_child_num }}</text>
-											人
-										</view>
-										<view>
-											<text>{{ item.order_num }}</text>
-											单
-										</view>
-										<view>
-											<text>{{ item.order_money | moneyFormat }}</text>
-											元
-										</view>
-									</view>
-								</block>
-								<block v-else>
-									<view class="left">
-										<view class="flex-box">
-											<view class="name font-size-tag">
-												<text>{{ item.nickname }}</text>
-											</view>
-										</view>
-										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
-									</view>
-									<view class="consume-info">
-										<view>
-											<text>0</text>
-											人
-										</view>
-										<view>
-											<text>{{ item.order_num }}</text>
-											单
-										</view>
-										<view>
-											<text>{{ item.order_money | moneyFormat }}</text>
-											元
-										</view>
-									</view>
-								</block>
-							</view>
-						</view>
-					</view>
-				</view>
-				<block v-if="teamList.length == 0 && emptyShow"><ns-empty text="暂无数据" :isIndex="false"></ns-empty></block>
-			</block>
-		</mescroll-uni>
-
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-export default {
-	data() {
-		return {
-			levelList: [
-				{
-					name: '一级',
-					level: 1
-				},
-				{
-					name: '二级',
-					level: 2
-				}
-			],
-			currentLevel: 1,
-			teamList: [],
-			emptyShow: false,
-			levelNum: 0,
-		};
-	},
-	mixins: [fenxiaoWords],
-	onShow() {
-		setTimeout( () => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		},1000);
-
-		if (this.fenxiaoWords && this.fenxiaoWords.my_team) this.$langConfig.title(this.fenxiaoWords.my_team);
-		this.getFenXiaoLevel();
-
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/team');
-			});
-		}
-	},
-	methods: {
-		getData(mescroll) {
-			this.emptyShow = false;
-			if (mescroll.num == 1) {
-				this.teamList = [];
-			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/team',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num,
-					level: this.currentLevel
-				},
-				success: res => {
-					this.emptyShow = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.teamList = []; //如果是第一页需手动制空列表
-					this.teamList = this.teamList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		imageError(e) {
-			this.teamList[e].headimg = this.$util.getDefaultImage().head;
-			this.$forceUpdate();
-		},
-		selectLevel(e) {
-			this.currentLevel = e;
-			this.$refs.mescroll.refresh();
-		},
-		toFenxiaoOrder(item) {
-			if (item.fenxiao_id) {
-				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { fenxiao_id: item.fenxiao_id });
-			} else {
-				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { sub_member_id: item.member_id });
-			}
-		},
-		async getFenXiaoLevel() {
-			let res = await this.$api.sendRequest({
-				url: '/fenxiao/api/config/basics',
-				async: false,
-				success: res => {}
-			});
-			if (res.code == 0 && res.data) {
-				this.levelNum = res.data.level;
-			}
-		}
-	},
-	watch: {
-		storeToken: function(nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.team-cate {
-	padding: 0 30rpx;
-	width: calc(100%);
-	height: 90rpx;
-	display: flex;
-	box-sizing: border-box;
-	background: #ffffff;
-	position: fixed;
-	left: 0;
-	top: var(--window-top);
-
-	.cate-li {
-		flex: 1;
-		justify-content: center;
-		text-align: center;
-		align-items: center;
-		display: inline-block;
-		line-height: 90rpx;
-		height: 100%;
-		font-size: 30rpx;
-
-		&.active {
-			box-sizing: border-box;
-			border-bottom: 4rpx solid;
-		}
-	}
-}
-
-.team-member {
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	color: $color-tip;
-	padding: 0 $padding;
-	box-sizing: border-box;
-}
-
-.team-li {
-	margin: $margin-updown $margin-both;
-	padding: $margin-both;
-	box-sizing: border-box;
-	background: #fff;
-	margin-bottom: 20rpx;
-	border-radius: 10rpx;
-
-	.li-box {
-		display: flex;
-		box-sizing: border-box;
-		align-items: center;
-
-		image {
-			width: 90rpx;
-			height: 90rpx;
-			border-radius: 50%;
-		}
-
-		.member-info {
-			flex: 1;
-			padding-left: $padding;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-
-			.member-name {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: $font-size-base;
-
-				.left {
-					width: 0;
-					flex: 1;
-
-					.flex-box {
-						display: flex;
-						align-items: center;
-						margin-bottom: 6rpx;
-					}
-
-					.name {
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-
-					.title {
-						padding: 4rpx 16rpx;
-						justify-content: center;
-						align-items: center;
-						text-align: center;
-						font-size: $font-size-activity-tag;
-						border-radius: 4rpx;
-						margin-left: 10rpx;
-						line-height: 1;
-						border: 2rpx solid;
-						color: #fff;
-					}
-				}
-
-				.consume-info {
-					text-align: right;
-
-					text {
-						margin-right: 6rpx;
-					}
-
-					view {
-						line-height: 1.5;
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.member-date {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: $padding;
-
-				view {
-					width: 50%;
-					height: 100%;
-					text-align: left;
-					line-height: 1;
-
-					text {
-						font-size: $font-size-tag;
-						color: $color-tip;
-					}
-
-					.tit {
-						color: $color-tip;
-					}
-				}
-			}
-		}
-
-		.btn-see {
-			display: flex;
-			flex-direction: row-reverse;
-		}
-	}
-	.order-box-btn {
-		display: inline-block;
-		line-height: 56rpx;
-		padding: 0 30rpx;
-		font-size: 26rpx;
-		color: #303133;
-		border: 2rpx solid #999;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		-webkit-border-radius: $border-radius;
-		border-radius: $border-radius;
-		margin-top: 30rpx;
-	}
-	.li-box.active {
-		border: none;
-	}
-}
-</style>
+	<view :style="themeColor">
+		<view class="team-cate" v-if="storeToken && levelNum > 1">
+			<block v-for="(item, index) in levelList" :key="index">
+				<view class="cate-li" :class="{ 'active color-base-text color-base-border': currentLevel == item.level }" @click="selectLevel(item.level)">{{ item.name }}</view>
+			</block>
+		</view>
+		<mescroll-uni ref="mescroll" @getData="getData" :top="levelNum > 1 ? 90 : 0" class="member-point" :size="8" v-if="storeToken">
+			<block slot="list">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
+					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
+						<image v-else :src="$util.getDefaultImage().head"></image>
+						<view class="member-info">
+							<view class="member-name">
+								<block v-if="item.is_fenxiao">
+									<view class="left">
+										<view class="flex-box">
+											<view class="name">{{ item.nickname }}</view>
+											<view class="title  color-base-border color-base-text">{{ fenxiaoWords.fenxiao_name }}</view>
+										</view>
+										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+									</view>
+									<view class="consume-info">
+										<view>
+											<text>{{ item.one_child_num }}</text>
+											人
+										</view>
+										<view>
+											<text>{{ item.order_num }}</text>
+											单
+										</view>
+										<view>
+											<text>{{ item.order_money | moneyFormat }}</text>
+											元
+										</view>
+									</view>
+								</block>
+								<block v-else>
+									<view class="left">
+										<view class="flex-box">
+											<view class="name font-size-tag">
+												<text>{{ item.nickname }}</text>
+											</view>
+										</view>
+										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+									</view>
+									<view class="consume-info">
+										<view>
+											<text>0</text>
+											人
+										</view>
+										<view>
+											<text>{{ item.order_num }}</text>
+											单
+										</view>
+										<view>
+											<text>{{ item.order_money | moneyFormat }}</text>
+											元
+										</view>
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</view>
+				<block v-if="teamList.length == 0 && emptyShow"><ns-empty text="暂无数据" :isIndex="false"></ns-empty></block>
+			</block>
+		</mescroll-uni>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	data() {
+		return {
+			levelList: [
+				{
+					name: '一级',
+					level: 1
+				},
+				{
+					name: '二级',
+					level: 2
+				}
+			],
+			currentLevel: 1,
+			teamList: [],
+			emptyShow: false,
+			levelNum: 0,
+		};
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if (this.fenxiaoWords && this.fenxiaoWords.my_team) this.$langConfig.title(this.fenxiaoWords.my_team);
+		this.getFenXiaoLevel();
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/team');
+			});
+		}
+	},
+	methods: {
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.teamList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/team',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					level: this.currentLevel
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.teamList = []; //如果是第一页需手动制空列表
+					this.teamList = this.teamList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError(e) {
+			this.teamList[e].headimg = this.$util.getDefaultImage().head;
+			this.$forceUpdate();
+		},
+		selectLevel(e) {
+			this.currentLevel = e;
+			this.$refs.mescroll.refresh();
+		},
+		toFenxiaoOrder(item) {
+			if (item.fenxiao_id) {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { fenxiao_id: item.fenxiao_id });
+			} else {
+				this.$util.redirectTo('/pages_promotion/fenxiao/relation', { sub_member_id: item.member_id });
+			}
+		},
+		async getFenXiaoLevel() {
+			let res = await this.$api.sendRequest({
+				url: '/fenxiao/api/config/basics',
+				async: false,
+				success: res => {}
+			});
+			if (res.code == 0 && res.data) {
+				this.levelNum = res.data.level;
+			}
+		}
+	},
+	watch: {
+		storeToken: function(nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.team-cate {
+	padding: 0 30rpx;
+	width: calc(100%);
+	height: 90rpx;
+	display: flex;
+	box-sizing: border-box;
+	background: #ffffff;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+
+	.cate-li {
+		flex: 1;
+		justify-content: center;
+		text-align: center;
+		align-items: center;
+		display: inline-block;
+		line-height: 90rpx;
+		height: 100%;
+		font-size: 30rpx;
+
+		&.active {
+			box-sizing: border-box;
+			border-bottom: 4rpx solid;
+		}
+	}
+}
+
+.team-member {
+	width: 100%;
+	height: 70rpx;
+	line-height: 70rpx;
+	color: $color-tip;
+	padding: 0 $padding;
+	box-sizing: border-box;
+}
+
+.team-li {
+	margin: $margin-updown $margin-both;
+	padding: $margin-both;
+	box-sizing: border-box;
+	background: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 10rpx;
+
+	.li-box {
+		display: flex;
+		box-sizing: border-box;
+		align-items: center;
+
+		image {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+		}
+
+		.member-info {
+			flex: 1;
+			padding-left: $padding;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+			.member-name {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-base;
+
+				.left {
+					width: 0;
+					flex: 1;
+
+					.flex-box {
+						display: flex;
+						align-items: center;
+						margin-bottom: 6rpx;
+					}
+
+					.name {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.title {
+						padding: 4rpx 16rpx;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+						font-size: $font-size-activity-tag;
+						border-radius: 4rpx;
+						margin-left: 10rpx;
+						line-height: 1;
+						border: 2rpx solid;
+						color: #fff;
+					}
+				}
+
+				.consume-info {
+					text-align: right;
+
+					text {
+						margin-right: 6rpx;
+					}
+
+					view {
+						line-height: 1.5;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.member-date {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: $padding;
+
+				view {
+					width: 50%;
+					height: 100%;
+					text-align: left;
+					line-height: 1;
+
+					text {
+						font-size: $font-size-tag;
+						color: $color-tip;
+					}
+
+					.tit {
+						color: $color-tip;
+					}
+				}
+			}
+		}
+
+		.btn-see {
+			display: flex;
+			flex-direction: row-reverse;
+		}
+	}
+	.order-box-btn {
+		display: inline-block;
+		line-height: 56rpx;
+		padding: 0 30rpx;
+		font-size: 26rpx;
+		color: #303133;
+		border: 2rpx solid #999;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		-webkit-border-radius: $border-radius;
+		border-radius: $border-radius;
+		margin-top: 30rpx;
+	}
+	.li-box.active {
+		border: none;
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
index 4c0a66f..8790457 100644
--- a/pages_promotion/fenxiao/withdraw_list.vue
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -1,209 +1,209 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<mescroll-uni @getData="getData" class="member-point">
-			<view slot="list">
-				<block v-if="withdrawList.length">
-					<view class="detailed-wrap">
-						<view class="cont">
-							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
-								<view class="info">
-									<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
-									<view>
-										<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
-									</view>
-								</view>
-								<view class="right-wrap">
-									<view class="num color-base-text">￥{{ item.money }}</view>
-									<view class="status-name" :style="withdrawState[item.status].color">{{ item.status_name }}</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</block>
-				<block v-else>
-					<ns-empty :isIndex="false" text="暂无提现记录"></ns-empty>
-				</block>
-			</view>
-		</mescroll-uni>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-<script>
-import fenxiaoWords from 'common/js/fenxiao-words.js';
-
-export default {
-	data() {
-		return {
-			withdrawState: {
-				'3': {
-					color: 'color: rgb(255, 69, 68)',
-					text: '已转账'
-				},
-				'1': {
-					color: 'color: rgb(255, 160, 68)',
-					text: '待审核'
-				},
-				'2': {
-					color: 'color: rgb(17, 189, 100)',
-					text: '已审核'
-				},
-				'-1': {
-					color: 'color: rgb(255, 69, 68)',
-					text: '已拒绝'
-				}
-			},
-			withdrawList: [],
-			emptyShow: false,
-		};
-	},
-	onShow() {
-		setTimeout( () => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		},1000);
-
-		if(this.fenxiaoWords && this.fenxiaoWords.withdraw)this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
-
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/withdraw_list');
-			});
-		}
-	},
-	mixins: [fenxiaoWords],
-	methods: {
-		//获得列表数据
-		getData(mescroll) {
-			this.emptyShow = false;
-			if (mescroll.num == 1) {
-				this.withdrawList = [];
-			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/withdraw/page',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num,
-				},
-				success: res => {
-					this.emptyShow = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data && res.data.list) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.withdrawList = []; //如果是第一页需手动制空列表
-					this.withdrawList = this.withdrawList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		toDetail(id) {
-			this.$util.redirectTo('/pages_promotion/fenxiao/withdrawal_detail', {
-				id: id
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.account-box {
-	width: 100vw;
-	padding: 30rpx;
-	box-sizing: border-box;
-	padding-bottom: 10rpx;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-
-	.tit {
-		color: #fff;
-		line-height: 1;
-	}
-
-	.iconmn_jifen_fill {
-		font-size: 60rpx;
-		color: #fff;
-	}
-
-	.point {
-		color: #fff;
-		font-size: 60rpx;
-		margin-left: 10rpx;
-	}
-}
-
-.detailed-wrap {
-	.head {
-		display: flex;
-		height: 90rpx;
-
-		& > view {
-			flex: 1;
-			text-align: left;
-			padding: 0 $padding;
-			line-height: 90rpx;
-		}
-	}
-
-	.cont {
-		background: #fff;
-
-		.detailed-item {
-			padding: $padding 10rpx;
-			margin: 0 $margin-both;
-			border-bottom: 2rpx solid #eee;
-			position: relative;
-
-			&:last-of-type {
-				border-bottom: none;
-			}
-
-			.info {
-				padding-right: 180rpx;
-
-				.event {
-					font-size: $font-size-base;
-					line-height: 1.3;
-				}
-
-				.time {
-					font-size: $font-size-base;
-					color: $color-tip;
-				}
-			}
-
-			.right-wrap {
-				position: absolute;
-				right: 0;
-				top: 0;
-				text-align: right;
-
-				.num {
-					font-size: $font-size-toolbar;
-				}
-			}
-		}
-	}
-}
-</style>
+	<view :style="themeColor">
+		<mescroll-uni @getData="getData" class="member-point">
+			<view slot="list">
+				<block v-if="withdrawList.length">
+					<view class="detailed-wrap">
+						<view class="cont">
+							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
+								<view class="info">
+									<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
+									<view>
+										<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
+									</view>
+								</view>
+								<view class="right-wrap">
+									<view class="num color-base-text">￥{{ item.money }}</view>
+									<view class="status-name" :style="withdrawState[item.status].color">{{ item.status_name }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<ns-empty :isIndex="false" text="暂无提现记录"></ns-empty>
+				</block>
+			</view>
+		</mescroll-uni>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+<script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+
+export default {
+	data() {
+		return {
+			withdrawState: {
+				'3': {
+					color: 'color: rgb(255, 69, 68)',
+					text: '已转账'
+				},
+				'1': {
+					color: 'color: rgb(255, 160, 68)',
+					text: '待审核'
+				},
+				'2': {
+					color: 'color: rgb(17, 189, 100)',
+					text: '已审核'
+				},
+				'-1': {
+					color: 'color: rgb(255, 69, 68)',
+					text: '已拒绝'
+				}
+			},
+			withdrawList: [],
+			emptyShow: false,
+		};
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+
+		if(this.fenxiaoWords && this.fenxiaoWords.withdraw)this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/withdraw_list');
+			});
+		}
+	},
+	mixins: [fenxiaoWords],
+	methods: {
+		//获得列表数据
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.withdrawList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/withdraw/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data && res.data.list) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.withdrawList = []; //如果是第一页需手动制空列表
+					this.withdrawList = this.withdrawList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toDetail(id) {
+			this.$util.redirectTo('/pages_promotion/fenxiao/withdrawal_detail', {
+				id: id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.account-box {
+	width: 100vw;
+	padding: 30rpx;
+	box-sizing: border-box;
+	padding-bottom: 10rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+
+	.tit {
+		color: #fff;
+		line-height: 1;
+	}
+
+	.iconmn_jifen_fill {
+		font-size: 60rpx;
+		color: #fff;
+	}
+
+	.point {
+		color: #fff;
+		font-size: 60rpx;
+		margin-left: 10rpx;
+	}
+}
+
+.detailed-wrap {
+	.head {
+		display: flex;
+		height: 90rpx;
+
+		& > view {
+			flex: 1;
+			text-align: left;
+			padding: 0 $padding;
+			line-height: 90rpx;
+		}
+	}
+
+	.cont {
+		background: #fff;
+
+		.detailed-item {
+			padding: $padding 10rpx;
+			margin: 0 $margin-both;
+			border-bottom: 2rpx solid #eee;
+			position: relative;
+
+			&:last-of-type {
+				border-bottom: none;
+			}
+
+			.info {
+				padding-right: 180rpx;
+
+				.event {
+					font-size: $font-size-base;
+					line-height: 1.3;
+				}
+
+				.time {
+					font-size: $font-size-base;
+					color: $color-tip;
+				}
+			}
+
+			.right-wrap {
+				position: absolute;
+				right: 0;
+				top: 0;
+				text-align: right;
+
+				.num {
+					font-size: $font-size-toolbar;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/fenxiao/withdrawal_detail.vue b/pages_promotion/fenxiao/withdrawal_detail.vue
index ab18b5b..804098c 100644
--- a/pages_promotion/fenxiao/withdrawal_detail.vue
+++ b/pages_promotion/fenxiao/withdrawal_detail.vue
@@ -1,127 +1,127 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="money-wrap">
-			<text>-{{ detail.money }}</text>
-		</view>
-
-		<!-- 状态0待审核1.待转账2已转账 -1拒绝' -->
-		<view class="item">
-			<view class="line-wrap">
-				<text class="label">当前状态</text>
-				<text class="value">{{ detail.status_name }}</text>
-			</view>
-			<view class="line-wrap">
-				<text class="label">交易号</text>
-				<text class="value">{{ detail.withdraw_no }}</text>
-			</view>
-			<view class="line-wrap">
-				<text class="label">手续费</text>
-				<text class="value">￥{{ detail.withdraw_rate_money }}</text>
-			</view>
-			<view class="line-wrap">
-				<text class="label">申请时间</text>
-				<text class="value">{{ $util.timeStampTurnTime(detail.create_time) }}</text>
-			</view>
-			<view class="line-wrap" v-if="detail.status">
-				<text class="label">审核时间</text>
-				<text class="value">{{ $util.timeStampTurnTime(detail.audit_time) }}</text>
-			</view>
-			<view class="line-wrap" v-if="detail.bank_name">
-				<text class="label">银行名称</text>
-				<text class="value">{{ detail.bank_name }}</text>
-			</view>
-			<view class="line-wrap" v-if="detail.account_number">
-				<text class="label">收款账号</text>
-				<text class="value">{{ detail.account_number }}</text>
-			</view>
-			<view class="line-wrap" v-if="detail.status == -1 && detail.refuse_reason">
-				<text class="label">拒绝理由</text>
-				<text class="value">{{ detail.refuse_reason }}</text>
-			</view>
-			<view class="line-wrap" v-if="detail.status == 3">
-				<text class="label">转账方式名称</text>
-				<text class="value">{{ detail.transfer_name }}</text>
-			</view>
-			<view class="line-wrap" v-if="detail.status == 3">
-				<text class="label">转账时间</text>
-				<text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text>
-			</view>
-		</view>
-
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			id: 0,
-			detail: {}
-		};
-	},
-	onLoad(option) {
-		this.id = option.id || 0;
-	},
-	onShow() {
-		if (this.storeToken) {
-			this.getDetail();
-		} else {
-			this.$util.redirectTo('/pages_tool/login/login', {
-				back: '/pages_promotion/fenxiao/withdraw_list'
-			}, 'redirectTo');
-		}
-	},
-	methods: {
-		getDetail() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/withdraw/detail',
-				data: {
-					id: this.id
-				},
-				success: res => {
-					if (res.data) {
-						this.detail = res.data;
-					}
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.money-wrap {
-	text-align: center;
-	font-size: 50rpx;
-	font-weight: bold;
-	margin: 40rpx;
-	border-bottom: 2rpx solid $color-line;
-	padding: 40rpx;
-}
-
-.item {
-	margin: 40rpx;
-
-	.line-wrap {
-		margin-bottom: 20rpx;
-
-		.label {
-			display: inline-block;
-			width: 200rpx;
-			color: $color-tip;
-			font-size: $font-size-base;
-		}
-
-		.value {
-			display: inline-block;
-			font-size: $font-size-base;
-		}
-	}
-}
-</style>
+	<view :style="themeColor">
+		<view class="money-wrap">
+			<text>-{{ detail.money }}</text>
+		</view>
+
+		<!-- 状态0待审核1.待转账2已转账 -1拒绝' -->
+		<view class="item">
+			<view class="line-wrap">
+				<text class="label">当前状态</text>
+				<text class="value">{{ detail.status_name }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">交易号</text>
+				<text class="value">{{ detail.withdraw_no }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">手续费</text>
+				<text class="value">￥{{ detail.withdraw_rate_money }}</text>
+			</view>
+			<view class="line-wrap">
+				<text class="label">申请时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.create_time) }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status">
+				<text class="label">审核时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.audit_time) }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.bank_name">
+				<text class="label">银行名称</text>
+				<text class="value">{{ detail.bank_name }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.account_number">
+				<text class="label">收款账号</text>
+				<text class="value">{{ detail.account_number }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == -1 && detail.refuse_reason">
+				<text class="label">拒绝理由</text>
+				<text class="value">{{ detail.refuse_reason }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == 3">
+				<text class="label">转账方式名称</text>
+				<text class="value">{{ detail.transfer_name }}</text>
+			</view>
+			<view class="line-wrap" v-if="detail.status == 3">
+				<text class="label">转账时间</text>
+				<text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text>
+			</view>
+		</view>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			id: 0,
+			detail: {}
+		};
+	},
+	onLoad(option) {
+		this.id = option.id || 0;
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getDetail();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_promotion/fenxiao/withdraw_list'
+			}, 'redirectTo');
+		}
+	},
+	methods: {
+		getDetail() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/withdraw/detail',
+				data: {
+					id: this.id
+				},
+				success: res => {
+					if (res.data) {
+						this.detail = res.data;
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.money-wrap {
+	text-align: center;
+	font-size: 50rpx;
+	font-weight: bold;
+	margin: 40rpx;
+	border-bottom: 2rpx solid $color-line;
+	padding: 40rpx;
+}
+
+.item {
+	margin: 40rpx;
+
+	.line-wrap {
+		margin-bottom: 20rpx;
+
+		.label {
+			display: inline-block;
+			width: 200rpx;
+			color: $color-tip;
+			font-size: $font-size-base;
+		}
+
+		.value {
+			display: inline-block;
+			font-size: $font-size-base;
+		}
+	}
+}
+</style>
diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue
index ce7f83e..88d997e 100644
--- a/pages_promotion/merch/merchcategory.vue
+++ b/pages_promotion/merch/merchcategory.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view class="category-page-wrap category-template-1" style="height: calc(-56px + 100vh);">
 
 		<!-- 	<view class="search-box" @click="$util.redirectTo('/pages_tool/goods/search')">
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
index 0d541b0..fb896dc 100644
--- a/pages_promotion/point/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -1,6 +1,6 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
 		<view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
 			<view class="goods-container">
 				<view class="goods-media">
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index fbca850..a5ae4a1 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<mescroll-uni @getData="getData" ref="mescroll">
 			<block slot="list">
 				<view class="article-wrap" v-if="list.length">
diff --git a/pages_tool/contact/contact.vue b/pages_tool/contact/contact.vue
index 57c43e1..1a8e1af 100644
--- a/pages_tool/contact/contact.vue
+++ b/pages_tool/contact/contact.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view class="about w100">
 			<view class="bg border-top"></view>
 			<view class="list_cotact padding-top">
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
index 5405b52..4a0f88a 100644
--- a/pages_tool/goods/coupon.vue
+++ b/pages_tool/goods/coupon.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view class="cf-container color-line-border">
 			<view class="tab">
 				<view @click="changeSort(1)"><text :class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
diff --git a/pages_tool/goods/search.vue b/pages_tool/goods/search.vue
index df4eddf..37aff0b 100644
--- a/pages_tool/goods/search.vue
+++ b/pages_tool/goods/search.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view class="content">
 			<view class="cate-search">
 				<view class="search-box" @click="search()" @tap.stop="search()">
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
index 203d0fb..8da6603 100644
--- a/pages_tool/member/account.vue
+++ b/pages_tool/member/account.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
 			<block slot="list">
 				<view class="nc-info-list-content">
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
index 3a18f70..4723837 100644
--- a/pages_tool/member/address.vue
+++ b/pages_tool/member/address.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getListData" v-if="storeToken">
 			<block slot="list">
 				<view class="address-list">
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
index ef0e8e5..e016fdc 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<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">
 				<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index f7a463b..745cfc0 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<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">
 				<block v-if="collectionList.length > 0">
diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue
index 066494d..be897db 100644
--- a/pages_tool/member/info.vue
+++ b/pages_tool/member/info.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view v-if="indent == 'all' && memberInfo" class="info-wrap">
 			<!-- 头像@click="headImage" -->
 			<view  class="info-list-cell info-item info-list-con" hover-class="cell-hover">
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
index bf3de74..894b670 100644
--- a/pages_tool/member/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<template v-if="memberInfo">
 			<!-- 修改用户名 -->
 			<view v-if="indent == 'username'" class="edit-info">
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
index 028bed5..7e13423 100644
--- a/pages_tool/member/invite_friends.vue
+++ b/pages_tool/member/invite_friends.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view v-if="info" style="background-color: #fff;">
 
 			<view class="invite_adv">
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index b4286cb..c8ea568 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 	<!-- 	<view class="tab color-bg">
 			<view class="tab-left">
 				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
index 73f30c8..3cc1353 100644
--- a/pages_tool/member/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<mescroll-uni @getData="getData" class="member-point">
 			<view slot="list">
 				<block v-if="dataList.length">
diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue
index f231756..90dd8e0 100644
--- a/pages_tool/member/withdrawal_detail.vue
+++ b/pages_tool/member/withdrawal_detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view class="money-wrap">
 			<text>-{{ detail.apply_money }}</text>
 		</view>
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index 76aea2c..7fcc2b9 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<mescroll-uni @getData="getData" ref="mescroll">
 			<block slot="list">
 				<view class="notice-list" v-if="dataList.length">
diff --git a/pages_tool/order/detail_virtual.vue b/pages_tool/order/detail_virtual.vue
index 4ee31cb..6897225 100644
--- a/pages_tool/order/detail_virtual.vue
+++ b/pages_tool/order/detail_virtual.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
diff --git a/pages_tool/order/evaluate.vue b/pages_tool/order/evaluate.vue
index 3ad08c0..947285e 100644
--- a/pages_tool/order/evaluate.vue
+++ b/pages_tool/order/evaluate.vue
@@ -1,87 +1,87 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view>
-			<view class="page">
-				<block v-for="(item, index) in goodsList" :key="index">
-					<view class="eval-wrap">
-						<view class="eval-good">
-							<view class="good-box">
-								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="widthFix" />
-								<view class="good_info font-size-base">{{ item.sku_name }}</view>
-							</view>
-						</view>
-						<view class="eval-star" v-if="!isEvaluate">
-							<view class="star-box">
-								<view class="star-title color-base-bg-before">描述相符</view>
-								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index" @change="setStar" /></view>
-								<view class="grade-li">
-									<view class="icon iconfont" :class="
-											goodsEvalList[index].explain_type == '1'
-												? 'icon-haoping1 color-base-text'
-												: goodsEvalList[index].explain_type == '2'
-												? 'icon-zhongchaping color-base-text'
-												: goodsEvalList[index].explain_type == '3'
-												? 'icon-zhongchaping'
-												: ''
-										"></view>
-									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '1'">好评</view>
-									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '2'">中评</view>
-									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '3'">差评</view>
-								</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="eval-text">
-						<view class="text-box">
-							<block v-if="!isEvaluate">
-								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content" maxlength="200" />
-								<text class="maxSize">{{ goodsEvalList[index].content.length }}/200</text>
-							</block>
-							<block v-else>
-								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content" maxlength="200" />
-								<text class="maxSize">{{ goodsEvalList[index].again_content.length }}/200</text>
-							</block>
-
-							<view class="other-info">
-								<view class="other-info-box" v-for="(i, t) in imgList[index]" :key="t">
-									<image :src="$util.img(i)" mode="aspectFill" @click="preview(i, index)"></image>
-									<view class="imgDel" @click="deleteImg(i, index ,t)"><text class=" icon iconfont icon-delete"></text></view>
-								</view>
-								<view class="other-info-box active" @click="addImg(index)" v-if="imgList[index].length < 6 || imgList[index].length == undefined">
-									<text class="icon iconfont icon-zhaoxiangji"></text>
-									<text>{{ imgList[index].length ? 6 - imgList[index].length : 0 }}/6</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</block>
-			</view>
-			<view class="eval-bottom" :class="{ 'safe-area': isIphoneX }">
-				<view class="all-election" @click="isAll()" v-if="!isEvaluate">
-					<view class="iconfont color-base-text" :class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
-					<text>匿名</text>
-				</view>
-				<view class="action-btn"><button type="primary" @click="save()">提交</button></view>
-			</view>
-			<loading-cover ref="loadingCover"></loading-cover>
-
-		</view>
-	</view>
-</template>
-
-<script>
-	import sxRate from '@/pages_tool/components/sx-rate/index.vue';
-	import evaluate from './public/js/evaluate.js';
-	export default {
-		components: {
-			sxRate
-		},
-		mixins: [evaluate],
-	};
-</script>
-
-<style lang="scss">
-	@import './public/css/evaluate.scss'
+	<view :style="themeColor">
+		<view>
+			<view class="page">
+				<block v-for="(item, index) in goodsList" :key="index">
+					<view class="eval-wrap">
+						<view class="eval-good">
+							<view class="good-box">
+								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="widthFix" />
+								<view class="good_info font-size-base">{{ item.sku_name }}</view>
+							</view>
+						</view>
+						<view class="eval-star" v-if="!isEvaluate">
+							<view class="star-box">
+								<view class="star-title color-base-bg-before">描述相符</view>
+								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index" @change="setStar" /></view>
+								<view class="grade-li">
+									<view class="icon iconfont" :class="
+											goodsEvalList[index].explain_type == '1'
+												? 'icon-haoping1 color-base-text'
+												: goodsEvalList[index].explain_type == '2'
+												? 'icon-zhongchaping color-base-text'
+												: goodsEvalList[index].explain_type == '3'
+												? 'icon-zhongchaping'
+												: ''
+										"></view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '1'">好评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '2'">中评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '3'">差评</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="eval-text">
+						<view class="text-box">
+							<block v-if="!isEvaluate">
+								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content" maxlength="200" />
+								<text class="maxSize">{{ goodsEvalList[index].content.length }}/200</text>
+							</block>
+							<block v-else>
+								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content" maxlength="200" />
+								<text class="maxSize">{{ goodsEvalList[index].again_content.length }}/200</text>
+							</block>
+
+							<view class="other-info">
+								<view class="other-info-box" v-for="(i, t) in imgList[index]" :key="t">
+									<image :src="$util.img(i)" mode="aspectFill" @click="preview(i, index)"></image>
+									<view class="imgDel" @click="deleteImg(i, index ,t)"><text class=" icon iconfont icon-delete"></text></view>
+								</view>
+								<view class="other-info-box active" @click="addImg(index)" v-if="imgList[index].length < 6 || imgList[index].length == undefined">
+									<text class="icon iconfont icon-zhaoxiangji"></text>
+									<text>{{ imgList[index].length ? 6 - imgList[index].length : 0 }}/6</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+			</view>
+			<view class="eval-bottom" :class="{ 'safe-area': isIphoneX }">
+				<view class="all-election" @click="isAll()" v-if="!isEvaluate">
+					<view class="iconfont color-base-text" :class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+					<text>匿名</text>
+				</view>
+				<view class="action-btn"><button type="primary" @click="save()">提交</button></view>
+			</view>
+			<loading-cover ref="loadingCover"></loading-cover>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import sxRate from '@/pages_tool/components/sx-rate/index.vue';
+	import evaluate from './public/js/evaluate.js';
+	export default {
+		components: {
+			sxRate
+		},
+		mixins: [evaluate],
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/evaluate.scss'
 </style>
\ No newline at end of file
diff --git a/pages_tool/order/logistics.vue b/pages_tool/order/logistics.vue
index 8aea65c..066947f 100644
--- a/pages_tool/order/logistics.vue
+++ b/pages_tool/order/logistics.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<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)">
 				<text class="uni-tab-item-title" :class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border  color-base-text' : ''">
diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue
index 5899a94..f094582 100644
--- a/pages_tool/order/refund.vue
+++ b/pages_tool/order/refund.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view>
 			<scroll-view scroll-y="true" class="refund-container">
 				<view class="goods-wrap">
diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
index 7a14556..e6bf98b 100644
--- a/pages_tool/order/refund_batch.vue
+++ b/pages_tool/order/refund_batch.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view>
 			<scroll-view scroll-y="true" class="refund-container">
 				<view class="goods-wrap" v-for="(item,index) in refund_data.order_goods_info" :key="index">
diff --git a/pages_tool/order/refund_detail.vue b/pages_tool/order/refund_detail.vue
index 0b47504..f39e9db 100644
--- a/pages_tool/order/refund_detail.vue
+++ b/pages_tool/order/refund_detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<scroll-view scroll-y="true" class="detail-container" :class="{ 'safe-area': isIphoneX }" v-if="detail">
 			<view v-show="action == ''">
 				<view class="status-wrap">
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 52c1418..8229471 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view>
 			<view class="refund-option">
 				<view class="option-item" @click="selectRefundType(1)">
diff --git a/pages_tool/storeclose/storeclose.vue b/pages_tool/storeclose/storeclose.vue
index 2ae9896..ee4997f 100644
--- a/pages_tool/storeclose/storeclose.vue
+++ b/pages_tool/storeclose/storeclose.vue
@@ -1,99 +1,99 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="closeBox">
-			<image :src="$util.img('public/uniapp/store/storeclose.png')" mode="widthFix"></image>
-			<text class="close-title">{{ textVal }}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			isIphoneX: false
-		};
-	},
-	onShow() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-		
-		this.getSiteStatus();
-		
-		// #ifdef MP-WEIXIN
-		wx.hideHomeButton();
-		// #endif
-	},
-	methods:{
-		getSiteStatus(){
-			this.$api.sendRequest({
-				url: '/api/site/status',
-				data: {},
-				success: res => {
-					if (res.code == 0) {
-						this.$util.redirectTo('/pages/index/index');
-					}
-				}
-			});
-		}
-	},
-	computed: {
-		textVal() {
-			return '该店铺已打烊...';
-		},
-		pageVal() {
-			if (this.$store.state.siteState == -2) {
-				return '店铺不存在';
-			} else if (this.$store.state.siteState == -3) {
-				return '店铺打烊';
-			}
-		}
-	},
-	onBackPress() {
-		return true;
-	}
-};
-</script>
-
-<style lang="scss">
-.head-nav {
-	width: 100%;
-	height: var(--status-bar-height);
-}
-
-.head-nav.active {
-	padding-top: 40rpx;
-}
-
-.head-return {
-	padding-left: 30rpx;
-	padding-right: 30rpx;
-	height: 90rpx;
-	line-height: 90rpx;
-	text-align: center;
-	font-weight: 600;
-	font-size: $font-size-toolbar;
-
-	text {
-		display: inline-block;
-		margin-right: 10rpx;
-	}
-}
-.closeBox {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	margin-top: 330rpx;
-}
-image {
-	width: 240rpx;
-}
-.close-title {
-	font-size: $font-size-toolbar;
-	color: $color-tip;
-	margin-top: 55rpx;
-	letter-spacing: 4rpx;
-}
-</style>
+	<view :style="themeColor">
+		<view class="closeBox">
+			<image :src="$util.img('public/uniapp/store/storeclose.png')" mode="widthFix"></image>
+			<text class="close-title">{{ textVal }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			isIphoneX: false
+		};
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		
+		this.getSiteStatus();
+		
+		// #ifdef MP-WEIXIN
+		wx.hideHomeButton();
+		// #endif
+	},
+	methods:{
+		getSiteStatus(){
+			this.$api.sendRequest({
+				url: '/api/site/status',
+				data: {},
+				success: res => {
+					if (res.code == 0) {
+						this.$util.redirectTo('/pages/index/index');
+					}
+				}
+			});
+		}
+	},
+	computed: {
+		textVal() {
+			return '该店铺已打烊...';
+		},
+		pageVal() {
+			if (this.$store.state.siteState == -2) {
+				return '店铺不存在';
+			} else if (this.$store.state.siteState == -3) {
+				return '店铺打烊';
+			}
+		}
+	},
+	onBackPress() {
+		return true;
+	}
+};
+</script>
+
+<style lang="scss">
+.head-nav {
+	width: 100%;
+	height: var(--status-bar-height);
+}
+
+.head-nav.active {
+	padding-top: 40rpx;
+}
+
+.head-return {
+	padding-left: 30rpx;
+	padding-right: 30rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	font-weight: 600;
+	font-size: $font-size-toolbar;
+
+	text {
+		display: inline-block;
+		margin-right: 10rpx;
+	}
+}
+.closeBox {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	margin-top: 330rpx;
+}
+image {
+	width: 240rpx;
+}
+.close-title {
+	font-size: $font-size-toolbar;
+	color: $color-tip;
+	margin-top: 55rpx;
+	letter-spacing: 4rpx;
+}
+</style>
diff --git a/pages_tool/vr/index.vue b/pages_tool/vr/index.vue
index bfe126c..c332b93 100644
--- a/pages_tool/vr/index.vue
+++ b/pages_tool/vr/index.vue
@@ -1,52 +1,52 @@
-<template>
+<template>
 	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="iconfont iconshang navigate-back" @click="navigateBack"></view>
-		<web-view :src="src"></web-view>
-	</view>
-<!-- 	<diy-bottom-nav></diy-bottom-nav> -->
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			src: ''
-		};
-	},
-	onLoad(option) {
-		// this.src = decodeURIComponent(option.src);
-		this.$api.sendRequest({
-			url: '/api/config/defaultvr',
-			success: res => {
-				console.log(res)
-				if (res.code == 0) {
-					uni.setNavigationBarTitle({
-						title:res.data.title
-					})
-					this.src = res.data.url
-				}
-			},
-			fail: res => {
-			}
-		});
-	},
-	methods: {
-		navigateBack() {
-			uni.navigateBack({
-				delta: 1
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.navigate-back {
-	position: absolute;
-	top: 34rpx;
-	left: 34rpx;
-	z-index: 5;
-	font-size: $font-size-toolbar;
-}
-</style>
+	<view :style="themeColor">
+		<view class="iconfont iconshang navigate-back" @click="navigateBack"></view>
+		<web-view :src="src"></web-view>
+	</view>
+<!-- 	<diy-bottom-nav></diy-bottom-nav> -->
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			src: ''
+		};
+	},
+	onLoad(option) {
+		// this.src = decodeURIComponent(option.src);
+		this.$api.sendRequest({
+			url: '/api/config/defaultvr',
+			success: res => {
+				console.log(res)
+				if (res.code == 0) {
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+					this.src = res.data.url
+				}
+			},
+			fail: res => {
+			}
+		});
+	},
+	methods: {
+		navigateBack() {
+			uni.navigateBack({
+				delta: 1
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.navigate-back {
+	position: absolute;
+	top: 34rpx;
+	left: 34rpx;
+	z-index: 5;
+	font-size: $font-size-toolbar;
+}
+</style>
diff --git a/pages_tool/webview/webview.vue b/pages_tool/webview/webview.vue
index c12f31f..7f5b84d 100644
--- a/pages_tool/webview/webview.vue
+++ b/pages_tool/webview/webview.vue
@@ -1,6 +1,6 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
 		<view class="iconfont iconshang navigate-back" @click="navigateBack"></view>
 		<web-view :src="src"></web-view>
 
diff --git a/store/index.js b/store/index.js
index 54de377..17b9fad 100644
--- a/store/index.js
+++ b/store/index.js
@@ -5,6 +5,7 @@ Vue.use(Vuex)
 import Http from '../common/js/http.js'
 import { themeConfig } from '../common/js/config-external.js'
 import configExternal from '../common/js/config-external.js'
+import util from '../common/js/util.js'
 
 const store = new Vuex.Store({
 	state: {
@@ -14,6 +15,7 @@ const store = new Vuex.Store({
 		tabBarList: '',
 		siteState: 1,
 		themeStyle: '',
+		themeColor: '',
 		addonIsExist: {
 			bundling: 0,
 			coupon: 0,
@@ -236,6 +238,10 @@ const store = new Vuex.Store({
 		// 设置AI未读消息数量
 		setAiUnreadCount(state, value) {
 			state.aiUnreadCount = value;
+		},
+		// 设置主题颜色
+		setThemeColor(state, value) {
+			state.themeColor = value;
 		}
 	},
 	getters: {
@@ -253,6 +259,7 @@ const store = new Vuex.Store({
 						var data = res.data;
 						if (data) {
 							this.commit('setThemeStyle', configExternal.loadThemeSync(data.style_theme?.name));
+							this.dispatch('themeColorSet');
 
 							// 底部导航
 							this.commit('setTabBarList', data.diy_bottom_nav);
@@ -401,6 +408,34 @@ const store = new Vuex.Store({
 
 			this.commit('setCartIds', ids);
 
+		},
+		// 生成主题颜色CSS变量
+		themeColorSet() {
+			console.log('样式颜色设置...');
+			let theme = this.state.themeStyle;
+			if (!theme?.main_color || !theme?.aux_color) return;
+			try {
+				let themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
+				if (this.state.tabBarHeight != '56px') themeColor += `--tab-bar-height:${this.state.tabBarHeight};`
+				Object.keys(theme).forEach(key => {
+					let data = theme[key];
+					if (typeof (data) == "object") {
+						Object.keys(data).forEach(k => {
+							themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
+						});
+					} else if (typeof (key) == "string" && key) {
+						themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
+					}
+				});
+				for (let i = 9; i >= 5; i--) {
+					let color = util.colourBlend(theme.main_color, '#ffffff', (i / 10));
+					themeColor += `--base-color-light-${i}:${color};`;
+				}
+				this.commit('setThemeColor', themeColor);
+			} catch (e) {
+				console.error('设置主题颜色失败', e);
+			}
+			console.log('themeColor => ', this.state.themeColor);
 		}
 	}
 })