chore(build): update vue.config.js

App.vue

@@ -1,7 +1,7 @@
 <script>
 	import auth from 'common/js/auth.js';
-	import { themeConfig } from 'common/js/config-external.js'
 	import configExternal from 'common/js/config-external.js'
+	
 	import {
 		Weixin
 	} from 'common/js/wx-jssdk.js';
@@ -10,10 +10,8 @@
 		mixins: [auth],
 		onLaunch: function(options) {
 			// 方式：支持快应用，从url中query部分获取uniacid，或useragent中获取uniacid
-			// console.log(options.query.uniacid)
 			if(options.query.uniacid){
 				uni.setStorageSync('uniacid', options.query.uniacid);
-				console.log(uni.getStorageSync('uniacid'))
 			}
 			uni.hideTabBar();
 
@@ -64,6 +62,7 @@
 			// 主题风格
 			if (uni.getStorageSync('themeStyle')) {
 				this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle')));
+				this.$store.dispatch('themeColorSet');
 			}
 
 			// 插件是否存在

common/css/mp_html_patch.scss

@@ -0,0 +1,4 @@
+// 修复图片垂直对齐问题，解决两张图片上下有空白缝隙问题
+/deep/ ._img {
+    vertical-align: top;
+}

common/js/config-external.js

@@ -110,7 +110,8 @@ class ConfigExternal {
 
     try {
       // 动态加载主题配置
-      const themeData = require(`@/common/js/style_color.js`)[theme];
+      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) {

common/js/config.js

@@ -61,8 +61,15 @@ try {
 
 const { uniacid = 0, domain = defaultDomain } = localDevConfig ?? { uniacid: 0, domain: defaultDomain }
 
-// 调试版本，配置说明
-const devCfg = {
+export default {
+    /**
+     * 1.开发调试模式
+     * 去掉注释 ...defaultCfg;
+     * 注释掉 ...releaseCfg,
+     * 2.发行/发布模式，例如通过`HBuilder>发行>小程序微信`的时候，原理是：
+     * 然后将 `import site from "../site.js";`追加到   `unpackage\dist\build\mp-weixin\common\vendor.js` 文件内容开头部分
+     * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
+     */
     // 商户ID
     uniacid: uniacid, //825
 
@@ -92,31 +99,20 @@ const devCfg = {
 
     // // H5端域名
     // h5Domain: 'http://saas.cn/',
-};
 
-var config = {
-    /**
-     * 1.开发调试模式
-     * 去掉注释 ...devCfg;
-     * 注释掉 ...releaseCfg,
-     * 2.发行/发布模式，例如通过`HBuilder>发行>小程序微信`的时候，原理是：
-     * 然后将 `import site from "../site.js";`追加到   `unpackage\dist\build\mp-weixin\common\vendor.js` 文件内容开头部分
-     * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
-     */
-    ...(releaseCfg ?? devCfg),
+    // 发行版本配置
+    ...(releaseCfg || {}),
 
 
     // 腾讯地图key 
     mpKey: 'TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4',
 
-    //客服地址
+    // 客服地址
     webSocket: '{{$webSocket}}',
 
-    //本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
+    // 本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
     pingInterval: 1500,
 
     // 版本号 
     version: '1.0'
-};
-
-export default config;
+};

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) {
 

common/js/http.js

@@ -49,7 +49,7 @@ export default {
 		}
 
 		var method = params.data != undefined ? 'POST' : 'GET', // 请求方式
-			url = Config.baseUrl + params.url, // 请求路径
+			url = (Config.baseUrl + params.url).replace(/(?<!:)\/+/g, '/'), // 请求路径
 			data = {
 				app_type,
 				app_type_name

common/js/lang.js

@@ -72,6 +72,7 @@ export default {
 			//当前页面语言包（同步加载）
 			let route = _this.route;
 			let langPath = processRoutePath(route);
+			// console.log(`当前页面语言包路径: ${langPath}`);
 			
 			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);

components-diy/diy-bottom-nav.vue

@@ -149,11 +149,22 @@ export default {
 				return true;
 			}
 
+			// console.log('diy-bottom-nav verify:', { likkUrl: adaptSubpackageUrl(linkUrl), currentPageRoute: currentPageRoute});
+
 			// 精确匹配当前路径
 			if (adaptSubpackageUrl(linkUrl) === currentPageRoute) {
 				return true;
 			}
 
+			// 同属于一个子包的路径，也认为是匹配的
+			try {
+				if (adaptSubpackageUrl(linkUrl).split('/')[1] === currentPageRoute.split('/')[1]) {
+					return true;
+				}
+			} catch (error) {
+				console.error('diy-bottom-nav verify error:', error);
+			}
+
 			return false;
 		}
 	}

components-diy/diy-category-item.vue

@@ -100,7 +100,7 @@
 													parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 											</block>
 											<block v-else>
-												<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
+												<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询价' }}</text>
 											</block>
 										</view>
 										<view class="member-price-tag"
@@ -192,7 +192,7 @@
 											parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 									</block>
 									<block v-else>
-										<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
+										<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询价' }}</text>
 									</block>
 
 								</view>

components-diy/diy-category.vue

@@ -610,10 +610,10 @@ export default {
 	view {
 		color: #222222;
 		width: 100%;
-		white-space: nowrap;
-		text-overflow: ellipsis;
+		white-space: break-word;
 		overflow: hidden;
 		text-align: center;
+		font-size: 10px;
 	}
 
 	&.border-top {
@@ -630,6 +630,7 @@ export default {
 		view {
 			color: #333;
 			font-weight: bold;
+			font-size: $font-size-base;
 		}
 
 		&::before {

docs/H5_ROUTER_FIX_README.md

@@ -0,0 +1,32 @@
+# H5路由模式修复说明
+
+## 问题描述
+生产环境下，导航到子页面（如 `/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`）后刷新页面，会导致页面空白，显示 `<html><head></head><body></body></html>`。
+
+## 根本原因
+1. 应用使用了H5的`history`路由模式
+2. 生产服务器没有配置路由回退机制
+3. 刷新时，浏览器直接向服务器请求完整URL路径，服务器无法找到对应的资源，返回空HTML
+
+## 解决方案
+将H5路由模式从`history`改为`hash`模式。Hash模式下，所有路由请求都会指向应用根路径，避免服务器配置问题。
+
+## 修改内容
+修改 `manifest.json` 文件中的H5路由配置：
+
+```json
+"h5": {
+    "router": {
+        "mode": "hash",  // 从 "history" 改为 "hash"
+        "base": "/hwappx/test/"
+    }
+}
+```
+
+## 预期效果
+- 子页面刷新后不再空白
+- URL格式变为 `http://domain/hwappx/test/#/pages_tool/form/formdata?id=73&uniacid=2793`
+- 无需修改服务器配置
+
+## 构建部署
+修改后，需要重新构建H5版本并部署到生产环境。可以通过HBuilderX或其他uni-app构建工具进行构建。

docs/HISTORY_MODE_SUB_DIR_DEPLOY.md

@@ -0,0 +1,756 @@
+# H5 History模式子目录部署配置指南
+
+## 场景说明
+您的uni-app H5应用部署在现有网站的子目录 `/hwappx/test/` 下，需要使用`history`路由模式，并解决刷新页面空白的问题。
+
+## 配置步骤
+
+### 1. 应用配置（已完成）
+确保`manifest.json`中的H5路由配置正确设置了`base`路径：
+
+```json
+"h5": {
+    "router": {
+        "mode": "history",
+        "base": "/hwappx/test/"
+    }
+}
+```
+
+### 2. 服务器配置
+服务器需要配置路由回退，将所有指向`/hwappx/test/`下不存在文件的请求重定向到`/hwappx/test/index.html`。
+
+#### 2.1 Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    
+    # 主网站根目录
+    root /path/to/main/website;
+    index index.html;
+    
+    # 静态文件直接返回
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+    
+    # H5应用子目录的路由回退配置
+    location /hwappx/test/ {
+        # 确保静态文件能被正确访问
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+    
+    # 主网站的其他配置
+    location / {
+        # 主网站的原有配置
+    }
+}
+```
+
+#### 2.2 Apache配置
+
+##### .htaccess文件配置（放在`/hwappx/test/`目录下）
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+##### 虚拟主机配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+    
+    # H5应用子目录配置
+    <Directory /path/to/main/website/hwappx/test>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+    
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 2.3 IIS配置
+在`/hwappx/test/`目录下创建`web.config`文件：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode Sub Directory">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+  </system.webServer>
+</configuration>
+```
+
+#### 2.4 Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// H5应用静态文件和路由回退
+app.use('/hwappx/test', express.static(path.join(__dirname, 'h5-app')));
+
+app.get('/hwappx/test/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+## 配置关键点
+
+1. **base路径一致性**：
+   - `manifest.json`中的`base`配置必须与部署路径一致：`/hwappx/test/`
+   - 服务器配置中的重定向路径必须包含完整的base路径
+
+2. **静态资源处理**：
+   - 确保CSS、JS、图片等静态资源能够被正确访问
+   - 静态资源的URL应该自动包含base路径
+
+3. **路由回退规则**：
+   - 规则必须限定在`/hwappx/test/`路径下
+   - 只重定向不存在的文件和目录请求
+
+## 验证方法
+
+1. 构建H5应用并部署到服务器的`/hwappx/test/`目录
+2. 访问应用首页：`http://yourdomain.com/hwappx/test/`
+3. 导航到子页面：`http://yourdomain.com/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`
+4. 刷新页面，验证页面是否正常显示
+
+## 常见问题排查
+
+1. **404错误**：
+   - 检查服务器配置中的重定向路径是否正确
+   - 确保`base`路径配置一致
+
+2. **页面样式缺失**：
+   - 检查静态资源URL是否包含了正确的base路径
+   - 确认CSS文件路径是否正确
+
+3. **路由无法跳转**：
+   - 检查`manifest.json`中的路由配置
+   - 确认服务器重定向规则是否生效
+
+## 部署注意事项
+
+1. 配置完成后需要重启服务器
+2. 对于HTTPS站点，需要在对应的HTTPS配置中添加相同的规则
+3. 如果使用CDN，需要确保CDN也配置了相应的路由回退规则
+4. 定期检查服务器日志，确保配置正常工作
+
+## 总结
+通过正确配置应用的`base`路径和服务器的路由回退规则，您的uni-app H5应用可以在子目录`/hwappx/test/`下成功使用`history`路由模式，并且解决刷新页面空白的问题。
+
+---
+
+## 多子目录部署支持
+
+### 场景说明
+如果您需要在同一服务器上部署多个使用`history`模式的uni-app H5应用，例如：
+- `/hwapp/`
+- `/hwappx/test/`
+- `/hwappx/comoon/`
+- `/hwappx/1000/`
+
+您可以按照以下配置方法实现多子目录部署。
+
+### 1. 每个应用的manifest.json配置
+每个应用都需要在`manifest.json`中配置正确的`base`路径：
+
+#### 应用1：部署到 `/hwapp/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwapp/"
+  }
+}
+```
+
+#### 应用2：部署到 `/hwappx/test/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/test/"
+  }
+}
+```
+
+#### 应用3：部署到 `/hwappx/comoon/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/comoon/"
+  }
+}
+```
+
+#### 应用4：部署到 `/hwappx/1000/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/1000/"
+  }
+}
+```
+
+### 2. 服务器多子目录配置
+
+#### 2.1 Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    root /path/to/main/website;
+    index index.html;
+
+    # 静态文件缓存设置
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+
+    # 应用1: /hwapp/
+    location /hwapp/ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    # 应用2: /hwappx/test/
+    location /hwappx/test/ {
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+
+    # 应用3: /hwappx/comoon/
+    location /hwappx/comoon/ {
+        try_files $uri $uri/ /hwappx/comoon/index.html;
+    }
+
+    # 应用4: /hwappx/1000/
+    location /hwappx/1000/ {
+        try_files $uri $uri/ /hwappx/1000/index.html;
+    }
+
+    # 主网站其他配置
+    location / {
+        # 原有主网站配置
+    }
+}
+```
+
+#### 2.2 Apache配置
+
+##### 方法1：在每个子目录下创建.htaccess文件
+
+在`/hwapp/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwapp/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwapp/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/test/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/comoon/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/comoon/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/comoon/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/1000/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/1000/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/1000/index.html [L]
+</IfModule>
+```
+
+##### 方法2：在主配置文件中统一配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+
+    # 应用1: /hwapp/
+    <Directory /path/to/main/website/hwapp>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwapp/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwapp/index.html [L]
+    </Directory>
+
+    # 应用2: /hwappx/test/
+    <Directory /path/to/main/website/hwappx/test>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+
+    # 应用3: /hwappx/comoon/
+    <Directory /path/to/main/website/hwappx/comoon>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/comoon/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/comoon/index.html [L]
+    </Directory>
+
+    # 应用4: /hwappx/1000/
+    <Directory /path/to/main/website/hwappx/1000>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/1000/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/1000/index.html [L]
+    </Directory>
+
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 2.3 IIS配置
+
+在每个子目录下创建`web.config`文件：
+
+##### 应用1：/hwapp/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwapp">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwapp/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用2：/hwappx/test/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/test">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用3：/hwappx/comoon/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/comoon">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/comoon/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用4：/hwappx/1000/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/1000">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/1000/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+#### 2.4 Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// 应用1: /hwapp/
+app.use('/hwapp', express.static(path.join(__dirname, 'h5-app1')));
+app.get('/hwapp/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app1', 'index.html'));
+});
+
+// 应用2: /hwappx/test/
+app.use('/hwappx/test', express.static(path.join(__dirname, 'h5-app2')));
+app.get('/hwappx/test/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app2', 'index.html'));
+});
+
+// 应用3: /hwappx/comoon/
+app.use('/hwappx/comoon', express.static(path.join(__dirname, 'h5-app3')));
+app.get('/hwappx/comoon/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app3', 'index.html'));
+});
+
+// 应用4: /hwappx/1000/
+app.use('/hwappx/1000', express.static(path.join(__dirname, 'h5-app4')));
+app.get('/hwappx/1000/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app4', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 3. 多子目录部署验证
+
+对于每个应用，执行以下验证步骤：
+
+1. 构建应用并部署到对应的子目录
+2. 访问应用首页，例如：`http://yourdomain.com/hwappx/test/`
+3. 导航到子页面，例如：`http://yourdomain.com/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`
+4. 刷新页面，验证页面是否正常显示
+5. 直接访问子页面URL，验证是否能正常加载
+
+### 4. 多子目录部署注意事项
+
+1. **路径隔离**：每个应用必须部署在独立的子目录下，避免文件和路由冲突
+2. **base一致性**：每个应用的`manifest.json`中的`base`配置必须与部署路径完全一致
+3. **服务器规则**：每个子目录都需要独立的路由回退规则
+4. **静态资源**：确保每个应用的静态资源URL包含了正确的base路径
+5. **缓存设置**：可以为不同应用设置不同的缓存策略
+6. **日志分离**：建议为不同应用配置独立的访问日志，便于问题排查
+
+### 5. 常见问题排查
+
+1. **应用间冲突**：
+   - 确保每个应用使用独立的子目录
+   - 检查`base`路径配置是否唯一
+
+2. **路由混乱**：
+   - 验证服务器配置中的重定向路径是否正确
+   - 检查应用的路由配置是否与其他应用冲突
+
+3. **静态资源404**：
+   - 确认静态资源URL是否包含了正确的base路径
+   - 检查服务器配置是否正确处理了静态资源请求
+
+4. **配置不生效**：
+   - 配置完成后重启服务器
+   - 清除浏览器缓存后重试
+
+通过以上配置，您可以在同一服务器上成功部署多个使用`history`模式的uni-app H5应用，每个应用都能独立运行并支持刷新操作。
+
+---
+
+## 通配符配置方案
+
+### 场景说明
+如果您的子目录有明确的命名规则（如您的`/hwapp/`、`/hwappx/test/`、`/hwappx/comoon/`、`/hwappx/1000/`等），可以使用通配符配置来简化服务器设置，避免为每个子目录手动添加配置。
+
+### 子目录规则分析
+根据您的子目录结构，可以分为两类：
+1. 一级子目录：`/hwapp/`
+2. `/hwappx/`下的所有二级子目录：`/hwappx/*/`
+
+### 服务器通配符配置
+
+#### 1. Nginx配置
+使用正则表达式location来匹配子目录模式：
+
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    root /path/to/main/website;
+    index index.html;
+
+    # 静态文件缓存设置
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+
+    # 匹配 /hwapp/ 一级子目录
+    location = /hwapp/ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    location ~ ^/hwapp/(.*)$ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    # 匹配 /hwappx/ 下的所有二级子目录，如 /hwappx/test/、/hwappx/comoon/、/hwappx/1000/ 等
+    location ~ ^/hwappx/([^/]+)/(.*)$ {
+        # 提取子目录名，重定向到对应目录的index.html
+        try_files $uri $uri/ /hwappx/$1/index.html;
+    }
+
+    # 主网站其他配置
+    location / {
+        # 原有主网站配置
+    }
+}
+```
+
+#### 2. Apache配置
+
+##### 方法1：使用RewriteRule的正则表达式
+
+在主网站根目录的`.htaccess`文件中添加：
+
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  
+  # 匹配 /hwapp/ 一级子目录
+  RewriteRule ^hwapp/(.*)$ /hwapp/index.html [L]
+  
+  # 匹配 /hwappx/ 下的所有二级子目录
+  RewriteRule ^hwappx/([^/]+)/(.*)$ /hwappx/$1/index.html [L]
+</IfModule>
+```
+
+##### 方法2：在虚拟主机配置中使用
+
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+
+    RewriteEngine On
+    
+    # 匹配 /hwapp/ 一级子目录
+    RewriteRule ^/hwapp/(.*)$ /hwapp/index.html [L]
+    
+    # 匹配 /hwappx/ 下的所有二级子目录
+    RewriteRule ^/hwappx/([^/]+)/(.*)$ /hwappx/$1/index.html [L]
+
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 3. IIS配置
+
+在主网站根目录的`web.config`文件中添加：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <!-- 匹配 /hwapp/ 一级子目录 -->
+        <rule name="History Mode hwapp Wildcard" stopProcessing="true">
+          <match url="^hwapp/.*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwapp/index.html" />
+        </rule>
+        
+        <!-- 匹配 /hwappx/ 下的所有二级子目录 -->
+        <rule name="History Mode hwappx Wildcard" stopProcessing="true">
+          <match url="^hwappx/([^/]+)/.*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/{R:1}/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+#### 4. Express.js配置
+
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// 匹配 /hwapp/ 一级子目录
+app.use('/hwapp', express.static(path.join(__dirname, 'hwapp')));
+app.get('/hwapp/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'hwapp', 'index.html'));
+});
+
+// 匹配 /hwappx/ 下的所有二级子目录
+// 使用路由参数来捕获子目录名
+app.get('/hwappx/:subdir/*', (req, res) => {
+    const subdir = req.params.subdir;
+    const appPath = path.join(__dirname, `hwappx/${subdir}`);
+    
+    // 检查应用目录是否存在
+    const fs = require('fs');
+    if (fs.existsSync(appPath)) {
+        res.sendFile(path.join(appPath, 'index.html'));
+    } else {
+        res.status(404).send('Application not found');
+    }
+});
+
+// 为 /hwappx/ 下的每个子目录提供静态文件服务
+app.use('/hwappx', express.static(path.join(__dirname, 'hwappx')));
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 通配符配置优势
+
+1. **减少配置量**：无需为每个新子目录手动添加配置
+2. **自动适应**：新添加的符合规则的子目录会自动应用路由回退
+3. **统一管理**：所有同类应用的配置集中管理，便于维护
+4. **规则灵活**：可以根据实际需要调整正则表达式匹配规则
+
+### 通配符配置注意事项
+
+1. **规则顺序**：确保更具体的规则优先于通配符规则
+2. **性能考虑**：过于复杂的正则表达式可能影响服务器性能
+3. **目录验证**：在Express.js等代码级配置中，建议添加目录存在性检查
+4. **冲突避免**：确保通配符规则不会与主网站或其他应用的路由冲突
+5. **测试充分**：配置后要充分测试各种子目录的访问情况
+
+### 验证方法
+
+1. 部署一个符合规则的新子目录应用，如 `/hwappx/newapp/`
+2. 访问应用首页：`http://yourdomain.com/hwappx/newapp/`
+3. 导航到子页面并刷新，验证是否正常显示
+4. 直接访问子页面URL，验证是否能正常加载
+
+通过以上通配符配置，您可以轻松管理大量符合规则的子目录应用，避免重复配置工作。

