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/main.scss

@@ -874,3 +874,5 @@ scroll-view ::-webkit-scrollbar {
     display: inline-block;
     z-index: 100;
 }
+
+@import './mp_html_patch.scss';

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 }
 
-// 调试版本，配置说明
+export default {
-const devCfg = {
+    /**
+     * 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 = {
+    // 发行版本配置
-    /**
+    ...(releaseCfg || {}),
-     * 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),
 
 
     // 腾讯地图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: {
 		// 是否是英文环境
@@ -25,6 +12,9 @@ export default {
 		themeStyle() {
 			return this.$store.state.themeStyle;
 		},		
+		themeColor() {
+			return this.$store.state.themeColor;
+		},
 		// 插件是否存在
 		addonIsExist() {
 			return this.$store.state.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;
+		white-space: break-word;
-		text-overflow: ellipsis;
 		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

@@ -2,5 +2,6 @@ export const lang = {
 	//title为每个页面的标题
 	title: '商品分类',
 	search:'商品搜索',
-	seeMore : '查看更多'
+	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

@@ -6,6 +6,6 @@ export const lang = {
 	Price:'价格',
 	Filter:'筛选',
 	Search:'请输入您要搜索的商品',
-	Make:'咨询',
+	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" :style="themeColor">
-	<view class="empty">
 	</view>
 </template>
 

pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
 			<view class="site-info-box"
 				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
 				<view class="site-info">
@@ -12,7 +13,8 @@
 						<text>{{ followOfficialAccount.welcomeMsg }}</text>
 					</view>
 				</view>
-			<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号' }}</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 }">
@@ -119,7 +121,8 @@
 							<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 *
+								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
+									nearestStore.distance *
 									1000 +
 									'm' }}</text>
 							</view>
@@ -141,6 +144,7 @@
 			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 			<ns-login ref="login"></ns-login>
 		</view>
+	</view>
 </template>
 
 <script>

pages_goods/cart.vue

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

pages_order/detail_local_delivery.vue

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

pages_order/list.vue

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

pages_order/payment.vue

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

pages_promotion/fenxiao/bill.vue

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

pages_promotion/fenxiao/child_fenxiao.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<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)">

pages_promotion/fenxiao/goods_list.vue

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

pages_promotion/fenxiao/index.vue

@@ -1,21 +1,26 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view class="fenxiao-index" :style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')',backgroundRepeat: 'no-repeat',backgroundSize:'100%' }">
+		<view class="fenxiao-index"
+			:style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')', backgroundRepeat: 'no-repeat', backgroundSize: '100%' }">
 			<block v-if="info.fenxiao_id > 0">
 				<!-- 头部 -->
-			<view class="fenxiao-index-header" :class="{ 'not-level': !levelList.length }" >
+				<view class="fenxiao-index-header" :class="{ 'not-level': !levelList.length }">
 					<view class="member">
 						<view class="member-pic">
-						<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+							<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head"
+								@error="info.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 							<!-- <text class="level-name ">{{ info.level_name }}</text> -->
 						</view>
 						<view class="member-info">
 							<view class="member-info-box">
 								<text class="name">{{ info.fenxiao_name }}</text>
-							<p class="level"  v-if="info.level_num > 0"><img :src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')" alt="" class="level-icon">{{ info.level_name }}</p>
+								<p class="level" v-if="info.level_num > 0"><img
+										:src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')"
+										alt="" class="level-icon">{{ info.level_name }}</p>
 							</view>
-						<view class="recommend">上级代理商：{{ info.parent_name?info.parent_name:'总店' }}</view>
+							<view class="recommend">上级代理商：{{ info.parent_name ? info.parent_name : '总店' }}</view>
-						<view class="recommend">已邀请成功：{{ teamNum.num }}人<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
+							<view class="recommend">已邀请成功：{{ teamNum.num }}人<text class="iconfont icon-right"
+									style="font-size: 24rpx;"></text></view>
 						</view>
 						<!-- 	<view class="promote-rules font-size-tag" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
 						<text class="iconfont icon-wenhao font-size-tag"></text>
@@ -36,7 +41,8 @@
 					<view class="allmoney-top-money">
 						<view class="allmoney-top">
 							<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>
-						<view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+							<view class="withdrawal-record"
+								@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
 								提现明细
 								<text class="iconfont icon-right"></text>
 							</view>
@@ -53,12 +59,16 @@
 						<view class="title">已提现{{ fenxiaoWords.account }}</view>
 						<view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view>
 					</view> -->
-					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+						<view class="allmoney-all-wrap"
-						<view class="title">提现中(元)<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
+							@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+							<view class="title">提现中(元)<text class="iconfont icon-right"
+									style="font-size: 24rpx;"></text></view>
 							<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>
 						</view>
-					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/order', { type: 1 })">
+						<view class="allmoney-all-wrap"
-						<view class="title">待入账(元)<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
+							@click="$util.redirectTo('/pages_promotion/fenxiao/order', { type: 1 })">
+							<view class="title">待入账(元)<text class="iconfont icon-right"
+									style="font-size: 24rpx;"></text></view>
 							<view class="money price-font">{{ info.in_progress_money | moneyFormat }}</view>
 						</view>
 					</view>
@@ -66,15 +76,18 @@
 					</view>
 				</view>
 
-			<view class="fenxiao-index-allmoney" style="padding: 0;border-radius:24rpx;margin-top: 0;" @click="toPoster()">
+				<view class="fenxiao-index-allmoney" style="padding: 0;border-radius:24rpx;margin-top: 0;"
-				<image :src="$util.img('public/uniapp/fenxiao/index/commissionFission-qrcode1.png')" mode="widthFix" style="width: 100%;border-radius:24rpx" />
+					@click="toPoster()">
+					<image :src="$util.img('public/uniapp/fenxiao/index/commissionFission-qrcode1.png')" mode="widthFix"
+						style="width: 100%;border-radius:24rpx" />
 				</view>
 
 				<!-- 功能列表 -->
 				<view class="fenxiao-menu-list">
 					<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/team')">
 						<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/down-line.png')" mode="widthFix"></image>
+							<image :src="$util.img('public/uniapp/fenxiao/index/down-line.png')" mode="widthFix">
+							</image>
 						</view>
 						<view class="info">
 							<view class="title">我的粉丝</view>
@@ -83,16 +96,19 @@
 					</view>
 					<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
 						<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/jifenjiangli.png')" mode="widthFix"></image>
+							<image :src="$util.img('public/uniapp/fenxiao/index/jifenjiangli.png')" mode="widthFix">
+							</image>
 						</view>
 						<view class="info">
 							<view class="title">{{ fenxiaoWords.withdraw }}明细</view>
-						<view class="desc">累计{{ fenxiaoWords.account }}￥{{ info.total_commission | moneyFormat }}</view>
+							<view class="desc">累计{{ fenxiaoWords.account }}￥{{ info.total_commission | moneyFormat }}
+							</view>
 						</view>
 					</view>
 					<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/order')">
 						<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/fenxiaodingdan.png')" mode="widthFix"></image>
+							<image :src="$util.img('public/uniapp/fenxiao/index/fenxiaodingdan.png')" mode="widthFix">
+							</image>
 						</view>
 						<view class="info">
 							<view class="title">{{ fenxiaoWords.concept + '订单' }}</view>
@@ -240,13 +256,14 @@
 				</view>
 			</uni-popup>
 		</view>
+	</view>
 </template>
 
 <script>
-	import fenxiaoWords from '@/common/js/fenxiao-words.js';
+import fenxiaoWords from '@/common/js/fenxiao-words.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
-	export default {
+export default {
 	components: {
 		uniPopup
 	},
@@ -267,7 +284,7 @@
 			profitRanking: 0,
 			invitedNumRanking: 0,
 			levelList: [],
-				poster:''
+			poster: ''
 		};
 	},
 	mixins: [fenxiaoWords],
@@ -286,7 +303,7 @@
 		this.getPoster();
 	},
 	onLoad() {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -297,12 +314,12 @@
 					this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 		this.getFenxiaoLevel();
 	},
 	methods: {
-			toPoster(){
+		toPoster() {
-				this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
+			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster, templateId: this.templateId })
 		},
 		/**
 		 * 获取分享海报
@@ -448,7 +465,7 @@
 		return true;
 	},
 	watch: {
-			storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.checkFenxiaoIsStart();
 			}
@@ -563,25 +580,25 @@
 			}
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/index.scss';
+@import './public/css/index.scss';
 </style>
 <style scoped lang="scss">
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	height: auto;
-	}
+}
 
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
-	.uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box {
+.uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
-	}
+}
 </style>

pages_promotion/fenxiao/level.vue

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

pages_promotion/fenxiao/order.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<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>

pages_promotion/fenxiao/order_detail.vue

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

pages_promotion/fenxiao/promote.vue

@@ -1,11 +1,14 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view class="fenxiao-promote" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+		<view class="fenxiao-promote"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
 			<view class="my-earnings">
 				<view class="earnings-head-wrap">
 					<view class="earnings-head">
-					<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')" mode="aspectFit"></image>
+						<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')"
-					<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')" mode="aspectFill"></image>
+							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>
@@ -21,12 +24,9 @@
 					<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
+								<image class="item-img"
-								class="item-img"
 									:src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
-								@error="item.headimg = $util.getDefaultImage().head"
+									@error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
-								mode="aspectFill"
-							></image>
 								<view class="item-content">
 									<view class="item-name multi-hidden">{{ item.nickname }}</view>
 								</view>
@@ -37,8 +37,10 @@
 				</view>
 			</view>
 			<view class="activity-rules">
-			<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')" mode="aspectFit"></image>
+				<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')"
-			<view class="content" v-if="promoteContent.content"><rich-text :nodes="promoteContent.content"></rich-text></view>
+					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>
@@ -51,6 +53,7 @@
 			<privacy-popup ref="privacyPopup"></privacy-popup>
 			<!-- #endif -->
 		</view>
+	</view>
 </template>
 
 <script>
@@ -69,11 +72,11 @@ export default {
 			isPay: 0,
 			detailData: {},
 			templateId: '',
-			poster:'',
+			poster: '',
 		};
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -84,7 +87,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
 		if (this.storeToken) {
 			this.getTeam();
@@ -101,8 +104,8 @@ export default {
 		this.getPoster();
 	},
 	methods: {
-		toPoster(){
+		toPoster() {
-			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
+			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster, templateId: this.templateId })
 		},
 		tabCut(index) {
 			this.tabIndex = index;
@@ -214,14 +217,17 @@ export default {
 	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;
@@ -229,33 +235,40 @@ export default {
 			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;
@@ -264,9 +277,11 @@ export default {
 				font-size: 30rpx;
 				color: #e93224;
 				margin-bottom: 10rpx;
+
 				text.active {
 					position: relative;
 					font-weight: bold;
+
 					&::after {
 						position: absolute;
 						content: '';
@@ -279,35 +294,43 @@ export default {
 					}
 				}
 			}
+
 			.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;
@@ -316,10 +339,12 @@ export default {
 			font-size: 30rpx;
 		}
 	}
+
 	.activity-rules {
 		position: relative;
 		margin-top: 60rpx;
 		min-height: 300rpx;
+
 		.rules-name {
 			position: absolute;
 			width: 384rpx;
@@ -328,9 +353,11 @@ export default {
 			left: 50%;
 			transform: translateX(-50%);
 		}
+
 		.content {
 			padding: 70rpx 20rpx 0;
 		}
+
 		.rules-empty {
 			padding-top: 140rpx;
 			text-align: center;

pages_promotion/fenxiao/promote_code.vue

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

pages_promotion/fenxiao/ranking_list.vue

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

pages_promotion/fenxiao/relation.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<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">

pages_promotion/fenxiao/team.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<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>

pages_promotion/fenxiao/withdraw_apply.vue

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

pages_promotion/fenxiao/withdraw_list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view>
 		<mescroll-uni @getData="getData" class="member-point">
 			<view slot="list">
 				<block v-if="withdrawList.length">

pages_promotion/fenxiao/withdrawal_detail.vue

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

pages_promotion/merch/detail.vue

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

pages_promotion/point/list.vue

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

pages_promotion/point/order_list.vue

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

pages_promotion/point/payment.vue

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

pages_promotion/point/result.vue

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

pages_tool/agreement/contenr.vue

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

pages_tool/article/detail.vue

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

pages_tool/article/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view>
 		<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 :style="themeColor">
-	<view>
 		<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>
-	</view>
 		<hover-nav></hover-nav>
 		<diy-bottom-nav></diy-bottom-nav>		
+	</view>
 </template>
 
 <script>

pages_tool/form/form.vue

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

pages_tool/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 :style="themeColor">
-	<view>
 		<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" :style="themeColor">
-	<view class="container">
 		<view class="content">
 			<view class="wx-code">
 				<image :src="$util.img(path)" />

pages_tool/goods/evaluate.vue

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

pages_tool/goods/not_exist.vue

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

pages_tool/goods/search.vue

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

pages_tool/help/list.vue

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

pages_tool/index/diy.vue

@@ -1,25 +1,32 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
-		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			class="page-img">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true"/>
+			<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-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true"/>
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<ns-copyright v-show="isShowCopyRight"/>
+				<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 }">
+			<view v-else class="bg-index"
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"/>
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<ns-copyright v-show="isShowCopyRight"/>
+				<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">
+			<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"/>
+							<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>
@@ -28,13 +35,14 @@
 
 			<!-- 底部tabBar -->
 			<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name"/>
+				<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' }">
+				<view v-if="showTip" class="collectPopupWindow"
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
 					<text @click="closeCollectPopupWindow">我知道了</text>
 				</view>
 			</uni-popup>
@@ -44,52 +52,53 @@
 			<privacy-popup ref="privacyPopup"></privacy-popup>
 			<!-- #endif -->
 		</view>
+	</view>
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-	import diyJs from '@/common/js/diy.js';
+import diyJs from '@/common/js/diy.js';
-	import microPageJs from './public/js/diy.js';
+import microPageJs from './public/js/diy.js';
 
-	export default {
+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 {
+.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none !important;
-	}
+}
 
-	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
 	border-radius: 0;
-	}
+}
 
-	.choose-store>>>.goodslist-uni-popup-box {
+.choose-store>>>.goodslist-uni-popup-box {
 	width: 80%;
-	}
+}
 
-	/deep/ .placeholder {
+/deep/ .placeholder {
 	height: 0;
-	}
+}
 
-	/deep/::-webkit-scrollbar {
+/deep/::-webkit-scrollbar {
 	width: 0;
 	height: 0;
 	background-color: transparent;
 	display: none;
-	}
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/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" :style="themeColor">
-	<view class="find">
 		<view class="iconfont icon-close" @click="navigateBack()"></view>
 		<view class="header-wrap">
 			<block v-if="stepShow == 0">

pages_tool/login/login.vue

@@ -1,7 +1,7 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<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="header-wrap" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
 				<view class="t-b">
 					<div v-html="$lang('welcomeText')"></div>
 				</view>
@@ -11,17 +11,21 @@
 					<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" />
+							<input type="number" :placeholder="$lang('mobileInputPlaceholder')"
+								placeholder-class="input-placeholder" class="input" maxlength="11"
+								v-model="formData.mobile" />
 						</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" />
+							<input type="text" :placeholder="$lang('accountInputPlaceholder')"
+								placeholder-class="input-placeholder" class="input" v-model="formData.account" />
 						</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" />
+							<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>
@@ -29,31 +33,42 @@
 					</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" />
+							<input type="text" :placeholder="$lang('dynacodeInputPlaceholder')"
-						<view class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'"
+								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="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>
+					<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 class="regisiter-agreement"
-				<view style="" class="iconfont" :class=" isAgree ? 'icon-fuxuankuang1 color-base-text' : 'icon-fuxuankuang2' " @click="isAgree = !isAgree"></view>
+					style="margin: 0 50rpx;padding-top: 40rpx;line-height: 1.5;display: flex;">
-				<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 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>
+	</view>
 </template>
 
 <script>
-	import validate from 'common/js/validate.js';
+import validate from 'common/js/validate.js';
-	import registerReward from '@/components/register-reward/register-reward.vue';
+import registerReward from '@/components/register-reward/register-reward.vue';
 
-	export default {
+export default {
 	data() {
 		return {
 			isAgree: false,
@@ -97,7 +112,7 @@
 		// this.getCaptchaConfig();
 		this.authInfo = uni.getStorageSync('authInfo');
 	},
-		onShow() {},
+	onShow() { },
 	onReady() {
 		if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 	},
@@ -173,7 +188,7 @@
 			});
 			else this.$util.redirectTo('/pages_tool/login/find');
 		},
-			tourl(url){
+		tourl(url) {
 			this.$util.redirectTo(url);
 		},
 		/**
@@ -224,7 +239,7 @@
 										title: this.$lang('loginSuccessTip')
 									});
 									let back = this.back ? this.back : '/pages/member/index';
-										if(this.$refs.registerReward) this.$refs.registerReward.open(back);
+									if (this.$refs.registerReward) this.$refs.registerReward.open(back);
 								} else {
 									if (this.back != '') {
 										this.$util.redirectTo(decodeURIComponent(this.back), {}, 'reLaunch');
@@ -338,7 +353,7 @@
 							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);
+									if (this.$refs.registerReward) this.$refs.registerReward.open(back);
 								} else {
 									if (this.back != '') {
 										this.$util.redirectTo(decodeURIComponent(this.back), {}, this.redirect);
@@ -458,25 +473,26 @@
 			deep: true
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/common.scss';
+@import './public/css/common.scss';
-	.color-base-text{
+
-		color:#2796f2 !important
+.color-base-text {
-	}
+	color: #2796f2 !important
+}
 </style>
 
 <style lang="scss" scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
+/deep/ .reward-popup .uni-popup__wrapper-box {
 	background: none !important;
 	max-width: unset !important;
 	max-height: unset !important;
 	overflow: unset !important;
-	}
+}
 
-	/deep/ uni-toast .uni-simple-toast__text {
+/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 :style="themeColor">
-	<view>
 		<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" :style="themeColor">
-	<view class="account-list-content">
 		<view class="edit-item">
 			<text class="tit">{{ $lang('name') }}</text>
 			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name" v-model="formData.realname" />

pages_tool/member/address.vue

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

pages_tool/member/apply_withdrawal.vue

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

pages_tool/member/assets.vue

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

pages_tool/member/balance.vue

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

pages_tool/member/balance_detail.vue

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

pages_tool/member/cancelrefuse.vue

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

pages_tool/member/cancelstatus.vue

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

pages_tool/member/cancelsuccess.vue

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

pages_tool/member/card.vue

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

pages_tool/member/card_agreement.vue

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

pages_tool/member/card_buy.vue

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

pages_tool/member/collection.vue

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

pages_tool/member/coupon.vue

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

pages_tool/member/footprint.vue

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

pages_tool/member/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<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 }">
@@ -61,6 +61,7 @@
 			<privacy-popup ref="privacyPopup"></privacy-popup>
 			<!-- #endif -->
 		</view>
+	</view>
 </template>
 
 <script>

pages_tool/member/info.vue

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

pages_tool/member/level_growth_rules.vue

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

pages_tool/member/modify_face.vue

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