docs/SERVER_ROUTER_FALLBACK_CONFIG.md

@@ -0,0 +1,140 @@
+# H5 History模式服务器路由回退配置指南
+
+## 配置原理
+当使用H5的`history`路由模式时，所有直接访问的URL（如刷新页面）都会发送到服务器。服务器需要配置路由回退，将所有匹配不到实际文件的请求重定向到应用的`index.html`，让客户端路由处理URL。
+
+## 服务器配置示例
+
+### 1. Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    
+    root /path/to/your/h5/dist;
+    index index.html;
+    
+    # 静态文件直接返回
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+    
+    # 所有其他请求重定向到index.html
+    location / {
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+}
+```
+
+### 2. Apache配置
+需要确保启用了`mod_rewrite`模块
+
+#### .htaccess文件配置
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+#### 虚拟主机配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/your/h5/dist
+    
+    <Directory /path/to/your/h5/dist>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+</VirtualHost>
+```
+
+### 3. Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 静态文件服务
+app.use('/hwappx/test/', express.static(path.join(__dirname, 'dist')));
+
+// 路由回退
+app.get('*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'dist', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 4. IIS配置
+需要安装URL重写模块（URL Rewrite Module）
+
+#### web.config文件配置
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Handle History Mode and custom 404/500" stopProcessing="true">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+      <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
+    </staticContent>
+  </system.webServer>
+</configuration>
+```
+
+## 配置要点
+
+1. **base路径设置**：确保服务器配置中的路径与`manifest.json`中的`base`配置一致
+   ```json
+   "h5": {
+       "router": {
+           "mode": "history",
+           "base": "/hwappx/test/"
+       }
+   }
+   ```
+
+2. **静态资源处理**：确保图片、CSS、JS等静态文件能够被正确访问
+
+3. **缓存策略**：为静态文件设置合理的缓存过期时间
+
+## 验证配置
+
+1. 部署配置后的应用到服务器
+2. 访问应用首页
+3. 导航到子页面（如`/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`）
+4. 刷新页面，验证页面是否正常显示
+
+## 注意事项
+
+- 配置完成后需要重启服务器生效
+- 确保服务器有权限读取配置文件
+- 对于HTTPS站点，需要在对应的HTTPS配置中添加相同的路由回退规则
+- 如果使用CDN，需要确保CDN也配置了相应的路由回退规则

lang/zh-cn/agreement/contenr.js

@@ -0,0 +1 @@
+export const lang = {}

lang/zh-cn/goods/category.js

@@ -1,6 +1,7 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '商品分类',
-	search:'商品搜索',
-	seeMore : '查看更多'
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '商品分类',
+	search:'商品搜索',
+	seeMore : '查看更多',
+	Make: "询价"
+}

lang/zh-cn/goods/detail.js

@@ -2,7 +2,7 @@ export const lang = {
 	//title为每个页面的标题
 	title: '',
 	select: '选择',
-	details:'商品详情',
+	details:'资源详情',
 	params: '参数',
 	service: '商品服务',
 	allGoods: '全部商品',
@@ -11,7 +11,7 @@ export const lang = {
 	home:'首页',
 	cart:'购物车',
 	leave:'立即留言',
-	make:'立即咨询',
+	make:'电话询价',
 	
 	send:'配送',
 	express:'快递发货',
@@ -22,7 +22,7 @@ export const lang = {
 	status:'该商品已下架',
 	sellout:'库存不足',
 	max:'已达最大限购数量',
-	makebtn:'咨询',
+	makebtn:'询价',
 	sales:'销量',
 	stock:'库存',
 	kefu:'客服',

lang/zh-cn/goods/list.js

@@ -1,11 +1,11 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '商品列表',
-	Random:'综合',
-	Sales:'销量',
-	Price:'价格',
-	Filter:'筛选',
-	Search:'请输入您要搜索的商品',
-	Make:'咨询',
-	
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '商品列表',
+	Random:'综合',
+	Sales:'销量',
+	Price:'价格',
+	Filter:'筛选',
+	Search:'请输入您要搜索的商品',
+	Make:'立即询价',
+	
+}

lang/zh-cn/member/index.js

@@ -11,6 +11,9 @@ export const lang = {
 	readyDelivery: '待发货',
 	waitDelivery: '待收货',
 	refunding: '退款',
+	getDynacode: '获取动态验证码',
+
+
 	// 会员中心入口
 	sign: '签到',
 	personInfo: '个人资料',

manifest.json

@@ -100,9 +100,9 @@
         },
         "router" : {
             "mode" : "history",
-            "base" : "/hwapp/"
+            "base" : "/hwappx/2724/"
         },
-        "title" : " ",
+        "title" : "",
         "devServer" : {
             "https" : false
         },

pages.json

@@ -43,7 +43,7 @@
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "商品详情"
+						"navigationBarTitleText": "资源详情"
 					}
 				},
 				{
@@ -855,6 +855,14 @@
 						// #endif
 					}
 				},
+				{
+					"path": "form/formdata",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},				
 				{
 					"path": "weapp/order_shipping",
 					"style": {

pages/empty/index.vue

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

pages/index/index.vue

@@ -1,66 +1,68 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="site-info-box"
-			v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-			<view class="site-info">
-				<view class="img-box" v-if="siteInfo.logo_square">
-					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-				</view>
-				<view class="info-box" :style="{ color: '#ffffff' }">
-					<text class="font-size-base">{{ siteInfo.site_name }}</text>
-					<text>{{ followOfficialAccount.welcomeMsg }}</text>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
+			<view class="site-info-box"
+				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+				<view class="site-info">
+					<view class="img-box" v-if="siteInfo.logo_square">
+						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+					</view>
+					<view class="info-box" :style="{ color: '#ffffff' }">
+						<text class="font-size-base">{{ siteInfo.site_name }}</text>
+						<text>{{ followOfficialAccount.welcomeMsg }}</text>
+					</view>
 				</view>
+				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
+					}}</view>
 			</view>
-			<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号' }}</view>
-		</view>
 
-		<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
 			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
 		</view> -->
 
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-			:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<template v-slot:components>
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<template v-slot:components>
+					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
+				</template>
+				<template v-slot:default>
+					<ns-copyright v-show="isShowCopyRight" />
+				</template>
+			</diy-index-page>
+
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
 				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-					:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
-			</template>
-			<template v-slot:default>
+					:followOfficialAccount="followOfficialAccount" />
 				<ns-copyright v-show="isShowCopyRight" />
-			</template>
-		</diy-index-page>
+			</view>
 
-		<view v-else class="bg-index"
-			:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-				:followOfficialAccount="followOfficialAccount" />
-			<ns-copyright v-show="isShowCopyRight" />
-		</view>
-
-		<template v-if="adv.advshow != -1">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="small-bot">
-						<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+			<template v-if="adv.advshow != -1">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="small-bot">
+							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
 							<view bindtap="adverclose">跳过</view>
 							<view class="time">{{clock}}s</view>
 						</view>
 						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
 							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
 						</view> -->
-						<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
-							indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
-							<swiper-item v-for="(item, index) in adv.list" :key="index">
-								<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
-									:src="$util.img(item.imageUrl)" width="100%"></image>
-								<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
-							</swiper-item>
-						</swiper>
-						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
-							<i class="iconfont icon-round-close" style="color:#fff"></i>
+							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
+								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+								<swiper-item v-for="(item, index) in adv.list" :key="index">
+									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
+										:src="$util.img(item.imageUrl)" width="100%"></image>
+									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
+								</swiper-item>
+							</swiper>
+							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+								<i class="iconfont icon-round-close" style="color:#fff"></i>
+							</view>
 						</view>
-					</view>
-					<!-- 	<view class="image-wrap">
+						<!-- 	<view class="image-wrap">
 						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
 							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
 								<view class="item">
@@ -70,76 +72,78 @@
 						</swiper>
 					</view>
 					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
+					</uni-popup>
+				</view>
+			</template>
+
+			<!-- 底部tabBar -->
+			<view class="page-bottom" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" :name="name" />
+			</view>
+
+			<!-- 关注公众号弹窗 -->
+			<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+				<uni-popup ref="officialAccountsPopup" type="center">
+					<view class="official-accounts-wrap">
+						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+						<text class="desc">关注了解更多</text>
+						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+					</view>
 				</uni-popup>
 			</view>
-		</template>
 
-		<!-- 底部tabBar -->
-		<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name" />
-		</view>
-
-		<!-- 关注公众号弹窗 -->
-		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-			<uni-popup ref="officialAccountsPopup" type="center">
-				<view class="official-accounts-wrap">
-					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-					<text class="desc">关注了解更多</text>
-					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
 				</view>
 			</uni-popup>
-		</view>
 
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow"
-				:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-				<text @click="closeCollectPopupWindow">我知道了</text>
-			</view>
-		</uni-popup>
-
-		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-		<view @touchmove.prevent.stop class="choose-store">
-			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-				<view class="choose-store-popup">
-					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-					<view class="position-wrap">
-						<text class="iconfont icon-dizhi"></text>
-						<text class="address">{{ currentPosition }}</text>
-						<view class="reposition" @click="reposition"
-							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-							<text class="iconfont icon-dingwei"></text>
-							<text>重新定位</text>
-						</view>
-					</view>
-					<view class="store-wrap" v-if="nearestStore">
-						<text class="tag">当前门店</text>
-						<view class="store-name">{{ nearestStore.store_name }}</view>
-						<view class="address">{{ nearestStore.show_address }}</view>
-						<view class="distance" v-if="nearestStore.distance">
+			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
+			<view @touchmove.prevent.stop class="choose-store">
+				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+					<view class="choose-store-popup">
+						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+						<view class="position-wrap">
 							<text class="iconfont icon-dizhi"></text>
-							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance *
-								1000 +
-								'm' }}</text>
+							<text class="address">{{ currentPosition }}</text>
+							<view class="reposition" @click="reposition"
+								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+								<text class="iconfont icon-dingwei"></text>
+								<text>重新定位</text>
+							</view>
+						</view>
+						<view class="store-wrap" v-if="nearestStore">
+							<text class="tag">当前门店</text>
+							<view class="store-name">{{ nearestStore.store_name }}</view>
+							<view class="address">{{ nearestStore.show_address }}</view>
+							<view class="distance" v-if="nearestStore.distance">
+								<text class="iconfont icon-dizhi"></text>
+								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
+									nearestStore.distance *
+									1000 +
+									'm' }}</text>
+							</view>
+						</view>
+						<button type="primary" @click="enterStore">确认进入</button>
+						<view class="other-store" @click="chooseOtherStore"
+							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+							<text>选择其他门店</text>
+							<text class="iconfont icon-right"></text>
 						</view>
 					</view>
-					<button type="primary" @click="enterStore">确认进入</button>
-					<view class="other-store" @click="chooseOtherStore"
-						v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-						<text>选择其他门店</text>
-						<text class="iconfont icon-right"></text>
-					</view>
-				</view>
-			</uni-popup>
+				</uni-popup>
+			</view>
+			<hover-nav></hover-nav>
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+			<ns-login ref="login"></ns-login>
 		</view>
-		<hover-nav></hover-nav>
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 

pages_goods/cart.vue

@@ -1,6 +1,5 @@
 <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">

pages_goods/category.vue

@@ -1,6 +1,5 @@
 <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'">

pages_goods/detail.vue

@@ -1,6 +1,5 @@
 <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>

pages_goods/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="content"> 
+	<view class="content" :style="themeColor"> 
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
@@ -63,7 +62,7 @@
 									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</text>
+									<text class="price price-style large">{{langstatus?$lang('Make'):'询价'}}</text>
 								</view>
 								
 								
@@ -148,7 +147,7 @@
 									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</text>
+									<text class="price price-style large">{{langstatus?$lang('Make'):'询价'}}</text>
 								</view>
 								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
@@ -271,6 +270,11 @@
 		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
 		<!-- #endif -->
+
+		<!-- 底部tabBar -->
+		<view id="tab-bar">
+			<diy-bottom-nav></diy-bottom-nav>
+		</view>		
 	</view>
 </template>
 

pages_goods/public/css/list.scss

@@ -294,6 +294,8 @@
 }
 
 .lineheight-clear {
+	display: flex;
+	justify-content: flex-end;
 }
 
 // 商品列表单列样式
@@ -386,12 +388,20 @@
 			line-height: 1;
 			margin-top: 16rpx;
 
+			background-color: var(--main-color);
+			border-radius: 35rpx;
+			padding: 12rpx 24rpx;
+			box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+
 			.unit {
 				margin-right: 6rpx;
 				color: var(--price-color);
 			}
 			.price {
 				color: var(--price-color);
+				color: #fff !important;
+				font-size: 15rpx !important;
+				font-weight: bold !important;
 			}
 		}
 

pages_order/detail.vue

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

pages_order/detail_local_delivery.vue

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

pages_order/detail_pickup.vue

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

pages_order/detail_point.vue

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

pages_order/list.vue

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

pages_order/payment.vue

@@ -1,6 +1,5 @@
 <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>

pages_promotion/fenxiao/apply.vue

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

pages_promotion/fenxiao/bill.vue

@@ -1,147 +1,146 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="bill" >
-		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8">
-			<block slot="list">
-				<view class="balances" v-if="accountList.length" v-for="item in accountList" :key="item.id">
-					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')" mode="widthFix"></image>
-					<image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image>
-					<view class="balances-info">
-						<text>{{ item.type_name }}</text>
-						<text>账单编号: {{ item.account_no }}</text>
-						<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
-					</view>
-					<view class="balances-num">
-						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money : item.money }}</text>
-					</view>
-				</view>
-				<ns-empty v-if="!accountList.length && showEmpty" text="暂无账单信息" :isIndex="false"></ns-empty>
-			</block>
-			<loading-cover ref="loadingCover"></loading-cover>
-		</mescroll-uni>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			accountList: {},
-			showEmpty: true
-		};
-	},
-	onShow() {
-		setTimeout( () => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		},1000);
-	},
-	methods: {
-		getData(mescroll) {
-			if (mescroll.num == 1) {
-				this.accountList = [];
-			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/account/page',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size
-				},
-				success: res => {
-					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.accountList = []; //如果是第一页需手动制空列表
-					this.accountList = this.accountList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					this.showEmpty = true;
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-/deep/ .empty {
-	margin-top: 0 !important;
-}
-
-/deep/ .member-point .mescroll-uni-content {
-	overflow: hidden;
-}
-
-.balances {
-	width: calc(100% - 60rpx);
-	border-radius: 10rpx;
-	margin: 0 auto;
-	padding: 27rpx 27rpx;
-	box-sizing: border-box;
-	display: flex;
-	align-items: flex-start;
-	background: #fff;
-	margin-bottom: 18rpx;
-	margin-top: 18rpx;
-
-	image {
-		width: 54rpx;
-		height: 54rpx;
-		border-radius: 50%;
-	}
-
-	.balances-info {
-		flex: 1;
-		margin-left: 16rpx;
-		display: flex;
-		flex-direction: column;
-
-		text {
-			line-height: 1;
-
-			&:last-child {
-				font-size: $font-size-base;
-			}
-
-			&:nth-child(2) {
-				margin-top: 18rpx;
-				font-size: $font-size-tag;
-				color: $color-tip;
-			}
-
-			&:nth-child(3) {
-				font-size: $font-size-tag;
-				margin-top: 19rpx;
-				color: $color-tip;
-			}
-		}
-	}
-
-	.balances-num {
-		text {
-			line-height: 1;
-			font-size: $font-size-toolbar;
-			color: #000;
-		}
-	}
-}
-</style>
+<template>
+	<view class="bill" :style="themeColor">
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8">
+			<block slot="list">
+				<view class="balances" v-if="accountList.length" v-for="item in accountList" :key="item.id">
+					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')" mode="widthFix"></image>
+					<image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image>
+					<view class="balances-info">
+						<text>{{ item.type_name }}</text>
+						<text>账单编号: {{ item.account_no }}</text>
+						<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
+					</view>
+					<view class="balances-num">
+						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money : item.money }}</text>
+					</view>
+				</view>
+				<ns-empty v-if="!accountList.length && showEmpty" text="暂无账单信息" :isIndex="false"></ns-empty>
+			</block>
+			<loading-cover ref="loadingCover"></loading-cover>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			accountList: {},
+			showEmpty: true
+		};
+	},
+	onShow() {
+		setTimeout( () => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		},1000);
+	},
+	methods: {
+		getData(mescroll) {
+			if (mescroll.num == 1) {
+				this.accountList = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/account/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size
+				},
+				success: res => {
+					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.accountList = []; //如果是第一页需手动制空列表
+					this.accountList = this.accountList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					this.showEmpty = true;
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+/deep/ .empty {
+	margin-top: 0 !important;
+}
+
+/deep/ .member-point .mescroll-uni-content {
+	overflow: hidden;
+}
+
+.balances {
+	width: calc(100% - 60rpx);
+	border-radius: 10rpx;
+	margin: 0 auto;
+	padding: 27rpx 27rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: flex-start;
+	background: #fff;
+	margin-bottom: 18rpx;
+	margin-top: 18rpx;
+
+	image {
+		width: 54rpx;
+		height: 54rpx;
+		border-radius: 50%;
+	}
+
+	.balances-info {
+		flex: 1;
+		margin-left: 16rpx;
+		display: flex;
+		flex-direction: column;
+
+		text {
+			line-height: 1;
+
+			&:last-child {
+				font-size: $font-size-base;
+			}
+
+			&:nth-child(2) {
+				margin-top: 18rpx;
+				font-size: $font-size-tag;
+				color: $color-tip;
+			}
+
+			&:nth-child(3) {
+				font-size: $font-size-tag;
+				margin-top: 19rpx;
+				color: $color-tip;
+			}
+		}
+	}
+
+	.balances-num {
+		text {
+			line-height: 1;
+			font-size: $font-size-toolbar;
+			color: #000;
+		}
+	}
+}
+</style>

pages_promotion/fenxiao/child_fenxiao.vue

@@ -1,289 +1,288 @@
-<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>
+<template>
+	<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>

pages_promotion/fenxiao/goods_list.vue

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

pages_promotion/fenxiao/level.vue

@@ -1,320 +1,319 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="container">
-		<view class="level-top">
-			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
-		</view>
-
-		<swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx" @change="swiperChange" :current="curr">
-			<swiper-item v-for="(item, index) in levelList" :key="index">
-				<view class="level-item" :class="{'curr': index == curr}">
-					<view class="level-wrap">
-						<view class="member-info">
-							<view class="head-img">
-								<image :src="fenxiaoInfo.headimg ? $util.img(fenxiaoInfo.headimg) : $util.getDefaultImage().head" @error="fenxiaoInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
-							</view>
-							<view class="nickname">{{ fenxiaoInfo.nickname }}</view>
-							<view class="level-name">{{ item.level_name }}</view>
-						</view>
-						<view class="level-rate">
-							<view class="rate-item" v-if="config.level > 0">
-								<view class="title">一级分佣比率</view>
-								<view class="rate">{{ item.one_rate }}<text class="percentage">%</text></view>
-							</view>
-							<view class="rate-item" v-if="config.level > 1">
-								<view class="title">二级分佣比率</view>
-								<view class="rate">{{ item.two_rate }}<text class="percentage">%</text></view>
-							</view>
-							<view class="rate-item" v-if="config.level > 2">
-								<view class="title">三级分佣比率</view>
-								<view class="rate">{{ item.three_rate }}<text class="percentage">%</text></view>
-							</view>
-						</view>
-
-						<view class="not-unlocked" v-if="item.level_num > fenxiaoInfo.level_num">
-							<text class="iconfont icon-suoding"></text>
-						</view>
-					</view>
-				</view>
-			</swiper-item>
-		</swiper>
-
-		<view class="level-condition" v-if="levelInfo">
-			<view class="condition-title">
-				<view class="title">快速升级技巧</view>
-				<view class="rate price-font">
-					<text class="complete">{{ levelInfo.complete > levelInfo.task_num ? levelInfo.task_num : levelInfo.complete }}</text>
-					<text class="num">/{{ levelInfo.task_num }}</text>
-				</view>
-			</view>
-			<view class="task">
-				<view class="task-item" v-for="(item, index) in levelInfo.task" :key="index">
-					<view class="flex-box">
-						<view class="title">
-							{{item.title}}
-							<text class="iconfont icon-wenxiao" @click="openTips(item)"></text>
-						</view>
-						<view class="status" :class="{'complete': item.progress == 100}">
-							{{ item.progress == 100 ? '已完成' : '未完成' }}</view>
-					</view>
-					<view class="progress">
-						<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
-					</view>
-					<view class="flex-box">
-						<view class="desc">{{item.desc}}</view>
-						<view class="rate price-font">
-							<text class="complete">{{ item.value }}</text>
-							<text class="num">/{{ item.condition }}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<uni-popup type="bottom" ref="tips">
-			<view class="popup">
-				<view class="popup-header">
-					<text class="tit">提示</text>
-					<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
-				</view>
-				<view class="popup-body">
-					<view>{{ tips }}</view>
-					<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? '满足任意一条件即可升级' : '满足全部条件才能进行升级' }}</view>
-				</view>
-			</view>
-		</uni-popup>
-
-		<ns-goods-recommend route="fenxiao_level"></ns-goods-recommend>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-	import fenxiaoWords from 'common/js/fenxiao-words.js';
-	export default {
-		data() {
-			return {
-				fenxiaoInfo: {
-					condition: {
-						last_level: null
-					}
-				},
-				config: {},
-				levelList: [],
-				curr: 0,
-				tips: ''
-			};
-		},
-		mixins: [fenxiaoWords],
-		computed: {
-			levelInfo() {
-				if (this.levelList.length) {
-					let level = this.levelList[this.curr];
-					level.task = [];
-					level.complete = 0;
-
-					if (level.one_fenxiao_order_num > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数达到'+ level.one_fenxiao_order_num + '单',
-							condition: level.one_fenxiao_order_num,
-							value: this.fenxiaoInfo.one_fenxiao_order_num,
-							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_fenxiao_total_order > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
-							tips: '分销商自己购买和推荐的直属会员购买的订单的总额达到'+ this.moneyFormat(level.one_fenxiao_total_order) + '元',
-							condition: this.moneyFormat(level.one_fenxiao_total_order),
-							value: this.fenxiaoInfo.one_fenxiao_total_order,
-							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order) * 100)
-								.toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_fenxiao_order_money > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费产生佣金总额满' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单佣金总额达到'+ this.moneyFormat(level.one_fenxiao_order_money) + '元',
-							condition: this.moneyFormat(level.one_fenxiao_order_money),
-							value: this.fenxiaoInfo.one_fenxiao_order_money,
-							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money) * 100)
-								.toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.order_num > 0) {
-						let task = {
-							title: '自身消费',
-							desc: '自身消费单数满' + level.order_num + '单',
-							tips: '分销商自己购买的订单次数达到'+ level.order_num + '单',
-							condition: level.order_num,
-							value: this.fenxiaoInfo.order_num,
-							progress: parseFloat(this.fenxiaoInfo.order_num) > parseFloat(level.order_num) ? 100 : (parseFloat(this.fenxiaoInfo.order_num) / parseFloat(level.order_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.order_money > 0) {
-						let task = {
-							title: '自身消费',
-							desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
-							tips: '分销商自己购买的订单总额满足'+ this.moneyFormat(level.order_money) + '元',
-							condition: this.moneyFormat(level.order_money),
-							value: this.fenxiaoInfo.order_money,
-							progress: parseFloat(this.fenxiaoInfo.order_money) > parseFloat(level.order_money) ? 100 : (parseFloat(this.fenxiaoInfo.order_money) / parseFloat(level.order_money) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_child_num > 0) {
-						let task = {
-							title: '邀请好友',
-							desc: '邀请好友人数达到' + level.one_child_num + '人',
-							tips: '分销商的直属下级会员人数达到'+level.one_child_num+'人（包含已经申请成为分销商的）',
-							condition: level.one_child_num,
-							value: this.fenxiaoInfo.one_child_num,
-							progress: parseFloat(this.fenxiaoInfo.one_child_num) > parseFloat(level.one_child_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_num) / parseFloat(level.one_child_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_child_fenxiao_num > 0) {
-						let task = {
-							title: '邀请好友',
-							desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
-							tips: '分销商的直属下级分销商人数达到'+ level.one_child_fenxiao_num + '人',
-							condition: level.one_child_fenxiao_num,
-							value: this.fenxiaoInfo.one_child_fenxiao_num,
-							progress: parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
-					return level;
-				}
-			}
-		},
-		onLoad() {},
-		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.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '等级');
-
-			if (this.storeToken) {
-				this.getFenxiaoInfo();
-				this.getBasicsConfig();
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages_promotion/fenxiao/level'
-				});
-			}
-		},
-		methods: {
-			/**
-			 * 获取分销等级信息
-			 */
-			getFenxiaoLevel() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/Level/lists',
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.levelList = res.data;
-							this.levelList.forEach((item, index) => {
-								if (item.level_id == this.fenxiaoInfo.level_id) this.curr = index;
-							})
-						}
-					}
-				});
-			},
-			/**
-			 * 获取分销商信息
-			 */
-			getFenxiaoInfo() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/detail',
-					success: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						if (res.code >= 0 && res.data) {
-							this.fenxiaoInfo = res.data;
-							this.curr = this.fenxiaoInfo.level_num;
-							this.getFenxiaoLevel();
-						} else {
-							this.$util.redirectTo('/pages_promotion/fenxiao/apply');
-						}
-					},
-					fail: () => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			/**
-			 * 获取分销基本配置
-			 */
-			getBasicsConfig() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/config/basics',
-					success: res => {
-						if (res.code >= 0) {
-							this.config = res.data;
-						}
-					}
-				});
-			},
-			swiperChange(e) {
-				this.curr = e.detail.current;
-			},
-			moneyFormat(money) {
-				if (isNaN(parseFloat(money))) return money;
-				return parseFloat(money).toFixed(2);
-			},
-			openTips(data) {
-				this.tips = data.tips;
-				this.$refs.tips.open();
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	@import './public/css/level.scss';
-</style>
-<style scoped lang="scss">
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none;
-		max-height: unset !important;
-		overflow-y: hidden !important;
-	}
-
-	/deep/ .uni-popup__wrapper {
-		border-radius: 20rpx 20rpx 0 0;
-	}
-
-	/deep/ .uni-popup {
-		z-index: 8;
-	}
-
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+<template>
+	<view class="container" :style="themeColor">
+		<view class="level-top">
+			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
+		</view>
+
+		<swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx" @change="swiperChange" :current="curr">
+			<swiper-item v-for="(item, index) in levelList" :key="index">
+				<view class="level-item" :class="{'curr': index == curr}">
+					<view class="level-wrap">
+						<view class="member-info">
+							<view class="head-img">
+								<image :src="fenxiaoInfo.headimg ? $util.img(fenxiaoInfo.headimg) : $util.getDefaultImage().head" @error="fenxiaoInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+							</view>
+							<view class="nickname">{{ fenxiaoInfo.nickname }}</view>
+							<view class="level-name">{{ item.level_name }}</view>
+						</view>
+						<view class="level-rate">
+							<view class="rate-item" v-if="config.level > 0">
+								<view class="title">一级分佣比率</view>
+								<view class="rate">{{ item.one_rate }}<text class="percentage">%</text></view>
+							</view>
+							<view class="rate-item" v-if="config.level > 1">
+								<view class="title">二级分佣比率</view>
+								<view class="rate">{{ item.two_rate }}<text class="percentage">%</text></view>
+							</view>
+							<view class="rate-item" v-if="config.level > 2">
+								<view class="title">三级分佣比率</view>
+								<view class="rate">{{ item.three_rate }}<text class="percentage">%</text></view>
+							</view>
+						</view>
+
+						<view class="not-unlocked" v-if="item.level_num > fenxiaoInfo.level_num">
+							<text class="iconfont icon-suoding"></text>
+						</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
+		<view class="level-condition" v-if="levelInfo">
+			<view class="condition-title">
+				<view class="title">快速升级技巧</view>
+				<view class="rate price-font">
+					<text class="complete">{{ levelInfo.complete > levelInfo.task_num ? levelInfo.task_num : levelInfo.complete }}</text>
+					<text class="num">/{{ levelInfo.task_num }}</text>
+				</view>
+			</view>
+			<view class="task">
+				<view class="task-item" v-for="(item, index) in levelInfo.task" :key="index">
+					<view class="flex-box">
+						<view class="title">
+							{{item.title}}
+							<text class="iconfont icon-wenxiao" @click="openTips(item)"></text>
+						</view>
+						<view class="status" :class="{'complete': item.progress == 100}">
+							{{ item.progress == 100 ? '已完成' : '未完成' }}</view>
+					</view>
+					<view class="progress">
+						<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
+					</view>
+					<view class="flex-box">
+						<view class="desc">{{item.desc}}</view>
+						<view class="rate price-font">
+							<text class="complete">{{ item.value }}</text>
+							<text class="num">/{{ item.condition }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<uni-popup type="bottom" ref="tips">
+			<view class="popup">
+				<view class="popup-header">
+					<text class="tit">提示</text>
+					<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
+				</view>
+				<view class="popup-body">
+					<view>{{ tips }}</view>
+					<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? '满足任意一条件即可升级' : '满足全部条件才能进行升级' }}</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<ns-goods-recommend route="fenxiao_level"></ns-goods-recommend>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import fenxiaoWords from 'common/js/fenxiao-words.js';
+	export default {
+		data() {
+			return {
+				fenxiaoInfo: {
+					condition: {
+						last_level: null
+					}
+				},
+				config: {},
+				levelList: [],
+				curr: 0,
+				tips: ''
+			};
+		},
+		mixins: [fenxiaoWords],
+		computed: {
+			levelInfo() {
+				if (this.levelList.length) {
+					let level = this.levelList[this.curr];
+					level.task = [];
+					level.complete = 0;
+
+					if (level.one_fenxiao_order_num > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
+							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数达到'+ level.one_fenxiao_order_num + '单',
+							condition: level.one_fenxiao_order_num,
+							value: this.fenxiaoInfo.one_fenxiao_order_num,
+							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_fenxiao_total_order > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
+							tips: '分销商自己购买和推荐的直属会员购买的订单的总额达到'+ this.moneyFormat(level.one_fenxiao_total_order) + '元',
+							condition: this.moneyFormat(level.one_fenxiao_total_order),
+							value: this.fenxiaoInfo.one_fenxiao_total_order,
+							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order) * 100)
+								.toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_fenxiao_order_money > 0) {
+						let task = {
+							title: '下级消费',
+							desc: '下级消费产生佣金总额满' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
+							tips: '分销商自己购买和自己推荐的直属会员购买的订单佣金总额达到'+ this.moneyFormat(level.one_fenxiao_order_money) + '元',
+							condition: this.moneyFormat(level.one_fenxiao_order_money),
+							value: this.fenxiaoInfo.one_fenxiao_order_money,
+							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money) * 100)
+								.toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.order_num > 0) {
+						let task = {
+							title: '自身消费',
+							desc: '自身消费单数满' + level.order_num + '单',
+							tips: '分销商自己购买的订单次数达到'+ level.order_num + '单',
+							condition: level.order_num,
+							value: this.fenxiaoInfo.order_num,
+							progress: parseFloat(this.fenxiaoInfo.order_num) > parseFloat(level.order_num) ? 100 : (parseFloat(this.fenxiaoInfo.order_num) / parseFloat(level.order_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.order_money > 0) {
+						let task = {
+							title: '自身消费',
+							desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
+							tips: '分销商自己购买的订单总额满足'+ this.moneyFormat(level.order_money) + '元',
+							condition: this.moneyFormat(level.order_money),
+							value: this.fenxiaoInfo.order_money,
+							progress: parseFloat(this.fenxiaoInfo.order_money) > parseFloat(level.order_money) ? 100 : (parseFloat(this.fenxiaoInfo.order_money) / parseFloat(level.order_money) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_child_num > 0) {
+						let task = {
+							title: '邀请好友',
+							desc: '邀请好友人数达到' + level.one_child_num + '人',
+							tips: '分销商的直属下级会员人数达到'+level.one_child_num+'人（包含已经申请成为分销商的）',
+							condition: level.one_child_num,
+							value: this.fenxiaoInfo.one_child_num,
+							progress: parseFloat(this.fenxiaoInfo.one_child_num) > parseFloat(level.one_child_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_num) / parseFloat(level.one_child_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					if (level.one_child_fenxiao_num > 0) {
+						let task = {
+							title: '邀请好友',
+							desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
+							tips: '分销商的直属下级分销商人数达到'+ level.one_child_fenxiao_num + '人',
+							condition: level.one_child_fenxiao_num,
+							value: this.fenxiaoInfo.one_child_fenxiao_num,
+							progress: parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num) * 100).toFixed(2)
+						}
+						if (task.progress == 100) level.complete += 1;
+						level.task.push(task);
+					}
+					level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
+					return level;
+				}
+			}
+		},
+		onLoad() {},
+		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.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '等级');
+
+			if (this.storeToken) {
+				this.getFenxiaoInfo();
+				this.getBasicsConfig();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_promotion/fenxiao/level'
+				});
+			}
+		},
+		methods: {
+			/**
+			 * 获取分销等级信息
+			 */
+			getFenxiaoLevel() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/Level/lists',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.levelList = res.data;
+							this.levelList.forEach((item, index) => {
+								if (item.level_id == this.fenxiaoInfo.level_id) this.curr = index;
+							})
+						}
+					}
+				});
+			},
+			/**
+			 * 获取分销商信息
+			 */
+			getFenxiaoInfo() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						if (res.code >= 0 && res.data) {
+							this.fenxiaoInfo = res.data;
+							this.curr = this.fenxiaoInfo.level_num;
+							this.getFenxiaoLevel();
+						} else {
+							this.$util.redirectTo('/pages_promotion/fenxiao/apply');
+						}
+					},
+					fail: () => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 获取分销基本配置
+			 */
+			getBasicsConfig() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/config/basics',
+					success: res => {
+						if (res.code >= 0) {
+							this.config = res.data;
+						}
+					}
+				});
+			},
+			swiperChange(e) {
+				this.curr = e.detail.current;
+			},
+			moneyFormat(money) {
+				if (isNaN(parseFloat(money))) return money;
+				return parseFloat(money).toFixed(2);
+			},
+			openTips(data) {
+				this.tips = data.tips;
+				this.$refs.tips.open();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/level.scss';
+</style>
+<style scoped lang="scss">
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none;
+		max-height: unset !important;
+		overflow-y: hidden !important;
+	}
+
+	/deep/ .uni-popup__wrapper {
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	/deep/ .uni-popup {
+		z-index: 8;
+	}
+
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_promotion/fenxiao/order.vue

@@ -1,203 +1,202 @@
-<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>
+<template>
+	<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>

pages_promotion/fenxiao/order_detail.vue

@@ -1,378 +1,377 @@
-<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>
+<template>
+	<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>

pages_promotion/fenxiao/promote.vue

@@ -1,363 +1,390 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="fenxiao-promote" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
-		<view class="my-earnings">
-			<view class="earnings-head-wrap">
-				<view class="earnings-head">
-					<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')" mode="aspectFit"></image>
-					<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')" mode="aspectFill"></image>
-					<view class="content">
-						累计收益
-						<text class="money-text">{{ detailData.total_commission }}</text>
-						元
-					</view>
-				</view>
-			</view>
-			<view class="earnings-body">
-				<view class="earnings-tab">
-					<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">已邀请好友</text>
-					<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">已下单好友</text>
-				</view>
-				<scroll-view scroll-y="true" class="earnings-content-wrap" @scrolltolower="getTeam()">
-					<view class="earnings-list" v-if="promote.list.length">
-						<view class="earnings-item" v-for="(item, index) in promote.list" :key="index">
-							<image
-								class="item-img"
-								:src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
-								@error="item.headimg = $util.getDefaultImage().head"
-								mode="aspectFill"
-							></image>
-							<view class="item-content">
-								<view class="item-name multi-hidden">{{ item.nickname }}</view>
-							</view>
-						</view>
-					</view>
-					<view class="earnings-empty" v-else>暂无已邀请好友，快去邀请吧</view>
-				</scroll-view>
-			</view>
-		</view>
-		<view class="activity-rules">
-			<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')" mode="aspectFit"></image>
-			<view class="content" v-if="promoteContent.content"><rich-text :nodes="promoteContent.content"></rich-text></view>
-			<view class="rules-empty" v-else>暂无活动规则</view>
-		</view>
-		<view class="active-btn"><button type="primary" @click="toPoster()">邀请好友</button></view>
-		<ns-copyright></ns-copyright>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-import htmlParser from '@/common/js/html-parser';
-export default {
-	data() {
-		return {
-			tabIndex: 0,
-			promoteContent: {},
-			promote: {
-				page: 0,
-				page_size: 5,
-				page_count: 0,
-				list: []
-			},
-			isPay: 0,
-			detailData: {},
-			templateId: '',
-			poster:'',
-		};
-	},
-	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.getTeam();
-			this.getPromoteRule();
-			this.getFenxiaoDetail();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
-			});
-		}
-	},
-	onLoad() {
-		this.getTemplateId();
-		this.getPoster();
-	},
-	methods: {
-		toPoster(){
-			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
-		},
-		tabCut(index) {
-			this.tabIndex = index;
-			this.isPay = index;
-
-			this.promote.page_count = 0;
-			this.promote.page = 0;
-			this.promote.page_size = 5;
-			this.getTeam();
-		},
-		getTeam() {
-			if (this.promote.page_count > 0 && this.promote.page == this.promote.page_count) return;
-			this.promote.page++;
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/team',
-				data: {
-					page: this.promote.page,
-					page_size: this.promote.page_size,
-					is_pay: this.isPay,
-					level: 1
-				},
-				success: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					if (res.code >= 0) {
-						if (this.promote.page == 1) this.promote.list = [];
-						this.promote.page_count = res.data.page_count;
-						this.promote.list = this.promote.list.concat(res.data.list);
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		// 获取分销商信息
-		getFenxiaoDetail() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/detail',
-				success: res => {
-					if (res.data) {
-						this.detailData = res.data;
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		// 获取富文本
-		getPromoteRule() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/config/promoterule',
-				success: res => {
-					if (res.data) {
-						this.promoteContent = res.data;
-						this.promoteContent.content = res.data.content ? htmlParser(res.data.content) : '';
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		/**
-		 * 获取分享海报
-		 */
-		getPoster() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/posterList',
-				success: res => {
-					if (res.code >= 0) {
-						this.poster = res.data.toString();
-						this.poster = encodeURIComponent(this.poster);
-					}
-				}
-			});
-		},
-		/**
-		 * 获取分享海报id
-		 */
-		getTemplateId() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/posterTemplateIds',
-				success: res => {
-					if (res.code >= 0) {
-						this.templateId = [...res.data].join();
-					}
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.fenxiao-promote {
-	overflow: hidden;
-	padding: 0 30rpx 160rpx;
-	min-height: 100vh;
-	background-color: #ff2d46;
-	background-size: 100%;
-	background-repeat: no-repeat;
-	.my-earnings,
-	.activity-rules {
-		background-color: #fff;
-		border-radius: 30rpx;
-	}
-	.my-earnings {
-		margin-top: 230rpx;
-		padding-bottom: 40rpx;
-		.earnings-head-wrap {
-			background-color: #fff7f5;
-			height: 160rpx;
-			border-radius: 30rpx;
-			border-bottom-left-radius: 0;
-			border-bottom-right-radius: 0;
-		}
-		.earnings-head {
-			position: relative;
-			padding-top: 60rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			.name {
-				position: absolute;
-				width: 384rpx;
-				height: 74rpx;
-				top: -22rpx;
-			}
-			.content {
-				font-size: $font-size-tag;
-			}
-			.money-bg {
-				width: 80rpx;
-				height: 80rpx;
-			}
-			.money-text {
-				margin: 0 6rpx;
-				font-size: 40rpx;
-				line-height: 1;
-			}
-		}
-		.earnings-body {
-			padding: 0 30rpx;
-			.earnings-tab {
-				display: flex;
-				justify-content: space-around;
-				align-items: center;
-				height: 100rpx;
-				font-size: 30rpx;
-				color: #e93224;
-				margin-bottom: 10rpx;
-				text.active {
-					position: relative;
-					font-weight: bold;
-					&::after {
-						position: absolute;
-						content: '';
-						height: 4rpx;
-						width: 86rpx;
-						left: 50%;
-						bottom: -4rpx;
-						transform: translateX(-50%);
-						background-color: #e93224;
-					}
-				}
-			}
-			.earnings-content-wrap {
-				max-height: 440rpx;
-			}
-			.earnings-item {
-				display: flex;
-				align-items: center;
-				margin-bottom: 20rpx;
-				&:last-child {
-					margin-bottom: 0;
-				}
-				.item-img {
-					width: 90rpx;
-					height: 90rpx;
-					margin-right: 20rpx;
-					flex-shrink: 0;
-				}
-				.item-time {
-					font-size: $font-size-tag;
-					color: $color-tip;
-				}
-				.item-name {
-					line-height: 1.3;
-				}
-				.money {
-					margin-left: auto;
-					color: #f9b124;
-				}
-			}
-		}
-		.earnings-empty {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			height: 160rpx;
-			font-size: 30rpx;
-		}
-	}
-	.activity-rules {
-		position: relative;
-		margin-top: 60rpx;
-		min-height: 300rpx;
-		.rules-name {
-			position: absolute;
-			width: 384rpx;
-			height: 74rpx;
-			top: -22rpx;
-			left: 50%;
-			transform: translateX(-50%);
-		}
-		.content {
-			padding: 70rpx 20rpx 0;
-		}
-		.rules-empty {
-			padding-top: 140rpx;
-			text-align: center;
-			font-size: 30rpx;
-		}
-	}
-
-	.active-btn {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		z-index: 5;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background-color: #ff2d46;
-		height: 160rpx;
-		padding: 0 60rpx;
-
-		button {
-			flex: 1;
-			margin: 0;
-			border-radius: 50rpx;
-			color: #985400;
-			background: linear-gradient(45deg, #ffe2ac 0%, #fdc174 100%);
-		}
-	}
-}
-</style>
+<template>
+	<view :style="themeColor">
+		<view class="fenxiao-promote"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+			<view class="my-earnings">
+				<view class="earnings-head-wrap">
+					<view class="earnings-head">
+						<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')"
+							mode="aspectFit"></image>
+						<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')"
+							mode="aspectFill"></image>
+						<view class="content">
+							累计收益
+							<text class="money-text">{{ detailData.total_commission }}</text>
+							元
+						</view>
+					</view>
+				</view>
+				<view class="earnings-body">
+					<view class="earnings-tab">
+						<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">已邀请好友</text>
+						<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">已下单好友</text>
+					</view>
+					<scroll-view scroll-y="true" class="earnings-content-wrap" @scrolltolower="getTeam()">
+						<view class="earnings-list" v-if="promote.list.length">
+							<view class="earnings-item" v-for="(item, index) in promote.list" :key="index">
+								<image class="item-img"
+									:src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
+									@error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
+								<view class="item-content">
+									<view class="item-name multi-hidden">{{ item.nickname }}</view>
+								</view>
+							</view>
+						</view>
+						<view class="earnings-empty" v-else>暂无已邀请好友，快去邀请吧</view>
+					</scroll-view>
+				</view>
+			</view>
+			<view class="activity-rules">
+				<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')"
+					mode="aspectFit"></image>
+				<view class="content" v-if="promoteContent.content"><rich-text
+						:nodes="promoteContent.content"></rich-text></view>
+				<view class="rules-empty" v-else>暂无活动规则</view>
+			</view>
+			<view class="active-btn"><button type="primary" @click="toPoster()">邀请好友</button></view>
+			<ns-copyright></ns-copyright>
+			<ns-login ref="login"></ns-login>
+			<loading-cover ref="loadingCover"></loading-cover>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
+	</view>
+</template>
+
+<script>
+import htmlParser from '@/common/js/html-parser';
+export default {
+	data() {
+		return {
+			tabIndex: 0,
+			promoteContent: {},
+			promote: {
+				page: 0,
+				page_size: 5,
+				page_count: 0,
+				list: []
+			},
+			isPay: 0,
+			detailData: {},
+			templateId: '',
+			poster: '',
+		};
+	},
+	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.getTeam();
+			this.getPromoteRule();
+			this.getFenxiaoDetail();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
+			});
+		}
+	},
+	onLoad() {
+		this.getTemplateId();
+		this.getPoster();
+	},
+	methods: {
+		toPoster() {
+			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster, templateId: this.templateId })
+		},
+		tabCut(index) {
+			this.tabIndex = index;
+			this.isPay = index;
+
+			this.promote.page_count = 0;
+			this.promote.page = 0;
+			this.promote.page_size = 5;
+			this.getTeam();
+		},
+		getTeam() {
+			if (this.promote.page_count > 0 && this.promote.page == this.promote.page_count) return;
+			this.promote.page++;
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/team',
+				data: {
+					page: this.promote.page,
+					page_size: this.promote.page_size,
+					is_pay: this.isPay,
+					level: 1
+				},
+				success: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					if (res.code >= 0) {
+						if (this.promote.page == 1) this.promote.list = [];
+						this.promote.page_count = res.data.page_count;
+						this.promote.list = this.promote.list.concat(res.data.list);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 获取分销商信息
+		getFenxiaoDetail() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/detail',
+				success: res => {
+					if (res.data) {
+						this.detailData = res.data;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		// 获取富文本
+		getPromoteRule() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/promoterule',
+				success: res => {
+					if (res.data) {
+						this.promoteContent = res.data;
+						this.promoteContent.content = res.data.content ? htmlParser(res.data.content) : '';
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 获取分享海报
+		 */
+		getPoster() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/posterList',
+				success: res => {
+					if (res.code >= 0) {
+						this.poster = res.data.toString();
+						this.poster = encodeURIComponent(this.poster);
+					}
+				}
+			});
+		},
+		/**
+		 * 获取分享海报id
+		 */
+		getTemplateId() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/posterTemplateIds',
+				success: res => {
+					if (res.code >= 0) {
+						this.templateId = [...res.data].join();
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.fenxiao-promote {
+	overflow: hidden;
+	padding: 0 30rpx 160rpx;
+	min-height: 100vh;
+	background-color: #ff2d46;
+	background-size: 100%;
+	background-repeat: no-repeat;
+
+	.my-earnings,
+	.activity-rules {
+		background-color: #fff;
+		border-radius: 30rpx;
+	}
+
+	.my-earnings {
+		margin-top: 230rpx;
+		padding-bottom: 40rpx;
+
+		.earnings-head-wrap {
+			background-color: #fff7f5;
+			height: 160rpx;
+			border-radius: 30rpx;
+			border-bottom-left-radius: 0;
+			border-bottom-right-radius: 0;
+		}
+
+		.earnings-head {
+			position: relative;
+			padding-top: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.name {
+				position: absolute;
+				width: 384rpx;
+				height: 74rpx;
+				top: -22rpx;
+			}
+
+			.content {
+				font-size: $font-size-tag;
+			}
+
+			.money-bg {
+				width: 80rpx;
+				height: 80rpx;
+			}
+
+			.money-text {
+				margin: 0 6rpx;
+				font-size: 40rpx;
+				line-height: 1;
+			}
+		}
+
+		.earnings-body {
+			padding: 0 30rpx;
+
+			.earnings-tab {
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				height: 100rpx;
+				font-size: 30rpx;
+				color: #e93224;
+				margin-bottom: 10rpx;
+
+				text.active {
+					position: relative;
+					font-weight: bold;
+
+					&::after {
+						position: absolute;
+						content: '';
+						height: 4rpx;
+						width: 86rpx;
+						left: 50%;
+						bottom: -4rpx;
+						transform: translateX(-50%);
+						background-color: #e93224;
+					}
+				}
+			}
+
+			.earnings-content-wrap {
+				max-height: 440rpx;
+			}
+
+			.earnings-item {
+				display: flex;
+				align-items: center;
+				margin-bottom: 20rpx;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.item-img {
+					width: 90rpx;
+					height: 90rpx;
+					margin-right: 20rpx;
+					flex-shrink: 0;
+				}
+
+				.item-time {
+					font-size: $font-size-tag;
+					color: $color-tip;
+				}
+
+				.item-name {
+					line-height: 1.3;
+				}
+
+				.money {
+					margin-left: auto;
+					color: #f9b124;
+				}
+			}
+		}
+
+		.earnings-empty {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 160rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.activity-rules {
+		position: relative;
+		margin-top: 60rpx;
+		min-height: 300rpx;
+
+		.rules-name {
+			position: absolute;
+			width: 384rpx;
+			height: 74rpx;
+			top: -22rpx;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+
+		.content {
+			padding: 70rpx 20rpx 0;
+		}
+
+		.rules-empty {
+			padding-top: 140rpx;
+			text-align: center;
+			font-size: 30rpx;
+		}
+	}
+
+	.active-btn {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 5;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #ff2d46;
+		height: 160rpx;
+		padding: 0 60rpx;
+
+		button {
+			flex: 1;
+			margin: 0;
+			border-radius: 50rpx;
+			color: #985400;
+			background: linear-gradient(45deg, #ffe2ac 0%, #fdc174 100%);
+		}
+	}
+}
+</style>

pages_promotion/fenxiao/promote_code.vue

@@ -1,307 +1,306 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="container">
-		<swiper class="swiper" @change="getIndex">
-			<swiper-item v-for="(item, index) in poster" :key="index">
-				<view class="swiper-item">
-					<view class="poster-wrap">
-						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true"/>
-					</view>
-				</view>
-			</swiper-item>
-		</swiper>
-
-		<!-- #ifdef H5 -->
-		<view class="tips">长按识别图中二维码</view>
-		<!--  #endif -->
-
-		<!-- #ifdef MP -->
-		<view class="btn color-base-bg color-base-border" @click="save">保存海报</view>
-		<!--  #endif -->
-
-		<uni-popup ref="popupDialog" :custom="true" :mask-click="false">
-			<view class="dialog-popup">
-				<view class="title">提示</view>
-				<view class="message">您拒绝了保存图片到相册的授权请求，无法保存图片到相册，如需正常使用，请授权之后再进行操作。</view>
-				<view class="action-wrap">
-					<view @click="closeDialog">取消</view>
-					<view>
-						<button type="default" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		Weixin
-	} from 'common/js/wx-jssdk.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
-	export default {
-		data() {
-			return {
-				poster: [],
-				fenxiaoInfo: {},
-				posterIndex: 0,
-				//海报模板id
-				templateId: ['default'],
-				mpShareData: null //小程序分享数据
-			};
-		},
-		components: {
-			uniPopup
-		},
-		methods: {
-			/**
-			 * 获取分销海报
-			 */
-			getPoster(id) {
-				return new Promise((resolve, reject) => {
-					this.$api.sendRequest({
-						url: '/fenxiao/api/fenxiao/poster',
-						data: {
-							page: '/pages/index/index',
-							qrcode_param: JSON.stringify({}),
-							template_id: id
-						},
-						success: res => {
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							if (res.code >= 0) {
-								resolve(res.data.path);
-							}
-						},
-						fail: res => {
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							reject();
-						}
-					});
-				});
-			},
-			getIndex(e) {
-				this.posterIndex = e.detail.current;
-			},
-			save() {
-				// #ifdef MP
-				uni.downloadFile({
-					url: this.$util.img(this.poster[this.posterIndex]),
-					success: res => {
-						if (res.statusCode === 200) {
-							uni.saveImageToPhotosAlbum({
-								filePath: res.tempFilePath,
-								success: () => {
-									this.$util.showToast({
-										title: '保存成功'
-									});
-								},
-								fail: res => {
-									if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
-										res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
-										this.$refs.popupDialog.open();
-									} else {
-										this.$util.showToast({
-											title: '保存失败，请稍后重试'
-										});
-									}
-								}
-							});
-						} else {
-							this.$util.showToast({
-								title: '下载失败'
-							});
-						}
-					},
-					fail: res => {
-						this.$util.showToast({
-							title: '下载失败'
-						});
-					}
-				});
-				// #endif
-			},
-			getFenxiaoDetail() {
-				this.poster = [];
-				try {
-					this.templateId.forEach((item, index) => {
-						this.getPoster(item).then(resolve => {
-							this.poster.push(resolve);
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						}).catch(reject => {
-							throw reject;
-						});
-					});
-				} catch {
-					this.$util.showToast({
-						title: '海报生成失败'
-					});
-				}
-			},
-
-			closeDialog() {
-				this.$refs.popupDialog.close();
-			}
-		},
-		onLoad(option) {
-			setTimeout( () => {
-				if (!this.addonIsExist.fenxiao) {
-					this.$util.showToast({
-						title: '商家未开启分销',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
-				}
-			},1000);
-
-			if (option.templateId) {
-				this.templateId = option.templateId.split(',');
-			}
-
-			if (this.storeToken) {
-				if(option.poster){
-					this.poster = decodeURIComponent(option.poster).split(',')
-					setTimeout(() => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}, 500)
-				}else{
-					this.getFenxiaoDetail();
-				}
-				
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
-				});
-			}
-		},
-		onShow() {
-			//小程序分享
-			// #ifdef MP-WEIXIN
-			this.$util.getMpShare().then(res => {
-				this.mpShareData = res;
-			});
-			// #endif
-		},
-		//分享给好友
-		onShareAppMessage() {
-			return this.mpShareData.appMessage;
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			return this.mpShareData.timeLine;
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.getFenxiaoDetail();
-				}
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container {
-		width: 100vw;
-		min-height: 100vh;
-		background-color: #f5f5f5;
-	}
-
-	.poster-wrap {
-		padding: 40rpx 0;
-		width: calc(100vw - 80rpx);
-		margin: 0 40rpx;
-		line-height: 1;
-
-		image {
-			border-radius: 20rpx;
-			overflow: hidden;
-			width: 100%;
-		}
-	}
-
-	.swiper {
-		height: 1240rpx;
-	}
-
-	.btn {
-		margin: 0 80rpx;
-		margin-top: 30rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: $border-radius;
-		color: #fff;
-		text-align: center;
-	}
-
-	.tips {
-		text-align: center;
-		font-size: $font-size-base;
-		color: #999;
-		font-weight: 600;
-		margin-top: 20rpx;
-	}
-
-	.dialog-popup {
-		width: 580rpx;
-		background: #fff;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		overflow: hidden;
-		height: initial;
-
-		.title {
-			padding: 30rpx 30rpx 0 30rpx;
-			text-align: center;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-
-		.message {
-			padding: 0 30rpx;
-			color: #666;
-			text-align: center;
-			font-size: $font-size-base;
-			line-height: 1.3;
-			margin-top: 30rpx;
-		}
-
-		.action-wrap {
-			margin-top: 50rpx;
-			height: 80rpx;
-			display: flex;
-			border-top: 2rpx solid #eee;
-
-			&>view {
-				flex: 1;
-				text-align: center;
-				line-height: 80rpx;
-
-				&:first-child {
-					border-right: 2rpx solid #eee;
-					color: #999;
-				}
-
-				button {
-					border: none;
-					line-height: 80rpx;
-					padding: 0;
-					margin: 0;
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
+<template>
+	<view class="container" :style="themeColor">
+		<swiper class="swiper" @change="getIndex">
+			<swiper-item v-for="(item, index) in poster" :key="index">
+				<view class="swiper-item">
+					<view class="poster-wrap">
+						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
+		<!-- #ifdef H5 -->
+		<view class="tips">长按识别图中二维码</view>
+		<!--  #endif -->
+
+		<!-- #ifdef MP -->
+		<view class="btn color-base-bg color-base-border" @click="save">保存海报</view>
+		<!--  #endif -->
+
+		<uni-popup ref="popupDialog" :custom="true" :mask-click="false">
+			<view class="dialog-popup">
+				<view class="title">提示</view>
+				<view class="message">您拒绝了保存图片到相册的授权请求，无法保存图片到相册，如需正常使用，请授权之后再进行操作。</view>
+				<view class="action-wrap">
+					<view @click="closeDialog">取消</view>
+					<view>
+						<button type="default" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		Weixin
+	} from 'common/js/wx-jssdk.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
+	export default {
+		data() {
+			return {
+				poster: [],
+				fenxiaoInfo: {},
+				posterIndex: 0,
+				//海报模板id
+				templateId: ['default'],
+				mpShareData: null //小程序分享数据
+			};
+		},
+		components: {
+			uniPopup
+		},
+		methods: {
+			/**
+			 * 获取分销海报
+			 */
+			getPoster(id) {
+				return new Promise((resolve, reject) => {
+					this.$api.sendRequest({
+						url: '/fenxiao/api/fenxiao/poster',
+						data: {
+							page: '/pages/index/index',
+							qrcode_param: JSON.stringify({}),
+							template_id: id
+						},
+						success: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							if (res.code >= 0) {
+								resolve(res.data.path);
+							}
+						},
+						fail: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							reject();
+						}
+					});
+				});
+			},
+			getIndex(e) {
+				this.posterIndex = e.detail.current;
+			},
+			save() {
+				// #ifdef MP
+				uni.downloadFile({
+					url: this.$util.img(this.poster[this.posterIndex]),
+					success: res => {
+						if (res.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath,
+								success: () => {
+									this.$util.showToast({
+										title: '保存成功'
+									});
+								},
+								fail: res => {
+									if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
+										res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
+										this.$refs.popupDialog.open();
+									} else {
+										this.$util.showToast({
+											title: '保存失败，请稍后重试'
+										});
+									}
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: '下载失败'
+							});
+						}
+					},
+					fail: res => {
+						this.$util.showToast({
+							title: '下载失败'
+						});
+					}
+				});
+				// #endif
+			},
+			getFenxiaoDetail() {
+				this.poster = [];
+				try {
+					this.templateId.forEach((item, index) => {
+						this.getPoster(item).then(resolve => {
+							this.poster.push(resolve);
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}).catch(reject => {
+							throw reject;
+						});
+					});
+				} catch {
+					this.$util.showToast({
+						title: '海报生成失败'
+					});
+				}
+			},
+
+			closeDialog() {
+				this.$refs.popupDialog.close();
+			}
+		},
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.fenxiao) {
+					this.$util.showToast({
+						title: '商家未开启分销',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (option.templateId) {
+				this.templateId = option.templateId.split(',');
+			}
+
+			if (this.storeToken) {
+				if(option.poster){
+					this.poster = decodeURIComponent(option.poster).split(',')
+					setTimeout(() => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}, 500)
+				}else{
+					this.getFenxiaoDetail();
+				}
+				
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
+				});
+			}
+		},
+		onShow() {
+			//小程序分享
+			// #ifdef MP-WEIXIN
+			this.$util.getMpShare().then(res => {
+				this.mpShareData = res;
+			});
+			// #endif
+		},
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getFenxiaoDetail();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: #f5f5f5;
+	}
+
+	.poster-wrap {
+		padding: 40rpx 0;
+		width: calc(100vw - 80rpx);
+		margin: 0 40rpx;
+		line-height: 1;
+
+		image {
+			border-radius: 20rpx;
+			overflow: hidden;
+			width: 100%;
+		}
+	}
+
+	.swiper {
+		height: 1240rpx;
+	}
+
+	.btn {
+		margin: 0 80rpx;
+		margin-top: 30rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: $border-radius;
+		color: #fff;
+		text-align: center;
+	}
+
+	.tips {
+		text-align: center;
+		font-size: $font-size-base;
+		color: #999;
+		font-weight: 600;
+		margin-top: 20rpx;
+	}
+
+	.dialog-popup {
+		width: 580rpx;
+		background: #fff;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		overflow: hidden;
+		height: initial;
+
+		.title {
+			padding: 30rpx 30rpx 0 30rpx;
+			text-align: center;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.message {
+			padding: 0 30rpx;
+			color: #666;
+			text-align: center;
+			font-size: $font-size-base;
+			line-height: 1.3;
+			margin-top: 30rpx;
+		}
+
+		.action-wrap {
+			margin-top: 50rpx;
+			height: 80rpx;
+			display: flex;
+			border-top: 2rpx solid #eee;
+
+			&>view {
+				flex: 1;
+				text-align: center;
+				line-height: 80rpx;
+
+				&:first-child {
+					border-right: 2rpx solid #eee;
+					color: #999;
+				}
+
+				button {
+					border: none;
+					line-height: 80rpx;
+					padding: 0;
+					margin: 0;
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
 </style>

pages_promotion/fenxiao/ranking_list.vue

@@ -1,416 +1,415 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="container">
-		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
-			<view slot="list">
-				<block v-if="list.length != 0">
-					<view class="banner" :style="{background: 'url('+ $util.img('public/uniapp/fenxiao/index/header_bg.png') +') no-repeat top left / 100% 100%'}">
-						<view class="info">
-							<view class="info-pic">
-								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
-							</view>
-							<view class="member-info">
-								<view class="rank-info-box">
-									<text class="name">{{info.nickname}}</text>
-								</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="fenxiao-team" v-if="type == 'profit'">
-						<view class="fenxiao-index-other">
-							<view class="all-money-item">
-								<view class="img-wrap">
-									<text class="iconfont icon-fenxiao"></text>
-								</view>
-								<view class="all-money-tit-wrap">
-									<text class="all-money-tit">分销佣金</text>
-									<text class="all-money-num">{{ info.today_commission}}元</text>
-								</view>
-							</view>
-						</view>
-						<view class="fenxiao-index-other">
-							<view class="all-money-item">
-								<view class="img-wrap">
-									<text class="iconfont icon-baixingbeng"></text>
-								</view>
-								<view class="all-money-tit-wrap">
-									<text class="all-money-tit">佣金排行</text>
-									<text class="all-money-num">您排行第{{ ranking }}名</text>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="fenxiao-team" v-if="type == 'invited_num'">
-						<view class="fenxiao-index-other">
-							<view class="all-money-item">
-								<view class="img-wrap">
-									<text class="iconfont icon-huodongtuiyan"></text>
-								</view>
-								<view class="all-money-tit-wrap">
-									<text class="all-money-tit">推广人数</text>
-									<text class="all-money-num">{{ info.one_child_num}}人</text>
-								</view>
-							</view>
-						</view>
-						<view class="fenxiao-index-other">
-							<view class="all-money-item">
-								<view class="img-wrap">
-									<text class="iconfont icon-baixingbeng"></text>
-								</view>
-								<view class="all-money-tit-wrap">
-									<text class="all-money-tit" v-if="type == 'invited_num'">推广排行</text>
-									<text class="all-money-num">您排行第{{ ranking }}名</text>
-								</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="title-rakn-text"  v-if="type == 'profit'">佣金排行</view>
-					<view class="title-rakn-text"  v-if="type == 'invited_num'">推广排行</view>
-
-					<view class="ranking-list">
-						<view class="ranking-item" v-for="(item, index) in list" :key="index">
-							<view class="ranking price-font">{{ index + 1 }}</view>
-							<view class="content">
-								<view class="head-img">
-									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head" @error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
-								</view>
-								<view class="nickname">{{ item.nickname }}</view>
-							</view>
-							<view class="price-font price-style" v-if="type == 'profit'">
-								￥{{ item.total_commission|moneyFormat }}</view>
-							<view class="price-font price-style" v-if="type == 'invited_num'">{{ item.child_num }}人
-							</view>
-						</view>
-					</view>
-				</block>
-				<block v-if="list.length == 0 && emptyShow">
-					<ns-empty text="暂无数据" :isIndex="false"></ns-empty>
-				</block>
-			</view>
-		</mescroll-uni>
-
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list: [],
-				emptyShow: false,
-				type: '',
-				ranking: 0,
-				info: {}
-			}
-		},
-		onLoad(data) {
-			this.type = data.type;
-			this.getRanking();
-			this.getFenxiaoDetail();
-		},
-		methods: {
-			getData(mescroll) {
-				this.emptyShow = false;
-				if (mescroll.num == 1) {
-					this.list = [];
-				}
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/rankinglist',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num,
-						type: this.type
-					},
-					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.list = []; //如果是第一页需手动制空列表
-						this.list = this.list.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			getRanking() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/ranking',
-					data: {
-						type: this.type
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.ranking = res.data;
-						}
-					}
-				})
-			},
-			getFenxiaoDetail() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/detail',
-					success: res => {
-						if (res.data) {
-							this.info = res.data;
-						}
-					},
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.container {
-		width: 100vw;
-		height: 100vh;
-	}
-
-	.banner {
-		width: 100%;
-		height: 200rpx;
-		// background: $base-color;
-	}
-
-	.info {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 50rpx 80rpx 0;
-		box-sizing: border-box;
-
-		.info-pic {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 50%;
-			border: 4rpx solid #fff;
-			position: relative;
-
-			image {
-				width: 100%;
-				height: 100%;
-				border-radius: 50%;
-			}
-
-		}
-
-		.member-info {
-			flex: 1;
-			width: 0;
-			margin-left: 32rpx;
-			display: flex;
-
-			view {
-				color: #fff;
-			}
-
-			.rank-info-box {
-				line-height: 1;
-				flex: 1;
-			}
-
-			.name {
-				font-size: 32rpx;
-				font-weight: 600;
-				color: #FFFFFF;
-			}
-
-			.withdrawal {
-				border-radius: 4px;
-				line-height: 23px;
-				margin: auto;
-				text-align: center;
-				font-size: 11px;
-			}
-
-		}
-
-	}
-
-	.fenxiao-team {
-		display: flex;
-		width: 100%;
-		margin-top: 22rpx;
-
-		.fenxiao-index-other {
-			margin: 0 24rpx 20rpx 24rpx;
-			border-radius: 16rpx;
-			background-color: #ffffff;
-			padding: 30rpx 0;
-			flex: 1;
-
-			&:last-child {
-				margin-left: 0;
-			}
-
-			.all-money-item {
-				margin: 0 30rpx;
-				display: flex;
-				font-size: $font-size-tag;
-				align-items: center;
-
-				.img-wrap {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 70rpx;
-					height: 70rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.all-money-tit-wrap {
-					flex: 1;
-					margin-left: 24rpx;
-					display: flex;
-					flex-direction: column;
-					height: 70rpx;
-
-					.all-money-tit {
-						line-height: 1;
-						color: $color-title;
-						font-size: $font-size-base;
-						flex: 1;
-					}
-
-					.all-money-num {
-						color: $color-tip;
-						font-size: 24rpx;
-						line-height: 1;
-					}
-				}
-			}
-		}
-	}
-
-	.icon-wenxiao {
-		text-align: center;
-		font-size: 50rpx;
-		color: var(--base-color) !important;
-	}
-
-	.number {
-		font-weight: 600;
-		text-align: center;
-	}
-
-	.info-text {
-		font-size: 20rpx;
-		text-align: center;
-	}
-
-	.info-title {
-		font-size: 50rpx;
-		font-weight: 900;
-		color: #f5f5f5;
-		text-align: center;
-	}
-
-	.info-rank {
-		color: #f5f5f5;
-		margin-top: 10rpx;
-	}
-
-	.title-rakn-text {
-		text-align: center;
-		font-size: 30rpx;
-		font-weight: 900;
-	}
-
-	.ranking-list {
-		transform: translateY(-120rpx);
-		margin: 200rpx 24rpx;
-		background: #fff;
-		border-radius: 16rpx;
-		padding: 10rpx 20rpx;
-		margin-top: 140rpx;
-
-		.ranking-item {
-			display: flex;
-			align-items: center;
-			padding: 20rpx 0;
-			border-bottom: 2rpx solid #f5f5f5;
-
-			&:last-child {
-				border-bottom: 0;
-			}
-
-			.ranking {
-				width: 60rpx;
-				height: 60rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				box-sizing: border-box;
-				font-size: 24rpx;
-			}
-
-			&:nth-child(1) .ranking {
-				background: rgb(249, 186, 1);
-				border-radius: 50%;
-				border: 10rpx solid rgb(254, 220, 92);
-			}
-
-			&:nth-child(2) .ranking {
-				background: rgb(172, 185, 194);
-				border-radius: 50%;
-				border: 10rpx solid rgb(215, 223, 229);
-			}
-
-			&:nth-child(3) .ranking {
-				background: rgb(211, 163, 136);
-				border-radius: 50%;
-				border: 10rpx solid rgb(235, 201, 190);
-			}
-
-			.content {
-				flex: 1;
-				width: 0;
-				padding: 0 20rpx;
-				display: flex;
-				align-items: center;
-
-				.head-img {
-					width: 90rpx;
-					height: 90rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					border-radius: 50%;
-					overflow: hidden;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.nickname {
-					color: #333;
-					margin: 0 20rpx;
-					font-size: 28rpx;
-				}
-			}
-		}
-	}
-</style>
+<template>
+	<view class="container" :style="themeColor">
+		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
+			<view slot="list">
+				<block v-if="list.length != 0">
+					<view class="banner" :style="{background: 'url('+ $util.img('public/uniapp/fenxiao/index/header_bg.png') +') no-repeat top left / 100% 100%'}">
+						<view class="info">
+							<view class="info-pic">
+								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+							</view>
+							<view class="member-info">
+								<view class="rank-info-box">
+									<text class="name">{{info.nickname}}</text>
+								</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="fenxiao-team" v-if="type == 'profit'">
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-fenxiao"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit">分销佣金</text>
+									<text class="all-money-num">{{ info.today_commission}}元</text>
+								</view>
+							</view>
+						</view>
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-baixingbeng"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit">佣金排行</text>
+									<text class="all-money-num">您排行第{{ ranking }}名</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="fenxiao-team" v-if="type == 'invited_num'">
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-huodongtuiyan"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit">推广人数</text>
+									<text class="all-money-num">{{ info.one_child_num}}人</text>
+								</view>
+							</view>
+						</view>
+						<view class="fenxiao-index-other">
+							<view class="all-money-item">
+								<view class="img-wrap">
+									<text class="iconfont icon-baixingbeng"></text>
+								</view>
+								<view class="all-money-tit-wrap">
+									<text class="all-money-tit" v-if="type == 'invited_num'">推广排行</text>
+									<text class="all-money-num">您排行第{{ ranking }}名</text>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="title-rakn-text"  v-if="type == 'profit'">佣金排行</view>
+					<view class="title-rakn-text"  v-if="type == 'invited_num'">推广排行</view>
+
+					<view class="ranking-list">
+						<view class="ranking-item" v-for="(item, index) in list" :key="index">
+							<view class="ranking price-font">{{ index + 1 }}</view>
+							<view class="content">
+								<view class="head-img">
+									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head" @error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+								</view>
+								<view class="nickname">{{ item.nickname }}</view>
+							</view>
+							<view class="price-font price-style" v-if="type == 'profit'">
+								￥{{ item.total_commission|moneyFormat }}</view>
+							<view class="price-font price-style" v-if="type == 'invited_num'">{{ item.child_num }}人
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-if="list.length == 0 && emptyShow">
+					<ns-empty text="暂无数据" :isIndex="false"></ns-empty>
+				</block>
+			</view>
+		</mescroll-uni>
+
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+				emptyShow: false,
+				type: '',
+				ranking: 0,
+				info: {}
+			}
+		},
+		onLoad(data) {
+			this.type = data.type;
+			this.getRanking();
+			this.getFenxiaoDetail();
+		},
+		methods: {
+			getData(mescroll) {
+				this.emptyShow = false;
+				if (mescroll.num == 1) {
+					this.list = [];
+				}
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/rankinglist',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						type: this.type
+					},
+					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.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			getRanking() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/ranking',
+					data: {
+						type: this.type
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.ranking = res.data;
+						}
+					}
+				})
+			},
+			getFenxiaoDetail() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						if (res.data) {
+							this.info = res.data;
+						}
+					},
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+	}
+
+	.banner {
+		width: 100%;
+		height: 200rpx;
+		// background: $base-color;
+	}
+
+	.info {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 50rpx 80rpx 0;
+		box-sizing: border-box;
+
+		.info-pic {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			border: 4rpx solid #fff;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+
+		}
+
+		.member-info {
+			flex: 1;
+			width: 0;
+			margin-left: 32rpx;
+			display: flex;
+
+			view {
+				color: #fff;
+			}
+
+			.rank-info-box {
+				line-height: 1;
+				flex: 1;
+			}
+
+			.name {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+			}
+
+			.withdrawal {
+				border-radius: 4px;
+				line-height: 23px;
+				margin: auto;
+				text-align: center;
+				font-size: 11px;
+			}
+
+		}
+
+	}
+
+	.fenxiao-team {
+		display: flex;
+		width: 100%;
+		margin-top: 22rpx;
+
+		.fenxiao-index-other {
+			margin: 0 24rpx 20rpx 24rpx;
+			border-radius: 16rpx;
+			background-color: #ffffff;
+			padding: 30rpx 0;
+			flex: 1;
+
+			&:last-child {
+				margin-left: 0;
+			}
+
+			.all-money-item {
+				margin: 0 30rpx;
+				display: flex;
+				font-size: $font-size-tag;
+				align-items: center;
+
+				.img-wrap {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 70rpx;
+					height: 70rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.all-money-tit-wrap {
+					flex: 1;
+					margin-left: 24rpx;
+					display: flex;
+					flex-direction: column;
+					height: 70rpx;
+
+					.all-money-tit {
+						line-height: 1;
+						color: $color-title;
+						font-size: $font-size-base;
+						flex: 1;
+					}
+
+					.all-money-num {
+						color: $color-tip;
+						font-size: 24rpx;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	.icon-wenxiao {
+		text-align: center;
+		font-size: 50rpx;
+		color: var(--base-color) !important;
+	}
+
+	.number {
+		font-weight: 600;
+		text-align: center;
+	}
+
+	.info-text {
+		font-size: 20rpx;
+		text-align: center;
+	}
+
+	.info-title {
+		font-size: 50rpx;
+		font-weight: 900;
+		color: #f5f5f5;
+		text-align: center;
+	}
+
+	.info-rank {
+		color: #f5f5f5;
+		margin-top: 10rpx;
+	}
+
+	.title-rakn-text {
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.ranking-list {
+		transform: translateY(-120rpx);
+		margin: 200rpx 24rpx;
+		background: #fff;
+		border-radius: 16rpx;
+		padding: 10rpx 20rpx;
+		margin-top: 140rpx;
+
+		.ranking-item {
+			display: flex;
+			align-items: center;
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #f5f5f5;
+
+			&:last-child {
+				border-bottom: 0;
+			}
+
+			.ranking {
+				width: 60rpx;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+				font-size: 24rpx;
+			}
+
+			&:nth-child(1) .ranking {
+				background: rgb(249, 186, 1);
+				border-radius: 50%;
+				border: 10rpx solid rgb(254, 220, 92);
+			}
+
+			&:nth-child(2) .ranking {
+				background: rgb(172, 185, 194);
+				border-radius: 50%;
+				border: 10rpx solid rgb(215, 223, 229);
+			}
+
+			&:nth-child(3) .ranking {
+				background: rgb(211, 163, 136);
+				border-radius: 50%;
+				border: 10rpx solid rgb(235, 201, 190);
+			}
+
+			.content {
+				flex: 1;
+				width: 0;
+				padding: 0 20rpx;
+				display: flex;
+				align-items: center;
+
+				.head-img {
+					width: 90rpx;
+					height: 90rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-radius: 50%;
+					overflow: hidden;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.nickname {
+					color: #333;
+					margin: 0 20rpx;
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+</style>

pages_promotion/fenxiao/relation.vue

@@ -1,152 +1,151 @@
-<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>
+<template>
+	<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>

pages_promotion/fenxiao/team.vue

@@ -1,355 +1,354 @@
-<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>
+<template>
+	<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>

pages_promotion/fenxiao/withdraw_apply.vue

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

pages_promotion/fenxiao/withdraw_list.vue

@@ -1,209 +1,208 @@
-<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>
+<template>
+	<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>

pages_promotion/fenxiao/withdrawal_detail.vue

@@ -1,127 +1,126 @@
-<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>
+<template>
+	<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>

pages_promotion/merch/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="content">
+	<view class="content" :style="themeColor">
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row" style="margin-bottom: 20rpx;">
@@ -79,7 +78,7 @@
 									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询价' }}</text>
 								</view>
 								
 								
@@ -164,7 +163,7 @@
 									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询价' }}</text>
 								</view>
 								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>

pages_promotion/merch/merchcategory.vue

@@ -1,6 +1,5 @@
 <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')">

pages_promotion/point/detail.vue

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

pages_promotion/point/goods_list.vue

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

pages_promotion/point/list.vue

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

pages_promotion/point/order_list.vue

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

pages_promotion/point/payment.vue

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

pages_promotion/point/result.vue

@@ -1,93 +1,92 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="container">
-		<view class="image-wrap">
-			<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix"></image>
-		</view>
-		<view class="msg">{{ $lang('exchangeSuccess') }}</view>
-		<view class="action">
-			<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('see') }}</view>
-			<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('goHome') }}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {};
-		},
-		onShow() {
-		},
-		methods: {
-			toOrderList() {
-				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
-			},
-			toIndex() {
-				this.$util.redirectTo('/pages/index/index');
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container {
-		width: 100vw;
-		height: 100vh;
-		background: #fff;
-
-		.image-wrap {
-			display: flex;
-			justify-content: center;
-			padding: 200rpx 0 40rpx 0;
-
-			.result-image {
-				width: 166rpx;
-			}
-		}
-
-		.msg {
-			text-align: center;
-			line-height: 1;
-			margin-bottom: 50rpx;
-			font-size: $font-size-base;
-			color: #000;
-		}
-
-		.pay-amount {
-			color: #999;
-			text-align: center;
-			line-height: 1;
-			margin-bottom: 30rpx;
-		}
-
-		.action {
-			width: 90%;
-			margin: 0 auto;
-			text-align: center;
-			margin-top: 150rpx;
-			display: flex;
-			justify-content: space-between;
-
-			.btn {
-				width: 310rpx;
-				height: 78rpx;
-				border: 2rpx solid #ffffff;
-				border-radius: $border-radius;
-				font-size: $font-size-tag;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.alone {
-				margin-left: 0;
-				width: 60%;
-			}
-
-			.go-home {
-				color: #fff;
-			}
-		}
-	}
-</style>
+<template>
+	<view class="container" :style="themeColor">
+		<view class="image-wrap">
+			<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix"></image>
+		</view>
+		<view class="msg">{{ $lang('exchangeSuccess') }}</view>
+		<view class="action">
+			<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('see') }}</view>
+			<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('goHome') }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onShow() {
+		},
+		methods: {
+			toOrderList() {
+				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
+			},
+			toIndex() {
+				this.$util.redirectTo('/pages/index/index');
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+
+		.image-wrap {
+			display: flex;
+			justify-content: center;
+			padding: 200rpx 0 40rpx 0;
+
+			.result-image {
+				width: 166rpx;
+			}
+		}
+
+		.msg {
+			text-align: center;
+			line-height: 1;
+			margin-bottom: 50rpx;
+			font-size: $font-size-base;
+			color: #000;
+		}
+
+		.pay-amount {
+			color: #999;
+			text-align: center;
+			line-height: 1;
+			margin-bottom: 30rpx;
+		}
+
+		.action {
+			width: 90%;
+			margin: 0 auto;
+			text-align: center;
+			margin-top: 150rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.btn {
+				width: 310rpx;
+				height: 78rpx;
+				border: 2rpx solid #ffffff;
+				border-radius: $border-radius;
+				font-size: $font-size-tag;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.alone {
+				margin-left: 0;
+				width: 60%;
+			}
+
+			.go-home {
+				color: #fff;
+			}
+		}
+	}
+</style>

pages_tool/agreement/contenr.vue

@@ -1,55 +1,54 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view style="padding: 20rpx;">
-		<rich-text :nodes="content"></rich-text>
-	</view>
-</template>
-
-<script>
-import htmlParser from '@/common/js/html-parser';
-export default {
-	 components: {
-	  },
-    data() {
-        return {
-			content:'',
-			type:'',
-			uniacid:0
-        };
-    },
-    onLoad(option) {
-		this.type = option.type
-		this.uniacid = option.uniacid?option.uniacid:0
-		
-        this.isIphoneX = this.$util.uniappIsIPhoneX()
-		 this.getcontent()
-    },
-    onShow() {
-      
-    },
-    methods: {
-        getcontent() {
-			// privacy  content
-			var data = {
-				type:this.type
-			}
-			if(this.uniacid > 0) data.uniacid = this.uniacid
-            this.$api.sendRequest({
-               	url: '/api/config/agreement',
-				data:data,
-                success: res => {
-					console.log(res.data.title)
-					uni.setNavigationBarTitle({
-						title:res.data.title
-					})
-					this.content = res.data.content
-				}                   
-            });
-        }
-    }
-};
-</script>
-
-<style lang="scss">
-
+<template>
+	<view style="padding: 20rpx;" :style="themeColor">
+		<rich-text :nodes="content"></rich-text>
+	</view>
+</template>
+
+<script>
+import htmlParser from '@/common/js/html-parser';
+export default {
+	 components: {
+	  },
+    data() {
+        return {
+			content:'',
+			type:'',
+			uniacid:0
+        };
+    },
+    onLoad(option) {
+		this.type = option.type
+		this.uniacid = option.uniacid?option.uniacid:0
+		
+        this.isIphoneX = this.$util.uniappIsIPhoneX()
+		 this.getcontent()
+    },
+    onShow() {
+      
+    },
+    methods: {
+        getcontent() {
+			// privacy  content
+			var data = {
+				type:this.type
+			}
+			if(this.uniacid > 0) data.uniacid = this.uniacid
+            this.$api.sendRequest({
+               	url: '/api/config/agreement',
+				data:data,
+                success: res => {
+					console.log(res.data.title)
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+					this.content = res.data.content
+				}                   
+            });
+        }
+    }
+};
+</script>
+
+<style lang="scss">
+
 </style>

pages_tool/article/detail.vue

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

pages_tool/article/list.vue

@@ -1,6 +1,5 @@
 <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">

pages_tool/contact/contact.vue

@@ -1,6 +1,5 @@
 <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">
@@ -146,9 +145,9 @@
 			</uni-popup>
 		</view>
 		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<hover-nav></hover-nav>
+		<diy-bottom-nav></diy-bottom-nav>		
 	</view>
-	<hover-nav></hover-nav>
-	<diy-bottom-nav></diy-bottom-nav>
 </template>
 
 <script>

pages_tool/form/form.vue

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

pages_tool/form/formdata.vue

@@ -0,0 +1,165 @@
+<template>
+	<view>
+		<block v-if="detail">
+			<view class="page">
+				<view class="system-form-wrap">
+					<view class="form-title" style="text-align:center;padding-top:40rpx;font-weight:600;font-size:30rpx;">
+						请填写表单所需信息
+					</view>
+					<ns-newform ref="form" :data="detail.json_data" @submit="create"></ns-newform>
+					<button class="button mini" style="font-size:32rpx;" type="primary" size="mini" @click="create">提交</button>
+				</view>
+			</view>
+		</block>
+		<block v-else>
+			<ns-empty :text="complete ? '提交成功' : '未获取到表单信息'" :isIndex="false"></ns-empty>
+		</block>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			id: 0,
+			detail: null,
+			isRepeat: false,
+			complete: false,
+			scroll: true,
+			uniacid: 0
+		}
+	},
+	onLoad(options) {
+		if (!options.uniacid) {
+			uni.showModal({
+				title: '提示',
+				content: '参数错误',
+				showCancel: false,
+				success: () => {}
+			})
+			return false
+		}
+
+		this.uniacid = options.uniacid
+		this.id = options.id || 0
+
+		if (options.scene) {
+			const scene = decodeURIComponent(options.scene)
+			const params = scene.split('&')
+			params.length && params.forEach(item => {
+				if (item.indexOf('id') != -1) {
+					this.id = item.split('-')[1]
+				}
+			})
+		}
+
+		this.getData()
+	},
+	watch: {
+		storeToken(newVal, oldVal) {
+			newVal && this.getData()
+		}
+	},
+	methods: {
+		getData() {
+			this.$api.sendRequest({
+				url: '/form/api/form/info',
+				data: {
+					form_id: this.id,
+					uniacid: this.uniacid
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.detail = res.data
+						uni.setNavigationBarTitle({
+							title: res.data.form_name
+						})
+					}
+					this.$refs.loadingCover && this.$refs.loadingCover.hide()
+				},
+				fail: () => {
+					this.$refs.loadingCover && this.$refs.loadingCover.hide()
+				}
+			})
+		},
+		create() {
+			if (!this.$refs.form.verify()) return
+
+			if (this.isRepeat) return
+
+			this.isRepeat = true
+			this.$api.sendRequest({
+				url: '/form/api/form/create',
+				data: {
+					form_id: this.id,
+					form_data: JSON.stringify(this.$refs.form.formData),
+					uniacid: this.uniacid
+				},
+				success: res => {
+					if (res.code == 0) {
+						uni.showModal({
+							title: '提示',
+							content: '提交成功',
+							showCancel: false,
+							success: () => {}
+						})
+					} else {
+						this.isRepeat = false
+						this.$util.showToast({
+							title: res.message
+						})
+					}
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style scoped>
+page {
+	background: #fff;
+}
+
+.form-banner {
+	width: 100vw;
+	line-height: 1;
+}
+
+.form-banner image {
+	width: 100%;
+	line-height: 1;
+}
+
+.system-form-wrap {
+	border-radius: 32rpx;
+	overflow: hidden;
+	margin: 0 0 60rpx 0;
+	padding: 0 12rpx;
+	transform: translateY(-40rpx);
+}
+
+.system-form-wrap .form-title {
+	line-height: 100rpx;
+	padding-top: 20rpx;
+}
+
+.system-form-wrap .button {
+	height: 80rpx;
+	line-height: 80rpx !important;
+	margin-top: 30rpx !important;
+	width: 84%;
+	margin-left: 28rpx !important;
+	border-radius: 80rpx;
+	background: #f4391c;
+	color: #fff;
+}
+
+.system-form-wrap .form-wrap {
+	background: #fff;
+	padding: 30rpx;
+	border-radius: 32rpx;
+}
+</style>

pages_tool/goods/coupon.vue

@@ -1,6 +1,5 @@
 <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>

pages_tool/goods/coupon_receive.vue

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

pages_tool/goods/evaluate.vue

@@ -1,342 +1,341 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="goods-evaluate">
-		<view class="evaluate-tab">
-			<view v-for="(item, index) in evaluateList" :key="index" :class="evaluateTab == item.value ? 'active-tab' : ''" @click="onEvaluateTab(item.value)">
-				{{ item.name }}({{ item.count }})
-			</view>
-		</view>
-		<mescroll-uni ref="mescroll" top="100" @getData="getGoodsEvaluate">
-			<block slot="list">
-				<view class="evaluate-item" v-for="(item, index) in list" :key="index">
-					<view class="evaluator">
-						<view>
-							<view class="evaluator-face">
-								<image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="imageError(index)" mode="aspectFill" />
-								<image v-else :src="$util.getDefaultImage().head" mode="aspectFill" />
-							</view>
-
-							<view class="evaluator-info">
-								<view class="evaluator-info-left">
-									<view class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-										{{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
-									</view>
-									<text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
-									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</view>
-								</view>
-								<view class="evaluator-xing"><xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent></view>
-							</view>
-						</view>
-					</view>
-					<view class="cont">{{ item.content }}</view>
-					<scroll-view scroll-x="true">
-						<view class="evaluate-img" v-if="item.images">
-							<view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
-								<image :src="$util.img(img)" mode="aspectFill" />
-							</view>
-						</view>
-					</scroll-view>
-
-					<view v-if="item.explain_first != ''" class="time shop-reply-box">
-						<view class="shop-reply">商家回复：</view>
-						<view class="cont">{{ item.explain_first }}</view>
-					</view>
-
-					<template v-if="item.again_content != '' && item.again_is_audit == 1">
-						<view class="review-evaluation color-base-text">追加评价</view>
-						<view class="cont">{{ item.again_content }}</view>
-						<scroll-view scroll-x="true">
-							<view class="evaluate-img" v-if="item.again_images.length > 0">
-								<view
-									class="img-box"
-									v-for="(again_img, again_index) in item.again_images"
-									:key="again_index"
-									@click="previewEvaluate(index, again_index, 'again_images')"
-								>
-									<image :src="$util.img(again_img)" mode="aspectFill"></image>
-								</view>
-							</view>
-						</scroll-view>
-
-						<view v-if="item.again_explain != ''" class="time shop-reply-box">
-							<view class="shop-reply" v-if="item.again_explain != ''">商家回复：</view>
-							<view class="cont">{{ item.again_explain }}</view>
-						</view>
-					</template>
-				</view>
-				<view v-if="list.length == 0"><ns-empty text="暂无商品评价"></ns-empty></view>
-			</block>
-		</mescroll-uni>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
-export default {
-	components: { xiaoStarComponent },
-	data() {
-		return {
-			goodsId: 0,
-			list: [],
-			evaluateList: [{ name: '全部', value: 0, count: 0 }, { name: '好评', value: 1, count: 0 }, { name: '中评', value: 2, count: 0 }, { name: '差评', value: 3, count: 0 }],
-			evaluateTab: 0,
-			mescroll_type: {}
-		};
-	},
-	onLoad(data) {
-		this.goodsId = data.goods_id || 0;
-		this.getEvaluateCount();
-	},
-	onShow() {
-	},
-	methods: {
-		getEvaluateCount(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/goodsevaluate/getgoodsevaluate',
-				data: {
-					goods_id: this.goodsId
-				},
-				success: res => {
-					for (let i = 0; i < this.evaluateList.length; i++) {
-						if (this.evaluateList[i].value == 0) {
-							this.evaluateList[i].count = res.data.total;
-						} else if (this.evaluateList[i].value == 1) {
-							this.evaluateList[i].count = res.data.haoping;
-						} else if (this.evaluateList[i].value == 2) {
-							this.evaluateList[i].count = res.data.zhongping;
-						} else if (this.evaluateList[i].value == 3) {
-							this.evaluateList[i].count = res.data.chaping;
-						}
-					}
-				}
-			});
-		},
-		getGoodsEvaluate(mescroll) {
-			this.mescroll_type = mescroll;
-			this.$api.sendRequest({
-				url: '/api/goodsevaluate/page',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size,
-					goods_id: this.goodsId,
-					explain_type: this.evaluateTab == 0 ? '' : this.evaluateTab
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-
-					for (var i = 0; i < newArr.length; i++) {
-						if (newArr[i].images) newArr[i].images = newArr[i].images.split(',');
-						if (newArr[i].again_images) newArr[i].again_images = newArr[i].again_images.split(',');
-						if (newArr[i].is_anonymous == 1) newArr[i].member_name = newArr[i].member_name.replace(newArr[i].member_name.substring(1, newArr[i].member_name.length - 1), '***');
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-					this.list = this.list.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-
-		// 预览评价图片
-		previewEvaluate(index, img_index, field) {
-			var paths = [];
-			for (let i = 0; i < this.list[index][field].length; i++) {
-				paths.push(this.$util.img(this.list[index][field][i]));
-			}
-			uni.previewImage({
-				current: img_index,
-				urls: paths
-			});
-		},
-
-		imageError(index) {
-			this.list[index].member_headimg = this.$util.getDefaultImage().head;
-			this.$forceUpdate();
-		},
-		onEvaluateTab(value) {
-			this.list = [];
-			this.evaluateTab = value;
-			this.mescroll_type.num = 1;
-			this.mescroll_type.size = 10;
-			let mescrolls = {
-				num: 1,
-				size: 10
-			};
-			this.getGoodsEvaluate(this.mescroll_type);
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.goods-evaluate {
-	.evaluate-tab {
-		display: flex;
-		align-items: center;
-		background: #fff;
-		height: 100rpx;
-		padding: 0 $margin-both;
-
-		view {
-			background: #f0f0f0;
-			color: #333;
-			border-radius: 30rpx;
-			margin-right: 20rpx;
-			padding: 8rpx 30rpx;
-			font-size: 24rpx;
-		}
-		.active-tab {
-			background-color: $base-color;
-			color: #fff;
-		}
-	}
-	.evaluate-item {
-		margin: $margin-updown $margin-both;
-		padding: $margin-both;
-		background: #fff;
-		border-radius: 10rpx;
-
-		.evaluator {
-			& > view {
-				display: flex;
-				align-items: center;
-			}
-
-			.evaluator-face {
-				width: 79rpx;
-				height: 79rpx;
-				border-radius: 50%;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.evaluator-info {
-				width: 85%;
-				margin-left: 13rpx;
-
-				.evaluator-name {
-					color: #303133;
-					font-size: $font-size-base;
-					line-height: 1;
-					width: 250rpx;
-				}
-
-				.evaluator-time {
-					font-size: $font-size-tag;
-					// margin-top: 14rpx;
-					line-height: 1;
-				}
-				.evaluator-info-left {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-				}
-			}
-		}
-
-		.cont {
-			text-align: justify;
-			display: -webkit-box;
-			word-break: break-all;
-			font-size: $font-size-base;
-			margin: 26rpx 0 0;
-			color: #000000;
-			line-height: 42rpx;
-		}
-
-		.evaluate-img {
-			display: flex;
-			width: 100%;
-			flex-wrap: wrap;
-			margin-top: 19rpx;
-
-			.img-box {
-				flex-shrink: 0;
-				width: 140rpx;
-				height: 140rpx;
-				overflow: hidden;
-				margin: 20rpx 23rpx 0 0;
-				border-radius: 10rpx;
-
-				&:nth-child(4n) {
-					margin-right: 0;
-				}
-
-				&:nth-child(-n + 4) {
-					margin-top: 0;
-				}
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-		.time {
-			font-size: $font-size-tag;
-			background: #f8f8f8;
-			padding: 10rpx 20rpx;
-			border-radius: 6rpx;
-			margin-top: 20rpx;
-
-			text {
-				line-height: 42rpx;
-				color: $color-tip;
-			}
-		}
-
-		.evaluation-reply {
-			margin-top: 10rpx;
-			font-size: $font-size-tag;
-		}
-
-		.review-evaluation {
-			margin-top: 29rpx;
-			font-size: $font-size-base;
-			line-height: 1;
-
-			.review-time {
-				overflow: hidden;
-				float: right;
-			}
-
-			& + .cont {
-				margin: 18rpx 0 0;
-			}
-		}
-	}
-}
-
-.shop-reply {
-	font-size: $font-size-base;
-	color: #000;
-	line-height: 1;
-
-	& + .cont {
-		margin-top: 10rpx !important;
-	}
-}
-
-.shop-reply-box {
-	padding: 20rpx !important;
-}
-</style>
+<template>
+	<view class="goods-evaluate" :style="themeColor">
+		<view class="evaluate-tab">
+			<view v-for="(item, index) in evaluateList" :key="index" :class="evaluateTab == item.value ? 'active-tab' : ''" @click="onEvaluateTab(item.value)">
+				{{ item.name }}({{ item.count }})
+			</view>
+		</view>
+		<mescroll-uni ref="mescroll" top="100" @getData="getGoodsEvaluate">
+			<block slot="list">
+				<view class="evaluate-item" v-for="(item, index) in list" :key="index">
+					<view class="evaluator">
+						<view>
+							<view class="evaluator-face">
+								<image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="imageError(index)" mode="aspectFill" />
+								<image v-else :src="$util.getDefaultImage().head" mode="aspectFill" />
+							</view>
+
+							<view class="evaluator-info">
+								<view class="evaluator-info-left">
+									<view class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+										{{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
+									</view>
+									<text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
+									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</view>
+								</view>
+								<view class="evaluator-xing"><xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent></view>
+							</view>
+						</view>
+					</view>
+					<view class="cont">{{ item.content }}</view>
+					<scroll-view scroll-x="true">
+						<view class="evaluate-img" v-if="item.images">
+							<view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
+								<image :src="$util.img(img)" mode="aspectFill" />
+							</view>
+						</view>
+					</scroll-view>
+
+					<view v-if="item.explain_first != ''" class="time shop-reply-box">
+						<view class="shop-reply">商家回复：</view>
+						<view class="cont">{{ item.explain_first }}</view>
+					</view>
+
+					<template v-if="item.again_content != '' && item.again_is_audit == 1">
+						<view class="review-evaluation color-base-text">追加评价</view>
+						<view class="cont">{{ item.again_content }}</view>
+						<scroll-view scroll-x="true">
+							<view class="evaluate-img" v-if="item.again_images.length > 0">
+								<view
+									class="img-box"
+									v-for="(again_img, again_index) in item.again_images"
+									:key="again_index"
+									@click="previewEvaluate(index, again_index, 'again_images')"
+								>
+									<image :src="$util.img(again_img)" mode="aspectFill"></image>
+								</view>
+							</view>
+						</scroll-view>
+
+						<view v-if="item.again_explain != ''" class="time shop-reply-box">
+							<view class="shop-reply" v-if="item.again_explain != ''">商家回复：</view>
+							<view class="cont">{{ item.again_explain }}</view>
+						</view>
+					</template>
+				</view>
+				<view v-if="list.length == 0"><ns-empty text="暂无商品评价"></ns-empty></view>
+			</block>
+		</mescroll-uni>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
+export default {
+	components: { xiaoStarComponent },
+	data() {
+		return {
+			goodsId: 0,
+			list: [],
+			evaluateList: [{ name: '全部', value: 0, count: 0 }, { name: '好评', value: 1, count: 0 }, { name: '中评', value: 2, count: 0 }, { name: '差评', value: 3, count: 0 }],
+			evaluateTab: 0,
+			mescroll_type: {}
+		};
+	},
+	onLoad(data) {
+		this.goodsId = data.goods_id || 0;
+		this.getEvaluateCount();
+	},
+	onShow() {
+	},
+	methods: {
+		getEvaluateCount(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/getgoodsevaluate',
+				data: {
+					goods_id: this.goodsId
+				},
+				success: res => {
+					for (let i = 0; i < this.evaluateList.length; i++) {
+						if (this.evaluateList[i].value == 0) {
+							this.evaluateList[i].count = res.data.total;
+						} else if (this.evaluateList[i].value == 1) {
+							this.evaluateList[i].count = res.data.haoping;
+						} else if (this.evaluateList[i].value == 2) {
+							this.evaluateList[i].count = res.data.zhongping;
+						} else if (this.evaluateList[i].value == 3) {
+							this.evaluateList[i].count = res.data.chaping;
+						}
+					}
+				}
+			});
+		},
+		getGoodsEvaluate(mescroll) {
+			this.mescroll_type = mescroll;
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					goods_id: this.goodsId,
+					explain_type: this.evaluateTab == 0 ? '' : this.evaluateTab
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+
+					for (var i = 0; i < newArr.length; i++) {
+						if (newArr[i].images) newArr[i].images = newArr[i].images.split(',');
+						if (newArr[i].again_images) newArr[i].again_images = newArr[i].again_images.split(',');
+						if (newArr[i].is_anonymous == 1) newArr[i].member_name = newArr[i].member_name.replace(newArr[i].member_name.substring(1, newArr[i].member_name.length - 1), '***');
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+					this.list = this.list.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+
+		// 预览评价图片
+		previewEvaluate(index, img_index, field) {
+			var paths = [];
+			for (let i = 0; i < this.list[index][field].length; i++) {
+				paths.push(this.$util.img(this.list[index][field][i]));
+			}
+			uni.previewImage({
+				current: img_index,
+				urls: paths
+			});
+		},
+
+		imageError(index) {
+			this.list[index].member_headimg = this.$util.getDefaultImage().head;
+			this.$forceUpdate();
+		},
+		onEvaluateTab(value) {
+			this.list = [];
+			this.evaluateTab = value;
+			this.mescroll_type.num = 1;
+			this.mescroll_type.size = 10;
+			let mescrolls = {
+				num: 1,
+				size: 10
+			};
+			this.getGoodsEvaluate(this.mescroll_type);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.goods-evaluate {
+	.evaluate-tab {
+		display: flex;
+		align-items: center;
+		background: #fff;
+		height: 100rpx;
+		padding: 0 $margin-both;
+
+		view {
+			background: #f0f0f0;
+			color: #333;
+			border-radius: 30rpx;
+			margin-right: 20rpx;
+			padding: 8rpx 30rpx;
+			font-size: 24rpx;
+		}
+		.active-tab {
+			background-color: $base-color;
+			color: #fff;
+		}
+	}
+	.evaluate-item {
+		margin: $margin-updown $margin-both;
+		padding: $margin-both;
+		background: #fff;
+		border-radius: 10rpx;
+
+		.evaluator {
+			& > view {
+				display: flex;
+				align-items: center;
+			}
+
+			.evaluator-face {
+				width: 79rpx;
+				height: 79rpx;
+				border-radius: 50%;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.evaluator-info {
+				width: 85%;
+				margin-left: 13rpx;
+
+				.evaluator-name {
+					color: #303133;
+					font-size: $font-size-base;
+					line-height: 1;
+					width: 250rpx;
+				}
+
+				.evaluator-time {
+					font-size: $font-size-tag;
+					// margin-top: 14rpx;
+					line-height: 1;
+				}
+				.evaluator-info-left {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+			}
+		}
+
+		.cont {
+			text-align: justify;
+			display: -webkit-box;
+			word-break: break-all;
+			font-size: $font-size-base;
+			margin: 26rpx 0 0;
+			color: #000000;
+			line-height: 42rpx;
+		}
+
+		.evaluate-img {
+			display: flex;
+			width: 100%;
+			flex-wrap: wrap;
+			margin-top: 19rpx;
+
+			.img-box {
+				flex-shrink: 0;
+				width: 140rpx;
+				height: 140rpx;
+				overflow: hidden;
+				margin: 20rpx 23rpx 0 0;
+				border-radius: 10rpx;
+
+				&:nth-child(4n) {
+					margin-right: 0;
+				}
+
+				&:nth-child(-n + 4) {
+					margin-top: 0;
+				}
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.time {
+			font-size: $font-size-tag;
+			background: #f8f8f8;
+			padding: 10rpx 20rpx;
+			border-radius: 6rpx;
+			margin-top: 20rpx;
+
+			text {
+				line-height: 42rpx;
+				color: $color-tip;
+			}
+		}
+
+		.evaluation-reply {
+			margin-top: 10rpx;
+			font-size: $font-size-tag;
+		}
+
+		.review-evaluation {
+			margin-top: 29rpx;
+			font-size: $font-size-base;
+			line-height: 1;
+
+			.review-time {
+				overflow: hidden;
+				float: right;
+			}
+
+			& + .cont {
+				margin: 18rpx 0 0;
+			}
+		}
+	}
+}
+
+.shop-reply {
+	font-size: $font-size-base;
+	color: #000;
+	line-height: 1;
+
+	& + .cont {
+		margin-top: 10rpx !important;
+	}
+}
+
+.shop-reply-box {
+	padding: 20rpx !important;
+}
+</style>

pages_tool/goods/not_exist.vue

@@ -1,43 +1,42 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="page">
-		<view class="closeBox">
-			<image :src="$util.img('public/uniapp/goods/not_exist.png')" mode="widthFix"></image>
-			<text class="close-title">您查看的商品不存在，可能已下架或被删除</text>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {};
-	},
-	onShow() {},
-	methods: {}
-};
-</script>
-
-<style lang="scss">
-.page{
-	height: 100vh;
-	overflow: hidden;
-}
-.closeBox {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	margin-top: 260rpx;
-}
-image {
-	width: 400rpx;
-}
-.close-title {
-	font-size: $font-size-base;
-	color: $color-tip;
-	margin: 55rpx;
-	letter-spacing: 4rpx;
-}
-</style>
+<template>
+	<view class="page" :style="themeColor">
+		<view class="closeBox">
+			<image :src="$util.img('public/uniapp/goods/not_exist.png')" mode="widthFix"></image>
+			<text class="close-title">您查看的商品不存在，可能已下架或被删除</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onShow() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.page{
+	height: 100vh;
+	overflow: hidden;
+}
+.closeBox {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	margin-top: 260rpx;
+}
+image {
+	width: 400rpx;
+}
+.close-title {
+	font-size: $font-size-base;
+	color: $color-tip;
+	margin: 55rpx;
+	letter-spacing: 4rpx;
+}
+</style>

pages_tool/goods/search.vue

@@ -1,6 +1,5 @@
 <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()">

pages_tool/help/detail.vue

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

pages_tool/help/list.vue

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

pages_tool/index/diy.vue

@@ -1,95 +1,104 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true"/>
-		</view>
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</diy-index-page>
-
-		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</view>
-
-		<template v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="image-wrap">
-						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle" @click="uniPopupWindowFn()" mode="aspectFit"/>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
-				</uni-popup>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
+			<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
+				:style="{ backgroundImage: bgImg }">
+				<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
 			</view>
-		</template>
 
-		<!-- 底部tabBar -->
-		<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name"/>
-		</view>
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+					:haveTopCategory="true" />
+				<ns-copyright v-show="isShowCopyRight" />
+			</diy-index-page>
 
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
-				<text @click="closeCollectPopupWindow">我知道了</text>
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
+				<ns-copyright v-show="isShowCopyRight" />
 			</view>
-		</uni-popup>
 
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
+			<template
+				v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="image-wrap">
+							<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
+								@click="uniPopupWindowFn()" mode="aspectFit" />
+						</view>
+						<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
+					</uni-popup>
+				</view>
+			</template>
+
+			<!-- 底部tabBar -->
+			<view class="page-bottom" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" :name="name" />
+			</view>
+
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
+				</view>
+			</uni-popup>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-	import diyJs from '@/common/js/diy.js';
-	import microPageJs from './public/js/diy.js';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+import diyJs from '@/common/js/diy.js';
+import microPageJs from './public/js/diy.js';
 
-	export default {
-		components: {
-			uniPopup,
-			nsNavbar
-		},
-		mixins: [diyJs, microPageJs]
-	};
+export default {
+	components: {
+		uniPopup,
+		nsNavbar
+	},
+	mixins: [diyJs, microPageJs]
+};
 </script>
 
 <style lang="scss">
-	@import '@/common/css/diy.scss';
+@import '@/common/css/diy.scss';
 </style>
 
 <style scoped>
-	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none !important;
-	}
+.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none !important;
+}
 
-	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-		border-radius: 0;
-	}
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
 
-	.choose-store>>>.goodslist-uni-popup-box {
-		width: 80%;
-	}
+.choose-store>>>.goodslist-uni-popup-box {
+	width: 80%;
+}
 
-	/deep/ .placeholder {
-		height: 0;
-	}
+/deep/ .placeholder {
+	height: 0;
+}
 
-	/deep/::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		background-color: transparent;
-		display: none;
-	}
+/deep/::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>

pages_tool/login/find.vue

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

pages_tool/login/login.vue

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

pages_tool/member/account.vue

@@ -1,6 +1,5 @@
 <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">

pages_tool/member/account_edit.vue

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

pages_tool/member/address.vue

@@ -1,6 +1,5 @@
 <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">

pages_tool/member/address_edit.vue

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

pages_tool/member/apply_withdrawal.vue

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

pages_tool/member/assets.vue

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

pages_tool/member/balance.vue

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

pages_tool/member/balance_detail.vue

@@ -1,6 +1,5 @@
 <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>

pages_tool/member/cancellation.vue

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

pages_tool/member/cancelrefuse.vue

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

pages_tool/member/cancelstatus.vue

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

pages_tool/member/cancelsuccess.vue

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

pages_tool/member/card.vue

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

pages_tool/member/card_agreement.vue

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

pages_tool/member/card_buy.vue

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

pages_tool/member/collection.vue

@@ -1,6 +1,5 @@
 <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">

pages_tool/member/contact.vue

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

pages_tool/member/coupon.vue

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

pages_tool/member/footprint.vue

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

pages_tool/member/index.vue

@@ -1,65 +1,66 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
-			:style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
-		</view>
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-			:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-				:haveTopCategory="true" />
-			<ns-copyright v-show="isShowCopyRight" />
-		</diy-index-page>
-
-		<view v-else class="bg-index"
-			:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
-			<ns-copyright v-show="isShowCopyRight" />
-
-			<view class="foot">
-				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">{{ isEnEnv ? 'Privacy Policy' : '隐私协议'}}</view>
-				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">{{ isEnEnv ? 'Registration Agreement' : '注册协议'}}</view>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+			<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
+				:style="{ backgroundImage: bgImg }">
+				<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
 			</view>
-		</view>
 
-		<template
-			v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="image-wrap">
-						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
-							@click="uniPopupWindowFn()" mode="aspectFit" />
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
-				</uni-popup>
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+					:haveTopCategory="true" />
+				<ns-copyright v-show="isShowCopyRight" />
+			</diy-index-page>
+
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
+				<ns-copyright v-show="isShowCopyRight" />
+
+				<view class="foot">
+					<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">{{ isEnEnv ? 'Privacy Policy' : '隐私协议'}}</view>
+					<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">{{ isEnEnv ? 'Registration Agreement' : '注册协议'}}</view>
+				</view>
 			</view>
-		</template>
 
-		<!-- 底部tabBar -->
-		<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" />
-		</view>
+			<template
+				v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="image-wrap">
+							<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
+								@click="uniPopupWindowFn()" mode="aspectFit" />
+						</view>
+						<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
+					</uni-popup>
+				</view>
+			</template>
 
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow"
-				:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-				<text @click="closeCollectPopupWindow">我知道了</text>
+			<!-- 底部tabBar -->
+			<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" />
 			</view>
-		</uni-popup>
 
-		<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
-		<ns-new-gift ref="nsNewGift"></ns-new-gift>
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
+				</view>
+			</uni-popup>
+
+			<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
+			<ns-new-gift ref="nsNewGift"></ns-new-gift>
 
 
-		<hover-nav></hover-nav>
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
+			<hover-nav></hover-nav>
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
 	</view>
 </template>
 

pages_tool/member/info.vue

@@ -1,6 +1,5 @@
 <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">

pages_tool/member/info_edit.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<template v-if="memberInfo">
 			<!-- 修改用户名 -->
 			<view v-if="indent == 'username'" class="edit-info">

pages_tool/member/invite_friends.vue

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

pages_tool/member/level.vue

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

pages_tool/member/level_growth_rules.vue

@@ -1,275 +1,274 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="member-level">
-		<view class="grow-explain">
-			<view class="explain-title">
-				<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
-				成长值说明
-				<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
-			</view>
-			<view class="explain-table">
-				<view class="explain-tr">
-					<text class="explain-th">等级</text>
-					<text class="explain-th">成长值</text>
-				</view>
-				<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
-					<text class="explain-td">{{ item.level_name }}</text>
-					<text class="explain-td">{{ item.growth }}</text>
-				</view>
-			</view>
-		</view>
-		<view class="grow-value">
-			<view class="title">
-				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
-				<text>什么是成长值</text>
-			</view>
-			<view class="content color-tip">成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。</view>
-		</view>
-		<view class="acquisition-grow">
-			<view class="title">
-				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
-				<text>如何获得成长值</text>
-			</view>
-			<view class="content color-tip">
-				<text>1、注册会员送x成长值。</text>
-				<text>2、会员充值到余额送x成长值。</text>
-				<text>3、会员签到送x成长值。</text>
-				<text>4、会员消费x元，交易完成即可获得x个成长值。</text>
-			</view>
-		</view>
-
-		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
-	import toTop from '@/components/toTop/toTop.vue';
-	import scroll from '@/common/js/scroll-view.js';
-
-	export default {
-		components: {
-			nsProgress,
-			toTop
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				curIndex: 0,
-				descIndex: 0,
-				isDescAnimating: false,
-				scaleX: (634 / 540).toFixed(4),
-				scaleY: (378 / 330).toFixed(4),
-				swiperConfig: {
-					//type==1时的默认参数
-					indicatorDots: false,
-					indicatorColor: 'rgba(255, 255, 255, .4)',
-					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-					interval: 3000,
-					duration: 300,
-					circular: false,
-					previousMargin: '58rpx',
-					nextMargin: '58rpx'
-				},
-				levelList: [{
-					needGrowth: 0,
-					growth: 0
-				}],
-				levelId: 0,
-				growth: 0,
-
-				nowIndex: 0, //我当前所在等级的index
-				rule: [] //成长值规则
-			};
-		},
-		computed: {
-			listLen() {
-				return this.levelList.length;
-			},
-		},
-		onLoad() {
-			//会员等级
-			this.getLevelList();
-			this.getLevelRule();
-		},
-		onShow() {},
-		filters: {
-			rate(index, list, growth) {
-				let nowGrowth = Number(growth);
-				let minGrouth = Number(list[index].growth);
-				if (index == list.length - 1) {
-					return nowGrowth > minGrouth ? 100 : 0;
-				} else {
-					let maxGrouth = Number(list[index + 1].growth);
-					let num2 = nowGrowth - minGrouth;
-					let num1 = maxGrouth - minGrouth;
-					let num = Math.floor((num2 / num1) * 100);
-					return num > 100 ? 100 : num;
-				}
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				let that = this;
-				this.curIndex = e.detail.current;
-				this.isDescAnimating = true;
-				let timer = setTimeout(function() {
-					that.descIndex = e.detail.current;
-					clearTimeout(timer);
-				}, 150);
-			},
-			animationfinish(e) {
-				this.isDescAnimating = false;
-			},
-			getBannerDetail(index) {
-				uni.showLoading({
-					title: '将前往详情页面',
-					duration: 2000,
-					mask: true
-				});
-			},
-			getLevelList() {
-				this.$api.sendRequest({
-					url: '/api/memberlevel/lists',
-					success: res => {
-						if (res.data && res.code == 0) {
-							this.levelList = res.data;
-							this.levelId = this.memberInfo.member_level;
-							this.growth = this.memberInfo.growth;
-							for (let i = 0; i < this.levelList.length; i++) {
-								if (this.levelList[i].level_id == this.levelId) {
-									this.curIndex = i;
-									this.descIndex = i;
-									this.nowIndex = i;
-									break;
-								}
-							}
-							this.levelList.forEach((v, i) => {
-								let rate = 0;
-								if (i != this.levelList.length - 1) {
-									v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
-
-									if (v.needGrowth <= 0) {
-										rate = 100;
-									} else {
-										rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
-									}
-								} else {
-									v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
-									if (v.needGrowth <= 0) {
-										rate = 100;
-									} else {
-										rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
-									}
-								}
-								v.rate = rate;
-							});
-
-							this.levelList.forEach(v => {
-								if (v.consume_discount) {
-									v.consume_discount = (v.consume_discount / 10).toFixed(2);
-								}
-							});
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						}
-					}
-				});
-			},
-			getLevelRule() {
-				this.$api.sendRequest({
-					url: '/api/member/accountrule',
-					success: res => {
-						if (res.code == 0 && res.data && res.data.growth) {
-							this.rule = res.data.growth;
-						}
-					}
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #fff;
-	}
-
-	.grow-explain {
-		padding: 30rpx;
-		margin-top: 30rpx;
-
-		.explain-title {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			line-height: 1;
-
-			image {
-				margin: 0 20rpx;
-				width: 54rpx;
-				height: 18rpx;
-			}
-
-			margin-bottom: 40rpx;
-		}
-
-		.explain-tr {
-			display: flex;
-		}
-
-		.explain-th {
-			padding: 10rpx 30rpx;
-
-			&~.explain-th {
-				border-left: 4rpx solid #fff;
-			}
-
-			flex: 1;
-			background-color: #f6f1e4;
-		}
-
-		.explain-td {
-			padding: 10rpx 30rpx;
-
-			&~.explain-td {
-				border-left: 4rpx solid #fff;
-			}
-
-			height: 60rpx;
-			line-height: 60rpx;
-			flex: 1;
-			background-color: #fcfbf7;
-		}
-	}
-
-	.grow-value,
-	.acquisition-grow {
-		padding: 0 30rpx 30rpx;
-
-		.title {
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 30rpx;
-				height: 30rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.content {
-			font-size: 24rpx;
-			margin-left: 40rpx;
-
-			text {
-				display: block;
-			}
-		}
-	}
+<template>
+	<view :style="themeColor" class="member-level">
+		<view class="grow-explain">
+			<view class="explain-title">
+				<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
+				成长值说明
+				<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
+			</view>
+			<view class="explain-table">
+				<view class="explain-tr">
+					<text class="explain-th">等级</text>
+					<text class="explain-th">成长值</text>
+				</view>
+				<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
+					<text class="explain-td">{{ item.level_name }}</text>
+					<text class="explain-td">{{ item.growth }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="grow-value">
+			<view class="title">
+				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
+				<text>什么是成长值</text>
+			</view>
+			<view class="content color-tip">成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。</view>
+		</view>
+		<view class="acquisition-grow">
+			<view class="title">
+				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
+				<text>如何获得成长值</text>
+			</view>
+			<view class="content color-tip">
+				<text>1、注册会员送x成长值。</text>
+				<text>2、会员充值到余额送x成长值。</text>
+				<text>3、会员签到送x成长值。</text>
+				<text>4、会员消费x元，交易完成即可获得x个成长值。</text>
+			</view>
+		</view>
+
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
+	import toTop from '@/components/toTop/toTop.vue';
+	import scroll from '@/common/js/scroll-view.js';
+
+	export default {
+		components: {
+			nsProgress,
+			toTop
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				curIndex: 0,
+				descIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					//type==1时的默认参数
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [{
+					needGrowth: 0,
+					growth: 0
+				}],
+				levelId: 0,
+				growth: 0,
+
+				nowIndex: 0, //我当前所在等级的index
+				rule: [] //成长值规则
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+		},
+		onLoad() {
+			//会员等级
+			this.getLevelList();
+			this.getLevelRule();
+		},
+		onShow() {},
+		filters: {
+			rate(index, list, growth) {
+				let nowGrowth = Number(growth);
+				let minGrouth = Number(list[index].growth);
+				if (index == list.length - 1) {
+					return nowGrowth > minGrouth ? 100 : 0;
+				} else {
+					let maxGrouth = Number(list[index + 1].growth);
+					let num2 = nowGrowth - minGrouth;
+					let num1 = maxGrouth - minGrouth;
+					let num = Math.floor((num2 / num1) * 100);
+					return num > 100 ? 100 : num;
+				}
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				let that = this;
+				this.curIndex = e.detail.current;
+				this.isDescAnimating = true;
+				let timer = setTimeout(function() {
+					that.descIndex = e.detail.current;
+					clearTimeout(timer);
+				}, 150);
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getBannerDetail(index) {
+				uni.showLoading({
+					title: '将前往详情页面',
+					duration: 2000,
+					mask: true
+				});
+			},
+			getLevelList() {
+				this.$api.sendRequest({
+					url: '/api/memberlevel/lists',
+					success: res => {
+						if (res.data && res.code == 0) {
+							this.levelList = res.data;
+							this.levelId = this.memberInfo.member_level;
+							this.growth = this.memberInfo.growth;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									this.descIndex = i;
+									this.nowIndex = i;
+									break;
+								}
+							}
+							this.levelList.forEach((v, i) => {
+								let rate = 0;
+								if (i != this.levelList.length - 1) {
+									v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+
+									if (v.needGrowth <= 0) {
+										rate = 100;
+									} else {
+										rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
+									}
+								} else {
+									v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+									if (v.needGrowth <= 0) {
+										rate = 100;
+									} else {
+										rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
+									}
+								}
+								v.rate = rate;
+							});
+
+							this.levelList.forEach(v => {
+								if (v.consume_discount) {
+									v.consume_discount = (v.consume_discount / 10).toFixed(2);
+								}
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			getLevelRule() {
+				this.$api.sendRequest({
+					url: '/api/member/accountrule',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.growth) {
+							this.rule = res.data.growth;
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.grow-explain {
+		padding: 30rpx;
+		margin-top: 30rpx;
+
+		.explain-title {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			line-height: 1;
+
+			image {
+				margin: 0 20rpx;
+				width: 54rpx;
+				height: 18rpx;
+			}
+
+			margin-bottom: 40rpx;
+		}
+
+		.explain-tr {
+			display: flex;
+		}
+
+		.explain-th {
+			padding: 10rpx 30rpx;
+
+			&~.explain-th {
+				border-left: 4rpx solid #fff;
+			}
+
+			flex: 1;
+			background-color: #f6f1e4;
+		}
+
+		.explain-td {
+			padding: 10rpx 30rpx;
+
+			&~.explain-td {
+				border-left: 4rpx solid #fff;
+			}
+
+			height: 60rpx;
+			line-height: 60rpx;
+			flex: 1;
+			background-color: #fcfbf7;
+		}
+	}
+
+	.grow-value,
+	.acquisition-grow {
+		padding: 0 30rpx 30rpx;
+
+		.title {
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.content {
+			font-size: 24rpx;
+			margin-left: 40rpx;
+
+			text {
+				display: block;
+			}
+		}
+	}
 </style>