diff --git a/App.vue b/App.vue
index 67a717f..dadaa2e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,81 +1,56 @@
 <script>
-	import config from '@/app.config.js'
-	import { version } from './package.json'
-	export default {
-		methods: {
+import config from '@/app.config.js'
+import {version} from './package.json'
 
-		},
-		// 监听 - 页面404
-		onPageNotFound:function(e) {
-			uni.redirectTo({
-				url: config.error.url
-			})
-		},
-		onLaunch: function(options) {
-			// 注意：config.debug 在正式环境时，值为false，故此{}内的代码只有开发环境才会执行
-			if (config.debug) {
-				// #ifndef APP-PLUS
-				console.log(
-					`%c vk-client %c v${version} `,
-					'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
-					'background:#007aff ;padding: 1px; border-radius: 0 3px 3px 0;  color: #fff; font-weight: bold;'
-				);
-				// #endif
-				console.log('App Launch');
-			}
-			// 注意：以下代码正式和开发环境都会执行
-			// #ifdef MP
-			uni.vk.updateManager.updateReady(); // 此代码可以让小程序自动检测最新版本
-			// #endif
-			
-			
-			
-			
-			
-			
-			// 加载商品分类数据
-			vk.callFunction({
-				url: 'client/spot/category/pub/getTree',
-				loading: false,
-				data: {
-					
-				},
-				success: (data) => {
-					 vk.setVuex('$app.siteData.categoryData', data.rows)
-				}
-			});
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		},
-		onShow: function() {
-			if (config.debug) console.log("App Show");
-			// #ifdef MP-WEIXIN
-			// 检测如果当前是体验版，但没有点HBX的【发行】菜单发布，则提示开发者请点【发行】按钮
-			try {
-				console.log('当前运行模式: ', process.env.NODE_ENV);
-				const info = uni.getAccountInfoSync();
-				if (info.miniProgram.envVersion === "trial" && process.env.NODE_ENV !== 'production') {
-					// 如果不想要alert弹窗提示，可以将vk.alert改成console.log
-					uni.vk.alert('检测到您当前发布的【体验版】是通过【运行】按钮打包发布的，请重新点击HBX上方菜单的【发行】按钮进行打包发布小程序（如果确定是【发行】按钮打包的，请删除手机上的体验版小程序并重新扫码进入）', '重要提示', '好的');
-				}
-			} catch(err){}
-			// #endif
-		},
-		onHide: function() {
-			if(config.debug) console.log('App Hide');
-		}
-	}
+export default {
+    methods: {},
+    // 监听 - 页面404
+    onPageNotFound: function (e) {
+        uni.redirectTo({
+            url: config.error.url
+        })
+    },
+    onLaunch: function (options) {
+        // 注意：config.debug 在正式环境时，值为false，故此{}内的代码只有开发环境才会执行
+        if (config.debug) {
+            // #ifndef APP-PLUS
+            console.log(
+                `%c vk-client %c v${version} `,
+                'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
+                'background:#007aff ;padding: 1px; border-radius: 0 3px 3px 0;  color: #fff; font-weight: bold;'
+            );
+            // #endif
+            console.log('App Launch');
+        }
+        // 注意：以下代码正式和开发环境都会执行
+        // #ifdef MP
+        uni.vk.updateManager.updateReady(); // 此代码可以让小程序自动检测最新版本
+        // #endif
+
+    },
+    onShow: function () {
+        if (config.debug) console.log("App Show");
+        // #ifdef MP-WEIXIN
+        // 检测如果当前是体验版，但没有点HBX的【发行】菜单发布，则提示开发者请点【发行】按钮
+        try {
+            console.log('当前运行模式: ', process.env.NODE_ENV);
+            const info = uni.getAccountInfoSync();
+            if (info.miniProgram.envVersion === "trial" && process.env.NODE_ENV !== 'production') {
+                // 如果不想要alert弹窗提示，可以将vk.alert改成console.log
+                uni.vk.alert('检测到您当前发布的【体验版】是通过【运行】按钮打包发布的，请重新点击HBX上方菜单的【发行】按钮进行打包发布小程序（如果确定是【发行】按钮打包的，请删除手机上的体验版小程序并重新扫码进入）', '重要提示', '好的');
+            }
+        } catch (err) {
+        }
+        // #endif
+    },
+    onHide: function () {
+        if (config.debug) console.log('App Hide');
+    }
+}
 </script>
 
 <style lang="scss">
-	/*每个页面公共css */
-	// @import "./uni_modules/vk-uview-ui/index.scss";
-  @import "./common/css/app.scss";
+/*每个页面公共css */
+// @import "./uni_modules/vk-uview-ui/index.scss";
+@import "./common/css/app.scss";
 </style>
diff --git a/common/css/common.css b/common/css/common.css
index 78d1e32..dc2b556 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -529,6 +529,7 @@ h1, h2, h3, h4, h5 {
     white-space: nowrap;
     overflow: hidden;
     font-size: 0;
+    height: 44px;
 }
 
 .mod-mini-search .mod-hot-query li {
@@ -748,7 +749,7 @@ button, input, select, textarea {
     float: left;
     width: 220px;
     height: 40px;
-    cursor: pointer;
+    /*cursor: pointer;*/
     position: relative;
 }
 
@@ -892,7 +893,7 @@ button, input, select, textarea {
 
 .cate-menu {
     height: 500px;
-    overflow: hidden;
+    overflow-y: auto;
     width: 100%;
 }
 
@@ -2170,6 +2171,10 @@ input:disabled {
     color: #333;
 }
 
+.text-blue {
+    color: #316ccb;
+}
+
 .color-6C {
     color: #6C6C6C;
 }
@@ -2322,6 +2327,10 @@ input:disabled {
     width: 33%;
 }
 
+.w-35p {
+    width: 35%;
+}
+
 .w-40p {
     width: 40%;
 }
@@ -2701,11 +2710,11 @@ input:disabled {
     border-right: 1rpx solid #F1F5F9;
 }
 
-.bg-gray{
+.bg-gray {
     background-color: #DDD;
 }
 
-.bg-gray-light{
+.bg-gray-light {
     background-color: #F9F9F9;
 }
 
@@ -2741,9 +2750,23 @@ input:disabled {
     border: 1px solid #a92924;
 }
 
-.line-1{
+.line-1 {
     text-overflow: ellipsis;
     overflow: hidden;
     word-break: break-all;
     white-space: nowrap;
+}
+
+.line-2 {
+    text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+.text-line-through {
+    text-decoration: line-through;
 }
\ No newline at end of file
diff --git a/common/css/main.css b/common/css/main.css
index aa080b9..ad5e502 100644
--- a/common/css/main.css
+++ b/common/css/main.css
@@ -37,7 +37,7 @@ body, html {
 .group-inner1 .mod-tab ul li{
 	float: left;
 	border: 1px solid #ddd;
-	margin:0px 10px 10px 0px;
+	margin:0 10px 10px 0;
 }
 .group-inner1 .mod-tab ul li a{
     display: block;
@@ -213,7 +213,7 @@ body, html {
 }
 
 .mod-inner2Listcenter .inli-mask{
-    width: 266px;
+    width: 220px;
     position: relative;
     float: left;
     padding: 13px 5px;
@@ -221,12 +221,12 @@ body, html {
     -webkit-transition: all .2s linear;
     -o-transition: all .2s linear;
     transition: all .2s linear;
-    margin-right: 45px;
+    margin-right: 10px;
 	background-color: #FFFFFF;
-	margin-bottom: 45rpx;
+	margin-bottom: 30rpx;
 }
 
-.mod-inner2Listcenter .inli-mask:nth-child(4n){
+.mod-inner2Listcenter .inli-mask:nth-child(5n){
   margin-right: 0;
 }
 .mod-inner2Listcenter{
@@ -2632,9 +2632,13 @@ letter-spacing: 3px;
     font-size: 18px;
 }
 #footer{
-    margin-top: 0px;
+    margin-top: 0;
 }
 
 .ddddd .shop_check{
     color: #a92924;
+}
+
+.currentDatePickerClass .el-picker-panel__footer .el-button--text.el-picker-panel__link-btn {
+    display: none;
 }
\ No newline at end of file
diff --git a/components/category-bar/category-bar.vue b/components/category-bar/category-bar.vue
index dac2c69..c60241c 100644
--- a/components/category-bar/category-bar.vue
+++ b/components/category-bar/category-bar.vue
@@ -1,374 +1,494 @@
 <template>
-    <view>
-        <div class="group-nav">
-            <div class="mod-nav clearfix">
-                <div class="first-level-nav ">
-                    <div class="clearfix navigation-bottom">
-                        <div class="classification" id="bannerAllPro">
-                            <div class="classification-text">
-                                <i class="el-icon-menu"></i> 全部商品分类
-                            </div>
-                            <!--全部商品分类开始-->
-                            <div v-show="alwaysShowCategory || showCategory" class="banner-left" style="">
-                                <div class="mod-category">
-                                    <div class="part-category">
-                                        <div class="cate-menu" psa="a156">
-                                            <ul id="nav-sub" class="">
-                                                <li v-for="(item,index) in vk.getVuex('$app.siteData.categoryData')"
-                                                    class="clearfix menuliselected" :key="index">
-                                                    <i class="cate-menu-icon cate-icon-1"></i>
-                                                    <h2>
-                                                        <a href="">{{ item.name }}</a>
-                                                    </h2>
-                                                    <div class="cate-item clearfix">
-                                                        <a v-for="(citem,cindex) in item.children" href=""
-                                                           :key="cindex">{{ citem.name }}</a>
-                                                    </div>
-                                                </li>
+  <view>
+    <div class="group-nav">
+      <div class="mod-nav clearfix">
+        <div class="first-level-nav ">
+          <div class="clearfix navigation-bottom">
+            <div class="classification" id="bannerAllPro">
+              <div class="classification-text">
+                <i class="el-icon-menu"></i> 全部商品分类
+              </div>
+              <!--全部商品分类开始-->
+              <div v-show="alwaysShowCategory || showCategory" class="banner-left" style="">
+                <div class="mod-category">
+                  <div class="part-category">
+                    <div class="cate-menu" psa="a156">
+                      <ul id="nav-sub" class="">
+                        <li v-for="(item,index) in categoryData"
+                            @mouseenter="showShowChild(index)"
+                            @mouseleave="hideShowChild(index)"
+                            class="clearfix menuliselected" :key="index">
+                          <i class="cate-menu-icon cate-icon-1"></i>
+                          <h2>
+                            <a @click="jumpToIndex(item)" class="pointer cate-name">{{
+                                item.name
+                              }}</a>
+                          </h2>
+                          <div class="cate-item clearfix" v-if="item.showChild">
+                            <a v-for="(citem,cindex) in item.children" href="javascript:;"
+                               v-show="cindex < 9"
+                               @click="jump(item, citem)"
+                               :key="cindex">{{ citem.name }}</a>
+                          </div>
+                        </li>
+                      </ul>
+                    </div>
+                    <!--                                        <div class="cate-cont" psa="a157" style="">-->
+                    <!--                                            <div class="item-main" style="">-->
+                    <!--                                                <div class="part-hot-word">-->
+                    <!--                                                    <div class="item">-->
+                    <!--                                                        <div class="title">-->
+                    <!--                                                            <h2>-->
+                    <!--                                                                <a href="/market/index.html?name2=螺纹钢、高线">螺纹钢</a>-->
+                    <!--                                                            </h2>-->
+                    <!--                                                            <a href="/market/index.html" class="more">更多-->
+                    <!--                                                                <i>&gt;</i></a>-->
+                    <!--                                                        </div>-->
+                    <!--                                                        <div class="cont">-->
+                    <!--                                                        </div>-->
+                    <!--                                                    </div>-->
+                    <!--                                                </div>-->
+                    <!--                                                <div class="part-logo-cont">-->
+                    <!--                                                </div>-->
+                    <!--                                            </div>-->
+                    <!--                                        </div>-->
+                  </div>
+                </div>
+              </div>
 
-                                            </ul>
+              <!--全部商品分类结束-->
+            </div>
+            <div class="linkNav">
+              <ul>
+                <li class="nav ">
+                  <a href="/">首页</a>
+                </li>
+                <li class="nav" @click="navTo('/pages/index/self-support/self-support')"
+                    :class="[currentPage.includes('self-support') ? 'active' : '']">
+                  <a href="javascript:;">金久信自营</a>
+                </li>
+                <li @click="navTo('/pages/spot/goods/goods')" class="nav"
+                    :class="[currentPage.includes('spot') ? 'active' : '']">
+                  <a href="javascript:;" class="navigator">
+                    现货市场
+                  </a>
+                </li>
+                <li @click="navTo('/pages/enquiry/list')" class="nav "
+                    :class="[currentPage.includes('enquiry')  ? 'active' : '']">
+                  <a href="javascript:;" class="navigator">
+                    找供应
+                  </a>
+                </li>
+                <li @click="navTo('/pages/process/list')" class="nav "
+                    :class="[currentPage.includes('process')  ? 'active' : '']">
+                  <a href="javascript:;">找加工</a>
+                </li>
+                <li class="nav " @click="navTo('/pages/index/old/old')"
+                    :class="[currentPage.includes('old')  ? 'active' : '']">
+                  <a href="javascript:;">旧货交易</a>
+                </li>
+                <li @click="navTo('/pages/yellowPage/list')" class="nav "
+                    :class="[currentPage.includes('yellowPage')  ? 'active' : '']">
+                  <a href="javascript:;">金久信黄页</a>
+                </li>
+                <li class="nav " @click="navTo('/pages/article/list')"
+                    :class="[currentPage.includes('article')  ? 'active' : '']">
+                  <a href="javascript:;">金久信学堂</a>
+                </li>
+                <li class="nav " @click="navTo('/pages/index/shop/shop')"
+                    :class="[(currentPage.includes('shop') && !currentPage.includes('pay'))  ? 'active' : '']">
+                  <a href="javascript:;">特产商城</a>
+                </li>
+              </ul>
+            </div>
+            <div class="classification">
+              <div class="entry">
+                <div class="entry-link " @click="navTo('/pages/index/self-support/self-support')">
+                  <img src="@/static/images/logo-left2.png">
+                </div>
+              </div>
+              <!--全部商品分类开始-->
+              <div v-show="alwaysShowCategory" class="zghome-nav-display">
 
-                                        </div>
-                                        <div class="cate-cont" psa="a157" style="">
-                                            <div class="item-main" style="">
-                                                <div class="part-hot-word">
-                                                    <div class="item">
-                                                        <div class="title">
-                                                            <h2>
-                                                                <a href="/market/index.html?name2=螺纹钢、高线">螺纹钢</a>
-                                                            </h2>
-                                                            <a href="/market/index.html" class="more">更多
-                                                                <i>&gt;</i></a>
-                                                        </div>
-                                                        <div class="cont">
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="part-logo-cont">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                <div v-show="alwaysShowCategory" class="mod-manage" style="height: 500px;">
 
-                            <!--全部商品分类结束-->
+                  <div class="me-login">
+                    <div class="login-not">
+                      <div class="login-head">
+                        <img src="@/static/images/logo-small.png" alt="">
+                      </div>
+                      <div class="login-action">
+                        <el-button v-if="!vk.getVuex('$user.userInfo.nickname')" type="primary"
+                                   class="empty-bg-plain-btn w-full" plain icon="el-icon-user"
+                                   @click.native="navTo('/pages/auth/login/login')">登录
+                        </el-button>
+                        <el-button v-else type="primary"
+                                   class="empty-bg-plain-btn w-full" plain icon="el-icon-user"
+                                   @click.native="navTo('/pages/user/user')">个人中心
+                        </el-button>
+                      </div>
+                      <div class="login-action">
+                        <el-button type="primary" class="auth-btn"
+                                   @click.native="navTo('/pages/user/user')">
+                          <text class="company-name" style="max-width: 320rpx">{{
+                              JSON.stringify(vk.getVuex('$user.userInfo')) === '{}' ? '实名认证' :
+                                ([2, '2'].includes(vk.getVuex('$user.userInfo.accountType')) ? vk.getVuex('$user.userInfo.company.companyName') : vk.getVuex('$user.userInfo.person.personName'))
+                            }}
+                          </text>
+                        </el-button>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="me-tab">
+                    <div class="me-tab-text">
+                      <ul>
+                        <li @click="canShareType = 0;"
+                            class="tab-left"
+                            :class="[canShareType === 0 ? 'active' : '']">
+                          <a href="javascript:void(0)">买家可享</a>
+                        </li>
+                        <li @click="canShareType = 1;" class=""
+                            :class="[canShareType === 1 ? 'active' : '']">
+                          <a href="javascript:void(0)">卖家可享</a>
+                        </li>
+                      </ul>
+                    </div>
+                    <div class="me-tab-content">
+                      <div class="tab-inner">
+                        <div class="me-step clearfix" v-if="canShareType === 0">
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg1.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg13.png"></i>
+                            </dt>
+                            <dd>免费注册</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg2.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg13.png"></i>
+                            </dt>
+                            <dd>发布需求</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg3.png"></i>
+                            </dt>
+                            <dd>管理采购</dd>
+                          </dl>
+                          <dl class="dowslf3">
+                            <dt class="clearfix">
+                              <i class="iconNew iconNew-step-arrow2"><img
+                                src="/static/images/lg14.png"></i>
+                            </dt>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg6.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg15.png"></i>
+                            </dt>
+                            <dd>达成交易</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg5.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg15.png"></i>
+                            </dt>
+                            <dd>验收</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg4.png"></i>
+                            </dt>
+                            <dd>我的订单</dd>
+                          </dl>
                         </div>
-                        <div class="linkNav">
-                            <ul>
-                                <li class="nav ">
-                                    <a href="/">首页</a>
-                                </li>
-                                <li class="nav" @click="navTo('/pages/index/self-support/self-support')" :class="[currentPage.includes('self-support') ? 'active' : '']">
-                                    <a href="javascript:;">金久信自营</a>
-                                </li>
-                                <li @click="navTo('/pages/spot/goods/goods')" class="nav"
-                                    :class="[currentPage.includes('spot') ? 'active' : '']">
-                                    <a href="javascript:;" class="navigator">
-                                        现货市场
-                                    </a>
-                                </li>
-                                <li @click="navTo('/pages/enquiry/list')" class="nav "
-                                    :class="[currentPage.includes('enquiry')  ? 'active' : '']">
-                                    <a href="javascript:;" class="navigator">
-                                        找买家
-                                    </a>
-                                </li>
-                                <li @click="navTo('/pages/process/list')" class="nav "
-                                    :class="[currentPage.includes('process')  ? 'active' : '']">
-                                    <a href="javascript:;">找加工</a>
-                                </li>
-                                <li class="nav " @click="navTo('/pages/index/old/old')"
-                                    :class="[currentPage.includes('old')  ? 'active' : '']">
-                                    <a href="javascript:;">旧货交易</a>
-                                </li>
-                                <li @click="navTo('/pages/yellowPage/list')" class="nav "
-                                    :class="[currentPage.includes('yellowPage')  ? 'active' : '']">
-                                    <a href="javascript:;">金久信黄页</a>
-                                </li>
-                                <li class="nav " @click="navTo('/pages/article/list')"
-                                    :class="[currentPage.includes('article')  ? 'active' : '']">
-                                    <a href="javascript:;">金久信学堂</a>
-                                </li>
-                                <li class="nav " @click="navTo('/pages/index/shop/shop')" :class="[currentPage.includes('shop')  ? 'active' : '']">
-                                    <a href="javascript:;">特产商城</a>
-                                </li>
-                            </ul>
+                        <div class="me-step clearfix" v-else-if="canShareType === 1">
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg1.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg13.png"></i>
+                            </dt>
+                            <dd>免费注册</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg2.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg13.png"></i>
+                            </dt>
+                            <dd>优势报价</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg3.png"></i>
+                            </dt>
+                            <dd>管理销售</dd>
+                          </dl>
+                          <dl class="dowslf3">
+                            <dt class="clearfix">
+                              <i class="iconNew iconNew-step-arrow2"><img
+                                src="/static/images/lg14.png"></i>
+                            </dt>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg6.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg15.png"></i>
+                            </dt>
+                            <dd>完成交易</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg5.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg15.png"></i>
+                            </dt>
+                            <dd>组织发货</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg4.png"></i>
+                            </dt>
+                            <dd>我的订单</dd>
+                          </dl>
                         </div>
-                        <div class="classification">
-                            <div class="entry">
-                                <div class="entry-link">
-                                    <img src="@/static/images/logo-left2.png">
-                                </div>
-                            </div>
-                            <!--全部商品分类开始-->
-                            <div v-show="alwaysShowCategory" class="zghome-nav-display">
+                        <p style="width: 100%;margin:10px 0;">
+                          <a v-if="canShareType === 0" href="javascript:;" @click="navTo('/pages/store/buyer')"
+                             style="text-align: center;color: #a92924;font-size: 13px;line-height: 2">进入买家中心
+                            &gt;</a>
+                          <a v-else-if="canShareType === 1" href="javascript:;" @click="navTo('/pages/store/store')"
+                             style="text-align: center;color: #a92924;font-size: 13px;line-height: 2">进入卖家中心
+                            &gt;</a>
+                        </p>
+                      </div>
+                      <div class="tab-inner" style="display: none;">
+                        <div class="me-step clearfix">
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg7.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg13.png"></i>
+                            </dt>
+                            <dd>企业注册</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg8.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg13.png"></i>
+                            </dt>
+                            <dd>商品管理</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg9.png"></i>
+                            </dt>
+                            <dd>匹配需求</dd>
+                          </dl>
+                          <dl class="dowslf3">
+                            <dt class="clearfix">
+                              <i class="iconNew iconNew-step-arrow2"><img
+                                src="/static/images/lg14.png"></i>
+                            </dt>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg12.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg15.png"></i>
+                            </dt>
+                            <dd>完成订单</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg11.png"></i>
+                              <i class="iconNew iconNew-step-arrow"><img
+                                src="/static/images/lg15.png"></i>
+                            </dt>
+                            <dd>卖出货品</dd>
+                          </dl>
+                          <dl>
+                            <dt>
+                              <i class="iconNew"><img
+                                src="/static/images/lg10.png"></i>
+                            </dt>
+                            <dd> 报价</dd>
+                          </dl>
 
-                                <div v-show="alwaysShowCategory" class="mod-manage" style="height: 500px;">
-
-                                    <div class="me-login">
-                                        <div class="login-not">
-                                            <div class="login-head">
-                                                <img src="/static/images/logo-small.png" alt="">
-                                            </div>
-                                            <div class="login-action">
-                                                <el-button v-if="!vk.getVuex('$user.userInfo.nickname')" type="primary"
-                                                           class="empty-bg-plain-btn w-full" plain icon="el-icon-user"
-                                                           @click.native="navTo('/pages/auth/login/login')">登录
-                                                </el-button>
-                                                <el-button v-else type="primary"
-                                                           class="empty-bg-plain-btn w-full" plain icon="el-icon-user"
-                                                           @click.native="navTo('/pages/user/user')">个人中心
-                                                </el-button>
-                                            </div>
-                                            <div class="login-action">
-                                                <el-button type="primary" class="auth-btn">
-                                                    <img src="@/static/images/id-card.png">
-                                                    <text>实名认证</text>
-                                                </el-button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="me-tab">
-                                        <div class="me-tab-text">
-                                            <ul>
-                                                <li @click="canShareType = 0" class="tab-left"
-                                                    :class="[canShareType === 0 ? 'active' : '']">
-                                                    <a href="javascript:void(0)">买家可享</a>
-                                                </li>
-                                                <li @click="canShareType = 1" class=""
-                                                    :class="[canShareType === 1 ? 'active' : '']">
-                                                    <a href="javascript:void(0)">卖家可享</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                        <div class="me-tab-content">
-                                            <div class="tab-inner">
-                                                <div class="me-step clearfix">
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg1.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg13.png"></i>
-                                                        </dt>
-                                                        <dd>免费注册</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg2.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg13.png"></i>
-                                                        </dt>
-                                                        <dd>发布需求</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg3.png"></i>
-                                                        </dt>
-                                                        <dd>管理采购</dd>
-                                                    </dl>
-                                                    <dl class="dowslf3">
-                                                        <dt class="clearfix">
-                                                            <i class="iconNew iconNew-step-arrow2"><img
-                                                                src="/static/images/lg14.png"></i>
-                                                        </dt>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg6.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg15.png"></i>
-                                                        </dt>
-                                                        <dd>达成交易</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg5.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg15.png"></i>
-                                                        </dt>
-                                                        <dd>验收</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg4.png"></i>
-                                                        </dt>
-                                                        <dd> 我的订单</dd>
-                                                    </dl>
-                                                </div>
-                                                <p style="width: 100%;margin:10px 0px;">
-                                                    <a href="/buyer/index.html"
-                                                       style="text-align: center;color: #a92924;font-size: 13px;line-height: 2">进入买家中心
-                                                        &gt;</a>
-                                                </p>
-                                            </div>
-                                            <div class="tab-inner" style="display: none;">
-                                                <div class="me-step clearfix">
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg7.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg13.png"></i>
-                                                        </dt>
-                                                        <dd>企业注册</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg8.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg13.png"></i>
-                                                        </dt>
-                                                        <dd>商品管理</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg9.png"></i>
-                                                        </dt>
-                                                        <dd>匹配需求</dd>
-                                                    </dl>
-                                                    <dl class="dowslf3">
-                                                        <dt class="clearfix">
-                                                            <i class="iconNew iconNew-step-arrow2"><img
-                                                                src="/static/images/lg14.png"></i>
-                                                        </dt>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg12.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg15.png"></i>
-                                                        </dt>
-                                                        <dd>完成订单</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg11.png"></i>
-                                                            <i class="iconNew iconNew-step-arrow"><img
-                                                                src="/static/images/lg15.png"></i>
-                                                        </dt>
-                                                        <dd>卖出货品</dd>
-                                                    </dl>
-                                                    <dl>
-                                                        <dt>
-                                                            <i class="iconNew"><img
-                                                                src="/static/images/lg10.png"></i>
-                                                        </dt>
-                                                        <dd> 报价</dd>
-                                                    </dl>
-
-                                                </div>
-                                                <p style="width: 100%;margin:10px 0px;">
-                                                    <a href="/seller/index.html"
-                                                       style="text-align: center;color: #a92924;font-size: 13px;line-height: 2">进入卖家中心
-                                                        &gt;</a>
-                                                </p>
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                    <div class="clearfix wartchar">
-                                        <div class="wartcharlist"><img src="/static/images/wx.png"
-                                                                       style="height: 38px;margin-top: 5px;">
-                                            <p style="padding-top: 5px;line-height: 2">金久信</p>
-                                            <p>微信公众号</p>
-                                        </div>
-                                        <div class="wartcharlist">
-                                            <img src="/static/images/80705c8b12d05d0ff67a2758749ef09c.jpg"
-                                                 style="height: 100px;width: 100px;">
-                                        </div>
-                                    </div>
-
-
-                                </div>
-
-
-                            </div>
                         </div>
-                        <!---->
+                        <p style="width: 100%;margin:10px 0;">
+                          <a href="javascript:;" @click="navTo('/pages/store/store')"
+                             style="text-align: center;color: #a92924;font-size: 13px;line-height: 2">进入卖家中心
+                            &gt;</a>
+                        </p>
+                      </div>
 
                     </div>
+                  </div>
+                  <div class="clearfix wartchar">
+                    <div class="wartcharlist"><img src="/static/images/wx.png"
+                                                   style="height: 38px;margin-top: 5px;">
+                      <p style="padding-top: 5px;line-height: 2">金久信</p>
+                      <p>微信公众号</p>
+                    </div>
+                    <div class="wartcharlist">
+                      <img src="/static/images/80705c8b12d05d0ff67a2758749ef09c.jpg"
+                           style="height: 100px;width: 100px;">
+                    </div>
+                  </div>
+
+
                 </div>
+
+
+              </div>
             </div>
+            <!---->
+
+          </div>
         </div>
-    </view>
+      </div>
+    </div>
+  </view>
 </template>
 
 <script>
 export default {
-    props: {
-        alwaysShowCategory: {
-            type: Boolean,
-            default: false
-        }
-    },
-    name: "category-bar",
-    data() {
-        return {
-            showCategory: false,
-            canShareType: 0,
-            currentPage: ''
-        };
-    },
-    mounted() {
-        let that = this
-        const bannerAllPro = document.getElementById("bannerAllPro")
-        bannerAllPro.addEventListener("mouseover", () => {
-            that.showCategory = true
-        })
-        bannerAllPro.addEventListener("mouseleave", () => {
-            that.showCategory = false
-        })
-        const routes = getCurrentPages()
-        this.currentPage = getCurrentPages()[routes.length - 1].route
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo(url);
-        }
-    },
-    watch: {
-        $route({meta: {pagePath}}) {
-            this.currentPage = pagePath
-        }
+  props: {
+    alwaysShowCategory: {
+      type: Boolean,
+      default: false
     }
+  },
+  name: "category-bar",
+  data() {
+    return {
+      showCategory: false,
+      canShareType: 0,
+      currentPage: '',
+      categoryData: []
+    };
+  },
+  mounted() {
+    let that = this
+    this.getCateList()
+    const bannerAllPro = document.getElementById("bannerAllPro")
+    bannerAllPro.addEventListener("mouseover", () => {
+      that.showCategory = true
+    })
+    bannerAllPro.addEventListener("mouseleave", () => {
+      that.showCategory = false
+    })
+    const routes = getCurrentPages()
+    this.currentPage = getCurrentPages()[routes.length - 1].route
+  },
+  methods: {
+    navTo(url) {
+      if (JSON.stringify(vk.getVuex('$user.userInfo')) === '{}') {
+        if (url === '/pages/user/user') url = '/pages/auth/register/register'
+      }
+      vk.navigateTo(url);
+    },
+    showShowChild(index) {
+      this.$set(this.categoryData[index], 'showChild', true)
+    },
+    hideShowChild(index) {
+      this.$set(this.categoryData[index], 'showChild', false)
+    },
+    getCateList() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        loading: false,
+        data: {},
+        success: (data) => {
+          data.rows.map(item => {
+            item.showChild = false
+            return item
+          })
+          this.categoryData = data.rows
+        }
+      });
+    },
+    jump(item, citem) {
+      if (item._id === '657609c48b0da41d31e5f901') this.navTo(`/pages/index/old/list/list`)
+      else this.navTo(`/pages/spot/goods/goods?keyword=${citem.name}`)
+    },
+    jumpToIndex(item) {
+      if (item._id === '657609c48b0da41d31e5f901') this.navTo(`/pages/index/old/list/list`)
+      else this.navTo(`/pages/spot/goods/goods?keyword=${item.name}`)
+    }
+
+  },
+  watch: {
+    $route({meta: {pagePath}}) {
+      this.currentPage = pagePath
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 .navigator {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .login-action {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .auth-btn {
+    margin-top: .5rem;
     display: flex;
     align-items: center;
     justify-content: center;
+    width: 100%;
 
-    .auth-btn {
-        margin-top: .5rem;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-
-        img {
-            width: 14px;
-            margin-right: 5px;
-        }
+    img {
+      width: 14px;
+      margin-right: 5px;
     }
+  }
 }
-.el-icon-menu{
+
+.el-icon-menu {
   padding: 0 4px;
 }
+
+.company-name {
+  display: inline-block;
+  max-width: 100px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+  white-space: nowrap;
+}
+
+.cate-name:hover {
+  color: #a92924
+}
 </style>
diff --git a/components/common-footer/common-footer.vue b/components/common-footer/common-footer.vue
index fb3302c..dfb8655 100644
--- a/components/common-footer/common-footer.vue
+++ b/components/common-footer/common-footer.vue
@@ -1,195 +1,164 @@
 <template>
-    <view id="footer">
-        <div class="group-foot">
-            <div class="group-foot-inner">
-                <div class="mod-contact">
-                    <dl>
-                        <dt>平台服务</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/index/self-support/self-support')">金久信自营</a></li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457acf082105ea4d467f0')">常见问题</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">帮助中心</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;" @click="navTo('/')">实力商家入驻</a></li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="mod-contact">
-                    <dl>
-                        <dt>交易流程</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/detail?id=657458e821821b5c0fca7dff')">信誉采购</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/detail?id=6574591f7ad52d34471bd558')">金久信公正</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=6574592b09664c4f4af2e686')">自主交易</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/index/self-support/self-support')">金久信自营</a></li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/enquiry/list')">发布询价单</a>
-                                </li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="mod-contact">
-                    <dl>
-                        <dt>关于金久信</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">金久信动态</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">知识产权声明</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">隐私声明</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">免责声明</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">平台交易规则</a>
-                                </li>
-                                <li><a rel="nofollow" href="javascript:;"
-                                       @click="navTo('/pages/otherArticle/list?id=657457b621821b5c0fca456a')">关于我们</a>
-                                </li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="mod-contact">
-                    <dl>
-                        <dt> 旧货交易</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="/article/detail/id/19.html">旧货交易流程</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/18.html">如何下单</a>
-                                </li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="mod-contact">
-                    <dl>
-                        <dt>找加工</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="/article/detail/id/21.html">加工交易流程</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/20.html">如何下加工单</a>
-                                </li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="mod-contact">
-                    <dl>
-                        <dt>找合作</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="/article/detail/id/23.html">合作施工</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/22.html">合作供货</a>
-                                </li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
+  <view id="footer">
+    <div class="group-foot">
+      <div class="group-foot-inner">
+        <div class="mod-contact">
+          <dl>
+            <dt>关于金久信</dt>
+            <dd>
+              <ul>
+                <li v-for="(item, index) in aboutList" :key="index"><a rel="nofollow" href="javascript:;"
+                                                                       @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)">{{
+                    item.name
+                  }}</a>
+                </li>
+              </ul>
+            </dd>
+          </dl>
+        </div>
+        <div class="mod-contact">
+          <dl>
+            <dt>常见问题</dt>
+            <dd>
+              <ul>
+                <li v-for="(item, index) in oldList" :key="index"><a rel="nofollow" href="javascript:;"
+                                                                     @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)">{{
+                    item.name
+                  }}</a>
+                </li>
+              </ul>
+            </dd>
+          </dl>
+        </div>
+        <div class="mod-contact">
+          <dl>
+            <dt>帮助中心</dt>
+            <dd>
+              <ul>
+                <li v-for="(item, index) in processList" :key="index"><a rel="nofollow" href="javascript:;"
+                                                                         @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)">{{
+                    item.name
+                  }}</a>
+                </li>
+              </ul>
+            </dd>
+          </dl>
+        </div>
 
-                <div class="mod-contact">
-                    <dl>
-                        <dt> 金久信学堂</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="/article/detail/id/27.html">行业动态</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/26.html">技术论坛</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/25.html">执行标准</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/24.html">基础知识</a>
-                                </li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="mod-contact">
-                    <dl>
-                        <dt>金久信金融</dt>
-                        <dd>
-                            <ul>
-                                <li><a rel="nofollow" href="/article/detail/id/31.html">如何还款</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/30.html">如何使用额度</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/29.html">申请流程</a>
-                                </li>
-                                <li><a rel="nofollow" href="/article/detail/id/28.html"
-                                >金久信金融简介</a></li>
-                            </ul>
-                        </dd>
-                    </dl>
-                </div>
-            </div>
-        </div>
-        <div class="group-copyright active">
-            <div class="group-copyright-inner">
-                <div class="mod-inner">
-                    <div class="wuage-other-link">
-                        <div class="wuage-link">
-                            <p class="out-link">
-                                <a rel="nofollow" target="_self" href="http:/yilitong.com">亿利通官网</a>
-                                |<a rel="nofollow" target="_self" href="baidu.com">亿利通</a>
-                            </p>
-                        </div>
-                        <p class="wuage-copyright">
-                            Copyright © 2020-2021&nbsp;&nbsp; jinjiuxinzg.cn &nbsp;&nbsp;All Rights Reserved &nbsp;&nbsp;版权所有：&nbsp;&nbsp;南宁亿利通钢管有限公司
-                            <a href="https:/beian.miit.gov.cn" rel="nofollow">桂ICP备19008827号-1</a>
-                        </p>
-                    </div>
-                    <div class="certs-group">
-                        <a class="cert-1" rel="nofollow">
+      </div>
+    </div>
+    <div class="group-copyright active">
+      <div class="group-copyright-inner">
+        <div class="mod-inner">
+          <div class="wuage-other-link">
+<!--            <div class="wuage-link">-->
+<!--              <p class="out-link">-->
+<!--                <a rel="nofollow" target="_self"-->
+<!--                   href="https://baike.baidu.com/item/%E5%8D%97%E5%AE%81%E4%BA%BF%E5%88%A9%E9%80%9A%E9%92%A2%E7%AE%A1%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8/23408974?fr=ge_ala">亿利通官网</a>-->
+<!--                |<a rel="nofollow" target="_self"-->
+<!--                    href="https://baike.baidu.com/item/%E5%8D%97%E5%AE%81%E4%BA%BF%E5%88%A9%E9%80%9A%E9%92%A2%E7%AE%A1%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8/23408974?fr=ge_ala">亿利通</a>-->
+<!--              </p>-->
+<!--            </div>-->
+            <p class="wuage-copyright">
+              Copyright © 2020-2021&nbsp;&nbsp; jinjiuxinzg.cn &nbsp;&nbsp;All Rights Reserved &nbsp;&nbsp;版权所有：&nbsp;&nbsp;南宁亿利通钢管有限公司
+              <a href="https://beian.miit.gov.cn" rel="nofollow" target="_blank">桂ICP备19008827号-1</a>
+              <a class="wuage-copyright"
+                 href="https://beian.mps.gov.cn/#/query/webSearch?code=45010702002145" rel="noreferrer"
+                 target="blank">桂公网安备45010702002145</a>
+            </p>
+          </div>
+          <div class="certs-group">
+            <a class="cert-1" rel="nofollow">
                             <span class="clearfix"><img
-                                src="http:/jyx.gxwebsoft.com/public/upload/image/20210220/80705c8b12d05d0ff67a2758749ef09c.jpg"><p>公众号</p></span>
-                        </a>
-                        <a class="cert-2" rel="nofollow">
+                              :src="gzhQr"><p>公众号</p></span>
+            </a>
+            <a class="cert-2" rel="nofollow">
                             <span class="clearfix"><img
-                                src="http:/jyx.gxwebsoft.com/public/upload/image/20210220/80705c8b12d05d0ff67a2758749ef09c.jpg"><p>手机站</p></span>
-                        </a>
-                    </div>
-                </div>
-            </div>
+                              :src="mobileQr"><p>手机站</p></span>
+            </a>
+          </div>
         </div>
-    </view>
+      </div>
+    </div>
+  </view>
 </template>
 
 <script>
 export default {
-    name: "common-footer",
-    data() {
-        return {};
+  name: "common-footer",
+  data() {
+    return {
+      jinRongList: [],
+      tradeList: [],
+      aboutList: [],
+      coopList: [],
+      processList: [],
+      oldList: [],
+      serviceList: [],
+      gzhQr: '',
+      mobileQr: '',
+    };
+  },
+  mounted() {
+    this.getAboutList()
+    this.getProcessList()
+    this.getOldList()
+    this.getGzhQr()
+    this.getMobileQr()
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo({
+        url: url
+      });
     },
-    methods: {
-        navTo(url) {
-            vk.navigateTo({
-                url: url
-            });
+    async getGzhQr() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '8656c02468f88b03002dbcd84f57dd2d'
+
+        },
+      })
+      this.gzhQr = res.content
+    },
+    async getMobileQr() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '7f4b671368f88b39002cf006447af059'
+        },
+      })
+      this.mobileQr = res.content
+    },
+    async getAboutList() {
+      const res = await vk.callFunction({
+        url: 'client/otherArticle/list/pub/getList',
+        data: {
+          parentId: "c0a2d8e46870f2ed0513ba3239037c48"
         }
-    }
+      })
+      this.aboutList = res.rows
+    },
+    async getProcessList() {
+      const res = await vk.callFunction({
+        url: 'client/otherArticle/list/pub/getList',
+        data: {
+          parentId: "c0a2d8e46870f3090513bb2a71c44b74"
+        }
+      })
+      this.processList = res.rows
+    },
+    async getOldList() {
+      const res = await vk.callFunction({
+        url: 'client/otherArticle/list/pub/getList',
+        data: {
+          parentId: "29dca3d56870f2fe050cfa37206db15c"
+        }
+      })
+      this.oldList = res.rows
+    },
+  }
 }
 </script>
 
diff --git a/components/common-header/common-header.vue b/components/common-header/common-header.vue
index 91a804a..dcfe53a 100644
--- a/components/common-header/common-header.vue
+++ b/components/common-header/common-header.vue
@@ -1,115 +1,245 @@
 <template>
-	<view>
-		<div class="group-head clearfix">
-			<div class="group-inner clearfix">
-				<div class="mod-logo">
-					<a href="/" class="logo"><img src="@/static/images/logo.png"></a>
-				</div>
-				<div class="mod-mini-search">
-					<div class="navigation-top clearfix">
-						<div class="searchBar">
-							<ul class="searchBar-tab clearfix">
-								<li @click="searchTypeChange(0)" :class="{'active': searchType == 0}" class="_goods" >商品</li>
-								<li @click="searchTypeChange(1)" :class="{'active': searchType == 1}" class="_shop">商户</li>
-							</ul>
-							<div class="clearfix">
-								<div class="searchBar-input">
-									<div class="searchBar-input-inner">
-										<input type="text" :placeholder="searchList[searchType].placeholder" 
-											maxlength="100" autocomplete="off">
-									</div>
-									<div class="searchBar-input-list" style="display: none;"></div>
-								</div>
-								<div class="preventButton button" desc=""></div>
-								<div class="button" @click="search">搜索</div>
-							</div>
-						</div>
+    <view>
+        <div class="group-head clearfix">
+            <div class="group-inner clearfix">
+                <div class="mod-logo">
+                    <a href="/" class="logo"><img src="@/static/images/logo.png"></a>
+                </div>
+                <div class="mod-mini-search">
+                    <div class="navigation-top clearfix">
+                        <div class="searchBar">
+                            <ul class="searchBar-tab clearfix">
+                                <li @click="searchTypeChange(1)" :class="{'active': searchType === 1}" class="_shop">
+                                    现货
+                                </li>
+                                <li @click="searchTypeChange(2)" :class="{'active': searchType === 2}" class="_shop">
+                                    找供应
+                                </li>
+                                <li @click="searchTypeChange(3)" :class="{'active': searchType === 3}" class="_shop">
+                                    找加工
+                                </li>
+                                <li @click="searchTypeChange(4)" :class="{'active': searchType === 4}" class="_shop">
+                                    旧货
+                                </li>
+                                <li @click="searchTypeChange(0)" :class="{'active': searchType === 0}" class="_goods">
+                                    特产商品
+                                </li>
+                            </ul>
+                            <div class="clearfix">
+                                <div class="searchBar-input">
+                                    <div class="searchBar-input-inner">
+                                        <input type="text" :placeholder="searchList[searchType].placeholder"
+                                               maxlength="100" autocomplete="off" v-model="keyword">
+                                    </div>
+                                    <div class="searchBar-input-list" style="display: none;"></div>
+                                </div>
+                                <div class="preventButton button" desc=""></div>
+                                <div class="button" @click="search">搜索</div>
+                            </div>
+                        </div>
 
-						<div class="mod-hot-query">
-							<ul class="clearfix">
-								<li>
-									<a href="/market/index.html?product_name=直缝焊管">直缝焊管</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=架子管">架子管</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=无缝管">无缝管</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=方矩管">方矩管</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=钢板">钢板</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=螺纹钢">螺纹钢</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=H型钢">H型钢</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=工字钢">工字钢</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=槽钢">槽钢</a>
-								</li>
-								<li>
-									<a href="/market/index.html?product_name=镀锌钢管">镀锌钢管</a>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-				<div class="mod-menu">
-					<div class="hrd">
-						<a href="/support/index.html" class="hrd-landing">
-							<img src="@/static/images/logo-left.png">
-						</a>
-					</div>
-				</div>
-				<div class="mod-download-icon js-download">
-					<a class="download clearfix" href="" target="_blank">
-						<span style="float: left;font-size: 13px;padding-top: 27px;padding-right: 10px;">金久信<br>
-							手机站</span>
-						<img src="/public/upload/image/20210220/80705c8b12d05d0ff67a2758749ef09c.jpg"
-							style="height: 90px;width: 90px;float: left;">
-					</a>
-				</div>
-			</div>
-		</div>
-	</view>
+                        <div class="mod-hot-query">
+                            <ul style="width: 480px; overflow-x: auto;">
+                                <li v-for="(item, index) in allChildCate" :key="index">
+                                    <a href="javascript:;" @click="navTo(item.name)">{{ item.name }}</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                <div class="mod-menu">
+                    <div class="hrd">
+                        <a href="javascript:;" class="hrd-landing"
+                           @click="jump('/pages/index/self-support/self-support')">
+                            <img src="@/static/images/logo-left.png">
+                        </a>
+                    </div>
+                </div>
+                <!--				<div class="mod-download-icon js-download">-->
+                <!--					<a class="download clearfix" href="" target="_blank">-->
+                <!--						<span style="float: left;font-size: 13px;padding-top: 27px;padding-right: 10px;">金久信<br>-->
+                <!--							手机站</span>-->
+                <!--						<img src="/public/upload/image/20210220/80705c8b12d05d0ff67a2758749ef09c.jpg"-->
+                <!--							style="height: 90px;width: 90px;float: left;">-->
+                <!--					</a>-->
+                <!--				</div>-->
+            </div>
+        </div>
+    </view>
 </template>
 
 <script>
-	export default {
-		name: "common-header",
-		data() {
-			return {
-				searchType: 0,
-				searchList: [
-					{
-						type: 0,
-						name: '商品',
-						placeholder:'请输入品名 材质 规格 钢厂等搜索'
-					},
-					{
-						type: 1,
-						name: '商户',
-						placeholder:'请输入商户名或公司名进行搜索'
-					}
-				]
-			};
-		},
-		methods: {
-			searchTypeChange(e) {
-				this.searchType = e
-			},
-			search() {
-				 this.$message('这是一条消息提示');
-			}
-		}
-	}
+export default {
+    name: "common-header",
+    data() {
+        return {
+            searchType: 1,
+            allChildCate: [],
+            searchList: [
+                {
+                    type: 0,
+                    name: '商品',
+                    placeholder: '请输入商品名称等搜索',
+                    page: '/pages/index/shop/shop'
+                },
+                {
+                    type: 1,
+                    name: '现货',
+                    placeholder: '请输入品名 材质 规格 钢厂等搜索',
+                    page: '/pages/spot/goods/goods'
+                },
+                {
+                    type: 2,
+                    name: '找供应',
+                    placeholder: '请输入品名 材质 规格 钢厂等搜索',
+                    page: '/pages/enquiry/list'
+                },
+                {
+                    type: 3,
+                    name: '找加工',
+                    placeholder: '请输入品名 材质 规格 钢厂等搜索',
+                    page: '/pages/process/list'
+                },
+                {
+                    type: 4,
+                    name: '旧货',
+                    placeholder: '请输入品名 材质 规格 钢厂等搜索',
+                    page: '/pages/index/old/old'
+                },
+            ],
+            keyword: null,
+            currentPage: '',
+            spotCateList: [],
+            enquiryCateList: [],
+            processCateList: [],
+            oldCateList: [],
+            goodsCateList: [],
+        };
+    },
+    methods: {
+        searchTypeChange(e) {
+            this.searchType = e
+            switch (e) {
+                case 0 : {
+                    this.allChildCate = this.goodsCateList
+                }
+                    break;
+                case 1 : {
+                    this.allChildCate = this.spotCateList
+                }
+                    break;
+                case 2 : {
+                    this.allChildCate = this.enquiryCateList
+                }
+                    break;
+                case 3 : {
+                    this.allChildCate = this.processCateList
+                }
+                    break;
+                case 4 : {
+                    this.allChildCate = this.oldCateList
+                }
+                    break;
+
+            }
+        },
+        search() {
+            this.navTo(this.keyword)
+        },
+        getCateList() {
+            vk.callFunction({
+                url: 'client/spot/category/pub/getTree',
+                title: '请求中...',
+                data: {},
+                success: (data) => {
+                    this.spotCateList = []
+                    data.rows.forEach(item => {
+                        item.children.forEach(child => {
+                            this.spotCateList.push(child)
+                        })
+                    })
+                    this.allChildCate = this.spotCateList
+                }
+            });
+        },
+        async getEnquiryCateList() {
+            vk.callFunction({
+                url: 'client/enquiry/template/pub/getList',
+                title: '请求中...',
+                data: {},
+                success: (data) => {
+                    this.enquiryCateList = data.rows
+                }
+            });
+        },
+        async getProcessCateList() {
+            vk.callFunction({
+                url: 'client/process/category/pub/getTree',
+                title: '请求中...',
+                data: {},
+                success: (data) => {
+                    this.processCateList = data.rows
+                }
+            });
+        },
+        async getOldCateList() {
+            vk.callFunction({
+                url: 'client/old/pub/getTree',
+                title: '请求中...',
+                data: {type: 1},
+                success: (data) => {
+                    this.oldCateList = data.rows.map(item => {
+                        item.children.forEach(child => {
+                            delete child.children
+                        })
+                        return item
+                    })
+                }
+            });
+        },
+        getGoodsCate() {
+            vk.callFunction({
+                url: 'client/goods/category/pub/getList'
+            }).then(res => {
+                this.goodsCateList = res.rows
+            })
+        },
+        navTo(keyword) {
+            if (this.searchType === 0) {
+                vk.navigateTo({
+                    url: this.searchList[this.searchType].page + '?cateName=' + keyword
+                })
+            } else {
+                vk.navigateTo({
+                    url: this.searchList[this.searchType].page + '?keyword=' + keyword
+                })
+            }
+        },
+        jump(url) {
+            vk.navigateTo({
+                url: url
+            })
+        }
+    },
+    mounted() {
+        this.getCateList()
+        this.getEnquiryCateList()
+        this.getProcessCateList()
+        this.getOldCateList()
+        this.getGoodsCate()
+    },
+    watch: {
+        $route({meta: {pagePath}}) {
+            this.currentPage = pagePath
+            if (this.currentPage.includes('shop')) this.searchType = 0
+            if (this.currentPage.includes('spot')) this.searchType = 1
+            if (this.currentPage.includes('enquiry')) this.searchType = 2
+            if (this.currentPage.includes('process')) this.searchType = 3
+            if (this.currentPage.includes('old')) this.searchType = 4
+            // console.log(this.currentPage.includes('process'), this.searchType)
+        }
+    }
+}
 </script>
 
 <style lang="scss">
diff --git a/components/common-nav/common-nav.vue b/components/common-nav/common-nav.vue
index 0b12c5c..7fad132 100644
--- a/components/common-nav/common-nav.vue
+++ b/components/common-nav/common-nav.vue
@@ -1,845 +1,848 @@
 <template>
-    <view>
-        <div class="CenteruserNav clearfix">
-            <div class="CenteruserNav-hearder clearfix">
-                <div class="CenteruserNav-logo">
-                    <a href="/">
-                        <img src="/static/images/logo-small.png" alt="" class="logo-img">
-                    </a>
-                </div>
-
-                <ul class="CenteruserNav-menu">
-                    <li class="" :class="[currentPage.includes('user')  ? 'active' : '']"><a href="javascript:;"
-                                                                                             @click="jump('/pages/user/user')">个人中心</a>
-                    </li>
-                    <li class="" :class="[currentPage.includes('buyer')  ? 'active' : '']"><a href="javascript:;"
-                                                                                              @click="jump('/pages/store/buyer')">买家中心</a>
-                    </li>
-                    <li class="" :class="[currentPage.includes('store/store')  ? 'active' : '']"><a href="javascript:;"
-                                                                                                    @click="jump('/pages/store/store')">卖家中心</a>
-                    </li>
-                    <li class="" :class="[currentPage.includes('order')  ? 'active' : '']"><a href="javascript:;"
-                                                                                              @click="jump('/pages/order/order')">订单管理</a>
-                    </li>
-                    <li class="" :class="[currentPage.includes('contract')  ? 'active' : '']"><a href="javascript:;"
-                                                                                                 @click="jump('/pages/contract/index')">合同管理</a>
-                    </li>
-                    <li><a href="javascript:;" @click="jump('/pages/article/list')">金久信学堂</a></li>
-                </ul>
-            </div>
+  <view>
+    <div class="CenteruserNav clearfix">
+      <div class="CenteruserNav-hearder clearfix">
+        <div class="CenteruserNav-logo">
+          <a href="/signOnly/#/pages/contract/index?tab=sign">
+            <img src="@/static/images/logo-small.png" alt="" class="logo-img">
+          </a>
         </div>
-    </view>
+
+        <ul class="CenteruserNav-menu">
+          <li class="" :class="[(currentPage.includes('user') && !currentPage.includes('school'))  ? 'active' : '']"><a
+            href="javascript:;"
+            @click="jump('/pages/user/user')">个人中心</a>
+          </li>
+          <!--          <li class="" :class="[currentPage.includes('buyer')  ? 'active' : '']"><a href="javascript:;"-->
+          <!--                                                                                    @click="jump('/pages/store/buyer')">买家中心</a>-->
+          <!--          </li>-->
+          <!--          <li class="" :class="[currentPage.includes('store/store')  ? 'active' : '']"><a href="javascript:;"-->
+          <!--                                                                                          @click="jump('/pages/store/store')">卖家中心</a>-->
+          <!--          </li>-->
+          <!--          <li class="" :class="[currentPage.includes('order')  ? 'active' : '']"><a href="javascript:;"-->
+          <!--                                                                                    @click="jump('/pages/order/order')">订单管理</a>-->
+          <!--          </li>-->
+          <li class="" :class="[currentPage.includes('contract')  ? 'active' : '']"><a href="javascript:;"
+                                                                                       @click="jump('/pages/contract/index')">合同管理</a>
+          </li>
+          <!--          <li :class="[currentPage.includes('school')  ? 'active' : '']"><a href="javascript:;"-->
+          <!--                                                                            @click="jump('/pages/user/school')">金久信学堂</a>-->
+          <!--          </li>-->
+        </ul>
+      </div>
+    </div>
+  </view>
 </template>
 
 <script>
 export default {
-    name: "common-nav",
-    data() {
-        return {
-            currentPage: ''
-        };
-    },
-    mounted() {
-        const routes = getCurrentPages()
-        this.currentPage = getCurrentPages()[routes.length - 1].route
-    },
-    methods: {
-        jump(url) {
-            vk.navigateTo({
-                url
-            })
-        }
+  name: "common-nav",
+  data() {
+    return {
+      currentPage: ''
+    };
+  },
+  mounted() {
+    const routes = getCurrentPages()
+    this.currentPage = getCurrentPages()[routes.length - 1].route
+  },
+  methods: {
+    jump(url) {
+      vk.navigateTo({
+        url
+      })
     }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @charset "utf-8";
 .CenteruserNav {
-    background: #fff;
-    border-bottom: 2px solid #a92924
+  background: #fff;
+  border-bottom: 2px solid #a92924
 }
 
 .CenteruserNav-logo img {
-    max-width: 100%;
+  max-width: 100%;
 }
 
 .CenteruserNav-hearder {
-    width: 1200px;
-    margin: 0px auto;
+  width: 1200px;
+  margin: 0px auto;
 }
 
 .CenteruserNav-logo {
-    float: left;
-    margin-top: 11px;
-    width: 220px;
-    height: 68px;
-    margin-right: 20px;
+  float: left;
+  margin-top: 11px;
+  width: 220px;
+  height: 68px;
+  margin-right: 20px;
 }
 
 ul.CenteruserNav-menu {
-    float: left;
-    height: 80px;
-    line-height: 80px;
-    margin-left: 20px;
+  float: left;
+  height: 80px;
+  line-height: 80px;
+  margin-left: 20px;
 }
 
 .CenteruserNav-menu li {
-    float: left;
+  float: left;
 }
 
 .CenteruserNav-menu li a {
-    font-size: 16px;
-    padding: 0px 18px;
+  font-size: 16px;
+  padding: 0px 18px;
 }
 
 .CenteruserNav-menu li.active {
-    background: #a92924;
-    color: #fff;
+  background: #a92924;
+  color: #fff;
 }
 
 .CenteruserNav-menu li.active a {
-    background: #a92924;
-    color: #fff;
+  background: #a92924;
+  color: #fff;
 }
 
 .CenteruserNav-menu li:hover a {
-    background: #a92924;
-    color: #fff;
+  background: #a92924;
+  color: #fff;
 }
 
 .ptqyBodysFive a {
-    color: #fff !important;
-    background: #a92924;
-    font-size: 15px;
-    text-align: center;
-    height: 38px;
-    line-height: 38px;
-    width: 250px;
-    display: inline-block;
+  color: #fff !important;
+  background: #a92924;
+  font-size: 15px;
+  text-align: center;
+  height: 38px;
+  line-height: 38px;
+  width: 250px;
+  display: inline-block;
 }
 
 .ptqyBodysFour p {
-    line-height: 2
+  line-height: 2
 }
 
 .ptqyBodysFour span {
-    font-size: 46px;
-    color: #a92924;
-    font-weight: bold;
-    display: inline-block;
-    padding-right: 5px;
-    height: 78px;
+  font-size: 46px;
+  color: #a92924;
+  font-weight: bold;
+  display: inline-block;
+  padding-right: 5px;
+  height: 78px;
 }
 
 .ptqyBodys {
-    line-height: 2;
-    font-size: 13px;
-    padding: 0px 40px 10px;
+  line-height: 2;
+  font-size: 13px;
+  padding: 0px 40px 10px;
 }
 
 .ptqyBodysFour {
-    width: 100%;
+  width: 100%;
 }
 
 .ptqyBodysFive {
-    margin-top: 30px;
-    width: 100%;
+  margin-top: 30px;
+  width: 100%;
 }
 
 .ptqyBodysThree {
-    margin-top: 25px;
-    width: 100%;
-    line-height: 2;
-    font-size: 13px;
+  margin-top: 25px;
+  width: 100%;
+  line-height: 2;
+  font-size: 13px;
 }
 
 .ptqyBodysTwo {
-    color: #a92924;
-    font-size: 13px;
-    height: 30px;
-    line-height: 30px;
+  color: #a92924;
+  font-size: 13px;
+  height: 30px;
+  line-height: 30px;
 }
 
 .ptqyBodysTwo a {
-    display: inline-block;
-    background: #a92924;
-    color: #fff !important;
-    text-align: center;
-    padding: 0px 16px;
-    margin-left: 20px;
-    letter-spacing: 1px;
+  display: inline-block;
+  background: #a92924;
+  color: #fff !important;
+  text-align: center;
+  padding: 0px 16px;
+  margin-left: 20px;
+  letter-spacing: 1px;
 }
 
 .ptqyBodysFive a:hover, .ptqyBodysTwo a:hover {
-    background: #ce1b14
+  background: #ce1b14
 }
 
 .ptqyBodysOne {
-    margin: 5px 0px 25px;
-    line-height: 2;
+  margin: 5px 0px 25px;
+  line-height: 2;
 }
 
 .ptqyBodysOne span {
-    display: inline-block;
-    margin: 0px 5px 0px 10px;
-    padding: 0px 10px;
-    text-align: center;
-    font-size: 15px;
-    position: relative;
-    letter-spacing: 1px;
+  display: inline-block;
+  margin: 0px 5px 0px 10px;
+  padding: 0px 10px;
+  text-align: center;
+  font-size: 15px;
+  position: relative;
+  letter-spacing: 1px;
 }
 
 .ptqyBodysOne span em {
-    padding-right: 13px;
-    display: inline-block;
-    color: #a92924;
-    margin-left: 5px;
+  padding-right: 13px;
+  display: inline-block;
+  color: #a92924;
+  margin-left: 5px;
 }
 
 .ptqyBodysOne span i {
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    width: 39px;
-    height: 30px;
-    z-index: 8888;
-    display: inline-block;
-    background-position: -173px -174px;
-    position: absolute;
-    left: 0px;
-    top: 0px;
-    overflow: hidden;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  width: 39px;
+  height: 30px;
+  z-index: 8888;
+  display: inline-block;
+  background-position: -173px -174px;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  overflow: hidden;
 }
 
 .ptqyBodysOne span i.hj {
-    background-position: -173px -85px;
+  background-position: -173px -85px;
 }
 
 .ptqyBodysOne span i.zs {
-    background-position: -173px -174px;
+  background-position: -173px -174px;
 }
 
 .ptqyBodysOne span i.bj {
-    background-position: -173px -130px;
+  background-position: -173px -130px;
 }
 
 .zhuanshi {
-    background: #ffeb95;
-    border-radius: 54px;
-    position: relative;
-    color: #a92924;
-    padding-right: 8px;
-    padding-left: 33px;
-    letter-spacing: 2px;
-    height: 27px;
-    font-size: 12px;
-    line-height: 28px;
+  background: #ffeb95;
+  border-radius: 54px;
+  position: relative;
+  color: #a92924;
+  padding-right: 8px;
+  padding-left: 33px;
+  letter-spacing: 2px;
+  height: 27px;
+  font-size: 12px;
+  line-height: 28px;
 }
 
 .Centerlayui-table {
-    width: 100%;
-    margin: 0px 0;
-    background-color: #fff;
-    color: #666;
+  width: 100%;
+  margin: 0px 0;
+  background-color: #fff;
+  color: #666;
 }
 
 .Centerlayui-table table {
-    border-collapse: collapse;
-    border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
 
 .Centerlayui-table tr {
-    transition: all .3s;
-    -webkit-transition: all .3s;
+  transition: all .3s;
+  -webkit-transition: all .3s;
 }
 
 .shenfeng-renzheng {
-    width: 75px;
-    margin: 0px auto;
+  width: 75px;
+  margin: 0px auto;
 }
 
 .Centerlayui-table th, .Centerlayui-table td {
-    position: relative;
-    padding: 15px 0px;
-    min-height: 20px;
-    line-height: 20px;
-    font-size: 12px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #e6e6e6;
-    text-align: center;
+  position: relative;
+  padding: 15px 0px;
+  min-height: 20px;
+  line-height: 20px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #e6e6e6;
+  text-align: center;
 }
 
 .shenfeng-renzheng i {
-    display: block;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    width: 39px;
-    height: 32px;
-    z-index: 8888;
-    position: absolute;
-    top: 11px;
-    text-align: center;
-    left: 46px;
+  display: block;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  width: 39px;
+  height: 32px;
+  z-index: 8888;
+  position: absolute;
+  top: 11px;
+  text-align: center;
+  left: 46px;
 }
 
 .tables-renzheng {
-    background: #f4ebea;
-    border-radius: 10px;
-    padding: 5px;
-    color: #a92924;
-    line-height: 26px;
-    margin-top: 15px;
-    padding-top: 13px;
+  background: #f4ebea;
+  border-radius: 10px;
+  padding: 5px;
+  color: #a92924;
+  line-height: 26px;
+  margin-top: 15px;
+  padding-top: 13px;
 
 }
 
 .tables-renzheng p {
-    color: #a92924;
-    text-align: center;
+  color: #a92924;
+  text-align: center;
 }
 
 .tbody-Identity td:nth-child(2) .tables-renzheng {
-    background: #f4ebea
+  background: #f4ebea
 }
 
 .tbody-Identity td:nth-child(3) .tables-renzheng {
-    background: #fff3cf
+  background: #fff3cf
 }
 
 .tbody-Identity td:nth-child(4) .tables-renzheng {
-    background: #edf7f8
+  background: #edf7f8
 }
 
 .tbody-Identity td:nth-child(5) .tables-renzheng {
-    background: #ffeb95
+  background: #ffeb95
 }
 
 .tbody-Identity td:nth-child(6) .tables-renzheng {
-    background: #f4ebea
+  background: #f4ebea
 }
 
 .tbody-Identity td:nth-child(7) .tables-renzheng {
-    background: #f4ebea
+  background: #f4ebea
 }
 
 .tbody-Identity td:nth-child(8) .tables-renzheng {
-    background: #f4ebea
+  background: #f4ebea
 }
 
 .Centerlayui-table th a, .Centerlayui-table td a {
-    color: #a92924
+  color: #a92924
 }
 
 .tbody-Identity td:nth-child(2) .shenfeng-renzheng i {
-    background-position: -169px -35px;
-    left: 31px;
+  background-position: -169px -35px;
+  left: 31px;
 }
 
 .tbody-Identity td:nth-child(3) .shenfeng-renzheng i {
-    background-position: -173px -82px;
-    left: 31px;
+  background-position: -173px -82px;
+  left: 31px;
 }
 
 .tbody-Identity td:nth-child(4) .shenfeng-renzheng i {
-    background-position: -169px -127px;
-    left: 31px;
+  background-position: -169px -127px;
+  left: 31px;
 }
 
 .tbody-Identity td:nth-child(5) .shenfeng-renzheng i {
-    background-position: -169px -172px;
-    left: 31px;
+  background-position: -169px -172px;
+  left: 31px;
 }
 
 .tbody-Identity td:nth-child(6) .shenfeng-renzheng i {
-    background-position: -169px -210px;
-    left: 37px;
+  background-position: -169px -210px;
+  left: 37px;
 }
 
 .tbody-Identity td:nth-child(7) .shenfeng-renzheng i {
-    background-position: -169px -258px;
-    left: 39px;
+  background-position: -169px -258px;
+  left: 39px;
 }
 
 .tbody-Identity td:nth-child(8) .shenfeng-renzheng i {
-    background-position: -169px -307px;
+  background-position: -169px -307px;
 }
 
 .table-bottoms {
-    width: 100%;
-    text-align: center;
-    background: #fff;
+  width: 100%;
+  text-align: center;
+  background: #fff;
 }
 
 .table-bottoms .Centerlayui-bottoms {
-    background: #f9f9f9;
-    width: 100%;
-    border: 0px;
+  background: #f9f9f9;
+  width: 100%;
+  border: 0px;
 }
 
 .table-bottoms .Centerlayui-table tr, .table-bottoms .Centerlayui-bottoms td {
-    border: 0px;
-    font-size: 14px;
+  border: 0px;
+  font-size: 14px;
 }
 
 .table-bottoms .Centerlayui-table tr, .table-bottoms .Centerlayui-table td {
-    border-right: 0px;
-    border-left: 0px;
-    border-bottom: 0px;
+  border-right: 0px;
+  border-left: 0px;
+  border-bottom: 0px;
 }
 
 .cd-switcherTable {
-    border-bottom: 1px solid #dfdede;
-    width: 100%;
-    text-align: center;
-    margin: 20px auto;
+  border-bottom: 1px solid #dfdede;
+  width: 100%;
+  text-align: center;
+  margin: 20px auto;
 }
 
 .cd-switcher-Tablelist {
-    display: inline-block;
-    margin: 0px 60px;
-    text-align: center;
-    height: 42px;
-    font-weight: bold;
-    line-height: 20px;
-    font-size: 24px;
+  display: inline-block;
+  margin: 0px 60px;
+  text-align: center;
+  height: 42px;
+  font-weight: bold;
+  line-height: 20px;
+  font-size: 24px;
 
 }
 
 .active-cdSwit {
-    color: #a92924;
-    border-bottom: 2px solid #a92924
+  color: #a92924;
+  border-bottom: 2px solid #a92924
 }
 
 .cd-modal-containerOne {
-    width: 100%;
-    padding: 25px;
-    display: none;
+  width: 100%;
+  padding: 25px;
+  display: none;
 }
 
 .active-cdModal {
-    display: block;
+  display: block;
 }
 
 .cd-pingtai-title {
-    color: #a92924;
-    font-weight: bold;
-    font-size: 25px;
-    width: 100%;
-    text-align: center;
-    line-height: 2
+  color: #a92924;
+  font-weight: bold;
+  font-size: 25px;
+  width: 100%;
+  text-align: center;
+  line-height: 2
 }
 
 .quanyiUl-list {
-    float: left;
-    width: 50%;
-    text-align: left;
-    line-height: 2;
-    margin-bottom: 50px;
-    position: relative
+  float: left;
+  width: 50%;
+  text-align: left;
+  line-height: 2;
+  margin-bottom: 50px;
+  position: relative
 }
 
 .quanyiUl-listTexts {
-    font-size: 15px;
-    margin-left: 20px;
-    text-align: left;
-    width: 370px;
-    color: #000;
-    vertical-align: top;
-    margin-left: 150px;
+  font-size: 15px;
+  margin-left: 20px;
+  text-align: left;
+  width: 370px;
+  color: #000;
+  vertical-align: top;
+  margin-left: 150px;
 }
 
 .quanyiUl-listDiv {
-    float: left;
-    width: 120px;
-    max-height: 140px;
-    overflow: hidden;
-    text-align: center;
-    color: #a92924;
-    font-weight: bold;
-    margin-right: 30px;
+  float: left;
+  width: 120px;
+  max-height: 140px;
+  overflow: hidden;
+  text-align: center;
+  color: #a92924;
+  font-weight: bold;
+  margin-right: 30px;
 
 }
 
 .quanyiUl-listDiv p {
-    padding-top: 5px;
-    color: #a92924;
-    font-size: 18px;
-    line-height: 2
+  padding-top: 5px;
+  color: #a92924;
+  font-size: 18px;
+  line-height: 2
 }
 
 .kaitongVip {
-    width: 100%;
-    margin-top: 60px;
+  width: 100%;
+  margin-top: 60px;
 }
 
 .kaitongVip a {
-    color: #fff !important;
-    height: 40px;
-    line-height: 40px;
-    display: block;
-    text-align: center;
-    background: #a92924;
-    font-size: 16px;
+  color: #fff !important;
+  height: 40px;
+  line-height: 40px;
+  display: block;
+  text-align: center;
+  background: #a92924;
+  font-size: 16px;
 }
 
 .kaitongVip a:hover {
-    background: #f0242e;
+  background: #f0242e;
 }
 
 .quanyiUl-listTexts h2 {
-    color: #a92924
+  color: #a92924
 }
 
 .quanyiUl-listTexts p {
-    height: 95px;
-    width: 100%;
-    overflow: hidden;
+  height: 95px;
+  width: 100%;
+  overflow: hidden;
 }
 
 .lateral-titles {
-    width: 100%;
-    color: #a92924;
-    font-size: 19px;
-    font-weight: bold;
-    text-align: left;
-    border-left: 4px solid #a92924;
-    padding-left: 12px;
-    height: 20px;
-    line-height: 20px;
-    margin-bottom: 25px;
+  width: 100%;
+  color: #a92924;
+  font-size: 19px;
+  font-weight: bold;
+  text-align: left;
+  border-left: 4px solid #a92924;
+  padding-left: 12px;
+  height: 20px;
+  line-height: 20px;
+  margin-bottom: 25px;
 }
 
 .bzj-shuoming {
-    padding-left: 20px;
-    text-align: left;
-    line-height: 2;
-    font-size: 13px;
-    margin-bottom: 30px;
+  padding-left: 20px;
+  text-align: left;
+  line-height: 2;
+  font-size: 13px;
+  margin-bottom: 30px;
 }
 
 .sys_spec_text li {
-    float: left;
-    margin: 0px 10px 15px;
-    overflow: hidden;
-    position: relative;
-    width: 288px;
+  float: left;
+  margin: 0px 10px 15px;
+  overflow: hidden;
+  position: relative;
+  width: 288px;
 }
 
 .sys_spec_text li a {
-    border: 1px solid #dbdbdb;
-    height: 100px;
-    display: block;
-    text-align: center;
-    display: flex;
-    box-sizing: border-box;
-    position: relative;
+  border: 1px solid #dbdbdb;
+  height: 100px;
+  display: block;
+  text-align: center;
+  display: flex;
+  box-sizing: border-box;
+  position: relative;
 }
 
 .iteminfo_textas {
-    vertical-align: middle;
-    font-size: 16px;
-    font-weight: normal;
-    float: left;
-    padding: 0px 10px;
-    width: 45px;
-    padding-top: 8px;
-    height: 98px;
-    line-height: 25px;
-    display: block;
-    border-right: 1px solid #dbdbdb;
+  vertical-align: middle;
+  font-size: 16px;
+  font-weight: normal;
+  float: left;
+  padding: 0px 10px;
+  width: 45px;
+  padding-top: 8px;
+  height: 98px;
+  line-height: 25px;
+  display: block;
+  border-right: 1px solid #dbdbdb;
 }
 
 .iteminfo_bodyses {
-    height: 100%;
-    width: 100%;
-    position: relative;
+  height: 100%;
+  width: 100%;
+  position: relative;
 }
 
 .iteminfo_prices h2 {
-    font-weight: normal;
-    font-size: 25px;
-    text-align: center;
+  font-weight: normal;
+  font-size: 25px;
+  text-align: center;
 }
 
 .iteminfo_prices {
-    vertical-align: middle;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: 98px;
-    width: calc(100% - 50px);
+  vertical-align: middle;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 98px;
+  width: calc(100% - 50px);
 }
 
 .iteminfo_prices p {
-    width: 100%;
-    font-size: 12px;
-    color: #888;
-    white-space: nowrap;
-    padding: 10px 0px;
-    overflow: hidden;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+  width: 100%;
+  font-size: 12px;
+  color: #888;
+  white-space: nowrap;
+  padding: 10px 0px;
+  overflow: hidden;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .sys_spec_text li.selected a {
-    border: 1px solid #a92924;
+  border: 1px solid #a92924;
 }
 
 .sys_spec_text li.selected i {
-    display: block;
+  display: block;
 }
 
 .sys_spec_text li i {
-    position: absolute;
-    width: 42px;
-    height: 42px;
-    font-size: 0;
-    line-height: 0;
-    right: 0px;
-    bottom: 0px;
-    //background: url(/static/images/sys_item_selected.png) no-repeat right bottom;
-    z-index: 99;
-    display: none;
+  position: absolute;
+  width: 42px;
+  height: 42px;
+  font-size: 0;
+  line-height: 0;
+  right: 0px;
+  bottom: 0px;
+  //background: url(/static/images/sys_item_selected.png) no-repeat right bottom;
+  z-index: 99;
+  display: none;
 }
 
 .sys_spec_text li.selected .iteminfo_textas {
-    color: #a92924;
-    border-right: 1px solid #a92924
+  color: #a92924;
+  border-right: 1px solid #a92924
 }
 
 .sys_spec_text li.selected .iteminfo_prices h2 {
-    color: #a92924
+  color: #a92924
 }
 
 .sys_spec_text li.selected .iteminfo_prices h2 span {
-    color: #a92924
+  color: #a92924
 }
 
 .sys_payment_text li {
-    float: left;
-    cursor: pointer;
-    margin: 10px;
+  float: left;
+  cursor: pointer;
+  margin: 10px;
 }
 
 .iteminfo_payment img {
-    height: 67px;
-    overflow: hidden;
+  height: 67px;
+  overflow: hidden;
 }
 
 .sys_payment_text li i {
-    width: 30px;
-    height: 19px;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    display: inline-block;
-    float: left;
-    margin-top: 27px;
-    background-position: -216px -296px;
+  width: 30px;
+  height: 19px;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  display: inline-block;
+  float: left;
+  margin-top: 27px;
+  background-position: -216px -296px;
 }
 
 .sys_payment_text li.pay-selected i {
-    background-position: -216px -272px;
+  background-position: -216px -272px;
 }
 
 .Cumulative span i.zsvips {
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    width: 39px;
-    height: 30px;
-    z-index: 8888;
-    display: inline-block;
-    background-position: -173px -174px;
-    position: absolute;
-    left: 0px;
-    top: 0px;
-    overflow: hidden;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  width: 39px;
+  height: 30px;
+  z-index: 8888;
+  display: inline-block;
+  background-position: -173px -174px;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  overflow: hidden;
 }
 
 .vipQuanYiList {
-    display: inline-block;
-    margin: 0px 15px;
-    text-align: center;
-    line-height: 2;
-    color: #a92924;
-    font-size: 16px;
+  display: inline-block;
+  margin: 0px 15px;
+  text-align: center;
+  line-height: 2;
+  color: #a92924;
+  font-size: 16px;
 }
 
 .vipQuanYi {
-    margin-bottom: 15px;
-    border-bottom: 1px solid #eeeded;
+  margin-bottom: 15px;
+  border-bottom: 1px solid #eeeded;
 }
 
 .vipQuanYiList h2 {
-    color: #a92924;
-    font-size: 15px;
-    padding-bottom: 17px;
+  color: #a92924;
+  font-size: 15px;
+  padding-bottom: 17px;
 }
 
 .vipQuanYiList i {
-    display: block;
-    height: 68px;
-    width: 67px;
-    overflow: hidden;
-    margin: 0px auto;
-    text-align: center;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    background-position: -257px -344px;
+  display: block;
+  height: 68px;
+  width: 67px;
+  overflow: hidden;
+  margin: 0px auto;
+  text-align: center;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  background-position: -257px -344px;
 }
 
 .iteminfo_prices del {
-    font-weight: normal;
-    color: #888;
-    font-size: 15px;
-    padding-left: 5px;
+  font-weight: normal;
+  color: #888;
+  font-size: 15px;
+  padding-left: 5px;
 }
 
 .Renewal-matic {
-    width: 100%;
-    font-size: 15px;
-    box-sizing: border-box;
+  width: 100%;
+  font-size: 15px;
+  box-sizing: border-box;
 }
 
 .RenewalDics {
-    line-height: 2;
-    float: left;
+  line-height: 2;
+  float: left;
 }
 
 .Renewal a {
-    display: inline-block;
-    color: #3288b2;
+  display: inline-block;
+  color: #3288b2;
 }
 
 .RenewalDics span {
-    width: 100%;
-    display: block;
+  width: 100%;
+  display: block;
 }
 
 .Renewal-matic span {
-    float: left;
-    line-height: 2;
-    margin-left: 10px;
-    cursor: pointer;
+  float: left;
+  line-height: 2;
+  margin-left: 10px;
+  cursor: pointer;
 }
 
 .Renewal-matic span i {
-    width: 30px;
-    height: 19px;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    display: inline-block;
-    float: left;
-    margin-top: 5px;
-    background-position: -216px -296px;
+  width: 30px;
+  height: 19px;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  display: inline-block;
+  float: left;
+  margin-top: 5px;
+  background-position: -216px -296px;
 }
 
 .Renewal-matic span.uis-active i {
-    background-position: -216px -272px;
+  background-position: -216px -272px;
 }
 
 .Cumulative i.grrz2 {
-    height: 37px;
-    width: 49px;
-    float: left;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    background-position: -337px -82px;
+  height: 37px;
+  width: 49px;
+  float: left;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  background-position: -337px -82px;
 }
 
 .Cumulative i.weitijiaozil {
-    height: 30px;
-    width: 32px;
-    float: left;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    background-position: -335px -26px;
+  height: 30px;
+  width: 32px;
+  float: left;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  background-position: -335px -26px;
 }
 
 .Cumulative .spanTisp2 i.weitijiaozil {
-    height: 30px;
-    width: 32px;
-    float: left;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    background-position: -336px -56px;
-    margin-top: 7px;
+  height: 30px;
+  width: 32px;
+  float: left;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  background-position: -336px -56px;
+  margin-top: 7px;
 }
 
 span.rezhen-rightsw {
-    float: right;
+  float: right;
 }
 
 span.rezhen-rightsw a {
-    display: inline-block;
-    font-size: 12px;
-    color: #a92924;
-    border: 1px solid #a92924;
-    padding: 0px 6px;
-    height: 30px;
-    line-height: 30px;
+  display: inline-block;
+  font-size: 12px;
+  color: #a92924;
+  border: 1px solid #a92924;
+  padding: 0px 6px;
+  height: 30px;
+  line-height: 30px;
 }
 
 span.rezhen-rightsw a:hover {
-    background: #a92924;
-    color: #fff
+  background: #a92924;
+  color: #fff
 }
 
 .cneterForm_li {
-    margin-top: 22px;
-    width: 100%;
+  margin-top: 22px;
+  width: 100%;
 }
 
 .cneterForm_li::before, .cneterForm_li::after {
-    display: table;
-    content: '';
+  display: table;
+  content: '';
 }
 
 .cneterForm-label02 {
-    float: left;
-    line-height: 36px;
+  float: left;
+  line-height: 36px;
 
-    text-align: left;
-    font-size: 14px;
+  text-align: left;
+  font-size: 14px;
 }
 
 .cneterForm-inline02 {
-    margin-left: 110px;
-    min-height: 36px;
-    margin-right: 10px;
+  margin-left: 110px;
+  min-height: 36px;
+  margin-right: 10px;
 }
 
 .red {
-    color: #df1109;
+  color: #df1109;
 }
 
 .cneterForm_lileft {
-    float: left;
-    width: 444px;
+  float: left;
+  width: 444px;
 
 }
 
 .cneterForm_li .cneterForm_lileft:nth-child(1) {
-    margin-right: 20px;
+  margin-right: 20px;
 }
 
 .cneterForm-inline {
-    min-height: 30px;
-    line-height: 30px;
-    float: left;
-    margin-right: 10px;
+  min-height: 30px;
+  line-height: 30px;
+  float: left;
+  margin-right: 10px;
 }
 
 .cneterForm_li input {
-    font-size: 12px;
+  font-size: 12px;
 }
 
 .layui-upload {
-    cursor: pointer;
-    float: left;
-    overflow: hidden;
-    margin-right: 20px;
-    position: relative;
+  cursor: pointer;
+  float: left;
+  overflow: hidden;
+  margin-right: 20px;
+  position: relative;
 }
 
 .upload-icon {
-    float: left;
-    height: 38px;
+  float: left;
+  height: 38px;
 
-    overflow: hidden;
-    position: relative;
+  overflow: hidden;
+  position: relative;
 }
 
 .layui-upload img {
@@ -847,1126 +850,1126 @@ span.rezhen-rightsw a:hover {
 }
 
 .upload-drag span {
-    display: inline-block;
-    height: 44px;
-    line-height: 38px;
+  display: inline-block;
+  height: 44px;
+  line-height: 38px;
 }
 
 .upload-drag {
-    position: relative;
+  position: relative;
 }
 
 .layui-upload input[type=file] {
-    position: absolute;
-    left: 0px;
-    top: 0px;
-    width: 69px;
-    height: 40px;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  width: 69px;
+  height: 40px;
 
 }
 
 .upload-icon img {
-    margin-right: 10px;
+  margin-right: 10px;
 }
 
 button.pk-upload {
-    outline: none;
-    height: 38px;
-    line-height: 38px;
-    display: inline-block;
-    text-align: center;
-    padding: 0px 16px;
-    background: #a92924;
-    color: #fff
+  outline: none;
+  height: 38px;
+  line-height: 38px;
+  display: inline-block;
+  text-align: center;
+  padding: 0px 16px;
+  background: #a92924;
+  color: #fff
 }
 
 button.pk-dowmload {
-    outline: none;
-    height: 38px;
-    line-height: 38px;
-    display: inline-block;
-    text-align: center;
-    background: #a92924;
-    color: #fff;
-    padding: 0px 15px;
+  outline: none;
+  height: 38px;
+  line-height: 38px;
+  display: inline-block;
+  text-align: center;
+  background: #a92924;
+  color: #fff;
+  padding: 0px 15px;
 }
 
 .cneterForm-inline03 {
-    margin-left: 110px;
-    min-height: 36px;
-    margin-right: 30px;
+  margin-left: 110px;
+  min-height: 36px;
+  margin-right: 30px;
 }
 
 .thresgSpem span {
-    display: inline-block;
-    margin-right: 25px;
-    font-size: 13px;
+  display: inline-block;
+  margin-right: 25px;
+  font-size: 13px;
 }
 
 .cneterForm-inline02 .heyuos, .cneterForm-inline02 .thresgSpem {
-    margin-left: 50px;
-    line-height: 2
+  margin-left: 50px;
+  line-height: 2
 }
 
 button.Submit-dowmload {
-    outline: none;
-    height: 38px;
-    line-height: 38px;
-    display: inline-block;
-    text-align: center;
-    background: #a92924;
-    color: #fff;
-    width: 290px;
-    padding: 0px 15px;
-    font-size: 15px;
-    margin-bottom: 60px;
+  outline: none;
+  height: 38px;
+  line-height: 38px;
+  display: inline-block;
+  text-align: center;
+  background: #a92924;
+  color: #fff;
+  width: 290px;
+  padding: 0px 15px;
+  font-size: 15px;
+  margin-bottom: 60px;
 }
 
 .upload-icon {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .cneterForm_liHref {
-    position: absolute;
-    right: 18px;
-    top: -7px;
+  position: absolute;
+  right: 18px;
+  top: -7px;
 }
 
 .cneterForm_liHref .jysrz {
-    color: #a92924;
-    border: 1px solid #a92924;
-    outline: none;
-    height: 38px;
-    line-height: 38px;
-    display: block;
-    text-align: center;
-    padding: 0px 16px;
-    margin-bottom: 10px;
+  color: #a92924;
+  border: 1px solid #a92924;
+  outline: none;
+  height: 38px;
+  line-height: 38px;
+  display: block;
+  text-align: center;
+  padding: 0px 16px;
+  margin-bottom: 10px;
 
 }
 
 .cneterForm_liHref .gongto-renzhen {
-    color: #fff;
-    background: #a92924;
-    outline: none;
-    height: 38px;
-    line-height: 38px;
-    display: block;
-    text-align: center;
-    padding: 0px 16px;
+  color: #fff;
+  background: #a92924;
+  outline: none;
+  height: 38px;
+  line-height: 38px;
+  display: block;
+  text-align: center;
+  padding: 0px 16px;
 
 }
 
 .xinzheng-positions input[type=text] {
-    float: left;
-    width: 324px;
-    margin-right: 40px;
+  float: left;
+  width: 324px;
+  margin-right: 40px;
 }
 
 .cneterForm-inline02, .xinzheng-positions {
-    position: relative;
+  position: relative;
 }
 
 .xuanze-hao {
-    margin-top: 3px;
-    float: left;
-    cursor: pointer;
+  margin-top: 3px;
+  float: left;
+  cursor: pointer;
 }
 
 .xinzhengLists {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .upload-drag span {
-    color: #a92924
+  color: #a92924
 }
 
 .cneterForm-label02 i.delsx {
-    color: #fff;
-    border-radius: 50%;
-    background: #333333;
-    width: 20px;
-    height: 20px;
-    text-align: center;
-    line-height: 20px;
-    float: left;
-    margin-top: 15px;
-    cursor: pointer;
-    margin-right: 5px;
+  color: #fff;
+  border-radius: 50%;
+  background: #333333;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 20px;
+  float: left;
+  margin-top: 15px;
+  cursor: pointer;
+  margin-right: 5px;
 }
 
 .cneterForm-inline03 {
-    position: relative;
+  position: relative;
 }
 
 .tagCon .tag {
-    border: 1px solid #e6e6e6;
-    padding: 0px 15px;
-    height: 38px;
-    line-height: 38px;
-    border-radius: 1px;
-    position: relative;
-    margin-right: 13px;
-    float: left;
+  border: 1px solid #e6e6e6;
+  padding: 0px 15px;
+  height: 38px;
+  line-height: 38px;
+  border-radius: 1px;
+  position: relative;
+  margin-right: 13px;
+  float: left;
 }
 
 .closetag {
-    width: 16px;
-    height: 16px;
-    border-radius: 8px;
-    background-color: #323030;
-    font: 600 12px/16px "simsun";
-    text-align: center;
-    color: #f1f1f1;
-    position: absolute;
-    top: -4px;
-    right: -4px;
-    cursor: pointer;
+  width: 16px;
+  height: 16px;
+  border-radius: 8px;
+  background-color: #323030;
+  font: 600 12px/16px "simsun";
+  text-align: center;
+  color: #f1f1f1;
+  position: absolute;
+  top: -4px;
+  right: -4px;
+  cursor: pointer;
 }
 
 .documenTopH2 em {
-    font-size: 12px;
-    color: #a92924;
-    float: right;
-    margin-left: 6px;
-    cursor: pointer;
-    border: 1px solid #a92924;
-    padding: 0px 10px;
+  font-size: 12px;
+  color: #a92924;
+  float: right;
+  margin-left: 6px;
+  cursor: pointer;
+  border: 1px solid #a92924;
+  padding: 0px 10px;
 }
 
 .documenTopH2 em:hover {
-    background: #a92924;
-    color: #fff
+  background: #a92924;
+  color: #fff
 }
 
 .cneterForm-label02 i.mingpdz {
-    background: url(/static/images/iconsmall.png) no-repeat;
-    float: left;
-    width: 33px;
-    height: 30px;
-    background-position: 0px -66px;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  float: left;
+  width: 33px;
+  height: 30px;
+  background-position: 0px -66px;
 }
 
 .cneterForm-label02 i.mingpdh {
-    background: url(/static/images/iconsmall.png) no-repeat;
-    float: left;
-    width: 33px;
-    height: 30px;
-    background-position: 0px -102px;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  float: left;
+  width: 33px;
+  height: 30px;
+  background-position: 0px -102px;
 }
 
 .cneterForm-label02 i.mingpsj {
-    background: url(/static/images/iconsmall.png) no-repeat;
-    float: left;
-    width: 33px;
-    height: 30px;
-    background-position: 0px -137px;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  float: left;
+  width: 33px;
+  height: 30px;
+  background-position: 0px -137px;
 }
 
 .cneterForm-label02 i.mingpyx {
-    background: url(/static/images/iconsmall.png) no-repeat;
-    float: left;
-    width: 33px;
-    height: 30px;
-    background-position: 0px -168px;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  float: left;
+  width: 33px;
+  height: 30px;
+  background-position: 0px -168px;
 }
 
 .cneterForm-label02 i.mingpwz {
-    background: url(/static/images/iconsmall.png) no-repeat;
-    float: left;
-    width: 33px;
-    height: 30px;
-    overflow: hidden;
-    background-position: 0px -202px;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  float: left;
+  width: 33px;
+  height: 30px;
+  overflow: hidden;
+  background-position: 0px -202px;
 }
 
 .steelRight-Imgs img {
-    height: 75px;
-    width: 75px;
-    text-align: center;
+  height: 75px;
+  width: 75px;
+  text-align: center;
 }
 
 .bile-shade .yiduAll i {
-    float: left;
-    width: 35px;
-    line-height: 21px;
-    height: 21px;
-    overflow: hidden;
-    background: url(/static/images/iconsmall.png) no-repeat;
-    background-position: -214px -387px;
+  float: left;
+  width: 35px;
+  line-height: 21px;
+  height: 21px;
+  overflow: hidden;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  background-position: -214px -387px;
 }
 
 .bile-shade li {
-    float: left;
-    margin-left: 15px;
+  float: left;
+  margin-left: 15px;
 }
 
 .xiaxituison i {
-    float: left;
-    width: 33px;
-    overflow: hidden;
-    line-height: 21px;
-    height: 21px;
-    background: url(/static/images/iconsmall.png) no-repeat;
-    background-position: -211px -350px;
+  float: left;
+  width: 33px;
+  overflow: hidden;
+  line-height: 21px;
+  height: 21px;
+  background: url(/static/images/iconsmall.png) no-repeat;
+  background-position: -211px -350px;
 }
 
 .dash-widget-infoList {
-    border-top: 1px solid #dfdddd;
-    padding: 16px 20px;
+  border-top: 1px solid #dfdddd;
+  padding: 16px 20px;
 }
 
 .dash-widget-infoList-texts, .dash-widget-infoList-texts p {
-    line-height: 2;
-    font-size: 13px;
-    color: #888888
+  line-height: 2;
+  font-size: 13px;
+  color: #888888
 }
 
 .dash-widgetH2, .dash-widgetH2 span {
-    float: left;
+  float: left;
 }
 
 .dash-widget-right {
-    float: right;
-    color: #a92924;
-    font-size: 14px;
+  float: right;
+  color: #a92924;
+  font-size: 14px;
 }
 
 .dash-widget-right span {
-    margin-left: 20px;
-    float: left;
-    color: #a92924;
-    font-size: 13px;
-    cursor: pointer;
+  margin-left: 20px;
+  float: left;
+  color: #a92924;
+  font-size: 13px;
+  cursor: pointer;
 }
 
 .dash-widget-right span i {
-    width: 29px;
-    height: 20px;
-    float: left;
-    margin-top: 3px;
-    background: url(/static/images/iconsmall.png) no-repeat;
+  width: 29px;
+  height: 20px;
+  float: left;
+  margin-top: 3px;
+  background: url(/static/images/iconsmall.png) no-repeat;
 }
 
 .dash-widget-right span i.yd {
-    background-position: -220px -369px;
+  background-position: -220px -369px;
 }
 
 .dash-widget-right span i.sc {
-    background-position: -241px -336px;
+  background-position: -241px -336px;
 }
 
 .dash-widget-infoList-titles {
-    line-height: 27px;
+  line-height: 27px;
 }
 
 .dash-widget-infoList-texts {
-    margin: 1px 0px;
-    padding: 6px 21px 0px;
-    text-align: left;
-    height: 60px;
-    overflow: hidden;
+  margin: 1px 0px;
+  padding: 6px 21px 0px;
+  text-align: left;
+  height: 60px;
+  overflow: hidden;
 }
 
 .dash-widgetH2 {
-    font-size: 16px;
-    text-align: left;
+  font-size: 16px;
+  text-align: left;
 }
 
 .dash-widgetH2 em {
-    float: left;
-    height: 10px;
-    width: 10px;
-    border-radius: 50%;
-    margin-top: 8px;
-    margin-right: 9px;
+  float: left;
+  height: 10px;
+  width: 10px;
+  border-radius: 50%;
+  margin-top: 8px;
+  margin-right: 9px;
 }
 
 .dash-widgetH2 em.ydu {
-    background: #888888;
+  background: #888888;
 }
 
 .dash-widgetH2 em.wdu {
-    background: #a92924;
+  background: #a92924;
 }
 
 .dash-widget-infoList:link em {
-    background: #a92924;
+  background: #a92924;
 }
 
 .dash-widget-infoList:visited em {
-    background: #888888;
+  background: #888888;
 }
 
 .dash-widgetH2 a {
-    float: left;
+  float: left;
 }
 
 .dash-widget-infoList:hover {
-    background: #fafafa;
-    cursor: pointer;
+  background: #fafafa;
+  cursor: pointer;
 }
 
 .lmoresbtn {
-    color: #a92924;
-    font-size: 16px;
-    height: 35px;
-    line-height: 35px;
-    padding: 0px 20px;
-    display: inline-block;
-    text-align: center;
+  color: #a92924;
+  font-size: 16px;
+  height: 35px;
+  line-height: 35px;
+  padding: 0px 20px;
+  display: inline-block;
+  text-align: center;
 }
 
 .dash-widget-infoList-texts.active-texts {
-    height: auto;
+  height: auto;
 }
 
 .push-settings, .push-settingsTwo {
-    border-top: 1px solid #e6e6e6;
-    padding: 10px 15px;
+  border-top: 1px solid #e6e6e6;
+  padding: 10px 15px;
 
 }
 
 .push-settingsLists {
-    float: left;
-    width: 50%;
-    margin-bottom: 5px;
+  float: left;
+  width: 50%;
+  margin-bottom: 5px;
 }
 
 .pushForm-inline02 {
-    margin-left: 250px;
+  margin-left: 250px;
 }
 
 .cneterForm-settingsTwo {
-    color: #a92924;
-    font-weight: normal;
-    font-size: 17px;
-    height: 60px;
-    line-height: 60px;
+  color: #a92924;
+  font-weight: normal;
+  font-size: 17px;
+  height: 60px;
+  line-height: 60px;
 }
 
 .pushs-input-block {
-    padding: 4px 10px 18px;
+  padding: 4px 10px 18px;
 }
 
 .addAdes {
-    color: #fff;
-    background: #a92924;
-    height: 38px;
-    line-height: 38px;
-    padding: 0px 30px;
-    display: block;
-    cursor: pointer;
+  color: #fff;
+  background: #a92924;
+  height: 38px;
+  line-height: 38px;
+  padding: 0px 30px;
+  display: block;
+  cursor: pointer;
 }
 
 .choseBodys {
-    padding-top: 30px;
-    width: 100%;
+  padding-top: 30px;
+  width: 100%;
 }
 
 .choseBodys span {
-    float: left;
+  float: left;
 }
 
 .choseDibs {
-    float: left;
-    margin-right: 15px;
+  float: left;
+  margin-right: 15px;
 }
 
 .pushsListw {
-    padding: 11px 1px 5px;
-    text-align: left;
-    border-bottom: 1px #f4f4f4 dashed
+  padding: 11px 1px 5px;
+  text-align: left;
+  border-bottom: 1px #f4f4f4 dashed
 }
 
 .pushsListw span {
-    font-size: 15px;
-    float: left;
+  font-size: 15px;
+  float: left;
 }
 
 .pushsListw span img {
-    max-width: 20px;
-    max-height: 20px;
-    float: left;
-    margin-right: 10px;
+  max-width: 20px;
+  max-height: 20px;
+  float: left;
+  margin-right: 10px;
 }
 
 .gangguanw {
-    margin-left: 123px;
-    line-height: 2;
+  margin-left: 123px;
+  line-height: 2;
 }
 
 .gangguanw a {
-    float: left;
-    font-size: 13px;
-    padding: 0px 15px;
-    margin-bottom: 5px;
+  float: left;
+  font-size: 13px;
+  padding: 0px 15px;
+  margin-bottom: 5px;
 }
 
 .push-input-inline {
-    float: left;
-    width: 220px;
-    margin-right: 10px;
-    position: relative;
+  float: left;
+  width: 220px;
+  margin-right: 10px;
+  position: relative;
 }
 
 .push-form-mid {
-    position: relative;
-    float: left;
-    display: block;
-    padding: 9px 0 !important;
-    line-height: 20px;
-    margin-right: 10px;
+  position: relative;
+  float: left;
+  display: block;
+  padding: 9px 0 !important;
+  line-height: 20px;
+  margin-right: 10px;
 }
 
 .push-input-inline em {
-    height: 32px;
-    line-height: 32px;
-    position: absolute;
-    right: 3px;
-    top: 4px;
-    width: 31px;
-    background: #fff;
-    text-align: center;
+  height: 32px;
+  line-height: 32px;
+  position: absolute;
+  right: 3px;
+  top: 4px;
+  width: 31px;
+  background: #fff;
+  text-align: center;
 }
 
 .massagesTop {
-    width: 100%;
-    border-bottom: 1px solid #e6e6e6;
+  width: 100%;
+  border-bottom: 1px solid #e6e6e6;
 
-    margin: 0px auto;
-    text-align: center;
+  margin: 0px auto;
+  text-align: center;
 }
 
 .massagesTop a {
-    display: inline-block;
-    margin: 0px 30px;
-    font-size: 16px;
-    cursor: pointer;
-    text-align: center;
-    height: 47px;
-    line-height: 40px;
+  display: inline-block;
+  margin: 0px 30px;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+  height: 47px;
+  line-height: 40px;
 }
 
 .massagesTop a.active {
-    border-bottom: 2px solid #a92924;
-    color: #a92924
+  border-bottom: 2px solid #a92924;
+  color: #a92924
 }
 
 .avatar-edit {
-    text-align: center;
-    margin: 0px auto;
+  text-align: center;
+  margin: 0px auto;
 }
 
 .avatar-edit .avatar-editIMGS {
-    border-radius: 50%;
-    height: 120px;
-    text-align: center;
-    margin: 0px auto;
-    width: 120px;
-    overflow: hidden;
+  border-radius: 50%;
+  height: 120px;
+  text-align: center;
+  margin: 0px auto;
+  width: 120px;
+  overflow: hidden;
 }
 
 .avatar-edit .avatar-editIMGS img {
-    text-align: center;
-    width: 100%;
-    height: 100%;
-    display: block;
+  text-align: center;
+  width: 100%;
+  height: 100%;
+  display: block;
 }
 
 .avatar-edit a {
-    text-align: center;
-    margin: 10px 0px;
-    line-height: 2;
-    color: #a92924;
-    font-size: 14px;
+  text-align: center;
+  margin: 10px 0px;
+  line-height: 2;
+  color: #a92924;
+  font-size: 14px;
 }
 
 .avatar-edit p {
-    line-height: 2;
-    text-align: center;
-    color: #888888;
-    font-size: 12px;
+  line-height: 2;
+  text-align: center;
+  color: #888888;
+  font-size: 12px;
 }
 
 .mberManage-label02 {
-    float: left;
-    font-size: 15px;
-    text-align: left;
+  float: left;
+  font-size: 15px;
+  text-align: left;
 }
 
 .mberManage-label02 i {
-    width: 37px;
-    height: 24px;
-    float: left;
-    background: url(/static/images/iconsmall.png) no-repeat;
+  width: 37px;
+  height: 24px;
+  float: left;
+  background: url(/static/images/iconsmall.png) no-repeat;
 }
 
 .mberManage-label02 i.mbyhm {
-    background-position: -335px -127px;
+  background-position: -335px -127px;
 }
 
 .mberManage-label02 i.mbbdsjh {
-    background-position: -335px -159px
+  background-position: -335px -159px
 }
 
 .mberManage-label02 i.mbbdyx {
-    background-position: -335px -194px;
+  background-position: -335px -194px;
 }
 
 .mberManage-label02 i.mbwetchat {
-    background-position: -335px -223px;
+  background-position: -335px -223px;
 }
 
 .mberManage-label02 i.mbdlmm {
-    background-position: -332px -249px;
+  background-position: -332px -249px;
 }
 
 .mberManage_li {
-    border-bottom: 1px solid #f5f3f3;
-    padding: 15px 7px;
+  border-bottom: 1px solid #f5f3f3;
+  padding: 15px 7px;
 }
 
 .mbyhmchages {
-    float: right;
-    color: #a92924;
-    font-size: 13px;
-    text-align: right;
-    width: 93px;
+  float: right;
+  color: #a92924;
+  font-size: 13px;
+  text-align: right;
+  width: 93px;
 }
 
 .upload-file #file {
-    height: 100%;
-    width: 100%;;
-    opacity: 0;
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    z-index: 8888;
-    cursor: pointer;
+  height: 100%;
+  width: 100%;;
+  opacity: 0;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  z-index: 8888;
+  cursor: pointer;
 }
 
 .avatar-edit .upload-file {
-    height: 60px;
-    line-height: 60px;
-    width: 60px;
-    text-align: center;
-    margin: 0px auto;
-    position: relative;
-    font-size: 13px;
-    color: #a92924;
-    cursor: pointer;
+  height: 60px;
+  line-height: 60px;
+  width: 60px;
+  text-align: center;
+  margin: 0px auto;
+  position: relative;
+  font-size: 13px;
+  color: #a92924;
+  cursor: pointer;
 }
 
 .btn-lgbtn-info {
-    cursor: pointer;
-    color: #a92924;
-    cursor: pointer;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    display: block;
+  cursor: pointer;
+  color: #a92924;
+  cursor: pointer;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  display: block;
 }
 
 .bankofChi {
-    cursor: pointer;
-    text-align: center;
-    margin: 0px auto;
-    width: 293px;
-    float: left;
-    padding: 42px 0px;
-    margin: 7px 7px 10px;
-    height: 145px;
-    line-height: 2;
-    border: 1px solid #ddd;
-    color: #a92924
+  cursor: pointer;
+  text-align: center;
+  margin: 0px auto;
+  width: 293px;
+  float: left;
+  padding: 42px 0px;
+  margin: 7px 7px 10px;
+  height: 145px;
+  line-height: 2;
+  border: 1px solid #ddd;
+  color: #a92924
 
 }
 
 .bankofChi p {
-    color: #a92924;
-    line-height: 40px;
-    font-size: 15px;
+  color: #a92924;
+  line-height: 40px;
+  font-size: 15px;
 }
 
 .bankofChina-List {
-    cursor: pointer;
-    text-align: center;
-    margin: 0px auto;
-    margin: 7px 7px 10px;
-    width: 292px;
-    float: left;
-    padding: 0px 0px;
-    height: 145px;
-    line-height: 2;
-    border: 1px solid #ddd;
-    color: #a92924
+  cursor: pointer;
+  text-align: center;
+  margin: 0px auto;
+  margin: 7px 7px 10px;
+  width: 292px;
+  float: left;
+  padding: 0px 0px;
+  height: 145px;
+  line-height: 2;
+  border: 1px solid #ddd;
+  color: #a92924
 }
 
 .bankofChina-texts {
-    background: #f9f9f9;
-    padding: 10px;
-    text-align: left;
-    font-size: 12px;
-    position: relative;
+  background: #f9f9f9;
+  padding: 10px;
+  text-align: left;
+  font-size: 12px;
+  position: relative;
 }
 
 .bankofChina-top {
-    width: 100%;
-    height: 75px;
-    padding: 11px 0px;
-    position: relative;
+  width: 100%;
+  height: 75px;
+  padding: 11px 0px;
+  position: relative;
 }
 
 .bankofChina-top img {
-    height: 42px;
-    float: left;
-    margin-top: 5px;
+  height: 42px;
+  float: left;
+  margin-top: 5px;
 }
 
 .bankofChina-rigt {
-    transition: all .2s ease-in-out;
-    width: 50px;
-    opacity: 0;
-    position: absolute;
-    right: 1px;
-    top: 11px;
+  transition: all .2s ease-in-out;
+  width: 50px;
+  opacity: 0;
+  position: absolute;
+  right: 1px;
+  top: 11px;
 }
 
 .bankofChina-rigt a {
-    font-size: 13px;
-    color: #a92924;
-    display: block;
-    text-align: center;
+  font-size: 13px;
+  color: #a92924;
+  display: block;
+  text-align: center;
 }
 
 .bankofChina-List:hover .bankofChina-rigt {
-    opacity: 1;
+  opacity: 1;
 }
 
 .bankofChina-rigt2 {
-    font-size: 12px;
-    position: absolute;
-    position: absolute;
-    right: 1px;
-    top: 22px;
+  font-size: 12px;
+  position: absolute;
+  position: absolute;
+  right: 1px;
+  top: 22px;
 }
 
 .bankofChina-rigt2 span {
-    background: #fe7572;
-    display: inline-block;
-    color: #fff;
-    padding: 2px 3px;
-    font-size: 12px;
-    margin: 0px 7px;
+  background: #fe7572;
+  display: inline-block;
+  color: #fff;
+  padding: 2px 3px;
+  font-size: 12px;
+  margin: 0px 7px;
 }
 
 .bankofChina-List:nth-child(even) .bankofChina-rigt2 span {
-    background: #5f9ddc
+  background: #5f9ddc
 }
 
 .makeDures {
-    background: #a92924;
-    color: #fff;
-    padding: 0px 18px;
-    outline: none;
-    height: 36px;
-    line-height: 36px;
+  background: #a92924;
+  color: #fff;
+  padding: 0px 18px;
+  outline: none;
+  height: 36px;
+  line-height: 36px;
 }
 
 .quxiaos {
-    color: #a92924;
-    border: 1px solid #a92924;
-    padding: 0px 18px;
-    background: #fff;
-    outline: none;
-    height: 36px;
-    line-height: 36px;
-    margin-left: 5px;
+  color: #a92924;
+  border: 1px solid #a92924;
+  padding: 0px 18px;
+  background: #fff;
+  outline: none;
+  height: 36px;
+  line-height: 36px;
+  margin-left: 5px;
 }
 
 .quxiaos:hover {
-    background: #a92924;
-    color: #fff;
+  background: #a92924;
+  color: #fff;
 }
 
 .hqyzm {
-    position: absolute;
-    right: 8px;
-    top: 5px;
-    font-size: 13px;
-    height: 26px;
-    padding-left: 6px;
-    border-left: 1px solid #ddd;
-    background: #fff;
-    color: #a92924
+  position: absolute;
+  right: 8px;
+  top: 5px;
+  font-size: 13px;
+  height: 26px;
+  padding-left: 6px;
+  border-left: 1px solid #ddd;
+  background: #fff;
+  color: #a92924
 }
 
 .gerenAdd-label {
-    float: left;
-    width: 235px;
-    text-align: right;
-    font-size: 14px;
-    height: 38px;
-    line-height: 38px;
+  float: left;
+  width: 235px;
+  text-align: right;
+  font-size: 14px;
+  height: 38px;
+  line-height: 38px;
 
 }
 
 .gerenAdd-input-block {
-    margin-left: 240px;
-    position: relative;
-    width: 282px;
+  margin-left: 240px;
+  position: relative;
+  width: 282px;
 }
 
 .gerenAdd-input-block input {
-    position: relative;
-    font-size: 13px;
+  position: relative;
+  font-size: 13px;
 }
 
 .get-messnumber {
-    background: #fff;
-    position: absolute;
-    border-left: 1px solid #a92924;
-    font-size: 12px;
-    color: #a92924;
-    right: 6px;
-    top: 5px;
-    padding: 5px;
-    padding-left: 10px;
-    cursor: pointer;
+  background: #fff;
+  position: absolute;
+  border-left: 1px solid #a92924;
+  font-size: 12px;
+  color: #a92924;
+  right: 6px;
+  top: 5px;
+  padding: 5px;
+  padding-left: 10px;
+  cursor: pointer;
 }
 
 .gerenAdd-layui-btn {
-    outline: none;
-    background: #a92924;
-    color: #fff;
-    height: 38px;
-    line-height: 38px;
-    text-align: center;
-    width: 100%;
+  outline: none;
+  background: #a92924;
+  color: #fff;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  width: 100%;
 }
 
 .qiyeAdd-html, .gerenAdd-html, .qiyeChages-html, .grcxkChages-html {
-    display: none;
+  display: none;
 }
 
 .zhuyio {
-    height: 21px;
-    width: 32px;
-    float: left;
-    background: url(/static/images/iconsmall.png) no-repeat center center;
-    background-position: -335px -35px;
+  height: 21px;
+  width: 32px;
+  float: left;
+  background: url(/static/images/iconsmall.png) no-repeat center center;
+  background-position: -335px -35px;
 }
 
 
 .junkUlNav a {
-    height: 50px;
-    line-height: 50px;
-    text-align: center;
-    font-weight: bold;
-    font-size: 16px;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 16px;
 }
 
 .junkUlList a {
-    display: inline-block;
+  display: inline-block;
 }
 
 .junkUlNav a.active {
-    color: #a92924;
-    border-bottom: 2px solid #a92924;
+  color: #a92924;
+  border-bottom: 2px solid #a92924;
 }
 
 .junkUlList {
-    -webkit-box-flex: 1;
-    -webkit-flex: 1;
-    flex: 1;
-    min-width: 0;
-    text-align: center;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  flex: 1;
+  min-width: 0;
+  text-align: center;
 }
 
 .junkUl {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-    align-items: center;
-    position: relative;
-    width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+  position: relative;
+  width: 100%;
 }
 
 .main-yug-right {
-    margin: 50px 0px;
-    text-align: left;
+  margin: 50px 0px;
+  text-align: left;
 }
 
 .messless-timespan1 {
-    position: absolute;
-    right: 19px;
-    top: 6px;
-    width: 30px;
-    height: 24px;
-    background: #fff url(/static/images/iconsmall.png) no-repeat center center;
-    background-position: -333px -284px;
+  position: absolute;
+  right: 19px;
+  top: 6px;
+  width: 30px;
+  height: 24px;
+  background: #fff url(/static/images/iconsmall.png) no-repeat center center;
+  background-position: -333px -284px;
 }
 
 .chakandingdan {
-    color: #fff;
-    background: #a92924;
-    font-size: 14px;
-    width: 105px;
-    height: 38px;
-    line-height: 38px;
-    text-align: center;
-    border: 1px solid #a92924;
-    display: inline-block;
-    margin-right: 15px;
+  color: #fff;
+  background: #a92924;
+  font-size: 14px;
+  width: 105px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  border: 1px solid #a92924;
+  display: inline-block;
+  margin-right: 15px;
 }
 
 .chakandingdan:hover {
-    background: #dd221b;
-    border: 1px solid #dd221b;
+  background: #dd221b;
+  border: 1px solid #dd221b;
 }
 
 .dingdandaochu {
-    display: inline-block;
-    color: #a92924;
-    background: #fff;
-    border: 1px solid #a92924;
-    font-size: 14px;
-    width: 105px;
-    height: 38px;
-    line-height: 38px;
-    text-align: center;
+  display: inline-block;
+  color: #a92924;
+  background: #fff;
+  border: 1px solid #a92924;
+  font-size: 14px;
+  width: 105px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
 }
 
 .dingdandaochu:hover {
-    background: #a92924;
-    color: #fff !important
+  background: #a92924;
+  color: #fff !important
 }
 
 .panel-itemMod {
-    border-top: 1px solid #e6e6e6;
-    padding-top: 43px;
-    margin-top: 23px;
+  border-top: 1px solid #e6e6e6;
+  padding-top: 43px;
+  margin-top: 23px;
 }
 
 .panel-itemModtOP {
-    line-height: 28px;
+  line-height: 28px;
 }
 
 .panel-itemModtOP h3 {
-    line-height: 28px;
-    color: #a92924;
-    font-size: 19px;
-    text-indent: 15px;
-    position: relative;
-    float: left;
+  line-height: 28px;
+  color: #a92924;
+  font-size: 19px;
+  text-indent: 15px;
+  position: relative;
+  float: left;
 }
 
 .panel-itemModtOP h3:before {
-    content: " ";
-    width: 4px;
-    height: 26px;
-    background: #a92924;
-    display: inline-block;
-    position: absolute;
-    top: 1px;
-    left: 0;
+  content: " ";
+  width: 4px;
+  height: 26px;
+  background: #a92924;
+  display: inline-block;
+  position: absolute;
+  top: 1px;
+  left: 0;
 }
 
 .panel-itemModCenter table .pinName {
-    background: #f6f6f6;
-    text-align: center;
+  background: #f6f6f6;
+  text-align: center;
 }
 
 .nel-itemMod table .pinName {
-    width: 62px;
+  width: 62px;
 }
 
 .panel-itemModCenter table td {
-    line-height: 20px;
-    font-size: 12px;
-    padding: 10px 0;
-    text-align: center;
-    border: 1px solid #ededed;
+  line-height: 20px;
+  font-size: 12px;
+  padding: 10px 0;
+  text-align: center;
+  border: 1px solid #ededed;
 
 }
 
 .panel-itemModCenter {
-    padding-bottom: 25px;
+  padding-bottom: 25px;
 }
 
 .panel-itemModCenter:nth-child(1) .xianhuoForm_li {
-    padding-top: 0px;
-    border-top: none;
+  padding-top: 0px;
+  border-top: none;
 }
 
 .xianhuoForm_li {
-    margin-top: 10px;
-    width: 100%;
-    border-top: 1px solid #ededed;
-    padding-top: 26px;
+  margin-top: 10px;
+  width: 100%;
+  border-top: 1px solid #ededed;
+  padding-top: 26px;
 }
 
 .xianhuoForm_li a, .xianhuoForm_li i, .xianhuoForm_li span {
-    float: left;
-    margin-right: 16px;
-    text-align: left;
-    font-size: 13px;
+  float: left;
+  margin-right: 16px;
+  text-align: left;
+  font-size: 13px;
 }
 
 .hint-pop-up2 {
-    background: #fff;
-    width: 130px;
-    line-height: 2;
-    padding: 15px;
-    -webkit-transform: translate(37px, -55%);
-    transform: translate(37px, -55%);
-    position: absolute;
-    z-index: 5;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    -webkit-box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
-    box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
-    cursor: text;
-    display: none;
+  background: #fff;
+  width: 130px;
+  line-height: 2;
+  padding: 15px;
+  -webkit-transform: translate(37px, -55%);
+  transform: translate(37px, -55%);
+  position: absolute;
+  z-index: 5;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
+  box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
+  cursor: text;
+  display: none;
 }
 
 .hint-pop-up2::after {
-    content: "";
-    position: absolute;
-    border: 8px solid transparent;
+  content: "";
+  position: absolute;
+  border: 8px solid transparent;
 }
 
 .hint-pop-up2::after {
-    left: -15px;
-    top: 50%;
-    -webkit-transform: translateY(-6px);
-    transform: translateY(-6px);
-    border-right-color: #fff;
+  left: -15px;
+  top: 50%;
+  -webkit-transform: translateY(-6px);
+  transform: translateY(-6px);
+  border-right-color: #fff;
 }
 
 .jshi-gtong:hover .hint-pop-up2 {
-    display: block;
+  display: block;
 }
 
 .hint-pop-up3 {
-    background: #fff;
-    line-height: 2;
-    padding: 15px;
-    -webkit-transform: translate(-116px, -126%);
-    transform: translate(-116px, -126%);
-    position: absolute;
-    z-index: 5;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    -webkit-box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
-    box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
-    cursor: text;
-    display: none;
+  background: #fff;
+  line-height: 2;
+  padding: 15px;
+  -webkit-transform: translate(-116px, -126%);
+  transform: translate(-116px, -126%);
+  position: absolute;
+  z-index: 5;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
+  box-shadow: 0 0 16px 0 hsla(0, 0%, 77.3%, .5);
+  cursor: text;
+  display: none;
 }
 
 .hint-pop-up3::after {
-    content: "";
-    position: absolute;
-    border: 10px solid transparent;
+  content: "";
+  position: absolute;
+  border: 10px solid transparent;
 }
 
 .hint-pop-up3::after {
-    left: 43%;
-    bottom: -21%;
-    -webkit-transform: translateY(-6px);
-    transform: translateY(-6px);
-    border-top-color: #fff;
+  left: 43%;
+  bottom: -21%;
+  -webkit-transform: translateY(-6px);
+  transform: translateY(-6px);
+  border-top-color: #fff;
 }
 
 .iconHome:hover .hint-pop-up3 {
-    display: block;
+  display: block;
 }
 
 .hint-pop-up3 p {
-    text-align: left;
-    line-height: 2;
-    font-size: 12px;
-    color: #000;
+  text-align: left;
+  line-height: 2;
+  font-size: 12px;
+  color: #000;
 }
 
 .mod-four-floor ul .jhjyi {
-    border-bottom: 1px solid #f0f0f0;
-    border-right: 1px solid #f0f0f0;
-    border-left: 0px;
+  border-bottom: 1px solid #f0f0f0;
+  border-right: 1px solid #f0f0f0;
+  border-left: 0px;
 }
 
 .mod-four-floor ul .jhjyi:nth-child(5n) {
-    border-right: none;
+  border-right: none;
 }
 
 .pmczguge-gach-thead {
-    width: 100%;
-    background: #f9f9f9;
+  width: 100%;
+  background: #f9f9f9;
 }
 
 .pmczguge-gach-thead td {
-    color: #888;
+  color: #888;
 }
 
 .pmczguge-gach-show td {
-    padding: 16px 5px;
-    line-height: 25px;
-    text-align: center;
-    text-decoration-style: 12px;
+  padding: 16px 5px;
+  line-height: 25px;
+  text-align: center;
+  text-decoration-style: 12px;
 
 }
 
 .pmczguge-gach-tbidy .myyao-baojia {
-    display: inline-block;
-    height: 26px;
-    width: 72px;
-    line-height: 26px;
-    text-align: center;
-    border: 1px solid #a92924;
-    color: #a92924;
-    cursor: pointer;
+  display: inline-block;
+  height: 26px;
+  width: 72px;
+  line-height: 26px;
+  text-align: center;
+  border: 1px solid #a92924;
+  color: #a92924;
+  cursor: pointer;
 }
 
 .pmczguge-gach-tbidy .myyao-baojia:hover {
-    background: #a92924;
-    color: #fff
+  background: #a92924;
+  color: #fff
 }
 
 .pmczguge-gach-tbidy td:visited .desc-visited {
-    color: #a3211b;
+  color: #a3211b;
 }
 
 .pmczguge-gach-tbidy td .desc-visited {
-    color: #a92924;
-    font-size: 15px;
-    max-width: 126px;
-    display: inline-block;
-    vertical-align: middle;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  color: #a92924;
+  font-size: 15px;
+  max-width: 126px;
+  display: inline-block;
+  vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
 
 }
 
 .pmczguge-gach-show td span {
-    display: inline-block;
-    font-size: 14px;
-    max-width: 126px;
-    display: inline-block;
-    vertical-align: middle;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  display: inline-block;
+  font-size: 14px;
+  max-width: 126px;
+  display: inline-block;
+  vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .pmczguge-gach-tbidy tr {
-    width: 100%;
-    border-bottom: 1px solid #f5f2f2
+  width: 100%;
+  border-bottom: 1px solid #f5f2f2
 }
 
 .grxykChages-html {
-    display: none;
+  display: none;
 }
 
 </style>
\ No newline at end of file
diff --git a/components/common-swiper/common-swiper.vue b/components/common-swiper/common-swiper.vue
new file mode 100644
index 0000000..8460a68
--- /dev/null
+++ b/components/common-swiper/common-swiper.vue
@@ -0,0 +1,61 @@
+<template>
+  <el-carousel :height="`${height}px`" :style="{width: width}" class="m-a">
+    <el-carousel-item v-for="(item, index) in list.swiper" :key="item" :style="{width: width}">
+      <image class="carousel-img" :src="item" mode="scaleToFill" :style="{width: width}" @click="onClick(index)"/>
+    </el-carousel-item>
+  </el-carousel>
+</template>
+
+<script>
+export default {
+  name: "CommonSwiper",
+  props: {
+    page: {
+      type: String,
+      default: "index"
+    },
+    height: {
+      type: String | Number,
+      default: "500"
+    },
+    width: {
+      type: String,
+      default: "100%"
+    },
+
+  },
+  data() {
+    return {
+      list: []
+    }
+  },
+  methods: {
+    getList() {
+      vk.callFunction({
+        url: 'client/album/pub/list',
+        data: {
+          page: this.page
+        },
+        success: res => {
+          this.list = res
+          console.log(this.list)
+        }
+      })
+    },
+    onClick(index) {
+      // if (this.list.companyId) vk.navigateTo(`/pages/yellowPage/info?id=${this.list.companyId}`)
+    }
+  },
+  mounted() {
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.carousel-img {
+  width: 100%;
+  height: 100%;
+  margin: 0 auto;
+}
+</style>
\ No newline at end of file
diff --git a/components/file-type/file-type.vue b/components/file-type/file-type.vue
new file mode 100644
index 0000000..42388be
--- /dev/null
+++ b/components/file-type/file-type.vue
@@ -0,0 +1,38 @@
+<template>
+    <view>
+        <template v-if="['doc', 'docx'].includes(item.split('.').pop())">
+            <file-word theme="outline" class="pointer" size="40" fill="#4a90e2" strokeLinecap="square"/>
+        </template>
+        <template v-else-if="['xls', 'xlsx'].includes(item.split('.').pop())">
+            <file-excel theme="outline" class="pointer" size="40" fill="#417505" strokeLinecap="square"/>
+        </template>
+        <template v-else-if="['pdf'].includes(item.split('.').pop())">
+            <file-pdf-one theme="outline" class="pointer" size="40" fill="#f5a623"
+                          strokeLinecap="square"/>
+        </template>
+        <template v-else>
+            <el-image :src="item" style="width: 100px; height: 100px" fit="cover"
+                      :preview-src-list="[item]"/>
+        </template>
+    </view>
+</template>
+
+<script>
+import {FileExcel, FilePdfOne, FileWord} from "@icon-park/vue";
+
+export default {
+    name: "file-type",
+    components: {FilePdfOne, FileExcel, FileWord},
+    props: {
+        item: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {}
+    },
+    methods: {
+    },
+}
+</script>
\ No newline at end of file
diff --git a/components/quote-remain-num/quote-remain-num.vue b/components/quote-remain-num/quote-remain-num.vue
new file mode 100644
index 0000000..7eeeedd
--- /dev/null
+++ b/components/quote-remain-num/quote-remain-num.vue
@@ -0,0 +1,170 @@
+<template>
+  <view>
+    <template v-if="vk.getVuex('$user.userInfo.userLevel') < 3">
+      <div class="mt-20 text-main font-bold" v-if="!quoteExpiredAt || monthExpired">剩余报价次数:{{
+          remainQuoteNum
+        }}次
+      </div>
+      <div class="mt-20 text-main font-bold" v-else-if="quoteExpiredAt && !monthExpired">
+        报价包月过期时间:{{ dayjs(quoteExpiredAt).format('YYYY-MM-DD HH:mm:ss') }}
+      </div>
+    </template>
+    <el-dialog title="报价次数" :visible.sync="dialogVisible" width="50%">
+      <p>请选择购买模式</p>
+      <div class="flex justify-center items-center">
+        <div class="p-20 rounded m-20 shadow flex flex-col justify-center items-center flex-1 pointer"
+             :class="[buyQuoteMode === 'single' ? 'buy-quote-mode-active' : '']"
+             @click="buyQuoteMode = 'single'">
+          <p>单次购买</p>
+          <p>{{ amount ? amount : singleQuoteAmount }}元/次</p>
+        </div>
+        <div class="p-20 rounded m-20 shadow flex flex-col justify-center items-center flex-1 pointer"
+             :class="[buyQuoteMode === item._id ? 'buy-quote-mode-active' : '']"
+             :style="{cursor: 'not-allowed'}"
+             @click="buyQuoteMode = item._id" v-for="(item, index) in monthlyQuoteAmountList" :key="index">
+          <p>{{ item.name }}</p>
+          <p>{{ item.amount }}元</p>
+        </div>
+      </div>
+      <div class="mt-20 flex justify-start items-center"
+           v-if="vk.getVuex('$user.userInfo.userLevel') === 0 && buyQuoteMode !== 'single'">
+        <span>您还未成为会员,仅能单次购买。请</span>
+        <span class="text-main font-bold pointer mx-15 text-35" style="text-decoration: underline"
+              @click="toUpgrade">升级会员</span>
+        <span> ，可享受优惠报价套餐。</span>
+      </div>
+      <div class="mt-20 " v-if="!vk.getVuex('$user.userInfo.quoteExpiredAt')">
+        <span>剩余报价次数:</span>
+        <span class="text-main font-bold text-35">{{ remainQuoteNum }}</span>
+        <span>次</span>
+      </div>
+      <div class="mt-20 text-main font-bold" v-else>
+        报价包月过期时间:{{ dayjs(quoteExpiredAt).format('YYYY-MM-DD') }}
+      </div>
+      <div class="mt-20 flex justify-center items-center">
+        <el-button type="primary" :disabled="!buyQuoteMode || disabled" @click.native="doBuyQuote">确定
+        </el-button>
+        <el-button plain @click.native="cancel">取消</el-button>
+      </div>
+    </el-dialog>
+  </view>
+</template>
+
+<script>
+import dayjs from "dayjs";
+
+export default {
+  name: "quote-remain-num",
+  props: {
+    amount: Number,
+    type: String,
+    id: String,
+  },
+  data() {
+    return {
+      remainQuoteNum: '',
+      quoteExpiredAt: null,
+      dialogVisible: false,
+      monthExpired: false,
+      buyQuoteMode: null,
+      disabled: false,
+      singleQuoteAmount: 1,
+      monthlyQuoteAmount: 10,
+      monthlyQuoteAmountList: []
+    }
+  },
+  methods: {
+    dayjs,
+    async getSingleQuoteAmount() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '6587b034466d41a591df881c'
+        },
+      })
+      this.singleQuoteAmount = res.content
+    },
+    async getMonthlyAmount() {
+      const {rows} = await vk.callFunction({
+        url: 'client/quoteNumConfig/list/pub/list',
+      })
+      this.monthlyQuoteAmountList = rows
+    },
+    async doBuyQuote() {
+      const {data} = await vk.callFunction({
+        url: 'client/enquiry/quoteNum/kh/add',
+        data: {
+          buyQuoteMode: this.buyQuoteMode,
+          type: this.type,
+          id: this.id,
+        },
+      })
+      this.dialogVisible = false
+      vk.navigateTo({
+        url: `/pages/index/shop/pay?id=${data}`
+      })
+    },
+    cancel() {
+      this.dialogVisible = false
+      vk.navigateBack()
+    },
+    toUpgrade() {
+      this.dialogVisible = false
+      vk.navigateTo({
+        url: `/pages/user/user?menu=equity`
+      })
+    }
+  },
+  async mounted() {
+    await this.getSingleQuoteAmount()
+    await this.getMonthlyAmount()
+    vk.userCenter.getCurrentUserInfo({
+      success: async (data) => {
+        if (this.amount) {
+          const res = await vk.callFunction({
+            url: 'client/user/kh/getUserQuoteNumList',
+            data: {
+              type: this.type,
+              sheetId: this.id,
+            },
+          })
+          // if (!res.data) this.remainQuoteNum = 0
+          // else this.remainQuoteNum = res.data.num
+        }
+        this.remainQuoteNum = data.userInfo.remainQuoteNum ? parseInt(data.userInfo.remainQuoteNum) : 0
+        this.quoteExpiredAt = data.userInfo.quoteExpiredAt ? dayjs(data.userInfo.quoteExpiredAt).format('YYYY-MM-DD HH:mm:ss') : null
+        this.monthExpired = dayjs(data.userInfo.quoteExpiredAt).isBefore(dayjs())
+        if (this.remainQuoteNum === 0 && (!this.quoteExpiredAt || dayjs(this.quoteExpiredAt).isBefore(dayjs())) && parseInt(vk.getVuex('$user.userInfo.userLevel')) < 3) {
+          this.$confirm('您的报价次数已用完/已过期，是否立即购买？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            closeOnClickModal: false,
+            closeOnPressEscape: false,
+          }).then(async () => {
+            this.dialogVisible = true
+          }).catch(() => {
+            vk.navigateBack()
+          })
+        }
+      }
+    });
+  },
+  watch: {
+    buyQuoteMode(val) {
+      if (vk.getVuex('$user.userInfo.userLevel') === 0) {
+        if (val === 'single') this.disabled = false
+        else this.disabled = true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+.buy-quote-mode-active {
+  border: 1px solid #a92924;
+  background-color: #f1c7c7;
+}
+</style>
\ No newline at end of file
diff --git a/components/right-bar/right-bar.vue b/components/right-bar/right-bar.vue
index 5845d8a..2ff85c4 100644
--- a/components/right-bar/right-bar.vue
+++ b/components/right-bar/right-bar.vue
@@ -1,186 +1,186 @@
 <template>
-    <view>
-        <div class="layout layout-fix-tab-narrow" style="right: 0px;">
-            <div class="mod-fix-tab-narrow" style="display: block; ">
-                <div class="fix-tab-main">
-                    <ul>
-                        <li class="side-hrd">
-                            <a rel="nofollow" href="javascript:;" class="DeliveryMyCard"
-                               @click="navTo('/pages/enquiry/list')">
-                                <div class="item">
-                                    <i class="wag-icon"><img src="@/static/images/cl1.png"></i>
-                                </div>
-                                <span>找买家</span>
-                            </a>
-                        </li>
-                        <li class="side-add-cart"><a rel="nofollow" href="javascript:;"
-                                                     @click="navTo('/pages/index/shop/cart')">
-                            <div class="item">
-                                <i class="wag-icon"><img src="@/static/images/cl3.png"></i>
-                            </div>
-                            <span class="txt"> 进货单 </span>
-                        </a>
-                        </li>
-                        <li class="side-steel-kefu">
-                            <a rel="nofollow"
-                               href="http://wpa.qq.com/msgrd?v=3&amp;uin=949419497&amp;site=qq&amp;menu=yes"
-                               target="_blank">
-                                <div class="item">
-                                    <i class="wag-icon"><img src="@/static/images/cl4.png"></i>
-                                </div>
-                                <span>在线客服</span>
-                            </a>
-                        </li>
-                        <li class="side-steel-counter">
-                            <a rel="nofollow" href="/counter/index.html">
-                                <div class="item">
-                                    <i class="wag-icon"><img src="@/static/images/cl5.png"></i>
-                                </div>
-                                <span>钢材计算器</span>
-                            </a>
-                        </li>
-                        <li class="side-steel-search">
-                            <a rel="nofollow" href="javascript:;" @click="navTo('/pages/yellowPage/list')">
-                                <div class="item">
-                                    <i class="wag-icon"><img src="@/static/images/cl6.png"></i>
-                                </div>
-                                <span>金久信黄页</span>
-                            </a>
-                        </li>
-                        <li class="side-steel-search">
-                            <a rel="nofollow" href="javascript:;" @click="navTo('/pages/contract/index?tab=sign')">
-                                <div class="item">
-                                    <agreement theme="outline" size="16" fill="#666" strokeLinecap="square"/>
-                                </div>
-                                <span>签约宝</span>
-                            </a>
-                        </li>
-
-                        <li class="actGotop" style="display: none;">
-                            <div class="item">
-                                <i class="wag-icon"><img src="@/static/images/cc-top.png"></i>
-                            </div>
-                            <span>返回顶部</span>
-                        </li>
-                    </ul>
+  <view>
+    <div class="layout layout-fix-tab-narrow" style="right: 0px;">
+      <div class="mod-fix-tab-narrow" style="display: block; ">
+        <div class="fix-tab-main">
+          <ul>
+            <!--                        <li class="side-hrd">-->
+            <!--                            <a rel="nofollow" href="javascript:;" class="DeliveryMyCard"-->
+            <!--                               @click="navTo('/pages/enquiry/list')">-->
+            <!--                                <div class="item">-->
+            <!--                                    <i class="wag-icon"><img src="@/static/images/cl1.png"></i>-->
+            <!--                                </div>-->
+            <!--                                <span>下询价单</span>-->
+            <!--                            </a>-->
+            <!--                        </li>-->
+            <!--                        <li class="side-add-cart"><a rel="nofollow" href="javascript:;"-->
+            <!--                                                     @click="navTo('/pages/index/shop/cart')">-->
+            <!--                            <div class="item">-->
+            <!--                                <i class="wag-icon"><img src="@/static/images/cl3.png"></i>-->
+            <!--                            </div>-->
+            <!--                            <span class="txt"> 购物车 </span>-->
+            <!--                        </a>-->
+            <!--                        </li>-->
+            <li class="side-steel-kefu">
+              <a rel="nofollow"
+                 href="http://wpa.qq.com/msgrd?v=3&amp;uin=949419497&amp;site=qq&amp;menu=yes"
+                 target="_blank">
+                <div class="item">
+                  <i class="wag-icon"><img src="@/static/images/cl4.png"></i>
                 </div>
-            </div>
+                <span>在线客服</span>
+              </a>
+            </li>
+            <!--                        <li class="side-steel-counter">-->
+            <!--                            <a rel="nofollow" href="javascript:;" @click="navTo('/pages/stealCal/stealCal')">-->
+            <!--                                <div class="item">-->
+            <!--                                    <i class="wag-icon"><img src="@/static/images/cl5.png"></i>-->
+            <!--                                </div>-->
+            <!--                                <span>钢材计算器</span>-->
+            <!--                            </a>-->
+            <!--                        </li>-->
+            <!--                        <li class="side-steel-search">-->
+            <!--                            <a rel="nofollow" href="javascript:;" @click="navTo('/pages/yellowPage/list')">-->
+            <!--                                <div class="item">-->
+            <!--                                    <i class="wag-icon"><img src="@/static/images/cl6.png"></i>-->
+            <!--                                </div>-->
+            <!--                                <span>金久信黄页</span>-->
+            <!--                            </a>-->
+            <!--                        </li>-->
+            <li class="side-steel-search">
+              <a rel="nofollow" href="javascript:;" @click="navTo('/pages/contract/index?tab=sign')">
+                <div class="item">
+                  <agreement theme="outline" size="16" fill="#666" strokeLinecap="square"/>
+                </div>
+                <span>金久信签约宝</span>
+              </a>
+            </li>
+
+            <li class="actGotop" style="display: none;">
+              <div class="item">
+                <i class="wag-icon"><img src="@/static/images/cc-top.png"></i>
+              </div>
+              <span>返回顶部</span>
+            </li>
+          </ul>
         </div>
-    </view>
+      </div>
+    </div>
+  </view>
 </template>
 
 <script>
 import {Agreement} from '@icon-park/vue'
 
 export default {
-    components: {Agreement},
-    name: "right-bar",
-    data() {
-        return {};
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo(url);
-        }
+  components: {Agreement},
+  name: "right-bar",
+  data() {
+    return {};
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo(url);
     }
+  }
 }
 </script>
 
 <style lang="scss">
 .layout-fix-tab-narrow {
-    border-left: 1px solid #f1f1f1;
-    position: fixed;
-    right: -40px;
-    top: 0;
-    width: 40px;
-    height: 100%;
-    background: #fff;
-    z-index: 9999999;
-    -webkit-transition: right .5s ease;
-    -moz-transition: right .5s ease;
-    -ms-transition: right .5s ease;
-    -o-transition: right .5s ease;
-    transition: right .5s ease;
-    line-height: 1.5;
-    color: #656565;
-    font-size: 12px;
-    font-family: -apple-system, BlinkMacSystemFont, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+  border-left: 1px solid #f1f1f1;
+  position: fixed;
+  right: -40px;
+  top: 0;
+  width: 40px;
+  height: 100%;
+  background: #fff;
+  z-index: 9999999;
+  -webkit-transition: right .5s ease;
+  -moz-transition: right .5s ease;
+  -ms-transition: right .5s ease;
+  -o-transition: right .5s ease;
+  transition: right .5s ease;
+  line-height: 1.5;
+  color: #656565;
+  font-size: 12px;
+  font-family: -apple-system, BlinkMacSystemFont, Hiragino Sans GB, Microsoft YaHei, sans-serif;
 }
 
 .mod-fix-tab-narrow li {
-    width: 40px;
-    position: relative;
-    margin: 3px 0;
+  width: 40px;
+  position: relative;
+  margin: 3px 0;
 }
 
 .mod-fix-tab-narrow li {
-    padding: 4px 0;
-    cursor: pointer;
-    line-height: 16px;
+  padding: 4px 0;
+  cursor: pointer;
+  line-height: 16px;
 }
 
 .layout-fix-tab-narrow a {
-    color: #656565;
-    text-decoration: none;
-    padding: 5px 0px;
+  color: #656565;
+  text-decoration: none;
+  padding: 5px 0px;
 }
 
 .mod-fix-tab-narrow li .item {
-    display: block;
-    position: relative;
-    z-index: 99;
-    text-align: center;
-    height: 23px;
+  display: block;
+  position: relative;
+  z-index: 99;
+  text-align: center;
+  height: 23px;
 }
 
 .mod-fix-tab-narrow li span {
-    display: block;
-    right: 0;
-    width: 16px;
-    white-space: inherit;
-    text-align: center;
-    word-wrap: break-word;
-    word-break: break-all;
-    padding: 0 12px;
-    line-height: 14px;
-    z-index: 10;
-    top: 32px;
-    transition: inherit;
+  display: block;
+  right: 0;
+  width: 16px;
+  white-space: inherit;
+  text-align: center;
+  word-wrap: break-word;
+  word-break: break-all;
+  padding: 0 12px;
+  line-height: 14px;
+  z-index: 10;
+  top: 32px;
+  transition: inherit;
 }
 
 .wag-icon {
-    font-size: 16px;
-    height: 30px;
-    width: 30px;
-    font-style: normal;
-    color: #353535;
+  font-size: 16px;
+  height: 30px;
+  width: 30px;
+  font-style: normal;
+  color: #353535;
 
 }
 
 .mod-fix-tab-narrow li:hover {
-    box-shadow: 0 0;
-    color: #a92924
+  box-shadow: 0 0;
+  color: #a92924
 }
 
 .mod-fix-tab-narrow li:hover {
-    box-shadow: 0 0 16px 0 hsla(0, 0%, 77%, .5)
+  box-shadow: 0 0 16px 0 hsla(0, 0%, 77%, .5)
 }
 
 .mod-fix-tab-narrow li:hover span {
-    box-shadow: 0 0;
-    color: #a92924
+  box-shadow: 0 0;
+  color: #a92924
 }
 
 .mod-fix-tab-narrow {
-    margin-top: 50px;
+  margin-top: 50px;
 }
 
 .a-fadeinL {
-    margin-top: 50px;
-    -webkit-transition: right .5s ease;
-    -moz-transition: right .5s ease;
-    -ms-transition: right .5s ease;
-    -o-transition: right .5s ease;
-    transition: right .5s ease;
+  margin-top: 50px;
+  -webkit-transition: right .5s ease;
+  -moz-transition: right .5s ease;
+  -ms-transition: right .5s ease;
+  -o-transition: right .5s ease;
+  transition: right .5s ease;
 }
 </style>
\ No newline at end of file
diff --git a/components/top-bar/top-bar.vue b/components/top-bar/top-bar.vue
index 732ed60..6de6dcd 100644
--- a/components/top-bar/top-bar.vue
+++ b/components/top-bar/top-bar.vue
@@ -1,170 +1,204 @@
 <template>
-    <view>
-        <view class="group-wagbar">
-            <div class="group-inner">
-                <div class="mod-welcome">
-                    <h5 class="welcome-item slogan js-slogan">欢迎来到金久信钢城首页！</h5>
-                    <div class="welcome-item login-register">
+  <view>
+    <view class=" text-center py-15" style="background-color: red; color: yellow">
+      本站测试中，仅对 特约用户 开放部分功能测试，谢谢您的关注，敬请期待!
+    </view>
+    <view class="group-wagbar">
+      <div class="group-inner">
+        <div class="mod-welcome">
+          <h5 class="welcome-item slogan js-slogan">欢迎来到金久信签约宝！</h5>
+          <div class="welcome-item login-register">
 
-                        <navigator v-if="!vk.getVuex('$user.userInfo.nickname')" class="login js-top-bar-login"
-                                   url="/pages/auth/login/login" rel="nofollow" target="_self"
-                                   style="display: inline-block;">
-                            请登录
-                        </navigator>
-                        <navigator v-if="!vk.getVuex('$user.userInfo.nickname')" class="register "
-                                   url="/pages/auth/register/register" rel="nofollow" target="_blank"
-                                   style="display: inline-block;">免费注册
-                        </navigator>
+            <navigator v-if="!vk.getVuex('$user.userInfo.nickname')" class="login js-top-bar-login"
+                       url="/pages/auth/login/login" rel="nofollow" target="_self"
+                       style="display: inline-block;">
+              请登录
+            </navigator>
+            <navigator v-if="!vk.getVuex('$user.userInfo.nickname')" class="register "
+                       url="/pages/auth/register/register" rel="nofollow" target="_blank"
+                       style="display: inline-block;">免费注册
+            </navigator>
 
-                        <el-dropdown @command="handleCommand" size="mini" v-if="vk.getVuex('$user.userInfo.nickname')">
+            <el-dropdown @command="handleCommand" size="mini" v-if="vk.getVuex('$user.userInfo.nickname')">
 							<span class="register">
 								{{ vk.getVuex('$user.userInfo.nickname') }}<i
-                                class="el-icon-arrow-down el-icon--right"></i>
+                class="el-icon-arrow-down el-icon--right"></i>
 							</span>
-                            <el-dropdown-menu slot="dropdown">
-                                <el-dropdown-item>
-                                    <navigator url="/pages/user/user">个人中心</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/store/buyer">买家中心</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/store/store">卖家中心</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/process/my">我的加工</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/user/school">金久信学堂</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/contract/index">合同管理</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/contract/index?tab=sign">签约宝</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item>
-                                    <navigator url="/pages/user/order">订单管理</navigator>
-                                </el-dropdown-item>
-                                <el-dropdown-item command="logout">退出登录</el-dropdown-item>
-                            </el-dropdown-menu>
-                        </el-dropdown>
-                    </div>
-                </div>
-                <div class="mod-tools">
-                    <ul>
-                        <li class="tool-item buyer-item">
-                            <a rel="nofollow" href="javascript:;" class="bar-title">
-                                <navigator url="/pages/store/buyer">买家中心<i></i></navigator>
-                                </a>
-                            <div class="bar-content">
-                                <dl>
-                                    <dd>
-                                        <a rel="nofollow" href="javascript:;">
-                                            <navigator url="/pages/store/buyer?menuIndex=1">询价管理</navigator>
-                                        </a>
-                                    </dd>
-                                    <dd>
-                                        <a rel="nofollow" href="javascript:;">
-                                            <navigator url="/pages/order/order">订单管理</navigator>
-                                        </a>
-                                    </dd>
-<!--                                    <dd>-->
-<!--                                        <a rel="nofollow" href="javascript:;">-->
-<!--                                            <navigator url="/pages/order/order">订单管理</navigator>-->
-<!--                                        </a>-->
-<!--                                    </dd>-->
-                                </dl>
-                            </div>
-                        </li>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <navigator url="/pages/contract/index?tab=sign">金久信签约宝</navigator>
+                </el-dropdown-item>
+                <!--                                <el-dropdown-item>-->
+                <!--                                    <navigator url="/pages/user/user">个人中心</navigator>-->
+                <!--                                </el-dropdown-item>-->
+                <!--                                <el-dropdown-item>-->
+                <!--                                    <navigator url="/pages/store/buyer">买家中心</navigator>-->
+                <!--                                </el-dropdown-item>-->
+                <!--                                <el-dropdown-item>-->
+                <!--                                    <navigator url="/pages/store/store">卖家中心</navigator>-->
+                <!--                                </el-dropdown-item>-->
+                <!--                                <el-dropdown-item>-->
+                <!--                                    <navigator url="/pages/order/order">订单管理</navigator>-->
+                <!--                                </el-dropdown-item>-->
+                <el-dropdown-item>
+                  <navigator url="/pages/contract/index">合同管理</navigator>
+                </el-dropdown-item>
+                <!--                                <el-dropdown-item>-->
+                <!--                                    <navigator url="/pages/process/my">我的加工</navigator>-->
+                <!--                                </el-dropdown-item>-->
+                <!--                                <el-dropdown-item>-->
+                <!--                                    <navigator url="/pages/user/school">金久信学堂</navigator>-->
+                <!--                                </el-dropdown-item>-->
+                <el-dropdown-item command="logout">退出登录</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        </div>
+<!--        <div class="mod-tools">-->
+<!--          <ul>-->
+<!--            <li class="tool-item buyer-item">-->
+<!--              <a rel="nofollow" href="javascript:;" class="bar-title">-->
+<!--                <navigator url="/pages/store/buyer">买家中心<i></i></navigator>-->
+<!--              </a>-->
+<!--              <div class="bar-content">-->
+<!--                <dl>-->
+<!--                  <dd>-->
+<!--                    <a rel="nofollow" href="javascript:;">-->
+<!--                      <navigator url="/pages/store/buyer?menuIndex=1">询价管理</navigator>-->
+<!--                    </a>-->
+<!--                  </dd>-->
+<!--                  <dd>-->
+<!--                    <a rel="nofollow" href="javascript:;">-->
+<!--                      <navigator url="/pages/order/order">订单管理</navigator>-->
+<!--                    </a>-->
+<!--                  </dd>-->
+<!--                  &lt;!&ndash;                                    <dd>&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                        <a rel="nofollow" href="javascript:;">&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                            <navigator url="/pages/order/order">订单管理</navigator>&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                        </a>&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                    </dd>&ndash;&gt;-->
+<!--                </dl>-->
+<!--              </div>-->
+<!--            </li>-->
 
-                        <li class="tool-item service-item">
-                            <a rel="nofollow" href="" class="bar-title" target="_blank">客户服务<i></i></a>
-                            <div class="bar-content">
-                                <dl>
-                                    <dd>
-                                        <a rel="nofollow" href="javascript:;"
-                                           @click="navTo('/pages/otherArticle/list?id=657457acf082105ea4d467f0')">常见问题</a>
-                                    </dd>
-                                    <dd>
-                                        <a rel="nofollow" href="javascript:;"
-                                           @click="navTo('/pages/otherArticle/list?id=6573d7c3e0ec19b5047ffa8c')">买家指南</a>
-                                    </dd>
-                                    <dd>
-                                        <a rel="nofollow" href="javascript:;"
-                                           @click="navTo('/pages/otherArticle/list?id=6573d7bde0ec19b5047ff941')">卖家指南</a>
-                                    </dd>
-                                    <!--                                    <dd>-->
-                                    <!--                                        <a rel="nofollow" target="_self" id="wagbar-im"-->
-                                    <!--                                           class="im data-tracelog">在线咨询</a>-->
-                                    <!--                                    </dd>-->
-                                </dl>
-                            </div>
-                        </li>
-                        <li class="tool-item">
-                            <a rel="nofollow" href="javascript:;" class="bar-title"
-                               @click="navTo('/pages/user/user?menu=notice')"
-                            >我的消息</a>
-                        </li>
-                        <li class="tool-item2">
-                            <a rel="nofollow" href="" class="bar-title" target="_blank"><span>客服服务热线：+86
-									0771-3923001</span></a>
+<!--            <li class="tool-item service-item">-->
+<!--              <a rel="nofollow" href="" class="bar-title" target="_blank">客户服务<i></i></a>-->
+<!--              <div class="bar-content">-->
+<!--                <dl>-->
+<!--                  <dd>-->
+<!--                    <a rel="nofollow" href="javascript:;"-->
+<!--                       @click="navTo('/pages/otherArticle/list?id=657457acf082105ea4d467f0')">常见问题</a>-->
+<!--                  </dd>-->
+<!--                  <dd>-->
+<!--                    <a rel="nofollow" href="javascript:;"-->
+<!--                       @click="navTo('/pages/otherArticle/list?id=6573d7c3e0ec19b5047ffa8c')">买家指南</a>-->
+<!--                  </dd>-->
+<!--                  <dd>-->
+<!--                    <a rel="nofollow" href="javascript:;"-->
+<!--                       @click="navTo('/pages/otherArticle/list?id=6573d7bde0ec19b5047ff941')">卖家指南</a>-->
+<!--                  </dd>-->
+<!--                  &lt;!&ndash;                                    <dd>&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                        <a rel="nofollow" target="_self" id="wagbar-im"&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                           class="im data-tracelog">在线咨询</a>&ndash;&gt;-->
+<!--                  &lt;!&ndash;                                    </dd>&ndash;&gt;-->
+<!--                </dl>-->
+<!--              </div>-->
+<!--            </li>-->
+<!--            <li class="tool-item pos-r">-->
+<!--              <a rel="nofollow" href="javascript:;" class="bar-title"-->
+<!--                 @click="navTo('/pages/user/user?menu=notice')"-->
+<!--              >我的消息({{ messageUnreadNum }})</a>-->
+<!--              <div class="dot" v-if="messageUnreadNum > 0"></div>-->
+<!--            </li>-->
+<!--            <li class="tool-item2">-->
+<!--              <a rel="nofollow" href="javascript:;" class="bar-title"><span>客服服务热线：-->
+<!--									{{ serviceContract }}</span></a>-->
 
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </view>
+<!--            </li>-->
+<!--          </ul>-->
+<!--        </div>-->
+      </div>
     </view>
+  </view>
 </template>
 
 <script>
 export default {
-    name: "top-bar",
-    data() {
-        return {};
-    },
-    created() {
-
-    },
-    methods: {
-        handleCommand(e) {
-            if (e == 'logout') {
-                this.logout()
-            }
-        },
-        navTo(url) {
-            vk.navigateTo({
-                url
-            })
-        },
-        logout() {
-            this.$confirm('确认退出登录?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                vk.userCenter.logout({
-                    success: (data) => {
-                        // 退出登录成功后的逻辑
-                        uni.reLaunch({
-                            url: '/'
-                        })
-                    }
-                });
-            })
-
-        }
+  name: "top-bar",
+  data() {
+    return {
+      messageUnreadNum: 0,
+      serviceContract: '',
+    };
+  },
+  created() {
+    if (vk.getVuex('$user.userInfo._id')) {
+      this.getUnreadNum()
+      this.getServicePhone()
     }
+  },
+  methods: {
+    async getUnreadNum() {
+      const {data} = await vk.callFunction({
+        url: 'client/message/kh/getUnreadCount',
+      });
+      this.messageUnreadNum = data
+    },
+    handleCommand(e) {
+      if (e == 'logout') {
+        this.logout()
+      }
+    },
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
+    },
+    logout() {
+      this.$confirm('确认退出登录?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        vk.userCenter.logout({
+          success: (data) => {
+            // 退出登录成功后的逻辑
+            uni.reLaunch({
+              url: '/'
+            })
+          }
+        });
+      })
+    },
+    async getServicePhone() {
+      const {content} = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d8fca55b337cfadbe1063'
+        }
+      })
+      this.serviceContract = content
+    },
+  }
 }
 </script>
 
 <style lang="scss">
 .register {
-    cursor: pointer;
+  cursor: pointer;
 
-    &:hover {
-        color: #a92924;
-    }
+  &:hover {
+    color: #a92924;
+  }
+}
+
+.dot {
+  position: absolute;
+  right: 0;
+  top: 5px;
+  width: 10px;
+  height: 10px;
+  border-radius: 999px;
+  background-color: #a92924;
 }
 </style>
\ No newline at end of file
diff --git a/index.html b/index.html
index 1e33b82..431deb3 100644
--- a/index.html
+++ b/index.html
@@ -1,22 +1,29 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-	<head>
-		<meta charset="UTF-8" />
-		<script>
-			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-				CSS.supports('top: constant(a)'))
-			document.write(
-				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
-		</script>
-		<title></title>
-		<!--preload-links-->
-		<!--app-context-->
-		<!-- 配置H5的 web图标static/logo.png -->
-		<link rel="icon" href="./static/logo.png"/>
-	</head>
-	<body>
-		<div id="app"><!--app-html--></div>
-		<script type="module" src="/main.js"></script>
-	</body>
+<head>
+    <meta charset="UTF-8"/>
+    <script>
+        var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+            CSS.supports('top: constant(a)'))
+        document.write(
+            '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+            (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+        document.write('<meta name="keywords" content="金久信签约宝,金久信签约宝会员"/>')
+        document.write('<meta name="description" content="金久信签约宝专注线上电子签约,金久信签约宝会员服务.致力于为您提供一站式金久信签约宝会员服务."/>')
+
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+    <!-- 配置H5的 web图标static/logo.png -->
+    <link rel="icon" href="./static/logo.png"/>
+    <script type="text/javascript" src="http://qzonestyle.gtimg.cn/qzone/openapi/qc_loader.js" data-appid="101415280"
+            data-redirecturi="http://127.0.0.1:8080/"
+            charset="utf-8"></script>
+
+</head>
+<body>
+<div id="app"><!--app-html--></div>
+<script type="module" src="/main.js"></script>
+</body>
 </html>
\ No newline at end of file
diff --git a/main.js b/main.js
index 7015558..a900d37 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,7 @@
 import Vue from 'vue'
 import App from './App'
 import store from './store'
-import config from '@/app.config.js'
+import config from './app.config.js'
 
 // 引入 elementUI
 import elementUI from "element-ui";
@@ -29,6 +29,16 @@ import vkAdminUI from 'vk-unicloud-admin-ui';
 import 'vk-unicloud-admin-ui/theme/index.css';
 Vue.use(vkAdminUI);
 
+// 滑块
+import dragVerify from 'vue-drag-verify2'
+Vue.use(dragVerify);
+
+import VueTianditu from "vue-tianditu";
+Vue.use(VueTianditu, {
+    v: "4.0",
+    tk: "bfbc6bd9e85fcda67b62788705aa6427"
+});
+
 // 自动注册全局组件（必须加在Vue.use(vkAdminUI);的后面）
 const modulesFiles = require.context('./components', true, /\.vue$/);
 modulesFiles.keys().map((modulePath, index) => {
diff --git a/manifest.json b/manifest.json
index d38bff6..f661534 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,11 @@
 {
     "name" : "jinjiuxin-mobile",
-    "appid" : "__UNI__8BFD66E",
+    "appid" : "__UNI__0F0703D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
+    "sassImplementationName": "node-sass",
     "app-plus" : {
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
@@ -91,6 +92,10 @@
         "template" : "template.h5.html",
         "devServer" : {
             "disableHostCheck" : true
+        },
+        "router" : {
+            "base" : "/signOnly/",
+            "mode" : "hash"
         }
     },
     "vueVersion" : "2",
diff --git a/package-lock.json b/package-lock.json
index f2c378a..81ca49c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,12 +11,15 @@
 			"dependencies": {
 				"@icon-park/vue": "^1.4.2",
 				"@vant/area-data": "^1.5.1",
+				"@wangeditor/editor": "^5.1.23",
+				"@wangeditor/editor-for-vue": "^1.0.2",
 				"async-validator": "^4.2.5",
 				"babel-helper-vue-jsx-merge-props": "^2.0.3",
 				"crypto-js": "^4.2.0",
 				"dayjs": "^1.11.10",
 				"element-ui": "2.15.13",
 				"lodash": "^4.17.21",
+				"md5": "^2.3.0",
 				"normalize-wheel": "^1.0.1",
 				"request": "^2.88.2",
 				"resize-observer-polyfill": "^1.5.1",
@@ -27,7 +30,10 @@
 				"uqrcodejs": "^4.0.7",
 				"vk-unicloud-admin-ui": "^1.17.53",
 				"vue": "^2.7.15",
+				"vue-clipboard2": "^0.3.3",
 				"vue-cropper": "^0.6.4",
+				"vue-drag-verify2": "^1.2.0",
+				"vue-tianditu": "^1.2.11",
 				"vuedraggable": "^2.24.3",
 				"xe-utils": "^3.5.14"
 			},
@@ -51,6 +57,22 @@
 				"node": ">=6.0.0"
 			}
 		},
+		"node_modules/@babel/runtime": {
+			"version": "7.24.5",
+			"resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz",
+			"integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+			"dependencies": {
+				"regenerator-runtime": "^0.14.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+		},
 		"node_modules/@icon-park/vue": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmmirror.com/@icon-park/vue/-/vue-1.4.2.tgz",
@@ -68,6 +90,11 @@
 				"vue": "2.x"
 			}
 		},
+		"node_modules/@transloadit/prettier-bytes": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
+			"integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA=="
+		},
 		"node_modules/@types/caseless": {
 			"version": "0.12.5",
 			"resolved": "https://registry.npmmirror.com/@types/caseless/-/caseless-0.12.5.tgz",
@@ -80,6 +107,11 @@
 			"integrity": "sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==",
 			"dev": true
 		},
+		"node_modules/@types/event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ=="
+		},
 		"node_modules/@types/node": {
 			"version": "20.10.1",
 			"resolved": "https://registry.npmmirror.com/@types/node/-/node-20.10.1.tgz",
@@ -107,6 +139,56 @@
 			"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
 			"dev": true
 		},
+		"node_modules/@uppy/companion-client": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz",
+			"integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==",
+			"dependencies": {
+				"@uppy/utils": "^4.1.2",
+				"namespace-emitter": "^2.0.1"
+			}
+		},
+		"node_modules/@uppy/core": {
+			"version": "2.3.4",
+			"resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz",
+			"integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==",
+			"dependencies": {
+				"@transloadit/prettier-bytes": "0.0.7",
+				"@uppy/store-default": "^2.1.1",
+				"@uppy/utils": "^4.1.3",
+				"lodash.throttle": "^4.1.1",
+				"mime-match": "^1.0.2",
+				"namespace-emitter": "^2.0.1",
+				"nanoid": "^3.1.25",
+				"preact": "^10.5.13"
+			}
+		},
+		"node_modules/@uppy/store-default": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz",
+			"integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ=="
+		},
+		"node_modules/@uppy/utils": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz",
+			"integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==",
+			"dependencies": {
+				"lodash.throttle": "^4.1.1"
+			}
+		},
+		"node_modules/@uppy/xhr-upload": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz",
+			"integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==",
+			"dependencies": {
+				"@uppy/companion-client": "^2.2.2",
+				"@uppy/utils": "^4.1.2",
+				"nanoid": "^3.1.25"
+			},
+			"peerDependencies": {
+				"@uppy/core": "^2.3.3"
+			}
+		},
 		"node_modules/@vant/area-data": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmmirror.com/@vant/area-data/-/area-data-1.5.1.tgz",
@@ -129,6 +211,156 @@
 				"source-map": "^0.6.1"
 			}
 		},
+		"node_modules/@wangeditor/basic-modules": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
+			"integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==",
+			"dependencies": {
+				"is-url": "^1.2.4"
+			},
+			"peerDependencies": {
+				"@wangeditor/core": "1.x",
+				"dom7": "^3.0.0",
+				"lodash.throttle": "^4.1.1",
+				"nanoid": "^3.2.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/code-highlight": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz",
+			"integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==",
+			"dependencies": {
+				"prismjs": "^1.23.0"
+			},
+			"peerDependencies": {
+				"@wangeditor/core": "1.x",
+				"dom7": "^3.0.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/core": {
+			"version": "1.1.19",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz",
+			"integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==",
+			"dependencies": {
+				"@types/event-emitter": "^0.3.3",
+				"event-emitter": "^0.3.5",
+				"html-void-elements": "^2.0.0",
+				"i18next": "^20.4.0",
+				"scroll-into-view-if-needed": "^2.2.28",
+				"slate-history": "^0.66.0"
+			},
+			"peerDependencies": {
+				"@uppy/core": "^2.1.1",
+				"@uppy/xhr-upload": "^2.0.3",
+				"dom7": "^3.0.0",
+				"is-hotkey": "^0.2.0",
+				"lodash.camelcase": "^4.3.0",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.debounce": "^4.0.8",
+				"lodash.foreach": "^4.5.0",
+				"lodash.isequal": "^4.5.0",
+				"lodash.throttle": "^4.1.1",
+				"lodash.toarray": "^4.4.0",
+				"nanoid": "^3.2.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/editor": {
+			"version": "5.1.23",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
+			"integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
+			"dependencies": {
+				"@uppy/core": "^2.1.1",
+				"@uppy/xhr-upload": "^2.0.3",
+				"@wangeditor/basic-modules": "^1.1.7",
+				"@wangeditor/code-highlight": "^1.0.3",
+				"@wangeditor/core": "^1.1.19",
+				"@wangeditor/list-module": "^1.0.5",
+				"@wangeditor/table-module": "^1.1.4",
+				"@wangeditor/upload-image-module": "^1.0.2",
+				"@wangeditor/video-module": "^1.1.4",
+				"dom7": "^3.0.0",
+				"is-hotkey": "^0.2.0",
+				"lodash.camelcase": "^4.3.0",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.debounce": "^4.0.8",
+				"lodash.foreach": "^4.5.0",
+				"lodash.isequal": "^4.5.0",
+				"lodash.throttle": "^4.1.1",
+				"lodash.toarray": "^4.4.0",
+				"nanoid": "^3.2.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/editor-for-vue": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-1.0.2.tgz",
+			"integrity": "sha512-BOENvAXJVtVXlE2X50AAvjV82YlCUeu5cbeR0cvEQHQjYtiVnJtq7HSoj85r2kTgGouI5OrpJG9BBEjSjUSPyA==",
+			"peerDependencies": {
+				"@wangeditor/editor": ">=5.1.0",
+				"vue": "^2.6.14"
+			}
+		},
+		"node_modules/@wangeditor/list-module": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz",
+			"integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==",
+			"peerDependencies": {
+				"@wangeditor/core": "1.x",
+				"dom7": "^3.0.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/table-module": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz",
+			"integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==",
+			"peerDependencies": {
+				"@wangeditor/core": "1.x",
+				"dom7": "^3.0.0",
+				"lodash.isequal": "^4.5.0",
+				"lodash.throttle": "^4.1.1",
+				"nanoid": "^3.2.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/upload-image-module": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz",
+			"integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==",
+			"peerDependencies": {
+				"@uppy/core": "^2.0.3",
+				"@uppy/xhr-upload": "^2.0.3",
+				"@wangeditor/basic-modules": "1.x",
+				"@wangeditor/core": "1.x",
+				"dom7": "^3.0.0",
+				"lodash.foreach": "^4.5.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"node_modules/@wangeditor/video-module": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz",
+			"integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==",
+			"peerDependencies": {
+				"@uppy/core": "^2.1.4",
+				"@uppy/xhr-upload": "^2.0.7",
+				"@wangeditor/core": "1.x",
+				"dom7": "^3.0.0",
+				"nanoid": "^3.2.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
@@ -209,6 +441,24 @@
 			"resolved": "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
 		},
+		"node_modules/charenc": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
+			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/clipboard": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+			"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+			"dependencies": {
+				"good-listener": "^1.2.2",
+				"select": "^1.1.2",
+				"tiny-emitter": "^2.0.0"
+			}
+		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -220,6 +470,11 @@
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/compute-scroll-into-view": {
+			"version": "1.0.20",
+			"resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+			"integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+		},
 		"node_modules/core-js": {
 			"version": "2.6.12",
 			"resolved": "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz",
@@ -232,6 +487,14 @@
 			"resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz",
 			"integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
 		},
+		"node_modules/crypt": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
+			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/crypto-js": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
@@ -243,6 +506,18 @@
 			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
 			"license": "MIT"
 		},
+		"node_modules/d": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/d/-/d-1.0.2.tgz",
+			"integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+			"dependencies": {
+				"es5-ext": "^0.10.64",
+				"type": "^2.7.2"
+			},
+			"engines": {
+				"node": ">=0.12"
+			}
+		},
 		"node_modules/dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz",
@@ -277,6 +552,19 @@
 				"node": ">=0.4.0"
 			}
 		},
+		"node_modules/delegate": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+		},
+		"node_modules/dom7": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz",
+			"integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
+			"dependencies": {
+				"ssr-window": "^3.0.0-alpha.1"
+			}
+		},
 		"node_modules/ecc-jsbn": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -311,6 +599,74 @@
 				"babel-runtime": "6.x"
 			}
 		},
+		"node_modules/es5-ext": {
+			"version": "0.10.64",
+			"resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz",
+			"integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
+			"hasInstallScript": true,
+			"dependencies": {
+				"es6-iterator": "^2.0.3",
+				"es6-symbol": "^3.1.3",
+				"esniff": "^2.0.1",
+				"next-tick": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/es6-iterator": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+			"dependencies": {
+				"d": "1",
+				"es5-ext": "^0.10.35",
+				"es6-symbol": "^3.1.1"
+			}
+		},
+		"node_modules/es6-symbol": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz",
+			"integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+			"dependencies": {
+				"d": "^1.0.2",
+				"ext": "^1.7.0"
+			},
+			"engines": {
+				"node": ">=0.12"
+			}
+		},
+		"node_modules/esniff": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz",
+			"integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+			"dependencies": {
+				"d": "^1.0.1",
+				"es5-ext": "^0.10.62",
+				"event-emitter": "^0.3.5",
+				"type": "^2.7.2"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+			"dependencies": {
+				"d": "1",
+				"es5-ext": "~0.10.14"
+			}
+		},
+		"node_modules/ext": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
+			"integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+			"dependencies": {
+				"type": "^2.7.2"
+			}
+		},
 		"node_modules/extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
@@ -364,6 +720,14 @@
 				"assert-plus": "^1.0.0"
 			}
 		},
+		"node_modules/good-listener": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+			"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+			"dependencies": {
+				"delegate": "^3.1.2"
+			}
+		},
 		"node_modules/har-schema": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz",
@@ -385,6 +749,11 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/html-void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz",
+			"integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A=="
+		},
 		"node_modules/http-signature": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz",
@@ -399,11 +768,47 @@
 				"npm": ">=1.3.7"
 			}
 		},
+		"node_modules/i18next": {
+			"version": "20.6.1",
+			"resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz",
+			"integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==",
+			"dependencies": {
+				"@babel/runtime": "^7.12.0"
+			}
+		},
+		"node_modules/immer": {
+			"version": "9.0.21",
+			"resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.21.tgz",
+			"integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="
+		},
+		"node_modules/is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+		},
+		"node_modules/is-hotkey": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz",
+			"integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw=="
+		},
+		"node_modules/is-plain-object": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz",
+			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz",
 			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
 		},
+		"node_modules/is-url": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz",
+			"integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+		},
 		"node_modules/isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz",
@@ -449,6 +854,51 @@
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"license": "MIT"
 		},
+		"node_modules/lodash.camelcase": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+			"integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+		},
+		"node_modules/lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+		},
+		"node_modules/lodash.debounce": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+		},
+		"node_modules/lodash.foreach": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+			"integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ=="
+		},
+		"node_modules/lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+		},
+		"node_modules/lodash.throttle": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+			"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+		},
+		"node_modules/lodash.toarray": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+			"integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw=="
+		},
+		"node_modules/md5": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
+			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+			"dependencies": {
+				"charenc": "0.0.2",
+				"crypt": "0.0.2",
+				"is-buffer": "~1.1.6"
+			}
+		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
 			"resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
@@ -457,6 +907,14 @@
 				"node": ">= 0.6"
 			}
 		},
+		"node_modules/mime-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz",
+			"integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==",
+			"dependencies": {
+				"wildcard": "^1.1.0"
+			}
+		},
 		"node_modules/mime-types": {
 			"version": "2.1.35",
 			"resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
@@ -468,6 +926,11 @@
 				"node": ">= 0.6"
 			}
 		},
+		"node_modules/namespace-emitter": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz",
+			"integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g=="
+		},
 		"node_modules/nanoid": {
 			"version": "3.3.7",
 			"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
@@ -486,6 +949,11 @@
 				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
 			}
 		},
+		"node_modules/next-tick": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz",
+			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+		},
 		"node_modules/normalize-wheel": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
@@ -539,6 +1007,19 @@
 				"node": "^10 || ^12 || >=14"
 			}
 		},
+		"node_modules/preact": {
+			"version": "10.21.0",
+			"resolved": "https://registry.npmmirror.com/preact/-/preact-10.21.0.tgz",
+			"integrity": "sha512-aQAIxtzWEwH8ou+OovWVSVNlFImL7xUCwJX3YMqA3U8iKCNC34999fFOnWjYNsylgfPgMexpbk7WYOLtKr/mxg=="
+		},
+		"node_modules/prismjs": {
+			"version": "1.29.0",
+			"resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
+			"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/psl": {
 			"version": "1.9.0",
 			"resolved": "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz",
@@ -626,6 +1107,48 @@
 			"resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"node_modules/scroll-into-view-if-needed": {
+			"version": "2.2.31",
+			"resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
+			"integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
+			"dependencies": {
+				"compute-scroll-into-view": "^1.0.20"
+			}
+		},
+		"node_modules/select": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+			"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+		},
+		"node_modules/slate": {
+			"version": "0.72.8",
+			"resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz",
+			"integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==",
+			"dependencies": {
+				"immer": "^9.0.6",
+				"is-plain-object": "^5.0.0",
+				"tiny-warning": "^1.0.3"
+			}
+		},
+		"node_modules/slate-history": {
+			"version": "0.66.0",
+			"resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz",
+			"integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==",
+			"dependencies": {
+				"is-plain-object": "^5.0.0"
+			},
+			"peerDependencies": {
+				"slate": ">=0.65.3"
+			}
+		},
+		"node_modules/snabbdom": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.6.2.tgz",
+			"integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==",
+			"engines": {
+				"node": ">=12.17.0"
+			}
+		},
 		"node_modules/sortablejs": {
 			"version": "1.15.0",
 			"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
@@ -674,6 +1197,11 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/ssr-window": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz",
+			"integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
+		},
 		"node_modules/throttle-debounce": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
@@ -683,6 +1211,16 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/tiny-emitter": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+		},
+		"node_modules/tiny-warning": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz",
+			"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+		},
 		"node_modules/tough-cookie": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -711,6 +1249,11 @@
 			"resolved": "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
 		},
+		"node_modules/type": {
+			"version": "2.7.2",
+			"resolved": "https://registry.npmmirror.com/type/-/type-2.7.2.tgz",
+			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+		},
 		"node_modules/umy-table": {
 			"version": "1.1.8",
 			"resolved": "https://registry.npmmirror.com/umy-table/-/umy-table-1.1.8.tgz",
@@ -823,12 +1366,50 @@
 				"csstype": "^3.1.0"
 			}
 		},
+		"node_modules/vue-clipboard2": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
+			"integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
+			"dependencies": {
+				"clipboard": "^2.0.0"
+			}
+		},
 		"node_modules/vue-cropper": {
 			"version": "0.6.4",
 			"resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.6.4.tgz",
 			"integrity": "sha512-U3bm17Li/Xwfw2t3pr8/hFE/tYhvwIWqepHK9IFC1TnX1KFd64VyfCD9nMBhPY91RyvMC6jSQgT/DyDNKuTpIQ==",
 			"license": "ISC"
 		},
+		"node_modules/vue-drag-verify2": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmmirror.com/vue-drag-verify2/-/vue-drag-verify2-1.2.0.tgz",
+			"integrity": "sha512-Ie6cxw2K1fpDZDYwFaSxfNhJ9NDKWJyXQppDCPakN/HK92DHukdIFfZqaCS9hTgtSF3ZCuaVYYZ8UOYQHiOS7Q==",
+			"dependencies": {
+				"vue": "^2.5.11"
+			}
+		},
+		"node_modules/vue-tianditu": {
+			"version": "1.2.11",
+			"resolved": "https://registry.npmmirror.com/vue-tianditu/-/vue-tianditu-1.2.11.tgz",
+			"integrity": "sha512-yE80uENFI3be2Fh9gIjQ7R+H5y0fl7sNw8+MhkUpB7VDEnwiT4som93n+1kroMs9fNwMiSVXAMeBsJ+YrmGjIg==",
+			"dependencies": {
+				"async-validator": "1.11.5",
+				"core-js": "^3.6.5",
+				"element-ui": "^2.15.1",
+				"vue": "^2.6.12"
+			}
+		},
+		"node_modules/vue-tianditu/node_modules/async-validator": {
+			"version": "1.11.5",
+			"resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.11.5.tgz",
+			"integrity": "sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w=="
+		},
+		"node_modules/vue-tianditu/node_modules/core-js": {
+			"version": "3.37.0",
+			"resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.0.tgz",
+			"integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==",
+			"hasInstallScript": true
+		},
 		"node_modules/vuedraggable": {
 			"version": "2.24.3",
 			"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz",
@@ -844,6 +1425,11 @@
 			"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==",
 			"license": "MIT"
 		},
+		"node_modules/wildcard": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz",
+			"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng=="
+		},
 		"node_modules/xe-utils": {
 			"version": "3.5.14",
 			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.14.tgz",
@@ -857,6 +1443,21 @@
 			"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.5.tgz",
 			"integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ=="
 		},
+		"@babel/runtime": {
+			"version": "7.24.5",
+			"resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz",
+			"integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+			"requires": {
+				"regenerator-runtime": "^0.14.0"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.14.1",
+					"resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+					"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+				}
+			}
+		},
 		"@icon-park/vue": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmmirror.com/@icon-park/vue/-/vue-1.4.2.tgz",
@@ -866,6 +1467,11 @@
 				"csstype": "^3.0.3"
 			}
 		},
+		"@transloadit/prettier-bytes": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
+			"integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA=="
+		},
 		"@types/caseless": {
 			"version": "0.12.5",
 			"resolved": "https://registry.npmmirror.com/@types/caseless/-/caseless-0.12.5.tgz",
@@ -878,6 +1484,11 @@
 			"integrity": "sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==",
 			"dev": true
 		},
+		"@types/event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ=="
+		},
 		"@types/node": {
 			"version": "20.10.1",
 			"resolved": "https://registry.npmmirror.com/@types/node/-/node-20.10.1.tgz",
@@ -905,6 +1516,53 @@
 			"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
 			"dev": true
 		},
+		"@uppy/companion-client": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz",
+			"integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==",
+			"requires": {
+				"@uppy/utils": "^4.1.2",
+				"namespace-emitter": "^2.0.1"
+			}
+		},
+		"@uppy/core": {
+			"version": "2.3.4",
+			"resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz",
+			"integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==",
+			"requires": {
+				"@transloadit/prettier-bytes": "0.0.7",
+				"@uppy/store-default": "^2.1.1",
+				"@uppy/utils": "^4.1.3",
+				"lodash.throttle": "^4.1.1",
+				"mime-match": "^1.0.2",
+				"namespace-emitter": "^2.0.1",
+				"nanoid": "^3.1.25",
+				"preact": "^10.5.13"
+			}
+		},
+		"@uppy/store-default": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz",
+			"integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ=="
+		},
+		"@uppy/utils": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz",
+			"integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==",
+			"requires": {
+				"lodash.throttle": "^4.1.1"
+			}
+		},
+		"@uppy/xhr-upload": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz",
+			"integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==",
+			"requires": {
+				"@uppy/companion-client": "^2.2.2",
+				"@uppy/utils": "^4.1.2",
+				"nanoid": "^3.1.25"
+			}
+		},
 		"@vant/area-data": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmmirror.com/@vant/area-data/-/area-data-1.5.1.tgz",
@@ -925,6 +1583,93 @@
 				"source-map": "^0.6.1"
 			}
 		},
+		"@wangeditor/basic-modules": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
+			"integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==",
+			"requires": {
+				"is-url": "^1.2.4"
+			}
+		},
+		"@wangeditor/code-highlight": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz",
+			"integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==",
+			"requires": {
+				"prismjs": "^1.23.0"
+			}
+		},
+		"@wangeditor/core": {
+			"version": "1.1.19",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz",
+			"integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==",
+			"requires": {
+				"@types/event-emitter": "^0.3.3",
+				"event-emitter": "^0.3.5",
+				"html-void-elements": "^2.0.0",
+				"i18next": "^20.4.0",
+				"scroll-into-view-if-needed": "^2.2.28",
+				"slate-history": "^0.66.0"
+			}
+		},
+		"@wangeditor/editor": {
+			"version": "5.1.23",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
+			"integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
+			"requires": {
+				"@uppy/core": "^2.1.1",
+				"@uppy/xhr-upload": "^2.0.3",
+				"@wangeditor/basic-modules": "^1.1.7",
+				"@wangeditor/code-highlight": "^1.0.3",
+				"@wangeditor/core": "^1.1.19",
+				"@wangeditor/list-module": "^1.0.5",
+				"@wangeditor/table-module": "^1.1.4",
+				"@wangeditor/upload-image-module": "^1.0.2",
+				"@wangeditor/video-module": "^1.1.4",
+				"dom7": "^3.0.0",
+				"is-hotkey": "^0.2.0",
+				"lodash.camelcase": "^4.3.0",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.debounce": "^4.0.8",
+				"lodash.foreach": "^4.5.0",
+				"lodash.isequal": "^4.5.0",
+				"lodash.throttle": "^4.1.1",
+				"lodash.toarray": "^4.4.0",
+				"nanoid": "^3.2.0",
+				"slate": "^0.72.0",
+				"snabbdom": "^3.1.0"
+			}
+		},
+		"@wangeditor/editor-for-vue": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-1.0.2.tgz",
+			"integrity": "sha512-BOENvAXJVtVXlE2X50AAvjV82YlCUeu5cbeR0cvEQHQjYtiVnJtq7HSoj85r2kTgGouI5OrpJG9BBEjSjUSPyA==",
+			"requires": {}
+		},
+		"@wangeditor/list-module": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz",
+			"integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==",
+			"requires": {}
+		},
+		"@wangeditor/table-module": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz",
+			"integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==",
+			"requires": {}
+		},
+		"@wangeditor/upload-image-module": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz",
+			"integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==",
+			"requires": {}
+		},
+		"@wangeditor/video-module": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz",
+			"integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==",
+			"requires": {}
+		},
 		"ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
@@ -996,6 +1741,21 @@
 			"resolved": "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
 		},
+		"charenc": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
+			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
+		},
+		"clipboard": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+			"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+			"requires": {
+				"good-listener": "^1.2.2",
+				"select": "^1.1.2",
+				"tiny-emitter": "^2.0.0"
+			}
+		},
 		"combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -1004,6 +1764,11 @@
 				"delayed-stream": "~1.0.0"
 			}
 		},
+		"compute-scroll-into-view": {
+			"version": "1.0.20",
+			"resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+			"integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+		},
 		"core-js": {
 			"version": "2.6.12",
 			"resolved": "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz",
@@ -1014,6 +1779,11 @@
 			"resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz",
 			"integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
 		},
+		"crypt": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
+			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
+		},
 		"crypto-js": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
@@ -1024,6 +1794,15 @@
 			"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz",
 			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
 		},
+		"d": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/d/-/d-1.0.2.tgz",
+			"integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+			"requires": {
+				"es5-ext": "^0.10.64",
+				"type": "^2.7.2"
+			}
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz",
@@ -1047,6 +1826,19 @@
 			"resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
 			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
 		},
+		"delegate": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+		},
+		"dom7": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz",
+			"integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
+			"requires": {
+				"ssr-window": "^3.0.0-alpha.1"
+			}
+		},
 		"ecc-jsbn": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -1079,6 +1871,64 @@
 				}
 			}
 		},
+		"es5-ext": {
+			"version": "0.10.64",
+			"resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz",
+			"integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
+			"requires": {
+				"es6-iterator": "^2.0.3",
+				"es6-symbol": "^3.1.3",
+				"esniff": "^2.0.1",
+				"next-tick": "^1.1.0"
+			}
+		},
+		"es6-iterator": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+			"requires": {
+				"d": "1",
+				"es5-ext": "^0.10.35",
+				"es6-symbol": "^3.1.1"
+			}
+		},
+		"es6-symbol": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz",
+			"integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+			"requires": {
+				"d": "^1.0.2",
+				"ext": "^1.7.0"
+			}
+		},
+		"esniff": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz",
+			"integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+			"requires": {
+				"d": "^1.0.1",
+				"es5-ext": "^0.10.62",
+				"event-emitter": "^0.3.5",
+				"type": "^2.7.2"
+			}
+		},
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+			"requires": {
+				"d": "1",
+				"es5-ext": "~0.10.14"
+			}
+		},
+		"ext": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
+			"integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+			"requires": {
+				"type": "^2.7.2"
+			}
+		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
@@ -1123,6 +1973,14 @@
 				"assert-plus": "^1.0.0"
 			}
 		},
+		"good-listener": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+			"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+			"requires": {
+				"delegate": "^3.1.2"
+			}
+		},
 		"har-schema": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz",
@@ -1137,6 +1995,11 @@
 				"har-schema": "^2.0.0"
 			}
 		},
+		"html-void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz",
+			"integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A=="
+		},
 		"http-signature": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz",
@@ -1147,11 +2010,44 @@
 				"sshpk": "^1.7.0"
 			}
 		},
+		"i18next": {
+			"version": "20.6.1",
+			"resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz",
+			"integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==",
+			"requires": {
+				"@babel/runtime": "^7.12.0"
+			}
+		},
+		"immer": {
+			"version": "9.0.21",
+			"resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.21.tgz",
+			"integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="
+		},
+		"is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+		},
+		"is-hotkey": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz",
+			"integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw=="
+		},
+		"is-plain-object": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz",
+			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+		},
 		"is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz",
 			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
 		},
+		"is-url": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz",
+			"integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+		},
 		"isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz",
@@ -1193,11 +2089,64 @@
 			"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
+		"lodash.camelcase": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+			"integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+		},
+		"lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+		},
+		"lodash.debounce": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+		},
+		"lodash.foreach": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+			"integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ=="
+		},
+		"lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+		},
+		"lodash.throttle": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+			"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+		},
+		"lodash.toarray": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+			"integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw=="
+		},
+		"md5": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
+			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+			"requires": {
+				"charenc": "0.0.2",
+				"crypt": "0.0.2",
+				"is-buffer": "~1.1.6"
+			}
+		},
 		"mime-db": {
 			"version": "1.52.0",
 			"resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
 			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
 		},
+		"mime-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz",
+			"integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==",
+			"requires": {
+				"wildcard": "^1.1.0"
+			}
+		},
 		"mime-types": {
 			"version": "2.1.35",
 			"resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
@@ -1206,11 +2155,21 @@
 				"mime-db": "1.52.0"
 			}
 		},
+		"namespace-emitter": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz",
+			"integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g=="
+		},
 		"nanoid": {
 			"version": "3.3.7",
 			"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
 			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
 		},
+		"next-tick": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz",
+			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+		},
 		"normalize-wheel": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
@@ -1241,6 +2200,16 @@
 				"source-map-js": "^1.0.2"
 			}
 		},
+		"preact": {
+			"version": "10.21.0",
+			"resolved": "https://registry.npmmirror.com/preact/-/preact-10.21.0.tgz",
+			"integrity": "sha512-aQAIxtzWEwH8ou+OovWVSVNlFImL7xUCwJX3YMqA3U8iKCNC34999fFOnWjYNsylgfPgMexpbk7WYOLtKr/mxg=="
+		},
+		"prismjs": {
+			"version": "1.29.0",
+			"resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
+			"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
+		},
 		"psl": {
 			"version": "1.9.0",
 			"resolved": "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz",
@@ -1315,6 +2284,42 @@
 			"resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"scroll-into-view-if-needed": {
+			"version": "2.2.31",
+			"resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
+			"integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
+			"requires": {
+				"compute-scroll-into-view": "^1.0.20"
+			}
+		},
+		"select": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+			"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+		},
+		"slate": {
+			"version": "0.72.8",
+			"resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz",
+			"integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==",
+			"requires": {
+				"immer": "^9.0.6",
+				"is-plain-object": "^5.0.0",
+				"tiny-warning": "^1.0.3"
+			}
+		},
+		"slate-history": {
+			"version": "0.66.0",
+			"resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz",
+			"integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==",
+			"requires": {
+				"is-plain-object": "^5.0.0"
+			}
+		},
+		"snabbdom": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.6.2.tgz",
+			"integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q=="
+		},
 		"sortablejs": {
 			"version": "1.15.0",
 			"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
@@ -1346,11 +2351,26 @@
 				"tweetnacl": "~0.14.0"
 			}
 		},
+		"ssr-window": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz",
+			"integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
+		},
 		"throttle-debounce": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
 			"integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
 		},
+		"tiny-emitter": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+		},
+		"tiny-warning": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz",
+			"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+		},
 		"tough-cookie": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -1373,6 +2393,11 @@
 			"resolved": "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
 		},
+		"type": {
+			"version": "2.7.2",
+			"resolved": "https://registry.npmmirror.com/type/-/type-2.7.2.tgz",
+			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+		},
 		"umy-table": {
 			"version": "1.1.8",
 			"resolved": "https://registry.npmmirror.com/umy-table/-/umy-table-1.1.8.tgz",
@@ -1470,11 +2495,50 @@
 				"csstype": "^3.1.0"
 			}
 		},
+		"vue-clipboard2": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
+			"integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
+			"requires": {
+				"clipboard": "^2.0.0"
+			}
+		},
 		"vue-cropper": {
 			"version": "0.6.4",
 			"resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.6.4.tgz",
 			"integrity": "sha512-U3bm17Li/Xwfw2t3pr8/hFE/tYhvwIWqepHK9IFC1TnX1KFd64VyfCD9nMBhPY91RyvMC6jSQgT/DyDNKuTpIQ=="
 		},
+		"vue-drag-verify2": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmmirror.com/vue-drag-verify2/-/vue-drag-verify2-1.2.0.tgz",
+			"integrity": "sha512-Ie6cxw2K1fpDZDYwFaSxfNhJ9NDKWJyXQppDCPakN/HK92DHukdIFfZqaCS9hTgtSF3ZCuaVYYZ8UOYQHiOS7Q==",
+			"requires": {
+				"vue": "^2.5.11"
+			}
+		},
+		"vue-tianditu": {
+			"version": "1.2.11",
+			"resolved": "https://registry.npmmirror.com/vue-tianditu/-/vue-tianditu-1.2.11.tgz",
+			"integrity": "sha512-yE80uENFI3be2Fh9gIjQ7R+H5y0fl7sNw8+MhkUpB7VDEnwiT4som93n+1kroMs9fNwMiSVXAMeBsJ+YrmGjIg==",
+			"requires": {
+				"async-validator": "1.11.5",
+				"core-js": "^3.6.5",
+				"element-ui": "^2.15.1",
+				"vue": "^2.6.12"
+			},
+			"dependencies": {
+				"async-validator": {
+					"version": "1.11.5",
+					"resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.11.5.tgz",
+					"integrity": "sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w=="
+				},
+				"core-js": {
+					"version": "3.37.0",
+					"resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.0.tgz",
+					"integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug=="
+				}
+			}
+		},
 		"vuedraggable": {
 			"version": "2.24.3",
 			"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz",
@@ -1490,6 +2554,11 @@
 				}
 			}
 		},
+		"wildcard": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz",
+			"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng=="
+		},
 		"xe-utils": {
 			"version": "3.5.14",
 			"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.14.tgz",
diff --git a/package.json b/package.json
index 3d12743..87888f6 100644
--- a/package.json
+++ b/package.json
@@ -21,12 +21,15 @@
 	"dependencies": {
 		"@icon-park/vue": "^1.4.2",
 		"@vant/area-data": "^1.5.1",
+		"@wangeditor/editor": "^5.1.23",
+		"@wangeditor/editor-for-vue": "^1.0.2",
 		"async-validator": "^4.2.5",
 		"babel-helper-vue-jsx-merge-props": "^2.0.3",
 		"crypto-js": "^4.2.0",
 		"dayjs": "^1.11.10",
 		"element-ui": "2.15.13",
 		"lodash": "^4.17.21",
+		"md5": "^2.3.0",
 		"normalize-wheel": "^1.0.1",
 		"request": "^2.88.2",
 		"resize-observer-polyfill": "^1.5.1",
@@ -39,6 +42,8 @@
 		"vue": "^2.7.15",
 		"vue-clipboard2": "^0.3.3",
 		"vue-cropper": "^0.6.4",
+		"vue-drag-verify2": "^1.2.0",
+		"vue-tianditu": "^1.2.11",
 		"vuedraggable": "^2.24.3",
 		"xe-utils": "^3.5.14"
 	},
diff --git a/pages.json b/pages.json
index 6ef2ac6..463de07 100644
--- a/pages.json
+++ b/pages.json
@@ -1,390 +1,438 @@
 {
-	"pages": [
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "金久信钢城"
-			}
-		},
-		{
-			"path": "pages/error/404/404",
-			"style": {
-				"navigationBarTitleText": "404"
-			}
-		}
-	    ,{
-            "path" : "pages/auth/register/register",
-            "style" :
-            {
-                "navigationBarTitleText": "注册",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/auth/login/login",
-            "style" :
-            {
-                "navigationBarTitleText": "登录",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/spot/release/release",
-            "style" :
-            {
-                "navigationBarTitleText": "发布现货",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/spot/goods/goods",
-            "style" :
-            {
-                "navigationBarTitleText": "现货市场",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/user/user",
-            "style" :
-            {
-                "navigationBarTitleText": "个人中心",
-                "enablePullDownRefresh": false
-            }
-
-        },
-        {
-        	"path" : "pages/spot/goods/detail",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/company/company",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "黄页",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/enquiry/release",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "发布询价",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/enquiry/list",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "询价",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-		{
-			"path" : "pages/enquiry/my",
-			"style" :
-			{
-				"navigationBarTitleText" : "我发布的询价单",
-				"enablePullDownRefresh" : false
-			}
-		},
-        {
-        	"path" : "pages/enquiry/detail",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "报价单详情",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/enquiry/quote",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "填写报价单",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-		{
-			"path" : "pages/contract/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "合同管理",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/process/list",
-			"style" :
-			{
-				"navigationBarTitleText" : "找加工",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/process/release",
-			"style" :
-			{
-				"navigationBarTitleText" : "发布找加工",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/process/quote",
-			"style" :
-			{
-				"navigationBarTitleText" : "加工报价",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/process/detail",
-			"style" :
-			{
-				"navigationBarTitleText" : "加工单详情",
-				"enablePullDownRefresh" : false
-			}
-		},
-        {
-            "path" : "pages/process/my",
-            "style" :
-            {
-                "navigationBarTitleText" : "我的加工单",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-        	"path" : "pages/checkout/checkout",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-            "path" : "pages/article/list",
-            "style" :
-            {
-                "navigationBarTitleText" : "金久信学堂",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-        	"path" : "pages/index/self-support/self-support",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "金久信自营",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/index/self-support/companyQuote",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "金久信自营",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/index/self-support/selectType",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "金久信自营",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/index/self-support/productQuote",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "金久信自营",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/index/server/server",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "平台服务",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/index/shop/shop",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-		{
-			"path" : "pages/index/old/old",
-			"style" :
-			{
-				"navigationBarTitleText" : "旧货交易",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/index/old/list/list",
-			"style" :
-			{
-				"navigationBarTitleText" : "旧货交易列表",
-				"enablePullDownRefresh" : false
-			}
-		},
-        {
-        	"path" : "pages/index/shop/detail",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/index/shop/cart",
-        	"style" :
-        	{
-        		"navigationBarTitleText" : "购物车",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-            "path" : "pages/yellowPage/list",
-            "style" :
-            {
-                "navigationBarTitleText" : "",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/yellowPage/info",
-            "style" :
-            {
-                "navigationBarTitleText" : "",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/user/school",
-            "style" :
-            {
-                "navigationBarTitleText" : "金久信学堂",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/index/shop/pay",
-            "style" :
-            {
-                "navigationBarTitleText" : "订单支付",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/user/order",
-            "style" :
-            {
-                "navigationBarTitleText" : "订单列表",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/index/old/release",
-            "style" :
-            {
-                "navigationBarTitleText" : "旧货交易",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/store/store",
-            "style" :
-            {
-                "navigationBarTitleText" : "卖家中心",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/store/buyer",
-            "style" :
-            {
-                "navigationBarTitleText" : "买家中心",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/spot/goods/my",
-            "style" :
-            {
-                "navigationBarTitleText" : "",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/order/order",
-            "style" :
-            {
-                "navigationBarTitleText" : "",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/index/old/detail",
-            "style" :
-            {
-                "navigationBarTitleText" : "",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/otherArticle/list",
-            "style" :
-            {
-                "navigationBarTitleText" : "",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/otherArticle/detail",
-            "style" :
-            {
-                "navigationBarTitleText" : "详情",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/otherArticle/noticeDetail",
-            "style" :
-            {
-                "navigationBarTitleText" : "详情",
-                "enablePullDownRefresh" : false
-            }
-        },
-        {
-            "path" : "pages/index/old/my",
-            "style" :
-            {
-                "navigationBarTitleText" : "我发布的旧货信息",
-                "enablePullDownRefresh" : false
-            }
-        }
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "金久信钢城",
-		"navigationStyle": "custom",
-		// #ifndef MP-ALIPAY
-		"navigationBarBackgroundColor": "#F8F8F8",
-		// #endif
-		"backgroundColor": "#F8F8F8"
-	}
+  "pages": [
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "金久信钢城"
+      }
+    },
+    {
+      "path": "pages/error/404/404",
+      "style": {
+        "navigationBarTitleText": "404"
+      }
+    },
+    {
+      "path": "pages/auth/register/register",
+      "style": {
+        "navigationBarTitleText": "注册",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/auth/login/login",
+      "style": {
+        "navigationBarTitleText": "金久信签约宝_金久信签约宝会员登录",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/auth/login/wechat",
+      "style": {
+        "navigationBarTitleText": "微信登录",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/auth/login/wechat_test",
+      "style": {
+        "navigationBarTitleText": "微信登录",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/auth/login/qq",
+      "style": {
+        "navigationBarTitleText": "QQ登录",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/auth/login/find",
+      "style": {
+        "navigationBarTitleText": "找回密码",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/spot/release/release",
+      "style": {
+        "navigationBarTitleText": "发布现货",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/spot/goods/goods",
+      "style": {
+        "navigationBarTitleText": "现货市场",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/user/user",
+      "style": {
+        "navigationBarTitleText": "个人中心",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/spot/goods/detail",
+      "style": {
+        "navigationBarTitleText": "现货详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/company/company",
+      "style": {
+        "navigationBarTitleText": "黄页",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/enquiry/release",
+      "style": {
+        "navigationBarTitleText": "发布询价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/enquiry/list",
+      "style": {
+        "navigationBarTitleText": "找买家",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/enquiry/my",
+      "style": {
+        "navigationBarTitleText": "我发布的询价单",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/enquiry/quote/my",
+      "style": {
+        "navigationBarTitleText": "我的报价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/enquiry/detail",
+      "style": {
+        "navigationBarTitleText": "报价单详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/enquiry/quote",
+      "style": {
+        "navigationBarTitleText": "填写报价单",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/contract/index",
+      "style": {
+        "navigationBarTitleText": "合同管理",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/contract/certificate",
+      "style": {
+        "navigationBarTitleText": "司法调证",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/list",
+      "style": {
+        "navigationBarTitleText": "找加工",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/release",
+      "style": {
+        "navigationBarTitleText": "发布找加工",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/quote",
+      "style": {
+        "navigationBarTitleText": "加工报价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/quote/my",
+      "style": {
+        "navigationBarTitleText": "我的报价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/detail",
+      "style": {
+        "navigationBarTitleText": "加工单详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/my",
+      "style": {
+        "navigationBarTitleText": "我的加工单",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/process/factoryList",
+      "style": {
+        "navigationBarTitleText": "加工厂列表",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/checkout/checkout",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/article/list",
+      "style": {
+        "navigationBarTitleText": "金久信学堂",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/article/detail",
+      "style": {
+        "navigationBarTitleText": "金久信学堂",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/self-support/self-support",
+      "style": {
+        "navigationBarTitleText": "金久信自营",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/self-support/companyQuote",
+      "style": {
+        "navigationBarTitleText": "金久信自营",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/self-support/selectType",
+      "style": {
+        "navigationBarTitleText": "金久信自营",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/self-support/productQuote",
+      "style": {
+        "navigationBarTitleText": "金久信自营",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/self-support/costQuote",
+      "style": {
+        "navigationBarTitleText": "金久信自营",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/self-support/quote",
+      "style": {
+        "navigationBarTitleText": "金久信自营报价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/server/server",
+      "style": {
+        "navigationBarTitleText": "平台服务",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/shop/shop",
+      "style": {
+        "navigationBarTitleText": "特产商城",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/old",
+      "style": {
+        "navigationBarTitleText": "旧货交易",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/quote",
+      "style": {
+        "navigationBarTitleText": "旧货交易报价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/quote/my",
+      "style": {
+        "navigationBarTitleText": "我的报价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/list/list",
+      "style": {
+        "navigationBarTitleText": "旧货交易列表",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/shop/detail",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/shop/cart",
+      "style": {
+        "navigationBarTitleText": "购物车",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/yellowPage/list",
+      "style": {
+        "navigationBarTitleText": "黄页列表",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/yellowPage/info",
+      "style": {
+        "navigationBarTitleText": "黄页详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/user/school",
+      "style": {
+        "navigationBarTitleText": "金久信学堂",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/shop/pay",
+      "style": {
+        "navigationBarTitleText": "订单支付",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/release",
+      "style": {
+        "navigationBarTitleText": "旧货交易",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/store/store",
+      "style": {
+        "navigationBarTitleText": "卖家中心",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/store/buyer",
+      "style": {
+        "navigationBarTitleText": "买家中心",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/spot/goods/my",
+      "style": {
+        "navigationBarTitleText": "我的现货",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/order/order",
+      "style": {
+        "navigationBarTitleText": "订单管理",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/detail",
+      "style": {
+        "navigationBarTitleText": "旧货详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/otherArticle/list",
+      "style": {
+        "navigationBarTitleText": "文章列表",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/otherArticle/detail",
+      "style": {
+        "navigationBarTitleText": "详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/otherArticle/noticeDetail",
+      "style": {
+        "navigationBarTitleText": "详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/index/old/my",
+      "style": {
+        "navigationBarTitleText": "我发布的旧货信息",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/stealCal/stealCal",
+      "style": {
+        "navigationBarTitleText": "钢材计算器",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/yellowPage/factory",
+      "style": {
+        "navigationBarTitleText": "加工商信息",
+        "enablePullDownRefresh": false
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "金久信钢城",
+    "navigationStyle": "custom",
+    // #ifndef MP-ALIPAY
+    "navigationBarBackgroundColor": "#F8F8F8",
+    // #endif
+    "backgroundColor": "#F8F8F8"
+  }
 }
diff --git a/pages/article/detail.vue b/pages/article/detail.vue
new file mode 100644
index 0000000..c18c3cc
--- /dev/null
+++ b/pages/article/detail.vue
@@ -0,0 +1,222 @@
+<template>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="page-nav">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/article/list">金久信学堂</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>金久信学堂详情</el-breadcrumb-item>
+      </el-breadcrumb>
+    </view>
+
+    <view class="w-1200 m-a bg-white p-40">
+      <view class=" flex justify-between items-center">
+        <text class="text-50 font-bold">{{ info.name }}</text>
+        <view class="flex flex-col justify-center items-center">
+          <star @click.native="changeCollect" theme="outline" size="30" fill="#4a4a4a" strokeLinecap="square"
+                v-if="!hasCollect" class="pointer"/>
+          <star @click.native="changeCollect" theme="filled" size="30" fill="#d00243" strokeLinecap="square"
+                v-else class="pointer"/>
+          <text>{{ hasCollect ? '已收藏' : '收藏' }}</text>
+        </view>
+      </view>
+      <view class="mt-20 text-gray text-28 pb-20 border-bottom">{{ info._add_time_str }}</view>
+      <view class="mt-20 text-gray text-28 pb-20 border-bottom" v-if="userInfo">
+        <span>剩余</span>
+        <span class="mx-15 text-main font-bold">{{ userInfo.remainArticleDownloadNum }}</span>
+        <span>次下载次数</span>
+      </view>
+      <view class="py-20 border-bottom flex justify-start flex-col items-start " v-if="info.files">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              附件
+            </view>
+          </view>
+        </view>
+        <view class="flex justify-start items-start flex-wrap my-25">
+          <view class="mt-15 mr-15" v-for="(item, index) in info.files" :key="index">
+            <template v-if="['doc', 'docx'].includes(item.split('.').pop())">
+              <file-word theme="outline" class="pointer" size="100" fill="#4a90e2" strokeLinecap="square"
+                         @click.native="openDownload(item)"/>
+            </template>
+            <template v-else-if="['xls', 'xlsx'].includes(item.split('.').pop())">
+              <file-excel theme="outline" class="pointer" size="100" fill="#417505" strokeLinecap="square"
+                          @click.native="openDownload(item)"/>
+            </template>
+            <template v-else-if="['pdf'].includes(item.split('.').pop())">
+              <file-pdf-one theme="outline" class="pointer" size="100" fill="#f5a623"
+                            strokeLinecap="square"
+                            @click.native="openDownload(item)"/>
+            </template>
+            <template v-else>
+              <el-image :src="item" style="width: 100px; height: 100px" fit="cover"
+                        :preview-src-list="[item]"/>
+            </template>
+          </view>
+        </view>
+      </view>
+      <view v-html="info.content" class="mt-20"></view>
+    </view>
+    <gap height="50"/>
+    <common-footer></common-footer>
+  </view>
+</template>
+
+<script>
+import {FileExcel, FilePdfOne, FileWord, Star} from "@icon-park/vue";
+
+export default {
+  name: "detail",
+  components: {FileWord, FilePdfOne, FileExcel, Star},
+  data() {
+    return {
+      info: {
+        name: '',
+        content: ''
+      },
+      hasCollect: false,
+      userInfo: null,
+    }
+  },
+  onLoad(option) {
+    if (option.id) {
+      this.getInfo(option.id);
+      this.addView(option.id)
+      this.getUserInfo()
+    }
+  },
+  onShow() {
+    this.getUserInfo()
+  },
+  methods: {
+    async getInfo(id) {
+      this.info = await vk.callFunction({
+        url: `client/article/list/pub/getDetail`,
+        data: {id}
+      });
+      await this.checkCollect()
+    },
+    async getUserInfo() {
+      const {userInfo} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      this.userInfo = userInfo
+    },
+    addView(id) {
+      vk.callFunction({
+        url: `client/article/list/pub/addView`,
+        data: {id}
+      });
+    },
+    async openDownload(url) {
+      await this.getUserInfo()
+      if (this.userInfo.userLevel < 0) return this.$message.error('非会员,无法下载');
+      // else if (this.userInfo.userLevel === 0) {
+      const {data} = await vk.callFunction({
+        url: 'client/article/list/kh/check',
+        data: {
+          id: this.info._id,
+        }
+      })
+      if (!data) {
+        if (this.userInfo.remainArticleDownloadNum === 0) {
+          return this.$confirm(`下载次数不足,是否购买次数?`, '提示', {
+            cancelButtonText: '关闭',
+          }).then(async () => {
+            const {data} = await vk.callFunction({
+              url: 'client/order/kh/addDownloadOrder',
+              title: '请求中...',
+            })
+            vk.navigateTo({
+              url: `/pages/index/shop/pay?id=${data}`
+            })
+          })
+        } else {
+          this.$confirm(`将消耗1次下载次数,是否继续?`, '提示', {
+            cancelButtonText: '关闭',
+          }).then(async () => {
+            this.userInfo.remainArticleDownloadNum -= 1
+            // await this.getUserInfo()
+            vk.callFunction({
+              url: 'client/article/list/pub/addDownload',
+              data: {
+                id: this.info._id,
+              }
+            })
+            vk.callFunction({
+              url: 'client/user/kh/reduceDownloadNum',
+            })
+            vk.callFunction({
+              url: 'client/article/list/kh/addDownload',
+              data: {
+                id: this.info._id,
+              }
+            })
+            window.open(url)
+          })
+        }
+      } else {
+        window.open(url)
+      }
+      // } else {
+      //     vk.callFunction({
+      //         url: 'client/article/list/pub/addDownload',
+      //         data: {
+      //             id: this.info._id
+      //         }
+      //     })
+      //     window.open(url)
+      // }
+
+    },
+    async checkCollect() {
+      const {data} = await vk.callFunction({
+        url: 'client/article/collect/kh/check',
+        data: {
+          articleId: this.info._id
+        },
+      });
+      this.hasCollect = data
+    },
+    changeCollect() {
+      this.hasCollect = !this.hasCollect
+      vk.callFunction({
+        url: 'client/article/collect/kh/changeCollect',
+        data: {
+          articleId: this.info._id
+        },
+      });
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/common/css/app.scss";
+
+.form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+  }
+
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/pages/article/list.vue b/pages/article/list.vue
index 1ff01ce..7de2d73 100644
--- a/pages/article/list.vue
+++ b/pages/article/list.vue
@@ -1,241 +1,248 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-        </view>
-        <view class="filter-outer">
-            <view class="cate">
-                <view class="item" :class="[activeCateIndex === 0 ? 'active' : '']"
-                      @click="selectCate(0)">
-                    <text class="title">{{ cateList[0].name }}</text>
-                    <text class="remark mt-10">{{ cateList[0].remark }}</text>
-                </view>
-                <view class="item" :class="[activeCateIndex === 1 ? 'active' : '']"
-                      @click="selectCate(1)">
-                    <text class="title">{{ cateList[1].name }}</text>
-                    <text class="remark mt-10">{{ cateList[1].remark }}</text>
-                </view>
-                <view class="item" :class="[activeCateIndex === -1 ? 'active' : '']"
-                      @click="selectCate(-1)">
-                    <text class="title">乐邦团</text>
-                    <text class="remark mt-10">可提问一些与钢材有关的专业知识问答</text>
-                </view>
-                <view class="item" :class="[activeCateIndex === 2 ? 'active' : '']"
-                      @click="selectCate(2)">
-                    <text class="title">{{ cateList[2].name }}</text>
-                    <text class="remark mt-10">{{ cateList[2].remark }}</text>
-                </view>
-                <view class="item" :class="[activeCateIndex === -2 ? 'active' : '']"
-                      @click="selectCate(-2)">
-                    <text class="title">金久信风向标</text>
-                    <text class="remark mt-10">平台客户可将宝贵意见和平台需要改进的意见在此发表</text>
-                </view>
-                <view class="item mt-20" @click="toMySchool">
-                    <text class="title text-main">我的学堂</text>
-                    <text class="remark mt-10">我上传和下载的文档</text>
-                </view>
-            </view>
-            <view class="content-wrap">
-                <el-input @keyup.enter.native="getContentList" clearable placeholder="关键字搜索" v-model="keyword">
-                    <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                    <el-button @click="getContentList" type="primary" slot="append" style="border-radius: 0">搜索
-                    </el-button>
-                </el-input>
-                <view class="flex flex-col justify-start items-start pointer w-100p">
-                    <view v-for="(item, index) in list" :key="index" class="content-item-wrap"
-                          @click="openDownload(item._id, item.files[0])">
-                        <file-word theme="outline" size="80" fill="#4a90e2" strokeLinecap="square"/>
-                        <view class="content">
-                            <text class="title">{{ item.name }}</text>
-                            <view class="desc">
-                                <text class="item">{{ item._add_time_str }}</text>
-                                <text class="item">{{ item.viewNum }}人浏览</text>
-                                <text class="item">{{ item.downloadNum }}次下载</text>
-                                <text class="item">{{ item.amount === 0 ? '免费下载' : `${item.amount}元下载` }}</text>
-                                <!--                            <text class="item">{{ item._add_time_str }}</text>-->
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <right-bar></right-bar>
-        <common-footer></common-footer>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="carousel">
+      <common-swiper page="article"/>
     </view>
+    <view class="filter-outer">
+      <view class="cate">
+        <view class="item" :class="[activeCateIndex === 0 ? 'active' : '']"
+              @click="selectCate(0)">
+          <text class="title">{{ cateList[0].name }}</text>
+          <text class="remark mt-10">{{ cateList[0].remark }}</text>
+        </view>
+        <!--                <view class="item" :class="[activeCateIndex === 1 ? 'active' : '']"-->
+        <!--                      @click="selectCate(1)">-->
+        <!--                    <text class="title">{{ cateList[1].name }}</text>-->
+        <!--                    <text class="remark mt-10">{{ cateList[1].remark }}</text>-->
+        <!--                </view>-->
+        <!--                <view class="item" :class="[activeCateIndex === -1 ? 'active' : '']"-->
+        <!--                      @click="selectCate(-1)">-->
+        <!--                    <text class="title">乐邦团</text>-->
+        <!--                    <text class="remark mt-10">可提问一些与钢材有关的专业知识问答</text>-->
+        <!--                </view>-->
+        <view class="item" :class="[activeCateIndex === 1 ? 'active' : '']"
+              @click="selectCate(1)">
+          <text class="title">{{ cateList[1].name }}</text>
+          <text class="remark mt-10">{{ cateList[1].remark }}</text>
+        </view>
+        <!--                <view class="item" :class="[activeCateIndex === -2 ? 'active' : '']"-->
+        <!--                      @click="selectCate(-2)">-->
+        <!--                    <text class="title">金久信风向标</text>-->
+        <!--                    <text class="remark mt-10">平台客户可将宝贵意见和平台需要改进的意见在此发表</text>-->
+        <!--                </view>-->
+        <view class="item mt-20" @click="navTo('/pages/user/school')">
+          <text class="title text-main">我的学堂</text>
+          <text class="remark mt-10">我上传和下载的文档</text>
+        </view>
+      </view>
+      <view class="content-wrap">
+        <el-input @keyup.enter.native="getContentList()" clearable placeholder="关键字搜索" v-model="keyword">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          <el-button @click="getContentList()" type="primary" slot="append" style="border-radius: 0">搜索
+          </el-button>
+        </el-input>
+        <view class="flex flex-col justify-start items-start pointer w-100p">
+          <view v-for="(item, index) in list" :key="index" class="content-item-wrap"
+                @click="navTo(`/pages/article/detail?id=${item._id}`)">
+            <template v-if="item.files && item.files.length > 0">
+              <template v-if="['doc', 'docx'].includes(item.files[0].split('.').pop())">
+                <file-word theme="outline" class="pointer" size="80" fill="#4a90e2" strokeLinecap="square"/>
+              </template>
+              <template v-else-if="['xls', 'xlsx'].includes(item.files[0].split('.').pop())">
+                <file-excel theme="outline" class="pointer" size="80" fill="#417505" strokeLinecap="square"/>
+              </template>
+              <template v-else-if="['pdf'].includes(item.files[0].split('.').pop())">
+                <file-pdf-one theme="outline" class="pointer" size="80" fill="#f5a623" strokeLinecap="square"/>
+              </template>
+              <template v-else>
+                <el-image :src="item.files[0]" style="width: 100px; height: 100px" fit="cover"
+                          :preview-src-list="[item.files]"/>
+              </template>
+            </template>
+            <view class="content">
+              <text class="title">{{ item.name }}</text>
+              <view class="desc">
+                <text class="item">{{ item._add_time_str }}</text>
+                <text class="item">{{ item.viewNum }}人浏览</text>
+                <text class="item">{{ item.downloadNum }}次下载</text>
+                <!--                                <text class="item">{{ item.amount === 0 ? '免费下载' : `${item.amount}元下载` }}</text>-->
+                <!--                            <text class="item">{{ item._add_time_str }}</text>-->
+              </view>
+            </view>
+          </view>
+          <el-pagination @current-change="getContentList" background layout="prev, pager, next"
+                         :total="total"></el-pagination>
+        </view>
+      </view>
+    </view>
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
-import {FileWord} from '@icon-park/vue'
+import {FilePdfOne, FileExcel, FileWord} from '@icon-park/vue'
 
 export default {
-    name: "list",
-    components: {FileWord},
-    data() {
-        return {
-            cateList: [],
-            activeCateIndex: 0,
-            list: [],
-            keyword: null
-        }
-    },
-    methods: {
-        async getCateList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/article/category/pub/getList'
-            })
-            this.cateList = rows
-            await this.getContentList()
-        },
-        selectCate(index) {
-            this.activeCateIndex = index
-            this.getContentList()
-        },
-        async getContentList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/article/list/pub/getList',
-                data: {
-                    parentId: this.cateList[this.activeCateIndex]._id,
-                    keyword: this.keyword
-                }
-            })
-            this.list = rows
-        },
-        toMySchool() {
-            vk.navigateTo({
-                url: '/pages/user/school'
-            })
-        },
-        async openDownload(id, url) {
-            await vk.callFunction({
-                url: 'client/article/list/pub/addDownload',
-                data: {
-                    id
-                }
-            })
-            window.open(url)
-        }
-    },
-    onLoad() {
-        this.getCateList()
+  name: "list",
+  components: {FilePdfOne, FileExcel, FileWord},
+  data() {
+    return {
+      cateList: [],
+      activeCateIndex: 0,
+      list: [],
+      total: 0,
+      pageSize: 10,
+      keyword: null
     }
+  },
+  methods: {
+    async getCateList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/article/category/pub/getList'
+      })
+      this.cateList = rows
+      await this.getContentList()
+    },
+    selectCate(index) {
+      this.activeCateIndex = index
+      this.getContentList()
+    },
+    async getContentList(pageIndex = 1) {
+      const {rows, total} = await vk.callFunction({
+        url: 'client/article/list/pub/getList',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          parentId: this.cateList[this.activeCateIndex]._id,
+          keyword: this.keyword
+        }
+      })
+      this.list = rows
+      this.total = total
+      window.scrollTo({top: 0})
+    },
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
+    },
+  },
+  onLoad() {
+    this.getCateList()
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 
-    //padding: 20px;
+  //padding: 20px;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+
+  .cate {
+    width: 250px;
+    margin-right: 30px;
     display: flex;
     align-items: flex-start;
     justify-content: flex-start;
+    flex-direction: column;
 
-    .cate {
-        width: 250px;
-        margin-right: 30px;
+    .item {
+      width: 100%;
+      padding: 25px 10px;
+      display: flex;
+      align-items: flex-start;
+      justify-content: flex-start;
+      flex-direction: column;
+      cursor: pointer;
+      background-color: #FFFFFF;
+
+      .title {
+        font-size: 18px;
+      }
+
+      .remark {
+        color: #bbb;
+      }
+    }
+
+    .active {
+      background-color: #CB5050;
+      color: white;
+
+      .remark {
+        color: #F2CFCE;
+      }
+    }
+  }
+
+  .content-wrap {
+    padding: 20px;
+    background-color: #FFFFFF;
+    flex: 1;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    flex-direction: column;
+
+    .content-item-wrap {
+      display: flex;
+      align-items: flex-start;
+      justify-content: flex-start;
+      margin: 30px 0;
+
+      .content {
+        margin-left: 25px;
         display: flex;
         align-items: flex-start;
         justify-content: flex-start;
         flex-direction: column;
 
-        .item {
-            width: 100%;
-            padding: 25px 10px;
-            display: flex;
-            align-items: flex-start;
-            justify-content: flex-start;
-            flex-direction: column;
-            cursor: pointer;
-            background-color: #FFFFFF;
-
-            .title {
-                font-size: 18px;
-            }
-
-            .remark {
-                color: #bbb;
-            }
+        .title {
+          font-size: 20px;
         }
 
-        .active {
-            background-color: #CB5050;
-            color: white;
+        .desc {
+          font-size: 14px;
+          color: #bbb;
+          display: flex;
+          align-items: flex-start;
+          justify-content: flex-start;
+          margin-top: 10px;
 
-            .remark {
-                color: #F2CFCE;
-            }
-        }
-    }
-
-    .content-wrap {
-        padding: 20px;
-        background-color: #FFFFFF;
-        flex: 1;
-        display: flex;
-        align-items: flex-start;
-        justify-content: flex-start;
-        flex-direction: column;
-
-        .content-item-wrap {
-            display: flex;
-            align-items: flex-start;
-            justify-content: flex-start;
-            margin: 30px 0;
-
-            .content {
-                margin-left: 25px;
-                display: flex;
-                align-items: flex-start;
-                justify-content: flex-start;
-                flex-direction: column;
-
-                .title {
-                    font-size: 20px;
-                }
-
-                .desc {
-                    font-size: 14px;
-                    color: #bbb;
-                    display: flex;
-                    align-items: flex-start;
-                    justify-content: flex-start;
-                    margin-top: 10px;
-
-                    .item {
-                        padding: 0 10px;
-                        border-right: 2px solid #bbb;
-                    }
-
-                    :first-child {
-                        padding-left: 0;
-                    }
-
-                    :last-child {
-                        border-right: none
-                    }
-                }
-            }
+          .item {
+            padding: 0 10px;
+            border-right: 2px solid #bbb;
+          }
+
+          :first-child {
+            padding-left: 0;
+          }
+
+          :last-child {
+            border-right: none
+          }
         }
+      }
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/pages/auth/login/find.vue b/pages/auth/login/find.vue
new file mode 100644
index 0000000..f26aebb
--- /dev/null
+++ b/pages/auth/login/find.vue
@@ -0,0 +1,633 @@
+<template>
+    <view>
+        <div class="outter-wrapper">
+            <div class="login-page">
+                <div class="header w-1180 flex-h-ac">
+                    <a href="" class="zg-logo fl nuxt-link-active">
+                        <img src="@/static/images/logo-small.png" alt="买卖钢材,上金久信">
+                    </a>
+                </div>
+                <div class="main-container">
+                    <div class="w-1180 flex-h-e">
+                        <div class="login-container">
+                            <h2 style="margin-bottom: 15px;">找回密码</h2>
+                            <div id="from" action="">
+                                <div class="tabContent">
+                                    <!--企业用户登录-->
+                                    <div class="login-con active" id="rc">
+                                        <div class="input-group clear">
+                                            <div class="input-group-addon">
+                                                <i class="icon_user"></i>
+                                            </div>
+                                            <input type="text" class="form-control" v-model="form1.mobile"
+                                                   placeholder="请输入手机号" autocomplete="off">
+                                        </div>
+                                        <div class="input-group clear">
+                                            <input type="text" class="form-control" v-model="form1.code"
+                                                   placeholder="请输入短信验证码" autocomplete="off"/>
+                                            <div @click="sendSmsCode" id="btnSendCode1" type="button"
+                                                 class="btn-default" value="">{{ smsTips }}
+                                            </div>
+                                        </div>
+                                        <div class="input-group clear">
+                                            <div class="input-group-addon">
+                                                <i class="icon_password"></i>
+                                            </div>
+                                            <input type="password" class="form-control" v-model="form1.password"
+                                                   placeholder="请输入新密码" autocomplete="off">
+                                        </div>
+                                        <div class="input-group clear">
+                                            <div class="input-group-addon">
+                                                <i class="icon_password"></i>
+                                            </div>
+                                            <input type="password" class="form-control" v-model="form1.repassword"
+                                                   placeholder="请再次输入新密码" autocomplete="off">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="input-groupp clear">
+                                    <button @click="handleSubmit" type="submit" id="login" class="btnMarymt"
+                                            style="width: 100%;">确认密码
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="input-groupwp clear">
+                                <navigator url="/pages/auth/register/register" style="float: left;text-align: left;">
+                                    免费注册新账号
+                                </navigator>
+                                <a href="javascript:;" style="float: right;text-align: right;">
+                                    <navigator url="/pages/auth/login/login" style="float: left;text-align: left;">
+                                        登录
+                                    </navigator>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </view>
+</template>
+
+<script>
+var vk = uni.vk
+let timer = null
+let timeS = 60
+export default {
+    data() {
+        return {
+            memberType: 'business', // business 企业 、、personal个人
+            loginMethod: 'username', // username 用户名 + 密码 、、mobile 手机号 + 验证码
+            smsTips: '获取验证码',
+            form1: {
+                mobile: '',
+                password: '',
+                repassword: '',
+                code: '',
+                username: ''
+            },
+        };
+    },
+    methods: {
+        handleSubmit() {
+            if (this.testForm()) {
+                const {
+                    password,
+                    mobile,
+                    code
+                } = this.form1
+
+                vk.userCenter.resetPasswordByMobile({
+                    data: {
+                        password,
+                        mobile,
+                        code
+                    },
+                    success: (data) => {
+                        // 成功后的逻辑
+                        this.$message({
+                            message: "密码重置成功",
+                            type:'success'
+                        })
+                        vk.redirectTo({
+                            url: '/pages/auth/login/login'
+                        })
+                    }
+                });
+            }
+        },
+        sendSmsCode() {
+            if (timer != null) {
+                return
+            }
+            vk.userCenter.sendSmsCode({
+                loading: false,
+                data: {
+                    mobile: this.form1.mobile,
+                    type: 'reset-pwd',
+                },
+                success: (data) => {
+
+                    this.$message({
+                        message: "验证码已发送",
+                        type: 'success'
+                    })
+                    timeS = 60
+                    timer = setInterval(() => {
+                        timeS--
+                        if (timeS <= 0) {
+                            this.smsTips = "重新发送"
+                            this.stopTimer()
+                        } else {
+                            this.smsTips = timeS + "秒"
+                        }
+
+                    }, 1000)
+                }
+            });
+        },
+        stopTimer() {
+            if (timer != null) {
+                clearInterval(timer)
+                timer = null
+            }
+
+        },
+        loginSuccess() {
+            uni.reLaunch({
+                url: '/'
+            })
+        },
+        testForm() {
+            const {
+                mobile, // 手机号
+                code, // 短信验证码4-8位
+                password, // 密码 6-20位
+                repassword, // 重复输入密码
+            } = this.form1;
+
+            // 手机号验证
+            if (!mobile || !/^1[3456789]\d{9}$/.test(mobile)) {
+                this.$message({
+                    message: '手机号为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 短信验证码验证
+            if (!code || !/^\d{4,8}$/.test(code)) {
+                // 短信验证码为空或格式不正确
+                // 处理错误逻辑
+                this.$message({
+                    message: '短信验证码为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 密码验证
+            if (!password || password.length < 6 || password.length > 20) {
+                // 密码为空或长度不符合要求
+                this.$message({
+                    message: '密码长度不符合要求',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+
+            // 重复输入密码验证
+            if (password !== repassword) {
+                // 两次输入的密码不一致
+                this.$message({
+                    message: '两次输入的密码不一致',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+            return true
+
+        },
+    },
+    onUnload() {
+        if (timer != null) {
+            clearInterval(timer)
+            timer = null
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@charset "utf-8";
+
+.login-method {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    margin-bottom: 2px;
+
+    &-item {
+        color: #d0111a;
+        cursor: pointer;
+    }
+}
+
+
+.outter-wrapper {
+    background-color: #fff;
+}
+
+.zg-logo img {
+    width: 230px;
+    border: none;
+}
+
+.layout-common-footer {
+    text-align: center;
+    margin: 15px 0px 10px;
+}
+
+.layout-common-footer .copyright .link > a {
+    color: #666;
+    padding: 0 10px;
+    display: inline-block;
+    line-height: 2
+}
+
+.w-1180 {
+    width: 1200px;
+    margin: 0px auto;
+    box-sizing: border-box;
+}
+
+.flex-h-ac {
+    display: flex;
+    align-items: center;
+}
+
+.header {
+    height: 90px;
+}
+
+.main-container {
+    min-width: 1200px;
+    padding: 60px 0;
+    background: #e8f5fd url(/static/images/login-bg.jpg) 50% no-repeat;
+}
+
+.flex-h-e,
+.flex-h-e-ac {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+}
+
+.main-container .login-container {
+    width: 350px;
+    box-sizing: border-box;
+    padding: 30px 35px 30px;
+    background-color: #fff;
+}
+
+.login-container h2 {
+    text-align: center;
+    line-height: 2;
+    color: #000;
+    font-size: 25px;
+    margin-bottom: 25px;
+}
+
+.btnMarymt {
+    height: 48px;
+    line-height: 48px;
+    background: #a92924;
+    color: #fff !important;
+    text-align: center;
+    width: 100%;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    font-size: 16px;
+    cursor: pointer;
+    text-align: center;
+}
+
+.btnMarymt:hover {
+    background: #f12d36
+}
+
+.input-group {
+    width: 100%;
+    height: 46px;
+}
+
+.input-group-addon {
+}
+
+.input-group .form-control {
+    flex: 1;
+    height: 100%;
+    border: none;
+    background: none;
+    margin-left: 12px;
+    outline: none;
+    font-size: 13px;
+    color: #333;
+}
+
+.input-group {
+    display: flex;
+    align-items: center;
+    border: 1px solid #d4d4d4;
+    margin-bottom: 15px;
+    position: relative;
+}
+
+.input-group-addon i {
+    background: url(/static/images/iconsmall.png) no-repeat center center;
+    width: 38px;
+    border-right: 1px solid #d4d4d4;
+    height: 26px;
+    overflow: hidden;
+    display: inline-block
+}
+
+.input-group-addon .icon_user {
+    background-position: -212px -35px;
+}
+
+.input-group-addon .icon_phone {
+    background-position: -212px -67px;
+}
+
+.input-group-addon .icon_password {
+    background-position: -212px -100px;
+}
+
+.input-group-addon .icon_yaoqingma {
+    background-position: -209px -318px;
+}
+
+.input-groupp {
+    width: 100%;
+}
+
+#btnSendCode1 {
+    position: absolute;
+    right: 1px;
+    top: 8px;
+    line-height: 31px;
+    color: #d0111a;
+    width: 79px;
+    text-align: center;
+    cursor: pointer;
+    border-left: 1px solid;
+    background: none;
+    font-size: 14px;
+}
+
+.input-group.focus {
+    background-color: #fff;
+    box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
+}
+
+.input-groupwp {
+    width: 100%;
+    text-align: center;
+    height: 60px;
+    line-height: 60px;
+    font-size: 14px;
+    margin-bottom: 10px;
+}
+
+.input-groupwpg a {
+    display: inline-block;
+}
+
+.input-groupwpg .dsf-wetChat i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -218px -132px;
+}
+
+.input-groupwpg .dsf-qq i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -216px -178px;
+    margin: 0px 24px;
+}
+
+.input-groupwpg .dsf-dx i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -215px -224px;
+}
+
+.threeBorder {
+    position: relative;
+    text-align: center;
+
+}
+
+.threeBorder:after {
+    content: '';
+    position: absolute;
+    z-index: 0;
+    bottom: 10px;
+    left: 10px;
+    width: 95%;
+    height: 1px;
+    border-bottom: 1px solid #CCCCCC;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 100%;
+    transform-origin: 0 100%;
+}
+
+.threeBorder span {
+    color: #888888;
+    background: #fff;
+    width: 90px;
+    margin: 0 auto;
+    z-index: 1002;
+    position: relative;
+    display: block;
+}
+
+.input-groupwpg {
+    width: 100%;
+    text-align: center;
+    height: 48px;
+    font-size: 14px;
+    margin-top: 22px;
+
+}
+
+.login-con {
+    display: none;
+}
+
+.input-grouptabs span {
+    color: #666;
+    cursor: pointer;
+    font-size: 16px;
+    line-height: 23px;
+    font-weight: normal;
+    display: inline-block;
+    padding: 0px 18px;
+    text-align: center;
+    margin: 0px auto;
+}
+
+.input-grouptabs {
+    text-align: center;
+    margin: 0px auto 30px;
+    width: 100%;
+}
+
+.input-grouptabs i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 25px;
+    height: 25px;
+    float: left;
+    margin-right: 5px;
+}
+
+.input-grouptabs .tab-active#normal i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs .tab-active#nopw i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs #normal i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs #nopw i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs span.tab-active {
+    color: #a92924
+}
+
+.active {
+    display: block;
+}
+
+.input-groupread {
+    height: 40px;
+    line-height: 30px;
+    width: 100%;
+    text-align: left;
+}
+
+.agreement_dialogs {
+    position: fixed;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+    text-align: center;
+    display: none;
+    background-color: rgba(35, 35, 35, 0.4);
+    -webkit-transition: all 0.5s linear;
+    transition: all 0.5s linear;
+}
+
+.agreement_dialogs .dialog_lay_1syd {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    display: inline-block;
+    width: 750px;
+    color: #656565;
+    font-size: 12px;
+    line-height: 20px;
+    background-color: #fff;
+    text-align: left;
+    vertical-align: middle;
+    -webkit-transition: all 0.2s linear;
+    transition: all 0.2s linear;
+}
+
+.agreement_dialogs .dialog_foot_1hHfr {
+    height: 80px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    border-top: 1px solid #d5d5d5;
+    margin: 0;
+    text-align: center;
+}
+
+.agreement_dialogs .dialog_minorBtn_1u8nf {
+    display: inline-block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px #316ccb solid;
+    padding: 0 30px;
+    height: 40px;
+    background: #a92924;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    line-height: 40px;
+    cursor: pointer;
+    font-size: 16px;
+    vertical-align: top;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    color: #fff;
+    border-color: #fff;
+}
+
+.agreement_titley {
+    height: 55px;
+    line-height: 55px;
+    font-size: 16px;
+    color: #666;
+    text-align: center;
+    border-bottom: 1px solid #d5d5d5;
+    font-weight: 400;
+}
+
+.agreement_content {
+    margin: 23px 32px;
+}
+
+.con-subhead {
+    font-size: 14px;
+
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 16px;
+}
+
+.con-content {
+    height: 240px;
+    overflow-y: scroll;
+    line-height: 2;
+    font-size: 13px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/auth/login/login.vue b/pages/auth/login/login.vue
index 624845e..9389283 100644
--- a/pages/auth/login/login.vue
+++ b/pages/auth/login/login.vue
@@ -1,615 +1,653 @@
 <template>
-	<view>
-		<div class="outter-wrapper">
-			<div class="login-page">
-				<div class="header w-1180 flex-h-ac">
-					<a href="" class="zg-logo fl nuxt-link-active">
-						<img src="@/static/images/logo-small.png" alt="买卖钢材,上金久信">
-					</a>
-				</div>
-				<div class="main-container">
-					<div class="w-1180 flex-h-e">
-						<div class="login-container">
-							<h2 style="margin-bottom: 15px;">会员登录</h2>
-							<div id="from" action="">
-								<div class="input-grouptabs clear">
-                                    <span @click="memberType = 'business'"
-                                          :class="{'tab-active': memberType === 'business'}" class="nopassword" data-id="1"
-                                          id="nopw"><i></i>企业用户</span>
-									<span @click="memberType = 'personal'"
-										:class="{'tab-active': memberType === 'personal'}" class="normal" data-id="0"
-										id="normal"><i></i>个人用户</span>
-								</div>
-								<!-- 账号密码登录 -->
-								<view class="login-method">
-									<view @click="loginMethod = 'username'" class="login-method-item">账号密码登录</view>
-									<view @click="loginMethod = 'mobile'" class="login-method-item">验证码登录</view>
-								</view>
-								<div class="tabContent">
-									<!--企业用户登录-->
-									<div class="login-con active" id="rc">
-										<div v-if="loginMethod == 'username'" class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_user"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.username"
-												placeholder="请输入手机号/邮箱/用户名" autocomplete="off">
-										</div>
+  <view>
+    <div class="outter-wrapper">
+      <div class="login-page">
+        <div class="header w-1180 flex-h-ac">
+          <a href="" class="zg-logo fl nuxt-link-active">
+            <img src="@/static/images/logo-small.png" alt="买卖钢材,上金久信">
+          </a>
+        </div>
+        <div class="main-container">
+          <div class="w-1180 flex-h-e">
+            <div class="login-container">
+              <h2 style="margin-bottom: 15px;">会员登录</h2>
+              <div id="from" action="">
+                <!--                                <div class="input-grouptabs clear">-->
+                <!--                                    <span @click="memberType = 'business'"-->
+                <!--                                          :class="{'tab-active': memberType === 'business'}" class="nopassword"-->
+                <!--                                          data-id="1"-->
+                <!--                                          id="nopw"><i></i>企业用户</span>-->
+                <!--                                    <span @click="memberType = 'personal'"-->
+                <!--                                          :class="{'tab-active': memberType === 'personal'}" class="normal" data-id="0"-->
+                <!--                                          id="normal"><i></i>个人用户</span>-->
+                <!--                                </div>-->
+                <!-- 账号密码登录 -->
+                <!--                                <view class="login-method">-->
+                <!--                                    <view @click="loginMethod = 'username'" class="login-method-item">账号密码登录-->
+                <!--                                    </view>-->
+                <!--                                    <view @click="loginMethod = 'mobile'" class="login-method-item">验证码登录</view>-->
+                <!--                                </view>-->
+                <div class="tabContent">
+                  <!--企业用户登录-->
+                  <div class="login-con active" id="rc">
+                    <div v-if="loginMethod == 'username'" class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_user"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.username"
+                             placeholder="请输入手机号/邮箱/用户名" autocomplete="off">
+                    </div>
 
-										<div v-if="loginMethod == 'username'" class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_password"></i>
-											</div>
-											<input type="password" class="form-control" v-model="form1.password"
-												placeholder="请输入登录密码" autocomplete="off">
-										</div>
+                    <div v-if="loginMethod == 'username'" class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_password"></i>
+                      </div>
+                      <input type="password" class="form-control" v-model="form1.password"
+                             placeholder="请输入登录密码" autocomplete="off">
+                    </div>
 
-										<div v-if="loginMethod == 'mobile'" class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_user"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.mobile"
-												placeholder="请输入手机号" autocomplete="off">
-										</div>
+                    <div v-if="loginMethod == 'mobile'" class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_user"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.mobile"
+                             placeholder="请输入手机号" autocomplete="off">
+                    </div>
 
 
-										<div v-if="loginMethod == 'mobile'" class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_phone"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.smsCode"
-												placeholder="请输入短信验证码" autocomplete="off" />
-											<view @click="sendSmsCode" id="btnSendCode1" type="button"
-												class="btn-default" value="">{{smsTips}}</view>
+                    <div v-if="loginMethod == 'mobile'" class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_phone"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.smsCode"
+                             placeholder="请输入短信验证码" autocomplete="off"/>
+                      <view @click="sendSmsCode" id="btnSendCode1" type="button"
+                            class="btn-default" value="">{{ smsTips }}
+                      </view>
+                    </div>
+                  </div>
+                </div>
+                <div class="my-25">
+                  <drag-verify ref="dragVerify" :width="280" :isPassing.sync="isPassing"
+                               text="请按住滑块拖动" successText="验证通过"
+                               handlerIcon="el-icon-d-arrow-right" successIcon="el-icon-circle-check">
+                    <i v-show="!isPassing" slot="textBefore" class="el-icon-lock"></i>
+                  </drag-verify>
+                </div>
+                <div class="input-groupp clear">
+                  <button @click="handleSubmit" type="submit" id="login" class="btnMarymt"
+                          style="width: 100%;">立即登录
+                  </button>
+                </div>
+              </div>
 
-										</div>
+              <div class="input-groupwp clear">
+                <navigator url="/pages/auth/register/register" style="float: left;text-align: left;">
+                  免费注册新账号
+                </navigator>
+                <a href="javascript:;" style="float: right;text-align: right;">
+                  <navigator url="/pages/auth/login/find" style="float: left;text-align: left;">
+                    找回密码
+                  </navigator>
+                </a>
 
+              </div>
+<!--              <div class=" threeBorder"><span>第三方登录</span></div>-->
 
-									</div>
-								</div>
-								<div class="input-groupp clear">
-									<button @click="handleSubmit" type="submit" id="login" class="btnMarymt"
-										style="width: 100%;">立即登录</button>
-								</div>
-							</div>
+<!--              <div class="input-groupwpg clear">-->
+<!--                <a href="javascript:;" @click="toWechat" class="dsf-wetChat" title="微信"><i></i></a>-->
+<!--                &lt;!&ndash;                                <a href="javascript:;" @click="toQQ" class="dsf-qq" title="QQ"><i></i></a>&ndash;&gt;-->
+<!--                &lt;!&ndash;                        <a href="" class="dsf-dx" title="短信"><i></i></a>&ndash;&gt;-->
+<!--              </div>-->
+            </div>
+          </div>
+        </div>
 
-							<div class="input-groupwp clear">
-								<navigator url="/pages/auth/register/register" style="float: left;text-align: left;">免费注册新账号</navigator>
-								<a href="/user/find_pwd.html" style="float: right;text-align: right;">找回密码</a>
-
-							</div>
-							<div class=" threeBorder"><span>第三方登录</span></div>
-
-							<div class="input-groupwpg clear">
-								<!--                        <a href="" class="dsf-wetChat" title="微信"><i></i></a>-->
-								<a href="/user/qq_login.html" class="dsf-qq" title="QQ"><i></i></a>
-								<!--                        <a href="" class="dsf-dx" title="短信"><i></i></a>-->
-							</div>
-						</div>
-					</div>
-				</div>
-
-			</div>
-		</div>
-	</view>
+      </div>
+    </div>
+  </view>
 </template>
 
 <script>
-	var vk = uni.vk
-	let timer = null
-	let timeS = 60
-	export default {
-		data() {
-			return {
-				memberType: 'business', // business 企业 、、personal个人
-				loginMethod: 'username', // username 用户名 + 密码 、、mobile 手机号 + 验证码
-				smsTips: '获取验证码',
-				form1: {
-					mobile: '',
-					password: '',
-					smsCode: '',
-					username: ''
-				}
-			};
-		},
-		methods: {
-			handleSubmit() {
+var vk = uni.vk
+let timer = null
+let timeS = 60
+export default {
+  data() {
+    return {
+      memberType: 'business', // business 企业 、、personal个人
+      loginMethod: 'username', // username 用户名 + 密码 、、mobile 手机号 + 验证码
+      smsTips: '获取验证码',
+      form1: {
+        mobile: '',
+        password: '',
+        smsCode: '',
+        username: ''
+      },
+      isPassing: false
+    };
+  },
+  methods: {
+    handleSubmit() {
+      if (!this.isPassing) return this.$message.error('请先完成滑块验证')
+      let data = {}
 
-				let data = {}
+      const {
+        username,
+        password,
+        mobile,
+        smsCode
+      } = this.form1
 
-				const {
-					username,
-					password,
-					mobile,
-					smsCode
-				} = this.form1
+      if (this.loginMethod === 'username') {
+        data = {
+          username,
+          password,
+          // accountType: this.memberType === 'business' ? 2 : 1
+        }
+        vk.userCenter.login({
+          loading: false,
+          data,
+          success: (data) => {
+            this.loginSuccess()
+          }
+        }).catch(() => {
+          // this.$refs.dragVerify.reset()
+        })
+      } else {
+        vk.userCenter.loginBySms({
+          loading: false,
+          data: {
+            mobile: mobile,
+            code: smsCode,
+          },
+          success: (data) => {
+            this.loginSuccess()
+          }
+        }).catch(() => {
+          // this.$refs.dragVerify.reset()
+        })
+      }
+    },
+    sendSmsCode() {
+      if (timer != null) {
+        return
+      }
+      vk.userCenter.sendSmsCode({
+        loading: false,
+        data: {
+          mobile: this.form1.mobile,
+          type: 'login',
+        },
+        success: (data) => {
 
-				if (this.loginMethod == 'username') {
-					data = {
-						username,
-						password
-					}
-					vk.userCenter.login({
-						loading: false,
-						data,
-						success: (data) => {
-							this.loginSuccess()
-						}
-					});
-				} else {
-
-					vk.userCenter.loginBySms({
-						loading: false,
-						data: {
-							mobile: mobile,
-							code: smsCode,
-						},
-						success: (data) => {
-							this.loginSuccess()
-						}
-					});
-				}
-
-
-			},
-			sendSmsCode() {
-				if (timer != null) {
-					return
-				}
-				vk.userCenter.sendSmsCode({
-					loading: false,
-					data: {
-						mobile: this.form1.mobile,
-						type: 'login',
-					},
-					success: (data) => {
-
-						this.$message({
-							message: "验证码已发送",
-							type: 'success'
-						})
-						timeS = 60
-						timer = setInterval(() => {
-							timeS--
-							if (timeS <= 0) {
-								this.smsTips = "重新发送"
-								this.stopTimer()
-							} else {
-								this.smsTips = timeS + "秒"
-							}
-
-						}, 1000)
-					}
-				});
-			},
-			stopTimer() {
-				if (timer != null) {
-					clearInterval(timer)
-					timer = null
-				}
-
-			},
-			loginSuccess() {
-				uni.reLaunch({
-					url: '/'
-				})
-			}
-		},
-		onUnload() {
-			if (timer != null) {
-				clearInterval(timer)
-				timer = null
-			}
-		}
-	}
+          this.$message({
+            message: "验证码已发送",
+            type: 'success'
+          })
+          timeS = 60
+          timer = setInterval(() => {
+            timeS--
+            if (timeS <= 0) {
+              this.smsTips = "重新发送"
+              this.stopTimer()
+            } else {
+              this.smsTips = timeS + "秒"
+            }
+          }, 1000)
+        }
+      });
+    },
+    stopTimer() {
+      if (timer != null) {
+        clearInterval(timer)
+        timer = null
+      }
+    },
+    loginSuccess() {
+      uni.reLaunch({
+        url: '/pages/contract/index?tab=sign'
+      })
+    },
+    async toQQ() {
+      // const redirect_uri = 'http://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/pages/auth/login/qq'
+      const redirect_uri = 'https://tcb-nnexmh3j3i5hwh5-7caw62c422be-1252168680.tcloudbaseapp.com/#/pages/auth/login/qq'
+      const state = `jjx_` + (this.memberType === 'business' ? 2 : 1)
+      let url = `https://graph.qq.com/oauth2.0/authorize?response_type=code&state=${state}&client_id=101795826`
+      url += '&redirect_uri=' + encodeURIComponent(redirect_uri)
+      window.location.href = url
+    },
+    async toWechat() {
+      // const redirect_uri = 'https://tcb-nnexmh3j3i5hwh5-7caw62c422be-1252168680.tcloudbaseapp.com/#/pages/auth/login/wechat'
+      const redirect_uri = 'https://www.jinjiuxinzg.cn/#/pages/auth/login/wechat'
+      // const redirect_uri = 'https://tcb-nnexmh3j3i5hwh5-7caw62c422be-1252168680.tcloudbaseapp.com/#/pages/auth/login/wechat_test'
+      const state = `jjx_` + (this.memberType === 'business' ? 2 : 1)
+      let url = 'https://open.weixin.qq.com/connect/qrconnect?appid=wxf44c1b32124fe1d5'
+      url += '&redirect_uri=' + encodeURIComponent(redirect_uri)
+      url += `&response_type=code&scope=snsapi_login&state=${state}#wechat_redirect`
+      window.location.href = url
+    },
+  },
+  onUnload() {
+    if (timer != null) {
+      clearInterval(timer)
+      timer = null
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	@charset "utf-8";
+@charset "utf-8";
 
-	.login-method {
-		display: flex;
-		justify-content: space-between;
-		font-size: 14px;
-		margin-bottom: 2px;
+.login-method {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  margin-bottom: 2px;
 
-		&-item {
-			color: #d0111a;
-			cursor: pointer;
-		}
-	}
+  &-item {
+    color: #d0111a;
+    cursor: pointer;
+  }
+}
 
+.outter-wrapper {
+  background-color: #e8f5fd;
+  height: calc(100vh);
+}
 
-	.outter-wrapper {
-		background-color: #fff;
-	}
+.zg-logo img {
+  width: 230px;
+  border: none;
+}
 
-	.zg-logo img {
-		width: 230px;
-		border: none;
-	}
+.layout-common-footer {
+  text-align: center;
+  margin: 15px 0 10px;
+}
 
-	.layout-common-footer {
-		text-align: center;
-		margin: 15px 0px 10px;
-	}
+.layout-common-footer .copyright .link > a {
+  color: #666;
+  padding: 0 10px;
+  display: inline-block;
+  line-height: 2
+}
 
-	.layout-common-footer .copyright .link>a {
-		color: #666;
-		padding: 0 10px;
-		display: inline-block;
-		line-height: 2
-	}
+.w-1180 {
+  width: 1200px;
+  margin: 0 auto;
+  box-sizing: border-box;
+}
 
-	.w-1180 {
-		width: 1200px;
-		margin: 0px auto;
-		box-sizing: border-box;
-	}
+.flex-h-ac {
+  display: flex;
+  align-items: center;
+}
 
-	.flex-h-ac {
-		display: flex;
-		align-items: center;
-	}
+.header {
+  height: 90px;
+}
 
-	.header {
-		height: 90px;
-	}
+.main-container {
+  min-width: 1200px;
+  padding: 60px 0;
+  background: #5499CE url('@/static/images/logo-bg.jpg') no-repeat;
+  //background-size: 1920px 990px;
+  background-size: cover;
+}
 
-	.main-container {
-		min-width: 1200px;
-		padding: 60px 0;
-		background: #e8f5fd url(/static/images/login-bg.jpg)50% no-repeat;
-	}
+.flex-h-e,
+.flex-h-e-ac {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  height: calc(100vh - 90px);
+}
 
-	.flex-h-e,
-	.flex-h-e-ac {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-end;
-	}
+.main-container .login-container {
+  width: 350px;
+  box-sizing: border-box;
+  padding: 30px 35px 30px;
+  background-color: #fff;
+  height: 500px;
+}
 
-	.main-container .login-container {
-		width: 350px;
-		box-sizing: border-box;
-		padding: 30px 35px 30px;
-		background-color: #fff;
-	}
+.login-container h2 {
+  text-align: center;
+  line-height: 2;
+  color: #000;
+  font-size: 25px;
+  margin-bottom: 25px;
+}
 
-	.login-container h2 {
-		text-align: center;
-		line-height: 2;
-		color: #000;
-		font-size: 25px;
-		margin-bottom: 25px;
-	}
+.btnMarymt {
+  height: 48px;
+  line-height: 48px;
+  background: #a92924;
+  color: #fff !important;
+  text-align: center;
+  width: 100%;
+  background: linear-gradient(90deg, #f0242e, #d0111a);
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
 
-	.btnMarymt {
-		height: 48px;
-		line-height: 48px;
-		background: #a92924;
-		color: #fff !important;
-		text-align: center;
-		width: 100%;
-		background: linear-gradient(90deg, #f0242e, #d0111a);
-		font-size: 16px;
-		cursor: pointer;
-		text-align: center;
-	}
+.btnMarymt:hover {
+  background: #f12d36
+}
 
-	.btnMarymt:hover {
-		background: #f12d36
-	}
+.input-group {
+  width: 100%;
+  height: 46px;
+}
 
-	.input-group {
-		width: 100%;
-		height: 46px;
-	}
+.input-group-addon {
+}
 
-	.input-group-addon {}
+.input-group .form-control {
+  flex: 1;
+  height: 100%;
+  border: none;
+  background: none;
+  margin-left: 12px;
+  outline: none;
+  font-size: 13px;
+  color: #333;
+}
 
-	.input-group .form-control {
-		flex: 1;
-		height: 100%;
-		border: none;
-		background: none;
-		margin-left: 12px;
-		outline: none;
-		font-size: 13px;
-		color: #333;
-	}
+.input-group {
+  display: flex;
+  align-items: center;
+  border: 1px solid #d4d4d4;
+  margin-bottom: 15px;
+  position: relative;
+}
 
-	.input-group {
-		display: flex;
-		align-items: center;
-		border: 1px solid #d4d4d4;
-		margin-bottom: 15px;
-		position: relative;
-	}
+.input-group-addon i {
+  background: url('@/static/images/iconsmall.png') no-repeat center center;
+  width: 38px;
+  border-right: 1px solid #d4d4d4;
+  height: 26px;
+  overflow: hidden;
+  display: inline-block
+}
 
-	.input-group-addon i {
-		background: url(/static/images/iconsmall.png)no-repeat center center;
-		width: 38px;
-		border-right: 1px solid #d4d4d4;
-		height: 26px;
-		overflow: hidden;
-		display: inline-block
-	}
+.input-group-addon .icon_user {
+  background-position: -212px -35px;
+}
 
-	.input-group-addon .icon_user {
-		background-position: -212px -35px;
-	}
+.input-group-addon .icon_phone {
+  background-position: -212px -67px;
+}
 
-	.input-group-addon .icon_phone {
-		background-position: -212px -67px;
-	}
+.input-group-addon .icon_password {
+  background-position: -212px -100px;
+}
 
-	.input-group-addon .icon_password {
-		background-position: -212px -100px;
-	}
+.input-group-addon .icon_yaoqingma {
+  background-position: -209px -318px;
+}
 
-	.input-group-addon .icon_yaoqingma {
-		background-position: -209px -318px;
-	}
+.input-groupp {
+  width: 100%;
+}
 
-	.input-groupp {
-		width: 100%;
-	}
+#btnSendCode1 {
+  position: absolute;
+  right: 1px;
+  top: 8px;
+  line-height: 31px;
+  color: #d0111a;
+  width: 79px;
+  text-align: center;
+  cursor: pointer;
+  border-left: 1px solid;
+  background: none;
+  font-size: 14px;
+}
 
-	#btnSendCode1 {
-		position: absolute;
-		right: 1px;
-		top: 8px;
-		line-height: 31px;
-		color: #d0111a;
-		width: 79px;
-		text-align: center;
-		cursor: pointer;
-		border-left: 1px solid;
-		background: none;
-		font-size: 14px;
-	}
+.input-group.focus {
+  background-color: #fff;
+  box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
+}
 
-	.input-group.focus {
-		background-color: #fff;
-		box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
-	}
+.input-groupwp {
+  width: 100%;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+  font-size: 14px;
+  margin-bottom: 10px;
+}
 
-	.input-groupwp {
-		width: 100%;
-		text-align: center;
-		height: 60px;
-		line-height: 60px;
-		font-size: 14px;
-		margin-bottom: 10px;
-	}
+.input-groupwpg a {
+  display: inline-block;
+}
 
-	.input-groupwpg a {
-		display: inline-block;
-	}
+.input-groupwpg .dsf-wetChat i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 50px;
+  height: 40px;
+  display: block;
+  background-position: -218px -132px;
+}
 
-	.input-groupwpg .dsf-wetChat i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 50px;
-		height: 40px;
-		display: block;
-		background-position: -218px -132px;
-	}
+.input-groupwpg .dsf-qq i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 50px;
+  height: 40px;
+  display: block;
+  background-position: -216px -178px;
+  margin: 0 24px;
+}
 
-	.input-groupwpg .dsf-qq i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 50px;
-		height: 40px;
-		display: block;
-		background-position: -216px -178px;
-		margin: 0px 24px;
-	}
+.input-groupwpg .dsf-dx i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 50px;
+  height: 40px;
+  display: block;
+  background-position: -215px -224px;
+}
 
-	.input-groupwpg .dsf-dx i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 50px;
-		height: 40px;
-		display: block;
-		background-position: -215px -224px;
-	}
+.threeBorder {
+  position: relative;
+  text-align: center;
 
-	.threeBorder {
-		position: relative;
-		text-align: center;
+}
 
-	}
+.threeBorder:after {
+  content: '';
+  position: absolute;
+  z-index: 0;
+  bottom: 10px;
+  left: 10px;
+  width: 95%;
+  height: 1px;
+  border-bottom: 1px solid #CCCCCC;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  -webkit-transform-origin: 0 100%;
+  transform-origin: 0 100%;
+}
 
-	.threeBorder:after {
-		content: '';
-		position: absolute;
-		z-index: 0;
-		bottom: 10px;
-		left: 10px;
-		width: 95%;
-		height: 1px;
-		border-bottom: 1px solid #CCCCCC;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		-webkit-transform-origin: 0 100%;
-		transform-origin: 0 100%;
-	}
+.threeBorder span {
+  color: #888888;
+  background: #fff;
+  width: 90px;
+  margin: 0 auto;
+  z-index: 1002;
+  position: relative;
+  display: block;
+}
 
-	.threeBorder span {
-		color: #888888;
-		background: #fff;
-		width: 90px;
-		margin: 0 auto;
-		z-index: 1002;
-		position: relative;
-		display: block;
-	}
+.input-groupwpg {
+  width: 100%;
+  text-align: center;
+  height: 48px;
+  font-size: 14px;
+  margin-top: 22px;
 
-	.input-groupwpg {
-		width: 100%;
-		text-align: center;
-		height: 48px;
-		font-size: 14px;
-		margin-top: 22px;
+}
 
-	}
+.login-con {
+  display: none;
+}
 
-	.login-con {
-		display: none;
-	}
+.input-grouptabs span {
+  color: #666;
+  cursor: pointer;
+  font-size: 16px;
+  line-height: 23px;
+  font-weight: normal;
+  display: inline-block;
+  padding: 0 18px;
+  text-align: center;
+  margin: 0 auto;
+}
 
-	.input-grouptabs span {
-		color: #666;
-		cursor: pointer;
-		font-size: 16px;
-		line-height: 23px;
-		font-weight: normal;
-		display: inline-block;
-		padding: 0px 18px;
-		text-align: center;
-		margin: 0px auto;
-	}
+.input-grouptabs {
+  text-align: center;
+  margin: 0 auto 30px;
+  width: 100%;
+}
 
-	.input-grouptabs {
-		text-align: center;
-		margin: 0px auto 30px;
-		width: 100%;
-	}
+.input-grouptabs i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 25px;
+  height: 25px;
+  float: left;
+  margin-right: 5px;
+}
 
-	.input-grouptabs i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 25px;
-		height: 25px;
-		float: left;
-		margin-right: 5px;
-	}
+.input-grouptabs .tab-active#normal i {
+  background-position: -218px -269px;
+}
 
-	.input-grouptabs .tab-active#normal i {
-		background-position: -218px -269px;
-	}
+.input-grouptabs .tab-active#nopw i {
+  background-position: -218px -269px;
+}
 
-	.input-grouptabs .tab-active#nopw i {
-		background-position: -218px -269px;
-	}
+.input-grouptabs #normal i {
+  background-position: -218px -293px;
+}
 
-	.input-grouptabs #normal i {
-		background-position: -218px -293px;
-	}
+.input-grouptabs #nopw i {
+  background-position: -218px -293px;
+}
 
-	.input-grouptabs #nopw i {
-		background-position: -218px -293px;
-	}
+.input-grouptabs span.tab-active {
+  color: #a92924
+}
 
-	.input-grouptabs span.tab-active {
-		color: #a92924
-	}
+.active {
+  display: block;
+}
 
-	.active {
-		display: block;
-	}
+.input-groupread {
+  height: 40px;
+  line-height: 30px;
+  width: 100%;
+  text-align: left;
+}
 
-	.input-groupread {
-		height: 40px;
-		line-height: 30px;
-		width: 100%;
-		text-align: left;
-	}
+.agreement_dialogs {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 99999;
+  text-align: center;
+  display: none;
+  background-color: rgba(35, 35, 35, 0.4);
+  -webkit-transition: all 0.5s linear;
+  transition: all 0.5s linear;
+}
 
-	.agreement_dialogs {
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		right: 0px;
-		bottom: 0px;
-		width: 100%;
-		height: 100%;
-		z-index: 99999;
-		text-align: center;
-		display: none;
-		background-color: rgba(35, 35, 35, 0.4);
-		-webkit-transition: all 0.5s linear;
-		transition: all 0.5s linear;
-	}
+.agreement_dialogs .dialog_lay_1syd {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  display: inline-block;
+  width: 750px;
+  color: #656565;
+  font-size: 12px;
+  line-height: 20px;
+  background-color: #fff;
+  text-align: left;
+  vertical-align: middle;
+  -webkit-transition: all 0.2s linear;
+  transition: all 0.2s linear;
+}
 
-	.agreement_dialogs .dialog_lay_1syd {
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		display: inline-block;
-		width: 750px;
-		color: #656565;
-		font-size: 12px;
-		line-height: 20px;
-		background-color: #fff;
-		text-align: left;
-		vertical-align: middle;
-		-webkit-transition: all 0.2s linear;
-		transition: all 0.2s linear;
-	}
+.agreement_dialogs .dialog_foot_1hHfr {
+  height: 80px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  border-top: 1px solid #d5d5d5;
+  margin: 0;
+  text-align: center;
+}
 
-	.agreement_dialogs .dialog_foot_1hHfr {
-		height: 80px;
-		display: -webkit-box;
-		display: -ms-flexbox;
-		display: flex;
-		-webkit-box-align: center;
-		-ms-flex-align: center;
-		align-items: center;
-		-webkit-box-pack: center;
-		-ms-flex-pack: center;
-		justify-content: center;
-		border-top: 1px solid #d5d5d5;
-		margin: 0;
-		text-align: center;
-	}
+.agreement_dialogs .dialog_minorBtn_1u8nf {
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px #316ccb solid;
+  padding: 0 30px;
+  height: 40px;
+  background: #5499CE;
+  background: linear-gradient(90deg, #5499CE, #5499CE);
+  line-height: 40px;
+  cursor: pointer;
+  font-size: 16px;
+  vertical-align: top;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  color: #fff;
+  border-color: #fff;
+}
 
-	.agreement_dialogs .dialog_minorBtn_1u8nf {
-		display: inline-block;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		border: 1px #316ccb solid;
-		padding: 0 30px;
-		height: 40px;
-		background: #a92924;
-		background: linear-gradient(90deg, #f0242e, #d0111a);
-		line-height: 40px;
-		cursor: pointer;
-		font-size: 16px;
-		vertical-align: top;
-		-webkit-user-select: none;
-		-moz-user-select: none;
-		-ms-user-select: none;
-		user-select: none;
-		color: #fff;
-		border-color: #fff;
-	}
+.agreement_titley {
+  height: 55px;
+  line-height: 55px;
+  font-size: 16px;
+  color: #666;
+  text-align: center;
+  border-bottom: 1px solid #d5d5d5;
+  font-weight: 400;
+}
 
-	.agreement_titley {
-		height: 55px;
-		line-height: 55px;
-		font-size: 16px;
-		color: #666;
-		text-align: center;
-		border-bottom: 1px solid #d5d5d5;
-		font-weight: 400;
-	}
+.agreement_content {
+  margin: 23px 32px;
+}
 
-	.agreement_content {
-		margin: 23px 32px;
-	}
+.con-subhead {
+  font-size: 14px;
 
-	.con-subhead {
-		font-size: 14px;
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 16px;
+}
 
-		font-weight: 500;
-		color: #333;
-		margin-bottom: 16px;
-	}
-
-	.con-content {
-		height: 240px;
-		overflow-y: scroll;
-		line-height: 2;
-		font-size: 13px;
-	}
+.con-content {
+  height: 240px;
+  overflow-y: scroll;
+  line-height: 2;
+  font-size: 13px;
+}
 </style>
\ No newline at end of file
diff --git a/pages/auth/login/qq.vue b/pages/auth/login/qq.vue
new file mode 100644
index 0000000..e91869b
--- /dev/null
+++ b/pages/auth/login/qq.vue
@@ -0,0 +1,642 @@
+<template>
+    <view>
+        <div class="outter-wrapper">
+            <div class="login-page">
+                <div class="header w-1180 flex-h-ac">
+                    <a href="" class="zg-logo fl nuxt-link-active">
+                        <img src="@/static/images/logo-small.png" alt="买卖钢材,上金久信">
+                    </a>
+                </div>
+                <div class="main-container">
+                    <div class="w-1180 flex-h-e">
+                        <div class="login-container">
+                            <h2 style="margin-bottom: 15px;">QQ登录</h2>
+                            <template v-if="showBind">
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_user"></i>
+                                    </div>
+                                    <input v-model="form1.mobile" type="text" class="form-control" name="mobile"
+                                           placeholder="请输入手机号" autocomplete="off">
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_phone"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.smsCode" name="smsCode"
+                                           placeholder="请输入短信验证码" autocomplete="off"/>
+                                    <view @click="sendSmsCode" id="btnSendCode1" type="button"
+                                          class="btn-default" value="">{{ smsTips }}
+                                    </view>
+
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_password"></i>
+                                    </div>
+                                    <input type="password" class="form-control" v-model="form1.password" name="password"
+                                           placeholder="设置登录密码" autocomplete="off">
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_password"></i>
+                                    </div>
+                                    <input type="password" class="form-control" v-model="form1.repassword"
+                                           placeholder="确认登录密码" autocomplete="off">
+                                </div>
+                                <div class="input-groupp clear">
+                                    <button @click="handleSubmit" type="submit" id="login" class="btnMarymt"
+                                            style="width: 100%;">绑定并登录
+                                    </button>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </view>
+</template>
+
+<script>
+import {Loading} from "element-ui";
+
+var vk = uni.vk
+let timer = null
+let timeS = 60
+export default {
+    data() {
+        return {
+            showBind: false,
+            smsTips: '获取验证码',
+            form1: {
+                mobile: '',
+                password: '',
+                repassword: '',
+                smsCode: '',
+                username: ''
+            },
+            accountType: null
+        };
+    },
+    methods: {
+        handleSubmit() {
+            if (this.testForm()) {
+                vk.userCenter.bindMobile({
+                    data: {
+                        mobile: this.form1.mobile,
+                        code: this.form1.smsCode,
+                    },
+                    success: () => {
+                        vk.userCenter.resetPwd({
+                            data: {
+                                password: this.form1.password,
+                            },
+                            success: () => {
+                                vk.redirectTo({url: '/pages/auth/login/login'})
+                            }
+                        })
+                    }
+                })
+            }
+        },
+        sendSmsCode() {
+            if (timer != null) {
+                return
+            }
+            vk.userCenter.sendSmsCode({
+                loading: false,
+                data: {
+                    mobile: this.form1.mobile,
+                    type: 'bind',
+                },
+                success: (data) => {
+
+                    this.$message({
+                        message: "验证码已发送",
+                        type: 'success'
+                    })
+                    timeS = 60
+                    timer = setInterval(() => {
+                        timeS--
+                        if (timeS <= 0) {
+                            this.smsTips = "重新发送"
+                            this.stopTimer()
+                        } else {
+                            this.smsTips = timeS + "秒"
+                        }
+
+                    }, 1000)
+                }
+            });
+        },
+        stopTimer() {
+            if (timer != null) {
+                clearInterval(timer)
+                timer = null
+            }
+
+        },
+        loginSuccess() {
+            uni.reLaunch({
+                url: '/'
+            })
+        },
+        async loginByQQ(code, accountType) {
+            let loadingInstance1 = Loading.service({fullscreen: true, text: '登录中...'});
+            const res = await vk.callFunction({
+                url: 'user/pub/loginByQQ',
+                data: {code, accountType}
+            })
+            loadingInstance1.close()
+            if (res.code === 0) {
+                this.loading = false
+                if (!res.mobileConfirmed) {
+                    this.showBind = !res.mobileConfirmed
+                    this.accountType = parseInt(accountType)
+                } else this.loginSuccess()
+            }
+        },
+        testForm() {
+            const {
+                mobile, // 手机号
+                smsCode, // 短信验证码4-8位
+                password, // 密码 6-20位
+                repassword, // 重复输入密码
+            } = this.form1;
+
+            // 手机号验证
+            if (!mobile || !/^1[3456789]\d{9}$/.test(mobile)) {
+                this.$message({
+                    message: '手机号为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 短信验证码验证
+            if (!smsCode || !/^\d{4,8}$/.test(smsCode)) {
+                // 短信验证码为空或格式不正确
+                // 处理错误逻辑
+                this.$message({
+                    message: '短信验证码为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 密码验证
+            if (!password || password.length < 6 || password.length > 20) {
+                // 密码为空或长度不符合要求
+                this.$message({
+                    message: '密码长度不符合要求',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+
+            // 重复输入密码验证
+            if (password !== repassword) {
+                // 两次输入的密码不一致
+                this.$message({
+                    message: '两次输入的密码不一致',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+            return true
+
+        },
+    },
+    onLoad(options) {
+        if (options.state && options.state.includes('jjx')) {
+            this.loginByQQ(options.code, options.state.split('_')[1])
+        } else vk.redirectTo({url: '/pages/index/index'})
+
+    },
+    onUnload() {
+        if (timer != null) {
+            clearInterval(timer)
+            timer = null
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@charset "utf-8";
+
+.login-method {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    margin-bottom: 2px;
+
+    &-item {
+        color: #d0111a;
+        cursor: pointer;
+    }
+}
+
+
+.outter-wrapper {
+    background-color: #fff;
+}
+
+.zg-logo img {
+    width: 230px;
+    border: none;
+}
+
+.layout-common-footer {
+    text-align: center;
+    margin: 15px 0px 10px;
+}
+
+.layout-common-footer .copyright .link > a {
+    color: #666;
+    padding: 0 10px;
+    display: inline-block;
+    line-height: 2
+}
+
+.w-1180 {
+    width: 1200px;
+    margin: 0px auto;
+    box-sizing: border-box;
+}
+
+.flex-h-ac {
+    display: flex;
+    align-items: center;
+}
+
+.header {
+    height: 90px;
+}
+
+.main-container {
+    min-width: 1200px;
+    padding: 60px 0;
+    background: #e8f5fd url(/static/images/login-bg.jpg) 50% no-repeat;
+}
+
+.flex-h-e,
+.flex-h-e-ac {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+}
+
+.main-container .login-container {
+    height: 530px;
+    width: 350px;
+    box-sizing: border-box;
+    padding: 30px 35px 30px;
+    background-color: #fff;
+}
+
+.login-container h2 {
+    text-align: center;
+    line-height: 2;
+    color: #000;
+    font-size: 25px;
+    margin-bottom: 25px;
+}
+
+.btnMarymt {
+    height: 48px;
+    line-height: 48px;
+    background: #a92924;
+    color: #fff !important;
+    text-align: center;
+    width: 100%;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    font-size: 16px;
+    cursor: pointer;
+    text-align: center;
+}
+
+.btnMarymt:hover {
+    background: #f12d36
+}
+
+.input-group {
+    width: 100%;
+    height: 46px;
+}
+
+.input-group-addon {
+}
+
+.input-group .form-control {
+    flex: 1;
+    height: 100%;
+    border: none;
+    background: none;
+    margin-left: 12px;
+    outline: none;
+    font-size: 13px;
+    color: #333;
+}
+
+.input-group {
+    display: flex;
+    align-items: center;
+    border: 1px solid #d4d4d4;
+    margin-bottom: 15px;
+    position: relative;
+}
+
+.input-group-addon i {
+    background: url(/static/images/iconsmall.png) no-repeat center center;
+    width: 38px;
+    border-right: 1px solid #d4d4d4;
+    height: 26px;
+    overflow: hidden;
+    display: inline-block
+}
+
+.input-group-addon .icon_user {
+    background-position: -212px -35px;
+}
+
+.input-group-addon .icon_phone {
+    background-position: -212px -67px;
+}
+
+.input-group-addon .icon_password {
+    background-position: -212px -100px;
+}
+
+.input-group-addon .icon_yaoqingma {
+    background-position: -209px -318px;
+}
+
+.input-groupp {
+    width: 100%;
+}
+
+#btnSendCode1 {
+    position: absolute;
+    right: 1px;
+    top: 8px;
+    line-height: 31px;
+    color: #d0111a;
+    width: 79px;
+    text-align: center;
+    cursor: pointer;
+    border-left: 1px solid;
+    background: none;
+    font-size: 14px;
+}
+
+.input-group.focus {
+    background-color: #fff;
+    box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
+}
+
+.input-groupwp {
+    width: 100%;
+    text-align: center;
+    height: 60px;
+    line-height: 60px;
+    font-size: 14px;
+    margin-bottom: 10px;
+}
+
+.input-groupwpg a {
+    display: inline-block;
+}
+
+.input-groupwpg .dsf-wetChat i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -218px -132px;
+}
+
+.input-groupwpg .dsf-qq i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -216px -178px;
+    margin: 0px 24px;
+}
+
+.input-groupwpg .dsf-dx i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -215px -224px;
+}
+
+.threeBorder {
+    position: relative;
+    text-align: center;
+
+}
+
+.threeBorder:after {
+    content: '';
+    position: absolute;
+    z-index: 0;
+    bottom: 10px;
+    left: 10px;
+    width: 95%;
+    height: 1px;
+    border-bottom: 1px solid #CCCCCC;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 100%;
+    transform-origin: 0 100%;
+}
+
+.threeBorder span {
+    color: #888888;
+    background: #fff;
+    width: 90px;
+    margin: 0 auto;
+    z-index: 1002;
+    position: relative;
+    display: block;
+}
+
+.input-groupwpg {
+    width: 100%;
+    text-align: center;
+    height: 48px;
+    font-size: 14px;
+    margin-top: 22px;
+
+}
+
+.login-con {
+    display: none;
+}
+
+.input-grouptabs span {
+    color: #666;
+    cursor: pointer;
+    font-size: 16px;
+    line-height: 23px;
+    font-weight: normal;
+    display: inline-block;
+    padding: 0px 18px;
+    text-align: center;
+    margin: 0px auto;
+}
+
+.input-grouptabs {
+    text-align: center;
+    margin: 0px auto 30px;
+    width: 100%;
+}
+
+.input-grouptabs i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 25px;
+    height: 25px;
+    float: left;
+    margin-right: 5px;
+}
+
+.input-grouptabs .tab-active#normal i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs .tab-active#nopw i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs #normal i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs #nopw i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs span.tab-active {
+    color: #a92924
+}
+
+.active {
+    display: block;
+}
+
+.input-groupread {
+    height: 40px;
+    line-height: 30px;
+    width: 100%;
+    text-align: left;
+}
+
+.agreement_dialogs {
+    position: fixed;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+    text-align: center;
+    display: none;
+    background-color: rgba(35, 35, 35, 0.4);
+    -webkit-transition: all 0.5s linear;
+    transition: all 0.5s linear;
+}
+
+.agreement_dialogs .dialog_lay_1syd {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    display: inline-block;
+    width: 750px;
+    color: #656565;
+    font-size: 12px;
+    line-height: 20px;
+    background-color: #fff;
+    text-align: left;
+    vertical-align: middle;
+    -webkit-transition: all 0.2s linear;
+    transition: all 0.2s linear;
+}
+
+.agreement_dialogs .dialog_foot_1hHfr {
+    height: 80px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    border-top: 1px solid #d5d5d5;
+    margin: 0;
+    text-align: center;
+}
+
+.agreement_dialogs .dialog_minorBtn_1u8nf {
+    display: inline-block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px #316ccb solid;
+    padding: 0 30px;
+    height: 40px;
+    background: #a92924;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    line-height: 40px;
+    cursor: pointer;
+    font-size: 16px;
+    vertical-align: top;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    color: #fff;
+    border-color: #fff;
+}
+
+.agreement_titley {
+    height: 55px;
+    line-height: 55px;
+    font-size: 16px;
+    color: #666;
+    text-align: center;
+    border-bottom: 1px solid #d5d5d5;
+    font-weight: 400;
+}
+
+.agreement_content {
+    margin: 23px 32px;
+}
+
+.con-subhead {
+    font-size: 14px;
+
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 16px;
+}
+
+.con-content {
+    height: 240px;
+    overflow-y: scroll;
+    line-height: 2;
+    font-size: 13px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/auth/login/wechat.vue b/pages/auth/login/wechat.vue
new file mode 100644
index 0000000..0f5ce7c
--- /dev/null
+++ b/pages/auth/login/wechat.vue
@@ -0,0 +1,728 @@
+<template>
+    <view>
+        <div class="outter-wrapper">
+            <div class="login-page">
+                <div class="header w-1180 flex-h-ac">
+                    <a href="" class="zg-logo fl nuxt-link-active">
+                        <img src="@/static/images/logo-small.png" alt="买卖钢材,上金久信">
+                    </a>
+                </div>
+                <div class="main-container">
+                    <div class="w-1180 flex-h-e">
+                        <div class="login-container">
+                            <h2 style="margin-bottom: 15px;">手机号绑定</h2>
+                            <template v-if="showBind">
+                                <div class="input-grouptabs clear">
+                                    <span @click="form1.accountType = 2"
+                                          :class="{'tab-active': form1.accountType === 2}" class="nopassword"
+                                          data-id="1"
+                                          id="nopw"><i></i>企业用户</span>
+                                    <span @click="form1.accountType = 1"
+                                          :class="{'tab-active': form1.accountType === 1}" class="normal" data-id="0"
+                                          id="normal"><i></i>个人用户</span>
+                                </div>
+                                <div v-show="form1.accountType === 1" class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_yaoqingma"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.nickname"
+                                           placeholder="请输入姓名" autocomplete="off">
+                                </div>
+                                <div v-show="form1.accountType === 2" class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_yaoqingma"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.nickname"
+                                           placeholder="请输入公司名称" autocomplete="off">
+                                </div>
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_user"></i>
+                                    </div>
+                                    <input v-model="form1.mobile" type="text" class="form-control" name="mobile"
+                                           placeholder="请输入手机号" autocomplete="off">
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_phone"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.smsCode" name="smsCode"
+                                           placeholder="请输入短信验证码" autocomplete="off"/>
+                                    <view @click="sendSmsCode" id="btnSendCode1" type="button"
+                                          class="btn-default" value="">{{ smsTips }}
+                                    </view>
+
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_password"></i>
+                                    </div>
+                                    <input type="password" class="form-control" v-model="form1.password" name="password"
+                                           placeholder="设置登录密码" autocomplete="off">
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_password"></i>
+                                    </div>
+                                    <input type="password" class="form-control" v-model="form1.repassword"
+                                           placeholder="确认登录密码" autocomplete="off">
+                                </div>
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_yaoqingma"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.inviteCode"
+                                           placeholder="请输入邀请码，选填" autocomplete="off">
+                                </div>
+                                <div class="input-groupread clear">
+                                    <el-checkbox v-model="agree"></el-checkbox>
+                                    <label class="ml-20">阅读并同意<a href="javascript:;" style="display: inline-block;"
+                                                                      @click="getInfo">
+                                        <span style="color: #3288b2">《金久信注册协议》</span></a></label>
+                                </div>
+                                <div class="input-groupp clear">
+                                    <button @click="handleSubmit" type="submit" id="login" class="btnMarymt"
+                                            style="width: 100%;">绑定
+                                    </button>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <el-dialog title="" :visible.sync="dialogVisible" width="40%">
+            <div v-html="info"></div>
+        </el-dialog>
+    </view>
+</template>
+
+<script>
+import {Loading} from "element-ui";
+
+var vk = uni.vk
+let timer = null
+let timeS = 60
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            agree: false,
+            info: null,
+            showBind: false,
+            smsTips: '获取验证码',
+            form1: {
+                mobile: '',
+                password: '',
+                repassword: '',
+                smsCode: '',
+                username: '',
+                inviteCode: '',
+                accountType: 2,
+                nickname: '',
+            },
+            accountType: null,
+            code: null,
+            loginType: null,
+            uid: null
+        };
+    },
+    methods: {
+        async handleSubmit() {
+            if (!this.agree) {
+                this.$message({
+                    message: '请先阅读并同意《金久信注册协议》',
+                    type: 'warning'
+                })
+                return
+            }
+            if (this.testForm()) {
+                await vk.callFunction({
+                    url: '/client/user/kh/updateLoginInfo',
+                    data: {
+                        uid: this.uid,
+                        accountType: this.form1.accountType,
+                        nickname: this.form1.nickname,
+                        inviteCode: this.form1.inviteCode,
+                    }
+                })
+                vk.userCenter.bindMobile({
+                    data: {
+                        mobile: this.form1.mobile,
+                        code: this.form1.smsCode,
+                    },
+                    success: () => {
+                        vk.userCenter.resetPwd({
+                            data: {
+                                password: this.form1.password,
+                            },
+                            success: async () => {
+                                vk.redirectTo({url: '/pages/auth/login/login'})
+                            }
+                        })
+                    }
+                })
+            }
+        },
+        sendSmsCode() {
+            if (timer != null) {
+                return
+            }
+            vk.userCenter.sendSmsCode({
+                loading: false,
+                data: {
+                    mobile: this.form1.mobile,
+                    type: 'bind',
+                },
+                success: (data) => {
+                    this.$message({
+                        message: "验证码已发送",
+                        type: 'success'
+                    })
+                    timeS = 60
+                    timer = setInterval(() => {
+                        timeS--
+                        if (timeS <= 0) {
+                            this.smsTips = "重新发送"
+                            this.stopTimer()
+                        } else {
+                            this.smsTips = timeS + "秒"
+                        }
+
+                    }, 1000)
+                }
+            });
+        },
+        stopTimer() {
+            if (timer != null) {
+                clearInterval(timer)
+                timer = null
+            }
+        },
+        loginSuccess() {
+            uni.reLaunch({url: '/'})
+        },
+        testForm() {
+            const {
+                mobile, // 手机号
+                smsCode, // 短信验证码4-8位
+                password, // 密码 6-20位
+                repassword, // 重复输入密码
+                nickname
+            } = this.form1;
+
+            // 手机号验证
+            if (!mobile || !/^1[3456789]\d{9}$/.test(mobile)) {
+                this.$message({
+                    message: '手机号为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 短信验证码验证
+            if (!smsCode || !/^\d{4,8}$/.test(smsCode)) {
+                // 短信验证码为空或格式不正确
+                // 处理错误逻辑
+                this.$message({
+                    message: '短信验证码为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 密码验证
+            if (!password || password.length < 6 || password.length > 20) {
+                // 密码为空或长度不符合要求
+                this.$message({
+                    message: '密码长度不符合要求',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+
+            const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]+$/
+            if (!reg.test(password)) {
+                this.$message({
+                    message: '密码必须由数字和字母组成',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 重复输入密码验证
+            if (password !== repassword) {
+                // 两次输入的密码不一致
+                this.$message({
+                    message: '两次输入的密码不一致',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+
+            if (!nickname) {
+                return this.$message({
+                    message: '请输入' + (this.form1.accountType === 2 ? '公司名称' : '您的姓名'),
+                    type: 'error'
+                })
+            }
+            return true
+
+        },
+        async getInfo() {
+            const {content} = await vk.callFunction({
+                url: `client/otherArticle/list/pub/getDetail`,
+                data: {id: 'adea4666684a336402937a2c5dcc448e'}
+            });
+            this.info = content
+            this.dialogVisible = true
+        }
+    },
+    async onLoad(options) {
+        if (options.state && options.state.includes('jjx')) {
+            this.form1.accountType = parseInt(options.state.split('_')[1])
+            if (options.code) {
+                this.code = options.code
+                const {uid, type, mobileConfirmed} = await vk.callFunction({
+                    url: 'user/pub/loginByWeixin',
+                    data: {
+                        code: this.code,
+                        accountType: this.form1.accountType,
+                    },
+                })
+                this.uid = uid
+                this.showBind = type === "register"
+                if (mobileConfirmed) this.loginSuccess()
+                else this.showBind = true
+
+            } else {
+                this.showBind = !vk.getVuex('$user.userInfo.mobile')
+            }
+        } else this.loginSuccess()
+    },
+    onUnload() {
+        if (timer != null) {
+            clearInterval(timer)
+            timer = null
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@charset "utf-8";
+
+.login-method {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    margin-bottom: 2px;
+
+    &-item {
+        color: #d0111a;
+        cursor: pointer;
+    }
+}
+
+
+.outter-wrapper {
+    background-color: #fff;
+}
+
+.zg-logo img {
+    width: 230px;
+    border: none;
+}
+
+.layout-common-footer {
+    text-align: center;
+    margin: 15px 0px 10px;
+}
+
+.layout-common-footer .copyright .link > a {
+    color: #666;
+    padding: 0 10px;
+    display: inline-block;
+    line-height: 2
+}
+
+.w-1180 {
+    width: 1200px;
+    margin: 0px auto;
+    box-sizing: border-box;
+}
+
+.flex-h-ac {
+    display: flex;
+    align-items: center;
+}
+
+.header {
+    height: 90px;
+}
+
+.main-container {
+    min-width: 1200px;
+    padding: 60px 0;
+    background: #e8f5fd url(/static/images/login-bg.jpg) 50% no-repeat;
+}
+
+.flex-h-e,
+.flex-h-e-ac {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+}
+
+.main-container .login-container {
+    height: 640px;
+    width: 350px;
+    box-sizing: border-box;
+    padding: 30px 35px 30px;
+    background-color: #fff;
+}
+
+.login-container h2 {
+    text-align: center;
+    line-height: 2;
+    color: #000;
+    font-size: 25px;
+    margin-bottom: 25px;
+}
+
+.btnMarymt {
+    height: 48px;
+    line-height: 48px;
+    background: #a92924;
+    color: #fff !important;
+    text-align: center;
+    width: 100%;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    font-size: 16px;
+    cursor: pointer;
+    text-align: center;
+}
+
+.btnMarymt:hover {
+    background: #f12d36
+}
+
+.input-group {
+    width: 100%;
+    height: 46px;
+}
+
+.input-group-addon {
+}
+
+.input-group .form-control {
+    flex: 1;
+    height: 100%;
+    border: none;
+    background: none;
+    margin-left: 12px;
+    outline: none;
+    font-size: 13px;
+    color: #333;
+}
+
+.input-group {
+    display: flex;
+    align-items: center;
+    border: 1px solid #d4d4d4;
+    margin-bottom: 15px;
+    position: relative;
+}
+
+.input-group-addon i {
+    background: url(/static/images/iconsmall.png) no-repeat center center;
+    width: 38px;
+    border-right: 1px solid #d4d4d4;
+    height: 26px;
+    overflow: hidden;
+    display: inline-block
+}
+
+.input-group-addon .icon_user {
+    background-position: -212px -35px;
+}
+
+.input-group-addon .icon_phone {
+    background-position: -212px -67px;
+}
+
+.input-group-addon .icon_password {
+    background-position: -212px -100px;
+}
+
+.input-group-addon .icon_yaoqingma {
+    background-position: -209px -318px;
+}
+
+.input-groupp {
+    width: 100%;
+}
+
+#btnSendCode1 {
+    position: absolute;
+    right: 1px;
+    top: 8px;
+    line-height: 31px;
+    color: #d0111a;
+    width: 79px;
+    text-align: center;
+    cursor: pointer;
+    border-left: 1px solid;
+    background: none;
+    font-size: 14px;
+}
+
+.input-group.focus {
+    background-color: #fff;
+    box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
+}
+
+.input-groupwp {
+    width: 100%;
+    text-align: center;
+    height: 60px;
+    line-height: 60px;
+    font-size: 14px;
+    margin-bottom: 10px;
+}
+
+.input-groupwpg a {
+    display: inline-block;
+}
+
+.input-groupwpg .dsf-wetChat i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -218px -132px;
+}
+
+.input-groupwpg .dsf-qq i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -216px -178px;
+    margin: 0px 24px;
+}
+
+.input-groupwpg .dsf-dx i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -215px -224px;
+}
+
+.threeBorder {
+    position: relative;
+    text-align: center;
+
+}
+
+.threeBorder:after {
+    content: '';
+    position: absolute;
+    z-index: 0;
+    bottom: 10px;
+    left: 10px;
+    width: 95%;
+    height: 1px;
+    border-bottom: 1px solid #CCCCCC;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 100%;
+    transform-origin: 0 100%;
+}
+
+.threeBorder span {
+    color: #888888;
+    background: #fff;
+    width: 90px;
+    margin: 0 auto;
+    z-index: 1002;
+    position: relative;
+    display: block;
+}
+
+.input-groupwpg {
+    width: 100%;
+    text-align: center;
+    height: 48px;
+    font-size: 14px;
+    margin-top: 22px;
+
+}
+
+.login-con {
+    display: none;
+}
+
+.input-grouptabs span {
+    color: #666;
+    cursor: pointer;
+    font-size: 16px;
+    line-height: 23px;
+    font-weight: normal;
+    display: inline-block;
+    padding: 0px 18px;
+    text-align: center;
+    margin: 0px auto;
+}
+
+.input-grouptabs {
+    text-align: center;
+    margin: 0px auto 30px;
+    width: 100%;
+}
+
+.input-grouptabs i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 25px;
+    height: 25px;
+    float: left;
+    margin-right: 5px;
+}
+
+.input-grouptabs .tab-active#normal i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs .tab-active#nopw i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs #normal i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs #nopw i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs span.tab-active {
+    color: #a92924
+}
+
+.active {
+    display: block;
+}
+
+.input-groupread {
+    height: 40px;
+    line-height: 30px;
+    width: 100%;
+    text-align: left;
+}
+
+.agreement_dialogs {
+    position: fixed;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+    text-align: center;
+    display: none;
+    background-color: rgba(35, 35, 35, 0.4);
+    -webkit-transition: all 0.5s linear;
+    transition: all 0.5s linear;
+}
+
+.agreement_dialogs .dialog_lay_1syd {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    display: inline-block;
+    width: 750px;
+    color: #656565;
+    font-size: 12px;
+    line-height: 20px;
+    background-color: #fff;
+    text-align: left;
+    vertical-align: middle;
+    -webkit-transition: all 0.2s linear;
+    transition: all 0.2s linear;
+}
+
+.agreement_dialogs .dialog_foot_1hHfr {
+    height: 80px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    border-top: 1px solid #d5d5d5;
+    margin: 0;
+    text-align: center;
+}
+
+.agreement_dialogs .dialog_minorBtn_1u8nf {
+    display: inline-block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px #316ccb solid;
+    padding: 0 30px;
+    height: 40px;
+    background: #a92924;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    line-height: 40px;
+    cursor: pointer;
+    font-size: 16px;
+    vertical-align: top;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    color: #fff;
+    border-color: #fff;
+}
+
+.agreement_titley {
+    height: 55px;
+    line-height: 55px;
+    font-size: 16px;
+    color: #666;
+    text-align: center;
+    border-bottom: 1px solid #d5d5d5;
+    font-weight: 400;
+}
+
+.agreement_content {
+    margin: 23px 32px;
+}
+
+.con-subhead {
+    font-size: 14px;
+
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 16px;
+}
+
+.con-content {
+    height: 240px;
+    overflow-y: scroll;
+    line-height: 2;
+    font-size: 13px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/auth/login/wechat_test.vue b/pages/auth/login/wechat_test.vue
new file mode 100644
index 0000000..4d10bd2
--- /dev/null
+++ b/pages/auth/login/wechat_test.vue
@@ -0,0 +1,717 @@
+<template>
+    <view>
+        <div class="outter-wrapper">
+            <div class="login-page">
+                <div class="header w-1180 flex-h-ac">
+                    <a href="" class="zg-logo fl nuxt-link-active">
+                        <img src="@/static/images/logo-small.png" alt="买卖钢材,上金久信">
+                    </a>
+                </div>
+                <div class="main-container">
+                    <div class="w-1180 flex-h-e">
+                        <div class="login-container">
+                            <h2 style="margin-bottom: 15px;">手机号绑定</h2>
+                            <template v-if="showBind">
+                                <div class="input-grouptabs clear">
+                                    <span @click="form1.accountType = 2"
+                                          :class="{'tab-active': form1.accountType === 2}" class="nopassword"
+                                          data-id="1"
+                                          id="nopw"><i></i>企业用户</span>
+                                    <span @click="form1.accountType = 1"
+                                          :class="{'tab-active': form1.accountType === 1}" class="normal" data-id="0"
+                                          id="normal"><i></i>个人用户</span>
+                                </div>
+                                <div v-show="form1.accountType === 1" class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_yaoqingma"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.nickname"
+                                           placeholder="请输入姓名" autocomplete="off">
+                                </div>
+                                <div v-show="form1.accountType === 2" class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_yaoqingma"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.nickname"
+                                           placeholder="请输入公司名称" autocomplete="off">
+                                </div>
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_user"></i>
+                                    </div>
+                                    <input v-model="form1.mobile" type="text" class="form-control" name="mobile"
+                                           placeholder="请输入手机号" autocomplete="off">
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_phone"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.smsCode" name="smsCode"
+                                           placeholder="请输入短信验证码" autocomplete="off"/>
+                                    <view @click="sendSmsCode" id="btnSendCode1" type="button"
+                                          class="btn-default" value="">{{ smsTips }}
+                                    </view>
+
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_password"></i>
+                                    </div>
+                                    <input type="password" class="form-control" v-model="form1.password" name="password"
+                                           placeholder="设置登录密码" autocomplete="off">
+                                </div>
+
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_password"></i>
+                                    </div>
+                                    <input type="password" class="form-control" v-model="form1.repassword"
+                                           placeholder="确认登录密码" autocomplete="off">
+                                </div>
+                                <div class="input-group clear">
+                                    <div class="input-group-addon">
+                                        <i class="icon_yaoqingma"></i>
+                                    </div>
+                                    <input type="text" class="form-control" v-model="form1.inviteCode"
+                                           placeholder="请输入邀请码，选填" autocomplete="off">
+                                </div>
+                                <div class="input-groupread clear">
+                                    <el-checkbox v-model="agree"></el-checkbox>
+                                    <label class="ml-20">阅读并同意<a href="javascript:;" style="display: inline-block;"
+                                                                      @click="getInfo">
+                                        <span style="color: #3288b2">《金久信注册协议》</span></a></label>
+                                </div>
+                                <div class="input-groupp clear">
+                                    <button @click="handleSubmit" type="submit" id="login" class="btnMarymt"
+                                            style="width: 100%;">绑定
+                                    </button>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <el-dialog title="" :visible.sync="dialogVisible" width="40%">
+            <div v-html="info"></div>
+        </el-dialog>
+    </view>
+</template>
+
+<script>
+import {Loading} from "element-ui";
+
+var vk = uni.vk
+let timer = null
+let timeS = 60
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            agree: false,
+            info: null,
+            showBind: false,
+            smsTips: '获取验证码',
+            form1: {
+                mobile: '',
+                password: '',
+                repassword: '',
+                smsCode: '',
+                username: '',
+                inviteCode: '',
+                accountType: 2,
+                nickname: '',
+            },
+            accountType: null,
+            code: null,
+            loginType: null,
+            uid: null
+        };
+    },
+    methods: {
+        async handleSubmit() {
+            if (!this.agree) {
+                this.$message({
+                    message: '请先阅读并同意《金久信注册协议》',
+                    type: 'warning'
+                })
+                return
+            }
+            if (this.testForm()) {
+                await vk.callFunction({
+                    url: '/client/user/kh/updateLoginInfo',
+                    data: {
+                        uid: this.uid,
+                        accountType: this.form1.accountType,
+                        nickname: this.form1.nickname,
+                    }
+                })
+                vk.userCenter.bindMobile({
+                    data: {
+                        mobile: this.form1.mobile,
+                        code: this.form1.smsCode,
+                    },
+                    success: () => {
+                        vk.userCenter.resetPwd({
+                            data: {
+                                password: this.form1.password,
+                            },
+                            success: async () => {
+                                vk.redirectTo({url: '/pages/auth/login/login'})
+                            }
+                        })
+                    }
+                })
+            }
+        },
+        sendSmsCode() {
+            if (timer != null) {
+                return
+            }
+            vk.userCenter.sendSmsCode({
+                loading: false,
+                data: {
+                    mobile: this.form1.mobile,
+                    type: 'bind',
+                },
+                success: (data) => {
+                    this.$message({
+                        message: "验证码已发送",
+                        type: 'success'
+                    })
+                    timeS = 60
+                    timer = setInterval(() => {
+                        timeS--
+                        if (timeS <= 0) {
+                            this.smsTips = "重新发送"
+                            this.stopTimer()
+                        } else {
+                            this.smsTips = timeS + "秒"
+                        }
+
+                    }, 1000)
+                }
+            });
+        },
+        stopTimer() {
+            if (timer != null) {
+                clearInterval(timer)
+                timer = null
+            }
+        },
+        loginSuccess() {
+            uni.reLaunch({url: '/'})
+        },
+        testForm() {
+            const {
+                mobile, // 手机号
+                smsCode, // 短信验证码4-8位
+                password, // 密码 6-20位
+                repassword, // 重复输入密码
+                nickname
+            } = this.form1;
+
+            // 手机号验证
+            if (!mobile || !/^1[3456789]\d{9}$/.test(mobile)) {
+                this.$message({
+                    message: '手机号为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 短信验证码验证
+            if (!smsCode || !/^\d{4,8}$/.test(smsCode)) {
+                // 短信验证码为空或格式不正确
+                // 处理错误逻辑
+                this.$message({
+                    message: '短信验证码为空或格式不正确',
+                    type: 'error'
+                })
+                return false
+            }
+
+            // 密码验证
+            if (!password || password.length < 6 || password.length > 20) {
+                // 密码为空或长度不符合要求
+                this.$message({
+                    message: '密码长度不符合要求',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+
+            // 重复输入密码验证
+            if (password !== repassword) {
+                // 两次输入的密码不一致
+                this.$message({
+                    message: '两次输入的密码不一致',
+                    type: 'error'
+                })
+                return false
+                // 处理错误逻辑
+            }
+
+            if (!nickname) {
+                return this.$message({
+                    message: '请输入' + (this.form1.accountType === 2 ? '公司名称' : '您的姓名'),
+                    type: 'error'
+                })
+            }
+            return true
+
+        },
+        async getInfo() {
+            const {content} = await vk.callFunction({
+                url: `client/otherArticle/list/pub/getDetail`,
+                data: {id: '65792dc8652341901b34a0bc'}
+            });
+            this.info = content
+            this.dialogVisible = true
+        }
+    },
+    async onLoad(options) {
+        // if (options.state && options.state.includes('jjx')) {
+        //     this.form1.accountType = parseInt(options.state.split('_')[1])
+        //     if (options.code) {
+        //         this.code = options.code
+        //         const {uid, type, mobileConfirmed} = await vk.callFunction({
+        //             url: 'user/pub/loginByWeixin',
+        //             data: {
+        //                 code: this.code,
+        //                 accountType: this.form1.accountType,
+        //             },
+        //         })
+        //         this.uid = uid
+        //         this.showBind = type === "register"
+        //         if (mobileConfirmed) this.loginSuccess()
+        //
+        //     } else {
+        //         this.showBind = !vk.getVuex('$user.userInfo.mobile')
+        //     }
+        // } else this.loginSuccess()
+    },
+    onUnload() {
+        if (timer != null) {
+            clearInterval(timer)
+            timer = null
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@charset "utf-8";
+
+.login-method {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    margin-bottom: 2px;
+
+    &-item {
+        color: #d0111a;
+        cursor: pointer;
+    }
+}
+
+
+.outter-wrapper {
+    background-color: #fff;
+}
+
+.zg-logo img {
+    width: 230px;
+    border: none;
+}
+
+.layout-common-footer {
+    text-align: center;
+    margin: 15px 0px 10px;
+}
+
+.layout-common-footer .copyright .link > a {
+    color: #666;
+    padding: 0 10px;
+    display: inline-block;
+    line-height: 2
+}
+
+.w-1180 {
+    width: 1200px;
+    margin: 0px auto;
+    box-sizing: border-box;
+}
+
+.flex-h-ac {
+    display: flex;
+    align-items: center;
+}
+
+.header {
+    height: 90px;
+}
+
+.main-container {
+    min-width: 1200px;
+    padding: 60px 0;
+    background: #e8f5fd url(/static/images/login-bg.jpg) 50% no-repeat;
+}
+
+.flex-h-e,
+.flex-h-e-ac {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+}
+
+.main-container .login-container {
+    height: 640px;
+    width: 350px;
+    box-sizing: border-box;
+    padding: 30px 35px 30px;
+    background-color: #fff;
+}
+
+.login-container h2 {
+    text-align: center;
+    line-height: 2;
+    color: #000;
+    font-size: 25px;
+    margin-bottom: 25px;
+}
+
+.btnMarymt {
+    height: 48px;
+    line-height: 48px;
+    background: #a92924;
+    color: #fff !important;
+    text-align: center;
+    width: 100%;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    font-size: 16px;
+    cursor: pointer;
+    text-align: center;
+}
+
+.btnMarymt:hover {
+    background: #f12d36
+}
+
+.input-group {
+    width: 100%;
+    height: 46px;
+}
+
+.input-group-addon {
+}
+
+.input-group .form-control {
+    flex: 1;
+    height: 100%;
+    border: none;
+    background: none;
+    margin-left: 12px;
+    outline: none;
+    font-size: 13px;
+    color: #333;
+}
+
+.input-group {
+    display: flex;
+    align-items: center;
+    border: 1px solid #d4d4d4;
+    margin-bottom: 15px;
+    position: relative;
+}
+
+.input-group-addon i {
+    background: url(/static/images/iconsmall.png) no-repeat center center;
+    width: 38px;
+    border-right: 1px solid #d4d4d4;
+    height: 26px;
+    overflow: hidden;
+    display: inline-block
+}
+
+.input-group-addon .icon_user {
+    background-position: -212px -35px;
+}
+
+.input-group-addon .icon_phone {
+    background-position: -212px -67px;
+}
+
+.input-group-addon .icon_password {
+    background-position: -212px -100px;
+}
+
+.input-group-addon .icon_yaoqingma {
+    background-position: -209px -318px;
+}
+
+.input-groupp {
+    width: 100%;
+}
+
+#btnSendCode1 {
+    position: absolute;
+    right: 1px;
+    top: 8px;
+    line-height: 31px;
+    color: #d0111a;
+    width: 79px;
+    text-align: center;
+    cursor: pointer;
+    border-left: 1px solid;
+    background: none;
+    font-size: 14px;
+}
+
+.input-group.focus {
+    background-color: #fff;
+    box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
+}
+
+.input-groupwp {
+    width: 100%;
+    text-align: center;
+    height: 60px;
+    line-height: 60px;
+    font-size: 14px;
+    margin-bottom: 10px;
+}
+
+.input-groupwpg a {
+    display: inline-block;
+}
+
+.input-groupwpg .dsf-wetChat i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -218px -132px;
+}
+
+.input-groupwpg .dsf-qq i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -216px -178px;
+    margin: 0px 24px;
+}
+
+.input-groupwpg .dsf-dx i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 50px;
+    height: 40px;
+    display: block;
+    background-position: -215px -224px;
+}
+
+.threeBorder {
+    position: relative;
+    text-align: center;
+
+}
+
+.threeBorder:after {
+    content: '';
+    position: absolute;
+    z-index: 0;
+    bottom: 10px;
+    left: 10px;
+    width: 95%;
+    height: 1px;
+    border-bottom: 1px solid #CCCCCC;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 100%;
+    transform-origin: 0 100%;
+}
+
+.threeBorder span {
+    color: #888888;
+    background: #fff;
+    width: 90px;
+    margin: 0 auto;
+    z-index: 1002;
+    position: relative;
+    display: block;
+}
+
+.input-groupwpg {
+    width: 100%;
+    text-align: center;
+    height: 48px;
+    font-size: 14px;
+    margin-top: 22px;
+
+}
+
+.login-con {
+    display: none;
+}
+
+.input-grouptabs span {
+    color: #666;
+    cursor: pointer;
+    font-size: 16px;
+    line-height: 23px;
+    font-weight: normal;
+    display: inline-block;
+    padding: 0px 18px;
+    text-align: center;
+    margin: 0px auto;
+}
+
+.input-grouptabs {
+    text-align: center;
+    margin: 0px auto 30px;
+    width: 100%;
+}
+
+.input-grouptabs i {
+    background: url(/static/images/iconsmall.png) no-repeat;
+    width: 25px;
+    height: 25px;
+    float: left;
+    margin-right: 5px;
+}
+
+.input-grouptabs .tab-active#normal i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs .tab-active#nopw i {
+    background-position: -218px -269px;
+}
+
+.input-grouptabs #normal i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs #nopw i {
+    background-position: -218px -293px;
+}
+
+.input-grouptabs span.tab-active {
+    color: #a92924
+}
+
+.active {
+    display: block;
+}
+
+.input-groupread {
+    height: 40px;
+    line-height: 30px;
+    width: 100%;
+    text-align: left;
+}
+
+.agreement_dialogs {
+    position: fixed;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+    text-align: center;
+    display: none;
+    background-color: rgba(35, 35, 35, 0.4);
+    -webkit-transition: all 0.5s linear;
+    transition: all 0.5s linear;
+}
+
+.agreement_dialogs .dialog_lay_1syd {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    display: inline-block;
+    width: 750px;
+    color: #656565;
+    font-size: 12px;
+    line-height: 20px;
+    background-color: #fff;
+    text-align: left;
+    vertical-align: middle;
+    -webkit-transition: all 0.2s linear;
+    transition: all 0.2s linear;
+}
+
+.agreement_dialogs .dialog_foot_1hHfr {
+    height: 80px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    border-top: 1px solid #d5d5d5;
+    margin: 0;
+    text-align: center;
+}
+
+.agreement_dialogs .dialog_minorBtn_1u8nf {
+    display: inline-block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px #316ccb solid;
+    padding: 0 30px;
+    height: 40px;
+    background: #a92924;
+    background: linear-gradient(90deg, #f0242e, #d0111a);
+    line-height: 40px;
+    cursor: pointer;
+    font-size: 16px;
+    vertical-align: top;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    color: #fff;
+    border-color: #fff;
+}
+
+.agreement_titley {
+    height: 55px;
+    line-height: 55px;
+    font-size: 16px;
+    color: #666;
+    text-align: center;
+    border-bottom: 1px solid #d5d5d5;
+    font-weight: 400;
+}
+
+.agreement_content {
+    margin: 23px 32px;
+}
+
+.con-subhead {
+    font-size: 14px;
+
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 16px;
+}
+
+.con-content {
+    height: 240px;
+    overflow-y: scroll;
+    line-height: 2;
+    font-size: 13px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/auth/register/register.vue b/pages/auth/register/register.vue
index 6776402..8ac4ed8 100644
--- a/pages/auth/register/register.vue
+++ b/pages/auth/register/register.vue
@@ -1,682 +1,782 @@
 <template>
-	<view>
-		<top-bar></top-bar>
-		<common-header></common-header>
-		<category-bar></category-bar>
-		<div class="outter-wrapper">
-			<div class="login-page">
-				<div class="main-container">
-					<div class="w-1180 flex-h-e">
-						<div class="login-container">
-							<h2 style="margin-bottom: 15px;">免费注册会员</h2>
-							<view id="from" action="">
-								<div class="input-grouptabs clear">
+  <view>
+    <top-bar></top-bar>
+<!--    <common-header></common-header>-->
+<!--    <category-bar></category-bar>-->
+    <div class="outter-wrapper">
+      <div class="login-page">
+        <div class="main-container" :style="registerPageStyle">
+          <div class="w-1180 flex-h-e">
+            <div class="login-container">
+              <h2 style="margin-bottom: 15px;">免费注册会员</h2>
+              <view id="from" action="">
+                <div class="input-grouptabs clear">
                                     <span @click="form1.accountType = 2"
-                                          :class="{'tab-active': form1.accountType === 2}" class="nopassword" data-id="1"
+                                          :class="{'tab-active': form1.accountType === 2}" class="nopassword"
+                                          data-id="1"
                                           id="nopw"><i></i>企业用户</span>
-									<span @click="form1.accountType = 1"
-										:class="{'tab-active': form1.accountType === 1}" class="normal" data-id="0"
-										id="normal"><i></i>个人用户</span>
-								</div>
-								<div class="tabContent">
-									<div class="login-con active" id="rc">
-										<div class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_user"></i>
-											</div>
-											<input v-model="form1.mobile" type="text" class="form-control" name="mobile"
-												placeholder="请输入手机号" autocomplete="off">
-										</div>
+                  <span @click="form1.accountType = 1"
+                        :class="{'tab-active': form1.accountType === 1}" class="normal" data-id="0"
+                        id="normal"><i></i>个人用户</span>
+                </div>
+                <div class="tabContent">
+                  <div class="login-con active" id="rc">
+                    <div v-show="form1.accountType == 1" class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_user"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.person.personName"
+                             placeholder="请输入姓名或昵称" autocomplete="off">
+                    </div>
+                    <div v-show="form1.accountType == 2" class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_user"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.company.companyName"
+                             placeholder="请输入公司名称" autocomplete="off">
+                    </div>
+                    <div class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_yaoqingma"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.inviteCode"
+                             placeholder="请输入邀请码，选填" autocomplete="off">
+                    </div>
+                    <div class="input-group clear" style="margin-bottom: 0">
+                      <div class="input-group-addon">
+                        <i class="icon_password"></i>
+                      </div>
+                      <input type="password" class="form-control" v-model="form1.password"
+                             name="password"
+                             placeholder="设置登录密码" autocomplete="off">
+                    </div>
+                    <p class="tips mb-15 text-gray">6~20位的数字、字母组合</p>
 
-										<div class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_phone"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.smsCode" name="smsCode"
-												placeholder="请输入短信验证码" autocomplete="off" />
-											<view @click="sendSmsCode" id="btnSendCode1" type="button"
-												class="btn-default" value="">{{smsTips}}</view>
+                    <div class="input-group clear" style="margin-bottom: 0">
+                      <div class="input-group-addon">
+                        <i class="icon_password"></i>
+                      </div>
+                      <input type="password" class="form-control" v-model="form1.repassword"
+                             placeholder="确认登录密码" autocomplete="off">
+                    </div>
+                    <p class="tips mb-15 text-gray">6~20位的数字、字母组合</p>
+                    <div class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_phone"></i>
+                      </div>
+                      <input v-model="form1.mobile" type="text" class="form-control" name="mobile"
+                             placeholder="请输入手机号" autocomplete="off">
+                    </div>
+                    <div class="input-group clear">
+                      <div class="input-group-addon">
+                        <i class="icon_phone"></i>
+                      </div>
+                      <input type="text" class="form-control" v-model="form1.smsCode"
+                             name="smsCode"
+                             placeholder="请输入短信验证码" autocomplete="off"/>
+                      <view @click="sendSmsCode" id="btnSendCode1" type="button"
+                            class="btn-default" value="">{{ smsTips }}
+                      </view>
+                    </div>
+                  </div>
+                </div>
+                <div class="input-groupread clear">
+                  <el-checkbox v-model="agree" @click.native="clickAgree"
+                               :disabled="!hasRead"></el-checkbox>
+                  <label class="ml-20">已阅读并同意<a href="javascript:;" style="display: inline-block;"
+                                                      @click="getInfo">
+                    <span style="color: #3288b2">《用户协议和隐私政策》</span></a></label>
+                </div>
+                <div class="input-groupp clear">
+                  <button @click="handleSubmit" type="button" class="btnMarymt"
+                          style="width: 100%;">立即免费注册
+                  </button>
+                </div>
+              </view>
+              <div class="input-groupwp clear">
+                <navigator url="/pages/auth/login/login">已有账号？<span
+                  style="color: #a92924">去登录</span></navigator>
+              </div>
+<!--              <div class=" threeBorder"><span>第三方登录</span></div>-->
 
-										</div>
-
-										<div class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_password"></i>
-											</div>
-											<input type="password" class="form-control" v-model="form1.password"  name="password"
-												placeholder="设置登录密码" autocomplete="off">
-										</div>
-
-										<div class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_password"></i>
-											</div>
-											<input type="password" class="form-control" v-model="form1.repassword"
-												placeholder="确认登录密码" autocomplete="off">
-										</div>
-										<div v-show="form1.accountType == 1" class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_yaoqingma"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.person.personName"
-												placeholder="请输入姓名" autocomplete="off">
-										</div>
-										<div v-show="form1.accountType == 2" class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_yaoqingma"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.company.companyName"
-												placeholder="请输入公司名称" autocomplete="off">
-										</div>
-										<div class="input-group clear">
-											<div class="input-group-addon">
-												<i class="icon_yaoqingma"></i>
-											</div>
-											<input type="text" class="form-control" v-model="form1.inviteCode"
-												placeholder="请输入邀请码，选填" autocomplete="off">
-										</div>
-									</div>
-								</div>
-								<div class="input-groupread clear">
-									<input id="check" type="checkbox" class="check" name="is_read">
-									<label>阅读并同意<a href="javascript:;" style="display: inline-block;"
-											id="register-xieyi">
-											<span style="color: #3288b2">《金久信注册协议》</span></a></label>
-								</div>
-								<div class="input-groupp clear">
-									<button @click="handleSubmit" type="button" class="btnMarymt"
-										style="width: 100%;">立即免费注册</button>
-								</div>
-							</view>
-							<div class="input-groupwp clear">
-								<navigator url="/pages/auth/login/login">已有账号？<span style="color: #a92924">去登录</span></navigator>
-							</div>
-						</div>
-					</div>
-				</div>
-
-			</div>
-		</div>
-	</view>
+<!--              <div class="input-groupwpg clear">-->
+<!--                <a href="javascript:;" @click="toWechat" class="dsf-wetChat" title="微信"><i></i></a>-->
+<!--                &lt;!&ndash;                                <a href="javascript:;" @click="toQQ" class="dsf-qq" title="QQ"><i></i></a>&ndash;&gt;-->
+<!--                &lt;!&ndash;                        <a href="" class="dsf-dx" title="短信"><i></i></a>&ndash;&gt;-->
+<!--              </div>-->
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <el-dialog title="" :visible.sync="dialogVisible" width="70%" :close-on-press-escape="false"
+               :close-on-click-modal="false" :show-close="false"
+    >
+      <div v-html="info"></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false;hasRead = true" :disabled="readCountDown > 0">确
+          定{{
+            readCountDown === 0 ? '' : `${readCountDown}秒`
+          }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
-	let timer = null
-	let timeS = 60
-	var vk = uni.vk;
-	export default {
-		data() {
-			return {
-				
-				smsTips: '点击获取',
-				form1: {
-					accountType: 2, // business 企业 、、personal个人
-					mobile: '',
-					smsCode: '',
-					password: '',
-					repassword: '',
-					inviteCode: '',
-					person: {
-						personName: ''
-					},
-					company: {
-						companyName: ''
-					}
-				}
-			};
-		},
-        onLoad(option){
-            if (option.code) this.form1.inviteCode = option.code
+let timer = null
+let timeS = 60
+var vk = uni.vk;
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      agree: false,
+      smsTips: '点击获取',
+      form1: {
+        accountType: 2, // business 企业 、、personal个人
+        mobile: '',
+        smsCode: '',
+        password: '',
+        repassword: '',
+        inviteCode: '',
+        person: {
+          personName: ''
         },
-		methods: {
-			sendSmsCode() {
-				if (timer != null) {
-					return
-				}
-				vk.userCenter.sendSmsCode({
-					loading: false,
-					data: {
-						mobile: this.form1.mobile,
-						type: 'register',
-					},
-					success: (data) => {
-						this.$message({
-							message: "验证码已发送",
-							type: 'success'
-						})
-						timeS = 60
-						timer = setInterval(() => {
-							timeS--
-							if (timeS <= 0) {
-								this.smsTips = "重新发送"
-								this.stopTimer()
-							} else {
-								this.smsTips = timeS + "秒"
-							}
+        company: {
+          companyName: ''
+        }
+      },
+      info: null,
+      hasRead: false,
+      registerBgImage: '',
+      readCountDown: 10,
+      readInterval: null
+    };
+  },
+  onLoad(option) {
+    if (option.code) this.form1.inviteCode = option.code
+    this.loadSiteConfig()
+  },
+  computed: {
+    registerPageStyle() {
+      return this.registerBgImage ? {backgroundImage: `url(${this.registerBgImage})`} : {}
+    }
+  },
+  methods: {
+    sendSmsCode() {
+      if (timer != null) {
+        return
+      }
+      vk.userCenter.sendSmsCode({
+        loading: false,
+        data: {
+          mobile: this.form1.mobile,
+          type: 'register',
+        },
+        success: (data) => {
+          this.$message({
+            message: "验证码已发送",
+            type: 'success'
+          })
+          timeS = 60
+          timer = setInterval(() => {
+            timeS--
+            if (timeS <= 0) {
+              this.smsTips = "重新发送"
+              this.stopTimer()
+            } else {
+              this.smsTips = timeS + "秒"
+            }
+          }, 1000)
+        }
+      });
+    },
+    handleSubmit() {
+      if (!this.agree) {
+        this.$message({
+          message: '请先阅读并同意《用户协议和隐私政策》',
+          type: 'warning'
+        })
+      } else {
+        if (this.testForm()) {
+          const {
+            mobile, // 手机号
+            smsCode, // 短信验证码4-8位
+            password, // 密码 6-20位
+            repassword, // 重复输入密码
+            inviteCode, // 邀请码
+            accountType,
+            company,
+            person
+          } = this.form1
 
-						}, 1000)
-					}
-				});
-			},
-			handleSubmit() {
-				if (this.testForm()) {
-					const {
-						mobile, // 手机号
-						smsCode, // 短信验证码4-8位
-						password, // 密码 6-20位
-						repassword, // 重复输入密码
-						inviteCode, // 邀请码
-						accountType,
-						company,
-						person
-					} = this.form1
+          vk.userCenter.loginBySms({
+            data: {
+              type: 'register',
+              mobile: mobile,
+              code: smsCode,
+              password,
+              inviteCode,
+              accountType,
+              company,
+              person,
+              isSignOnly: true
+            },
+            success: (data) => {
+              uni.reLaunch({
+                url: '/'
+              })
 
-					vk.userCenter.loginBySms({
-						data: {
-							type: 'register',
-							mobile: mobile,
-							code: smsCode,
-							password,
-							inviteCode,
-							accountType,
-							company,
-							person
-							
-						},
-						success: (data) => {
-							uni.reLaunch({
-								url: '/'
-							})
+            }
+          });
+        }
+      }
+    },
+    testForm() {
+      const {
+        mobile, // 手机号
+        smsCode, // 短信验证码4-8位
+        password, // 密码 6-20位
+        repassword, // 重复输入密码
+        inviteCode, // 邀请码
+        accountType,
+        company,
+        person
+      } = this.form1;
 
-						}
-					});
-				}
+      // 手机号验证
+      if (!mobile || !/^1[3456789]\d{9}$/.test(mobile)) {
+        this.$message({
+          message: '手机号为空或格式不正确',
+          type: 'error'
+        })
+        return false
+      }
 
-			},
-			testForm() {
-				const {
-					mobile, // 手机号
-					smsCode, // 短信验证码4-8位
-					password, // 密码 6-20位
-					repassword, // 重复输入密码
-					inviteCode, // 邀请码
-					accountType,
-					company,
-					person
-				} = this.form1;
+      // 短信验证码验证
+      if (!smsCode || !/^\d{4,8}$/.test(smsCode)) {
+        // 短信验证码为空或格式不正确
+        // 处理错误逻辑
+        this.$message({
+          message: '短信验证码为空或格式不正确',
+          type: 'error'
+        })
+        return false
+      }
 
-				// 手机号验证
-				if (!mobile || !/^1[3456789]\d{9}$/.test(mobile)) {
-					this.$message({
-						message: '手机号为空或格式不正确',
-						type: 'error'
-					})
-					return false
-				}
+      // 密码验证
+      if (!password || password.length < 6 || password.length > 20) {
+        // 密码为空或长度不符合要求
+        this.$message({
+          message: '密码长度不符合要求',
+          type: 'error'
+        })
+        return false
+        // 处理错误逻辑
+      }
 
-				// 短信验证码验证
-				if (!smsCode || !/^\d{4,8}$/.test(smsCode)) {
-					// 短信验证码为空或格式不正确
-					// 处理错误逻辑
-					this.$message({
-						message: '短信验证码为空或格式不正确',
-						type: 'error'
-					})
-					return false
-				}
+      const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]+$/
+      if (!reg.test(password)) {
+        this.$message({
+          message: '密码必须由数字和字母组成',
+          type: 'error'
+        })
+        return false
+      }
 
-				// 密码验证
-				if (!password || password.length < 6 || password.length > 20) {
-					// 密码为空或长度不符合要求
-					this.$message({
-						message: '密码长度不符合要求',
-						type: 'error'
-					})
-					return false
-					// 处理错误逻辑
-				}
+      // 重复输入密码验证
+      if (password !== repassword) {
+        // 两次输入的密码不一致
+        this.$message({
+          message: '两次输入的密码不一致',
+          type: 'error'
+        })
+        return false
+        // 处理错误逻辑
+      }
 
-				// 重复输入密码验证
-				if (password !== repassword) {
-					// 两次输入的密码不一致
-					this.$message({
-						message: '两次输入的密码不一致',
-						type: 'error'
-					})
-					return false
-					// 处理错误逻辑
-				}
-				
-				if(accountType == 1 && !person.personName) {
-					this.$message({
-						message: '请输入姓名',
-						type: 'error'
-					})
-					return false
-				}
-				
-				if(accountType == 2 && !company.companyName) {
-					this.$message({
-						message: '请输入公司名称',
-						type: 'error'
-					})
-					return false
-				}
-				
+      if (accountType == 1 && !person.personName) {
+        this.$message({
+          message: '请输入姓名',
+          type: 'error'
+        })
+        return false
+      }
 
-				return true
+      if (accountType == 2 && !company.companyName) {
+        this.$message({
+          message: '请输入公司名称',
+          type: 'error'
+        })
+        return false
+      }
 
-			},
-			stopTimer() {
-				if (timer != null) {
-					clearInterval(timer)
-					timer = null
-				}
-			
-			},
-		},
-		onUnload() {
-			if (timer != null) {
-				clearInterval(timer)
-				timer = null
-			}
-		}
-	}
+
+      return true
+
+    },
+    stopTimer() {
+      if (timer != null) {
+        clearInterval(timer)
+        timer = null
+      }
+    },
+    async loadSiteConfig() {
+      try {
+        const {data = {}} = await vk.callFunction({
+          url: 'client/site_config/pub/detail',
+          loading: false
+        })
+        this.registerBgImage = data.registerSignPcBgImage || ''
+      } catch (e) {
+        this.registerBgImage = ''
+      }
+    },
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
+    },
+    async getInfo() {
+      const {content} = await vk.callFunction({
+        url: `client/otherArticle/list/pub/getDetail`,
+        data: {id: 'adea4666684a336402937a2c5dcc448e'}
+      });
+      this.info = content
+      this.dialogVisible = true
+      this.readCountDown = 10
+      this.readInterval = setInterval(() => {
+        this.readCountDown--
+        if (this.readCountDown <= 0) {
+          clearInterval(this.readInterval)
+        }
+      }, 1000)
+    },
+    clickAgree(check) {
+      if (check && !this.hasRead) {
+        this.agree = false
+        return this.$message.error('请先阅读并同意《用户协议和隐私政策》')
+      }
+    },
+    async toWechat() {
+      const redirect_uri = 'https://www.jinjiuxinzg.cn/#/pages/auth/login/wechat'
+      // const redirect_uri = 'https://tcb-nnexmh3j3i5hwh5-7caw62c422be-1252168680.tcloudbaseapp.com/#/pages/auth/login/wechat_test'
+      const state = `jjx_` + (this.memberType === 'business' ? 2 : 1)
+      let url = 'https://open.weixin.qq.com/connect/qrconnect?appid=wxf44c1b32124fe1d5'
+      url += '&redirect_uri=' + encodeURIComponent(redirect_uri)
+      url += `&response_type=code&scope=snsapi_login&state=${state}#wechat_redirect`
+      window.location.href = url
+    }
+  },
+  onUnload() {
+    if (timer != null) {
+      clearInterval(timer)
+      timer = null
+    }
+  }
+}
 </script>
 
 <style lang="scss">
-	@charset "utf-8";
+@charset "utf-8";
 
-	.zg-logo img {
-		width: 230px;
-		border: none;
-	}
+.zg-logo img {
+  width: 230px;
+  border: none;
+}
 
-	.layout-common-footer {
-		text-align: center;
-		margin: 15px 0px 10px;
-	}
+.layout-common-footer {
+  text-align: center;
+  margin: 15px 0px 10px;
+}
 
-	.layout-common-footer .copyright .link>a {
-		color: #666;
-		padding: 0 10px;
-		display: inline-block;
-		line-height: 2
-	}
+.layout-common-footer .copyright .link > a {
+  color: #666;
+  padding: 0 10px;
+  display: inline-block;
+  line-height: 2
+}
 
-	.w-1180 {
-		width: 1200px;
-		margin: 0px auto;
-		box-sizing: border-box;
-	}
+.w-1180 {
+  width: 1200px;
+  margin: 0px auto;
+  box-sizing: border-box;
+}
 
-	.flex-h-ac {
-		display: flex;
-		align-items: center;
-	}
+.flex-h-ac {
+  display: flex;
+  align-items: center;
+}
 
-	.header {
-		height: 90px;
-	}
+.header {
+  height: 90px;
+}
 
-	.main-container {
-		min-width: 1200px;
-		padding: 60px 0;
-		background: #e8f5fd url(/static/images/login-bg.jpg)50% no-repeat;
-	}
+.main-container {
+  min-width: 1200px;
+  padding: 60px 0;
+  background: #5499CE url('@/static/images/logo-bg.jpg') no-repeat;
+  //background-size: 1920px 990px;
+  background-size: cover;
+  background-position: center center;
+  min-height: calc(100vh - 80px);
+}
 
-	.flex-h-e,
-	.flex-h-e-ac {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-end;
-	}
+.flex-h-e,
+.flex-h-e-ac {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
 
-	.main-container .login-container {
-		width: 350px;
-		box-sizing: border-box;
-		padding: 30px 35px 30px;
-		background-color: #fff;
-	}
+.main-container .login-container {
+  width: 350px;
+  box-sizing: border-box;
+  padding: 30px 35px 30px;
+  background-color: #fff;
+}
 
-	.login-container h2 {
-		text-align: center;
-		line-height: 2;
-		color: #000;
-		font-size: 25px;
-		margin-bottom: 25px;
-	}
+.login-container h2 {
+  text-align: center;
+  line-height: 2;
+  color: #000;
+  font-size: 25px;
+  margin-bottom: 25px;
+}
 
-	.btnMarymt {
-		height: 48px;
-		line-height: 48px;
-		background: #a92924;
-		color: #fff !important;
-		text-align: center;
-		width: 100%;
-		background: linear-gradient(90deg, #f0242e, #d0111a);
-		font-size: 16px;
-		cursor: pointer;
-		text-align: center;
-	}
+.btnMarymt {
+  height: 48px;
+  line-height: 48px;
+  background: #a92924;
+  color: #fff !important;
+  text-align: center;
+  width: 100%;
+  background: linear-gradient(90deg, #f0242e, #d0111a);
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
 
-	.btnMarymt:hover {
-		background: #f12d36
-	}
+.btnMarymt:hover {
+  background: #f12d36
+}
 
-	.input-group {
-		width: 100%;
-		height: 46px;
-	}
+.input-group {
+  width: 100%;
+  height: 46px;
+}
 
-	.input-group-addon {}
+.input-group-addon {
+}
 
-	.input-group .form-control {
-		flex: 1;
-		height: 100%;
-		border: none;
-		background: none;
-		margin-left: 12px;
-		outline: none;
-		font-size: 13px;
-		color: #333;
-	}
+.input-group .form-control {
+  flex: 1;
+  height: 100%;
+  border: none;
+  background: none;
+  margin-left: 12px;
+  outline: none;
+  font-size: 13px;
+  color: #333;
+}
 
-	.input-group {
-		display: flex;
-		align-items: center;
-		border: 1px solid #d4d4d4;
-		margin-bottom: 15px;
-		position: relative;
-	}
+.input-group {
+  display: flex;
+  align-items: center;
+  border: 1px solid #d4d4d4;
+  margin-bottom: 15px;
+  position: relative;
+}
 
-	.input-group-addon i {
-		background: url(/static/images/iconsmall.png)no-repeat center center;
-		width: 38px;
-		border-right: 1px solid #d4d4d4;
-		height: 26px;
-		overflow: hidden;
-		display: inline-block
-	}
+.input-group-addon i {
+  background: url('@/static/images/iconsmall.png') no-repeat center center;
+  width: 38px;
+  border-right: 1px solid #d4d4d4;
+  height: 26px;
+  overflow: hidden;
+  display: inline-block
+}
 
-	.input-group-addon .icon_user {
-		background-position: -212px -35px;
-	}
+.input-group-addon .icon_user {
+  background-position: -212px -35px;
+}
 
-	.input-group-addon .icon_phone {
-		background-position: -212px -67px;
-	}
+.input-group-addon .icon_phone {
+  background-position: -212px -67px;
+}
 
-	.input-group-addon .icon_password {
-		background-position: -212px -100px;
-	}
+.input-group-addon .icon_password {
+  background-position: -212px -100px;
+}
 
-	.input-group-addon .icon_yaoqingma {
-		background-position: -209px -318px;
-	}
+.input-group-addon .icon_yaoqingma {
+  background-position: -209px -318px;
+}
 
-	.input-groupp {
-		width: 100%;
-	}
+.input-groupp {
+  width: 100%;
+}
 
-	#btnSendCode1 {
-		position: absolute;
-		right: 1px;
-		top: 8px;
-		line-height: 31px;
-		color: #d0111a;
-		width: 79px;
-		text-align: center;
-		cursor: pointer;
-		border-left: 1px solid;
-		background: none;
-		font-size: 14px;
-	}
+#btnSendCode1 {
+  position: absolute;
+  right: 1px;
+  top: 8px;
+  line-height: 31px;
+  color: #d0111a;
+  width: 79px;
+  text-align: center;
+  cursor: pointer;
+  border-left: 1px solid;
+  background: none;
+  font-size: 14px;
+}
 
-	.input-group.focus {
-		background-color: #fff;
-		box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
-	}
+.input-group.focus {
+  background-color: #fff;
+  box-shadow: 0 2px 11px 0 rgba(0, 0, 0, .04)
+}
 
-	.input-groupwp {
-		width: 100%;
-		text-align: center;
-		height: 60px;
-		line-height: 60px;
-		font-size: 14px;
-		margin-bottom: 10px;
-	}
+.input-groupwp {
+  width: 100%;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+  font-size: 14px;
+  margin-bottom: 10px;
+}
 
-	.input-groupwpg a {
-		display: inline-block;
-	}
+.input-groupwpg a {
+  display: inline-block;
+}
 
-	.input-groupwpg .dsf-wetChat i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 50px;
-		height: 40px;
-		display: block;
-		background-position: -218px -132px;
-	}
+.input-groupwpg .dsf-wetChat i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 50px;
+  height: 40px;
+  display: block;
+  background-position: -218px -132px;
+}
 
-	.input-groupwpg .dsf-qq i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 50px;
-		height: 40px;
-		display: block;
-		background-position: -216px -178px;
-		margin: 0px 24px;
-	}
+.input-groupwpg .dsf-qq i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 50px;
+  height: 40px;
+  display: block;
+  background-position: -216px -178px;
+  margin: 0px 24px;
+}
 
-	.input-groupwpg .dsf-dx i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 50px;
-		height: 40px;
-		display: block;
-		background-position: -215px -224px;
-	}
+.input-groupwpg .dsf-dx i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 50px;
+  height: 40px;
+  display: block;
+  background-position: -215px -224px;
+}
 
-	.threeBorder {
-		position: relative;
-		text-align: center;
+.threeBorder {
+  position: relative;
+  text-align: center;
 
-	}
+}
 
-	.threeBorder:after {
-		content: '';
-		position: absolute;
-		z-index: 0;
-		bottom: 10px;
-		left: 10px;
-		width: 95%;
-		height: 1px;
-		border-bottom: 1px solid #CCCCCC;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		-webkit-transform-origin: 0 100%;
-		transform-origin: 0 100%;
-	}
+.threeBorder:after {
+  content: '';
+  position: absolute;
+  z-index: 0;
+  bottom: 10px;
+  left: 10px;
+  width: 95%;
+  height: 1px;
+  border-bottom: 1px solid #CCCCCC;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  -webkit-transform-origin: 0 100%;
+  transform-origin: 0 100%;
+}
 
-	.threeBorder span {
-		color: #888888;
-		background: #fff;
-		width: 90px;
-		margin: 0 auto;
-		z-index: 1002;
-		position: relative;
-		display: block;
-	}
+.threeBorder span {
+  color: #888888;
+  background: #fff;
+  width: 90px;
+  margin: 0 auto;
+  z-index: 1002;
+  position: relative;
+  display: block;
+}
 
-	.input-groupwpg {
-		width: 100%;
-		text-align: center;
-		height: 48px;
-		font-size: 14px;
-		margin-top: 22px;
+.input-groupwpg {
+  width: 100%;
+  text-align: center;
+  height: 48px;
+  font-size: 14px;
+  margin-top: 22px;
 
-	}
+}
 
-	.login-con {
-		display: none;
-	}
+.login-con {
+  display: none;
+}
 
-	.input-grouptabs span {
-		color: #666;
-		cursor: pointer;
-		font-size: 16px;
-		line-height: 23px;
-		font-weight: normal;
-		display: inline-block;
-		padding: 0px 18px;
-		text-align: center;
-		margin: 0px auto;
-	}
+.input-grouptabs span {
+  color: #666;
+  cursor: pointer;
+  font-size: 16px;
+  line-height: 23px;
+  font-weight: normal;
+  display: inline-block;
+  padding: 0px 18px;
+  text-align: center;
+  margin: 0px auto;
+}
 
-	.input-grouptabs {
-		text-align: center;
-		margin: 0px auto 30px;
-		width: 100%;
-	}
+.input-grouptabs {
+  text-align: center;
+  margin: 0px auto 30px;
+  width: 100%;
+}
 
-	.input-grouptabs i {
-		background: url(/static/images/iconsmall.png)no-repeat;
-		width: 25px;
-		height: 25px;
-		float: left;
-		margin-right: 5px;
-	}
+.input-grouptabs i {
+  background: url('@/static/images/iconsmall.png') no-repeat;
+  width: 25px;
+  height: 25px;
+  float: left;
+  margin-right: 5px;
+}
 
-	.input-grouptabs .tab-active#normal i {
-		background-position: -218px -269px;
-	}
+.input-grouptabs .tab-active#normal i {
+  background-position: -218px -269px;
+}
 
-	.input-grouptabs .tab-active#nopw i {
-		background-position: -218px -269px;
-	}
+.input-grouptabs .tab-active#nopw i {
+  background-position: -218px -269px;
+}
 
-	.input-grouptabs #normal i {
-		background-position: -218px -293px;
-	}
+.input-grouptabs #normal i {
+  background-position: -218px -293px;
+}
 
-	.input-grouptabs #nopw i {
-		background-position: -218px -293px;
-	}
+.input-grouptabs #nopw i {
+  background-position: -218px -293px;
+}
 
-	.input-grouptabs span.tab-active {
-		color: #a92924
-	}
+.input-grouptabs span.tab-active {
+  color: #a92924
+}
 
-	.active {
-		display: block;
-	}
+.active {
+  display: block;
+}
 
-	.input-groupread {
-		height: 40px;
-		line-height: 30px;
-		width: 100%;
-		text-align: left;
-	}
+.input-groupread {
+  //height: 40px;
+  line-height: 30px;
+  width: 100%;
+  text-align: left;
+}
 
-	.agreement_dialogs {
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		right: 0px;
-		bottom: 0px;
-		width: 100%;
-		height: 100%;
-		z-index: 99999;
-		text-align: center;
-		display: none;
-		background-color: rgba(35, 35, 35, 0.4);
-		-webkit-transition: all 0.5s linear;
-		transition: all 0.5s linear;
-	}
+.agreement_dialogs {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  width: 100%;
+  height: 100%;
+  z-index: 99999;
+  text-align: center;
+  display: none;
+  background-color: rgba(35, 35, 35, 0.4);
+  -webkit-transition: all 0.5s linear;
+  transition: all 0.5s linear;
+}
 
-	.agreement_dialogs .dialog_lay_1syd {
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		display: inline-block;
-		width: 750px;
-		color: #656565;
-		font-size: 12px;
-		line-height: 20px;
-		background-color: #fff;
-		text-align: left;
-		vertical-align: middle;
-		-webkit-transition: all 0.2s linear;
-		transition: all 0.2s linear;
-	}
+.agreement_dialogs .dialog_lay_1syd {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  display: inline-block;
+  width: 750px;
+  color: #656565;
+  font-size: 12px;
+  line-height: 20px;
+  background-color: #fff;
+  text-align: left;
+  vertical-align: middle;
+  -webkit-transition: all 0.2s linear;
+  transition: all 0.2s linear;
+}
 
-	.agreement_dialogs .dialog_foot_1hHfr {
-		height: 80px;
-		display: -webkit-box;
-		display: -ms-flexbox;
-		display: flex;
-		-webkit-box-align: center;
-		-ms-flex-align: center;
-		align-items: center;
-		-webkit-box-pack: center;
-		-ms-flex-pack: center;
-		justify-content: center;
-		border-top: 1px solid #d5d5d5;
-		margin: 0;
-		text-align: center;
-	}
+.agreement_dialogs .dialog_foot_1hHfr {
+  height: 80px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  border-top: 1px solid #d5d5d5;
+  margin: 0;
+  text-align: center;
+}
 
-	.agreement_dialogs .dialog_minorBtn_1u8nf {
-		display: inline-block;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		border: 1px #316ccb solid;
-		padding: 0 30px;
-		height: 40px;
-		background: #a92924;
-		background: linear-gradient(90deg, #f0242e, #d0111a);
-		line-height: 40px;
-		cursor: pointer;
-		font-size: 16px;
-		vertical-align: top;
-		-webkit-user-select: none;
-		-moz-user-select: none;
-		-ms-user-select: none;
-		user-select: none;
-		color: #fff;
-		border-color: #fff;
-	}
+.agreement_dialogs .dialog_minorBtn_1u8nf {
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px #316ccb solid;
+  padding: 0 30px;
+  height: 40px;
+  background: #a92924;
+  background: linear-gradient(90deg, #f0242e, #d0111a);
+  line-height: 40px;
+  cursor: pointer;
+  font-size: 16px;
+  vertical-align: top;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  color: #fff;
+  border-color: #fff;
+}
 
-	.agreement_titley {
-		height: 55px;
-		line-height: 55px;
-		font-size: 16px;
-		color: #666;
-		text-align: center;
-		border-bottom: 1px solid #d5d5d5;
-		font-weight: 400;
-	}
+.agreement_titley {
+  height: 55px;
+  line-height: 55px;
+  font-size: 16px;
+  color: #666;
+  text-align: center;
+  border-bottom: 1px solid #d5d5d5;
+  font-weight: 400;
+}
 
-	.agreement_content {
-		margin: 23px 32px;
-	}
+.agreement_content {
+  margin: 23px 32px;
+}
 
-	.con-subhead {
-		font-size: 14px;
+.con-subhead {
+  font-size: 14px;
 
-		font-weight: 500;
-		color: #333;
-		margin-bottom: 16px;
-	}
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 16px;
+}
 
-	.con-content {
-		height: 240px;
-		overflow-y: scroll;
-		line-height: 2;
-		font-size: 13px;
-	}
+.con-content {
+  height: 240px;
+  overflow-y: scroll;
+  line-height: 2;
+  font-size: 13px;
+}
 
-	#btnSendCode1 {
-		cursor: pointer;
-	}
-</style>
\ No newline at end of file
+#btnSendCode1 {
+  cursor: pointer;
+}
+</style>
diff --git a/pages/contract/certificate.vue b/pages/contract/certificate.vue
new file mode 100644
index 0000000..5522a09
--- /dev/null
+++ b/pages/contract/certificate.vue
@@ -0,0 +1,439 @@
+<template>
+  <view class="">
+    <top-bar></top-bar>
+    <common-nav></common-nav>
+    <view class="w-1200">
+      <view class="certificate-container bg-white p-20">
+        <!-- 申请表格 -->
+        <div v-html="content"></div>
+
+        <!-- 出证样板选择 -->
+        <view class="form-item mb-20">
+          <view class="form-label">出证样板查看</view>
+        </view>
+
+        <!-- 出证方式 -->
+        <view class="form-item mb-20">
+          <view class="form-label">出证方式</view>
+          <view class="form-content">
+            <el-radio v-model="form.certificateType" label="normal">（正常）出证时效({{ amount }}元/份)</el-radio>
+            <el-radio v-model="form.certificateType" label="urgent">（加急）出证时效({{
+                urgentAmount
+              }}元/份)
+            </el-radio>
+          </view>
+        </view>
+
+        <!-- 发票类型 -->
+        <view class="form-item mb-20">
+          <view class="form-label">发票类型</view>
+          <view class="form-content">
+            <el-radio v-model="form.invoiceTypes" label="none">无需开具发票</el-radio>
+            <el-radio v-model="form.invoiceTypes" label="electronic">增值税专用发票（电子发票）</el-radio>
+            <el-radio v-model="form.invoiceTypes" label="normal">普票（电子发票）</el-radio>
+          </view>
+        </view>
+
+        <!-- 发票抬头 -->
+        <template v-if="form.invoiceTypes !== 'none'">
+          <view class="form-item mb-20">
+            <view class="form-label">发票抬头</view>
+            <view class="form-content">
+              <el-form :model="form.invoice" label-width="100px">
+                <el-form-item label="名称:" required>
+                  <el-input v-model="form.invoice.companyName" placeholder="请输入企业名称或个人姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="税号/证号:" required>
+                  <el-input v-model="form.invoice.taxNumber" placeholder="请输入税号或身份证号"></el-input>
+                </el-form-item>
+                <el-form-item label="开户行:">
+                  <el-input v-model="form.invoice.bankName"></el-input>
+                </el-form-item>
+                <el-form-item label="开户账号:">
+                  <el-input v-model="form.invoice.bankAccount"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话:" required>
+                  <el-input v-model="form.invoice.phone"></el-input>
+                </el-form-item>
+              </el-form>
+            </view>
+          </view>
+
+          <!-- 电子发票接收信息 -->
+          <!--          <view class="form-item mb-20">-->
+          <!--            <view class="form-label">电子发票接收信息</view>-->
+          <!--            <view class="form-content">-->
+          <!--              <el-form :model="form.electronicInvoice" label-width="100px">-->
+          <!--                <el-form-item label="收票人:" required>-->
+          <!--                  <el-input v-model="form.electronicInvoice.receiver"></el-input>-->
+          <!--                </el-form-item>-->
+          <!--                <el-form-item label="手机号码:" required>-->
+          <!--                  <el-input v-model="form.electronicInvoice.phone"></el-input>-->
+          <!--                </el-form-item>-->
+          <!--                <el-form-item label="邮箱:" required>-->
+          <!--                  <el-input v-model="form.electronicInvoice.email"></el-input>-->
+          <!--                </el-form-item>-->
+          <!--              </el-form>-->
+          <!--            </view>-->
+          <!--          </view>-->
+        </template>
+        <!-- 出证交付方式 -->
+        <view class="form-item mb-20">
+          <view class="form-label">出证交付方式</view>
+          <view class="form-content">
+            <el-checkbox v-model="form.deliveryMethods.electronic" @change="selectEle">电子</el-checkbox>
+            <!--            <el-form v-if="form.deliveryMethods.electronic" :model="form.electronicDelivery" label-width="100px">-->
+            <!--              <el-form-item label="收件人姓名:" class="required">-->
+            <!--                <el-input v-model="form.electronicDelivery.receiver"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--              <el-form-item label="手机号码:" class="required">-->
+            <!--                <el-input v-model="form.electronicDelivery.phone"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--              <el-form-item label="收件邮箱:" class="required">-->
+            <!--                <el-input v-model="form.electronicDelivery.email"></el-input>-->
+            <!--              </el-form-item>-->
+            <!--            </el-form>-->
+
+            <el-checkbox v-model="form.deliveryMethods.paper" @change="selectPaper">纸质邮寄</el-checkbox>
+            <el-form v-if="form.deliveryMethods.paper" :model="form.paperDelivery" label-width="100px">
+              <el-form-item label="收件人姓名:" class="required">
+                <el-input v-model="form.paperDelivery.receiver"></el-input>
+              </el-form-item>
+              <el-form-item label="手机号码:" class="required">
+                <el-input v-model="form.paperDelivery.phone"></el-input>
+              </el-form-item>
+              <el-form-item label="收件地址:" class="required">
+                <el-input v-model="form.paperDelivery.address" placeholder="请输入详细地址"></el-input>
+              </el-form-item>
+            </el-form>
+          </view>
+        </view>
+
+        <!-- 支付方式 -->
+        <view class="form-item mb-20">
+          <view class="form-label">支付方式</view>
+          <view class="form-content">
+            <el-radio v-model="form.paymentMethod" label="online">在线支付</el-radio>
+            <el-radio v-model="form.paymentMethod" label="advance">公对公支付</el-radio>
+          </view>
+        </view>
+        <view v-if="form.paymentMethod === 'advance'" v-html="bankAccount"></view>
+        <!-- 提交按钮 -->
+        <view class="text-center mb-20">
+          <el-button type="primary" @click="submitForm" v-if="form.paymentMethod === 'online'">提交支付</el-button>
+          <vk-data-upload v-else v-model="form.payVoucher" :cloudPathRemoveChinese="false" list-type="text"
+                          :limit="1" button-text="上传付款记录"
+                          accept=".jpg,.jpeg,.png" :on-success="uploadSuccess" ref="uploader"
+                          :show-file-list="false">
+          </vk-data-upload>
+        </view>
+
+        <!-- 客服电话 -->
+        <view class="text-center">
+          <view class="service-phone">客服电话：400 686 5559</view>
+        </view>
+      </view>
+    </view>
+    <common-footer></common-footer>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {
+        sampleSelected: false,
+        paidConfirm: false,
+        hasReport: false,
+        certificateType: 'normal',
+        lawPrice: '100',
+        agreementPrice: '150',
+        invoiceTypes: 'none',
+        invoice: {
+          companyName: '',
+          taxNumber: '',
+          bankName: '',
+          bankAccount: '',
+          phone: ''
+        },
+        electronicInvoice: {
+          receiver: '',
+          phone: '',
+          email: ''
+        },
+        deliveryMethods: {
+          electronic: true,
+          paper: false
+        },
+        electronicDelivery: {
+          receiver: '',
+          phone: '',
+          email: ''
+        },
+        paperDelivery: {
+          receiver: '',
+          phone: '',
+          address: ''
+        },
+        paymentMethod: 'online',
+        payVoucher: ''
+      },
+      contractId: null,
+      transactionId: null,
+      amount: null,
+      urgentAmount: null,
+      content: null,
+      bankAccount: null,
+
+    }
+  },
+  onLoad({contractId, transactionId,}) {
+    this.contractId = contractId;
+    this.transactionId = transactionId;
+    this.getContent()
+    this.getAmount()
+    this.getUrgentAmount()
+    this.getUserInfo()
+    this.getBankAccount()
+  },
+  methods: {
+    async getUserInfo() {
+      const {userInfo} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      this.form.invoice.companyName = userInfo.accountType === 2 ? userInfo.company.companyName : userInfo.person.personName
+      this.form.invoice.taxNumber = userInfo.accountType === 2 ? userInfo.company.organization : userInfo.person.idCard
+      this.form.invoice.phone = userInfo.accountType === 2 ? userInfo.company.mobile : userInfo.person.mobile
+    },
+    async getContent() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'e647148e684a458a0295b0a239c3d539'
+        },
+      })
+      this.content = res.content
+    },
+    async getAmount() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'd77d384f684a47b6029a135220ecf4c9'
+        },
+      })
+      this.amount = res.content
+    },
+    async getUrgentAmount() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '8524406c684a47c402985cb55941b3cb'
+        },
+      })
+      this.urgentAmount = res.content
+    },
+    uploadSuccess(response, file, fileList) {
+      this.form.payVoucher = response.url;
+      this.submitForm()
+    },
+    submitForm() {
+      // 表单验证
+      if (!this.validateForm()) {
+        return;
+      }
+      if (this.form.certificateType === 'normal') {
+        this.form.amount = this.amount;
+      } else {
+        this.form.amount = this.urgentAmount;
+      }
+      this.$confirm(`司法调证服务需向数据中心付费(${this.form.amount}元/次),是否继续？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        // 提交表单
+        this.form.contractId = this.contractId;
+        this.form.contractNo = this.transactionId;
+        vk.callFunction({
+          url: 'client/contract/kh/certificateAdd',
+          title: '提交中...',
+          data: this.form,
+          success: async (res) => {
+            this.$message({
+              message: '申请提交成功',
+              type: 'success'
+            });
+            if (this.form.paymentMethod === 'online') {
+              const {data} = await vk.callFunction({
+                url: 'client/contract/kh/buy',
+                title: '请求中...',
+                data: {
+                  contractId: this.contractId,
+                  contractNo: this.transactionId,
+                  amount: this.form.amount
+                },
+              })
+              vk.navigateTo({
+                url: `/pages/index/shop/pay?id=${data}`
+              })
+            } else {
+              this.$message({
+                message: '请等待后台审核',
+                type: 'success'
+              });
+              setTimeout(() => {
+
+                vk.navigateTo({
+                  url: `/pages/contract/index?tab=2`
+                })
+              }, 1500)
+            }
+          }
+        });
+      })
+    },
+    validateForm() {
+      // 验证必填项
+      // if (this.form.deliveryMethods.electronic) {
+      //   if (!this.form.electronicDelivery.receiver) {
+      //     this.$message.error('请填写电子发送邮箱的收件人姓名');
+      //     return false;
+      //   }
+      //   if (!this.form.electronicDelivery.phone) {
+      //     this.$message.error('请填写电子发送邮箱的手机号码');
+      //     return false;
+      //   }
+      //   if (!this.form.electronicDelivery.email) {
+      //     this.$message.error('请填写电子发送邮箱的收件邮箱');
+      //     return false;
+      //   }
+      // }
+
+      if (this.form.deliveryMethods.paper) {
+        if (!this.form.paperDelivery.receiver) {
+          this.$message.error('请填写纸质邮寄的收件人姓名');
+          return false;
+        }
+        if (!this.form.paperDelivery.phone) {
+          this.$message.error('请填写纸质邮寄的手机号码');
+          return false;
+        }
+        if (!this.form.paperDelivery.address) {
+          this.$message.error('请填写纸质邮寄的收件地址');
+          return false;
+        }
+      }
+      return true;
+    },
+    selectEle(e) {
+      if (e) {
+        this.form.deliveryMethods.electronic = true;
+        this.form.deliveryMethods.paper = false;
+      } else {
+        this.form.deliveryMethods.electronic = false;
+        this.form.deliveryMethods.paper = true;
+      }
+    },
+    selectPaper(e) {
+      if (!e) {
+        this.form.deliveryMethods.electronic = true;
+        this.form.deliveryMethods.paper = false;
+      } else {
+        this.form.deliveryMethods.electronic = false;
+        this.form.deliveryMethods.paper = true;
+      }
+    },
+    async getBankAccount() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'b5ad93e068f343230344c7b63cb1aac5'
+        },
+      })
+      this.bankAccount = res.content
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.w-1200 {
+  width: 1200px;
+  margin: 20px auto;
+}
+
+.certificate-container {
+  border-radius: 4px;
+}
+
+.title {
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.certificate-table {
+  width: 100%;
+
+  table {
+    border-collapse: collapse;
+    width: 100%;
+
+    th, td {
+      border: 1px solid #dcdfe6;
+      padding: 8px;
+      text-align: center;
+    }
+
+    th {
+      background-color: #f5f7fa;
+    }
+  }
+}
+
+.notice {
+  border: 1px solid #dcdfe6;
+  padding: 10px;
+  border-radius: 4px;
+
+  .notice-title {
+    font-weight: bold;
+    margin-bottom: 5px;
+  }
+
+  .notice-item {
+    font-size: 14px;
+    line-height: 1.5;
+    color: #606266;
+  }
+}
+
+.form-item {
+  margin-bottom: 20px;
+
+  .form-label {
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
+  .form-content {
+    padding: 0 20px;
+  }
+}
+
+.w-100 {
+  width: 100px;
+}
+
+.required /deep/ .el-form-item__label:before {
+  content: '*';
+  color: #f56c6c;
+  margin-right: 4px;
+}
+
+.service-phone {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+}
+</style>
\ No newline at end of file
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index 3d782d9..d2140a5 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -1,576 +1,1902 @@
 <template>
-    <view class="">
-        <top-bar></top-bar>
-        <common-nav></common-nav>
-        <view class="w-1200">
-            <el-row :gutter="20">
-                <el-col :span="6">
-                    <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
-                        <el-menu-item index="0">
-                            <i class="el-icon-edit"></i>
-                            <span slot="title">待创建</span>
-                        </el-menu-item>
-                        <el-menu-item index="1">
-                            <i class="el-icon-warning-outline"></i>
-                            <span slot="title">待签署</span>
-                        </el-menu-item>
-                        <el-menu-item index="2">
-                            <i class="el-icon-circle-check"></i>
-                            <span slot="title">已完成</span>
-                        </el-menu-item>
-                        <el-menu-item index="-1">
-                            <i class="el-icon-delete"></i>
-                            <span slot="title">已作废</span>
-                        </el-menu-item>
-                    </el-menu>
-                    <view class="mt-20 bg-white flex justify-start items-center sign pointer" @click="selectSign">
-                        <view class="icon">
-                            <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
-                        </view>
-                        <text class="ml-20" :class="[isSign ? 'text-main' : '']">签约宝</text>
+  <view class="">
+    <top-bar></top-bar>
+    <common-nav></common-nav>
+    <view class="w-1200">
+      <common-swiper page="qyb" v-if="isSign"/>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
+            <el-menu-item index="0">
+              <i class="el-icon-edit"></i>
+              <span slot="title">待创建</span>
+            </el-menu-item>
+            <el-menu-item index="1">
+              <i class="el-icon-warning-outline"></i>
+              <span slot="title">待签署</span>
+            </el-menu-item>
+            <el-menu-item index="2">
+              <i class="el-icon-circle-check"></i>
+              <span slot="title">已完成</span>
+            </el-menu-item>
+            <!--                        <el-menu-item index="-1">-->
+            <!--                            <i class="el-icon-delete"></i>-->
+            <!--                            <span slot="title">已作废</span>-->
+            <!--                        </el-menu-item>-->
+          </el-menu>
+          <view class="mt-20 bg-white flex justify-start items-center sign pointer" @click="selectSign">
+            <view class="icon">
+              <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
+            </view>
+            <text class="ml-20" :class="[isSign ? 'text-main' : '']">金久信签约宝</text>
+          </view>
+          <view class="bg-white flex justify-start items-center sign pointer" @click="selectSignIntro">
+            <view class="icon">
+              <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
+            </view>
+            <text class="ml-20" :class="[isSignIntro ? 'text-main' : '']">金久信签约宝简介</text>
+          </view>
+          <view class="bg-white flex justify-start items-center sign pointer" @click="selectSignLog">
+            <view class="icon">
+              <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
+            </view>
+            <text class="ml-20" :class="[isSignLog ? 'text-main' : '']">金久信签约宝消费明细</text>
+          </view>
+          <view class="bg-white flex justify-start items-center sign pointer" @click="selectSignTips">
+            <view class="icon">
+              <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
+            </view>
+            <text class="ml-20" :class="[isSignTips ? 'text-main' : '']">金久信签约宝重要提示</text>
+          </view>
+          <view class="bg-white flex justify-start items-center sign pointer" @click="selectSignFlow">
+            <view class="icon">
+              <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
+            </view>
+            <text class="ml-20" :class="[isSignFlow ? 'text-main' : '']">{{ signFlowTitle }}</text>
+          </view>
+          <view class="bg-white flex justify-start items-center sign pointer" @click="changeAuthInfo">
+            <view class="icon">
+              <agreement theme="outline" size="18" fill="#999" strokeLinecap="square"/>
+            </view>
+            <text class="ml-20">认证信息变更</text>
+          </view>
+        </el-col>
+        <el-col :span="18">
+          <view class="flex flex-col justify-start items-start" v-if="isSignLog">
+            <view class="trade-method">
+              <view @click="getSignLog(1)" class="trade-method-item"
+                    :class="{active: signLogType === 'log'}">使用明细
+              </view>
+              <view @click="getSignBuyLog(1)" class="trade-method-item"
+                    :class="{active: signLogType === 'payLog'}">付费明细
+              </view>
+            </view>
+            <template v-if="signLogType === 'log'">
+              <el-table :data="signLog.rows" style="width: 100%">
+                <el-table-column prop="_add_time_str" label="日期"/>
+                <el-table-column label="项目">
+                  <template slot-scope="scope">
+                    {{ parseInt(scope.row.contract.signType) === 1 ? '单据签约' : '合同签约' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="contract.transactionId" label="合同编号"/>
+                <el-table-column label="签约身份">
+                  <template slot-scope="scope">
+                    {{
+                      scope.row.mineContract ? (scope.row.mineContract.role === 'third' ? '第三方' : (scope.row.mineContract.userId === scope.row.userId ? '发起方' : '接收方')) : ''
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="扣除次数">
+                  <template slot-scope="scope">
+                    <p>扣除次数：1次</p>
+                    <p v-if="scope.row.remainNum !== undefined && scope.row.remainNum !== null">
+                      剩余次数：{{ scope.row.remainNum }}次</p>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <view class="flex justify-center items-center w-100p mt-20">
+                <el-pagination @current-change="getSignLog" background layout="prev, pager, next"
+                               :total="signLog.total"></el-pagination>
+              </view>
+            </template>
+            <template v-else>
+              <el-table :data="signBuyLog.rows" style="width: 100%">
+                <el-table-column prop="_add_time_str" label="日期"/>
+                <el-table-column label="项目">
+                  <template slot-scope="scope">
+                    {{ scope.row.type === 12 ? '合同司法调证' : '金久信签约宝续费' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="orderNo" label="流水号"/>
+                <el-table-column label="缴费金额">
+                  <template slot-scope="scope">
+                    {{ scope.row.type === 12 ? scope.row.amount : scope.row.payAmount }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="采购次数">
+                  <template slot-scope="scope">
+                    <p>{{ scope.row.goods[0].goodsName }}</p>
+                    <p v-if="scope.row.remainNum">剩余{{ scope.row.remainNum }}次</p>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作">
+                  <template slot-scope="scope">
+                    <view class="flex flex-col justify-start items-start">
+                      <el-button size="mini" @click="openInvoice(scope.row._id)" type="primary"
+                                 v-if="!scope.row.isInvoice">申请发票
+                      </el-button>
+                      <template v-else>
+                        <el-button size="mini" v-if="scope.row.isInvoice === 1">开票中</el-button>
+                        <el-button size="mini" type="success" v-if="scope.row.isInvoice === 2"
+                                   @click.native="copyInvoice(scope.row)">下载
+                        </el-button>
+                      </template>
+                      <el-button size="mini" style="margin-left: 0; margin-top: 10px"
+                                 v-if="scope.row.type === 12 && scope.row.certificate && scope.row.certificate.paymentMethod === 'advance'"
+                                 @click.native="openPayVoucher(scope.row.certificate)">查看支付凭证
+                      </el-button>
                     </view>
-                </el-col>
-                <el-col :span="18">
-                    <view class="contract-list" v-if="!isSign">
-                        <view class="trade-method">
-                            <view @click="formData.tradeMethod = 1" class="trade-method-item"
-                                  :class="{active: formData.tradeMethod == 1}">自主交易
-                            </view>
-                            <view @click="formData.tradeMethod = 0" class="trade-method-item"
-                                  :class="{active: formData.tradeMethod == 0}">金久信公正
-                            </view>
-                        </view>
-                        <view v-for="(item,index) in tableData.rows" class="contract-box" :key="index">
-                            <view class="contract-left">
-                                <view class="contract-left-top">
-                                    <el-tag size="mini" v-if="item.contract.type === 'enquiry'" type="danger"
-                                            effect="plain">询价单
-                                    </el-tag>
-                                    <el-tag size="mini" v-else-if="item.contract.type === 'process'" type="warning"
-                                            effect="plain">加工单
-                                    </el-tag>
-                                    <el-tag size="mini" v-else-if="item.contract.type === 'sign'" type="success"
-                                            effect="plain">签约宝
-                                    </el-tag>
-                                    <view class="contract-product">
-                                        {{ item.contract.productTitle }}
-                                    </view>
-                                    <view class="contract-status">
-                                        <text v-if="item.contract.status == 0">待创建</text>
-                                        <template v-if="item.contract.status == 1">
-                                            <view class="contract-status-tag"
-                                                  v-for="(party, pIndex) in item.contract.partyList" :key="pIndex">
-                                                <el-tag size="mini"
-                                                        v-if="party.userId !== vk.getVuex('$user.userInfo._id') && !party.sign"
-                                                        type="warning" effect="plain">待交易方签署
-                                                </el-tag>
-                                                <el-tag size="mini"
-                                                        v-if="party.userId === vk.getVuex('$user.userInfo._id') && !party.sign"
-                                                        type="warning" effect="plain">待我签署
-                                                </el-tag>
-                                            </view>
-                                        </template>
-                                        <text v-if="item.contract.status == -1">已作废</text>
-                                    </view>
-                                </view>
-                                <view class="contract-left-center">
-                                    <view>
-                                        交易编码：{{ item.contract.transactionId }}
-                                    </view>
-                                    <view>
-                                        创建时间：{{ item.contract._add_time_str }}
-                                    </view>
-                                </view>
-                                <view class="contract-left-bottom">
-                                    <el-button size="mini" type="text">查看交易方</el-button>
-                                    <el-button
-                                        v-if="item.contract.status === 0 && item.contract.userId === vk.getVuex('$user.userInfo._id')"
-                                        @click="createContract(item.contract)" size="mini" type="text">创建合同
-                                    </el-button>
-                                    <el-button v-if="item.contract.status == 1" @click="extSign(item.contract)"
-                                               size="mini" type="text">签署合同
-                                    </el-button>
-                                    <el-button v-if="item.contract.status == 2" @click="viewContract(item.contract)"
-                                               size="mini" type="text">查看合同
-                                    </el-button>
-                                </view>
-                            </view>
-                            <view class="contract-right">
-                                <!-- <view class="">
-                                    {{item._add_time_str}}到期，到期将无法签署合同
-                                </view> -->
-                                <view class="">
-                                    <el-button @click.native="changeContract(item.contract)"
-                                               v-if="item.contract.status == 1 && item.contract.userId == vk.getVuex('$user.userInfo._id')"
-                                               size="mini" type="primary">修改合同内容
-                                    </el-button>
-                                </view>
-                            </view>
-                        </view>
-
-
-                        <view class="paginatio">
-                            <el-pagination @current-change="query" background layout="prev, pager, next"
-                                           :total="tableData.total"></el-pagination>
-                        </view>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <view class="flex justify-center items-center w-100p mt-20">
+                <el-pagination @current-change="getSignBuyLog" background layout="prev, pager, next"
+                               :total="signBuyLog.total"></el-pagination>
+              </view>
+            </template>
+          </view>
+          <view class="contract-list" v-if="!isSign && !isSignIntro && !isSignLog && !isSignFlow && !isSignTips">
+            <view class="trade-method">
+              <!--              <view @click="changeTradeMethod(null)" class="trade-method-item"-->
+              <!--                    :class="{active: (formData.tradeMethod === null && formData.type === null)}">全部-->
+              <!--              </view>-->
+              <!--              <view @click="changeTradeMethod(0)" class="trade-method-item"-->
+              <!--                    :class="{active: formData.tradeMethod === 0}">自主交易-->
+              <!--              </view>-->
+              <!--              <view @click="changeTradeMethod(1)" class="trade-method-item"-->
+              <!--                    :class="{active: formData.tradeMethod === 1}">金久信公正-->
+              <!--              </view>-->
+              <view @click="changeType('sign')" class="trade-method-item"
+                    :class="{active: formData.type === 'sign'}">金久信签约宝
+              </view>
+            </view>
+            <view class="flex justify-start items-center" v-if="menuIndex === '2'">
+              <view style="flex: 0 0 200px">
+                <el-radio-group v-model="signTypeFilter" fill="#A92924" @change="query(1)">
+                  <el-radio-button label="2">合同签约</el-radio-button>
+                  <el-radio-button label="1">单据签约</el-radio-button>
+                </el-radio-group>
+              </view>
+              <el-input class="ml-10" @keyup.enter.native="query(1)" clearable placeholder="输入签约方关键字搜索"
+                        v-model="keyword">
+                <i slot="prefix" class="el-input__icon el-icon-search"></i>
+                <el-button @click="query(1)" type="primary" slot="append" style="border-radius: 0">搜索
+                </el-button>
+              </el-input>
+            </view>
+            <view v-for="(item,index) in tableData.rows" class="contract-box" :key="index">
+              <view class="contract-left">
+                <view class="contract-left-top">
+                  <el-tag size="mini" v-if="item.contract.type === 'enquiry'" type="danger"
+                          effect="plain">询价单
+                  </el-tag>
+                  <el-tag size="mini" v-else-if="item.contract.type === 'process'" type="warning"
+                          effect="plain">加工单
+                  </el-tag>
+                  <el-tag size="mini" v-else-if="item.contract.type === 'sign'" type="success"
+                          effect="plain">金久信签约宝
+                  </el-tag>
+                  <el-tag size="mini" v-else-if="item.contract.type === 'old'" type="primary"
+                          effect="plain">旧货交易
+                  </el-tag>
+                  <el-tag size="mini" v-else-if="item.contract.type === 'self-support'" type="primary"
+                          effect="plain">自营询价
+                  </el-tag>
+                  <template v-if="item.sheet">
+                    <view class="ml-20">
+                      <el-tag size="mini" v-if="item.sheet.tradeMethod === 0" type="primary"
+                      >自主交易
+                      </el-tag>
+                      <el-tag size="mini" v-if="item.sheet.tradeMethod === 1" type="success"
+                      >金久信公证
+                      </el-tag>
                     </view>
-                    <view v-else class="bg-white p-20">
-                        <vk-data-form ref="form2" v-model="form2.data" :action="form2.props.action"
-                                      :columns="form2.props.columns"
-                                      :rules="form2.props.rules" :form-type="form2.props.formType"
-                                      :loading.sync="form2.props.loading"
-                                      :auto-close="true" label-width="140px" @success="onFormSuccess"></vk-data-form>
+                    <view class="ml-20">
+                      <el-tag size="mini" effect="plain" v-if="item.sheet.signMethod === 0"
+                              type="success"
+                      >标准合同
+                      </el-tag>
+                      <el-tag size="mini" effect="plain" v-if="item.sheet.signMethod === 2"
+                              type="primary"
+                      >双方协商合同
+                      </el-tag>
+                      <el-tag size="mini" effect="plain" v-if="item.sheet.signMethod === 1"
+                              type="warning"
+                      >线下合同
+                      </el-tag>
                     </view>
-                </el-col>
-            </el-row>
+                  </template>
+                  <el-tag size="mini" v-if="item.contract.tradeMethod === 1" type="success"
+                  >金久信公证
+                  </el-tag>
+                  <view class="contract-product" v-if="item.contract.status > 0">
+                    {{ item.contract.docTitle }}
+                  </view>
+                  <template v-else>
+                    <text class="contract-product" v-if="item.sheet">
+                      {{ item.sheet.title }}
+                    </text>
+                  </template>
+                  <view class="contract-status">
+                    <template v-if="item.contract.status == 1">
+                      <view class="contract-status-tag"
+                            v-for="(party, pIndex) in item.contract.partyList" :key="pIndex">
+                        <el-tag size="mini"
+                                v-if="party.userId !== vk.getVuex('$user.userInfo._id') && !party.sign && party.role !== 'third'"
+                                type="warning" effect="plain">待交易方签署
+                        </el-tag>
+                        <el-tag size="mini"
+                                v-if="party.userId !== vk.getVuex('$user.userInfo._id') && !party.sign && party.role === 'third'"
+                                type="warning" effect="plain">待第三方签署
+                        </el-tag>
+                        <el-tag size="mini"
+                                v-if="party.userId === vk.getVuex('$user.userInfo._id') && !party.sign"
+                                type="primary" effect="plain">待我签署
+                        </el-tag>
+                      </view>
+                    </template>
+                    <!--                                        <text v-if="item.contract.status == -1">已作废</text>-->
+                  </view>
+                  <view v-if="item.order" class="text-main">
+                    (订单状态：{{
+                      item.order.orderStatus === 4 ? '已完成' : ([5, 6].includes(item.order.orderStatus) ? '订单终止' : '执行中')
+                    }})
+                  </view>
+                </view>
+                <view class="contract-left-center">
+                  <view>
+                    合同编码：{{ item.contract.transactionId }}
+                  </view>
+                  <view v-if="item.sheet && item.contract.type === 'old'">
+                    交易编码：{{
+                      item.contract.type === 'enquiry' ? item.sheet.enquiryNo : item.sheet.orderNo
+                    }}
+                  </view>
+                  <view>
+                    创建时间：{{ item.contract._add_time_str }}
+                  </view>
+                  <view v-if="item.contract.signEndDate">
+                    签订截止时间：{{
+                      dayjs(item.contract.signEndDate).format('YYYY-MM-DD HH:mm:ss')
+                    }}
+                  </view>
+                  <view v-if="item.contract.type === 'sign' && item.contract.payUser && item.contract.payUser.user">
+                    费用承担方：{{
+                      item.contract.payUser.user.accountType === 2 ?
+                        item.contract.payUser.user.company.companyName : item.contract.payUser.user.person.personName
+                    }}
+                  </view>
+                  <template v-if="parseInt(item.contract.status) > 0">
+                    <view v-for="(party, partyIndex) in item.contract.partyList.filter(p => p.role !== 'third')"
+                          :key="`p_${partyIndex}`">
+                      <template v-if="party.userId === item.contract.userId">
+                        发起方签订完成时间：{{
+                          party.signedAt ? dayjs(party.signedAt).format('YYYY-MM-DD HH:mm:ss') : ''
+                        }}
+                      </template>
+                      <template v-if="party.userId !== item.contract.userId">
+                        接收方签订完成时间：{{
+                          party.signedAt ? dayjs(party.signedAt).format('YYYY-MM-DD HH:mm:ss') : ''
+                        }}
+                      </template>
+                      <template v-if="party.role === 'third'">
+                        第三方签订完成时间：{{
+                          party.signedAt ? dayjs(party.signedAt).format('YYYY-MM-DD HH:mm:ss') : ''
+                        }}
+                      </template>
+                    </view>
+                    <view v-for="(party, partyIndex) in item.contract.partyList.filter(p => p.role === 'third')"
+                          :key="`t_${partyIndex}`">
+                      第{{ numToChForThird[partyIndex] }}方签订完成时间：{{
+                        party.signedAt ? dayjs(party.signedAt).format('YYYY-MM-DD HH:mm:ss') : ''
+                      }}
+                    </view>
+                  </template>
+                </view>
+                <view class="contract-left-bottom">
+                  <el-button size="mini" plain @click.native="showParty(item)">
+                    查看交易方
+                  </el-button>
+                  <el-button
+                    v-if="item.contract.status === 0 && item.contract.userId === vk.getVuex('$user.userInfo._id')"
+                    @click="createContract(item.contract)" size="mini" type="primary">创建合同
+                  </el-button>
+                  <el-button
+                    v-if="item.contract.isMine"
+                    @click="delContract(item.contract)" size="mini" type="text">
+                    删除合同
+                  </el-button>
+                  <template v-if="parseInt(item.contract.status) === 1">
+                    <el-button @click="extSign(item.sign, item.contract)" size="mini" type="primary"
+                               :disabled="item.sign">
+                      {{ item.sign ? '已签署' : '签署文件' }}
+                    </el-button>
+                  </template>
+                  <template v-if="parseInt(item.contract.status) === 2">
+                    <el-button
+                      @click="viewContract(item.contract)"
+                      size="mini" plain>
+                      {{ parseInt(item.contract.signType) === 1 ? '查看单据' : '查看合同' }}
+                    </el-button>
+                    <el-button @click="downloadContract(item.contract.transactionId)"
+                               type="primary"
+                               size="mini" plain>
+                      {{ parseInt(item.contract.signType) === 1 ? '下载单据' : '下载合同' }}
+                    </el-button>
+                    <el-button @click="payDownloadContract(item.contract)"
+                               size="mini" plain>
+                      {{
+                        parseInt(item.contract.signType) === 1 ? '下载单据(付费司法调证)' : '下载合同(付费司法调证)'
+                      }}
+                    </el-button>
+                  </template>
+                  <el-button
+                    v-if="item.order && parseInt(item.contract.status) === 2 && ((item.sheet && item.sheet.tradeMethod === 1) || item.contract.tradeMethod === 1)"
+                    @click="navTo(`/pages/order/order?menuIndex=${item.role === 'buyer' ? 1 : 0}&keyword=${item.order.orderNo}`)"
+                    size="mini"
+                    :type="(item.order && item.order.orderStatus > 4) ? 'info' :'success'">
+                    {{
+                      (item.order && item.order.orderStatus === 4) ? '订单已结束' : ([5, 6].includes(item.order.orderStatus) ? '订单已终止' : (item.role === 'buyer' ? '去付款' : '去请款'))
+                    }}
+                  </el-button>
+                  <el-button
+                    v-if="item.contract.otherFile && item.contract.otherFile.length > 0"
+                    @click="openDownload(item.contract.otherFile)" plain
+                    size="mini"
+                    type="info">查看附件
+                  </el-button>
+                </view>
+              </view>
+              <view class="contract-right">
+                <!-- <view class="">
+                    {{item._add_time_str}}到期，到期将无法签署合同
+                </view> -->
+                <view class="">
+                  <el-button @click.native="changeContract(item.contract)"
+                             v-if="((item.sheet && item.sheet.signMethod === 2) || item.contract.type === 'sign' || item.contract.type === 'self-support') && item.contract.status === 1
+                                               && item.contract.userId === vk.getVuex('$user.userInfo._id') && item.contract.signCount === 0"
+                             size="mini" type="primary">修改合同内容
+                  </el-button>
+                </view>
+              </view>
+            </view>
+            <view class="paginatio">
+              <el-pagination @current-change="query" background layout="prev, pager, next"
+                             :total="tableData.total"></el-pagination>
+            </view>
+          </view>
+          <view v-if="isSign" class="bg-white p-20">
+            <view class="flex justify-start items-center pb-30">
+              <text class="text-main mr-35">您剩余金久信签约宝次数: {{ userInfo.qybNum }}次</text>
+              <el-button size="mini" type="primary" @click.native="dialogVisible = true">立即购买
+              </el-button>
+            </view>
+            <view class="text-main mt-10">温馨提示:尊敬的用户如果您的剩余金久信签约宝次数为0次，请先进行购买，再进行签约。</view>
+            <vk-data-form ref="form2" v-model="form2.data" :action="form2.props.action"
+                          :columns="form2.props.columns"
+                          :rules="form2.props.rules" :form-type="form2.props.formType"
+                          :loading.sync="form2.props.loading" :show-cancel="false"
+                          :auto-close="true" label-width="140px" @success="onFormSuccess">
+              <template v-slot:download>
+                <el-button size="mini" type="text" @click="downloadContractTemplate">点击下载
+                </el-button>
+              </template>
+              <template v-slot:contractFile>
+                <vk-data-upload v-model="form2.data.contractFile" :cloudPathRemoveChinese="false" list-type="text"
+                                accept=".pdf" :on-success="uploadSuccess" ref="uploader" :before-upload="beforeUpload"
+                                :show-file-list="false">
+                </vk-data-upload>
+                <view class="text-main text-24 my-15 pointer" @click="openPreview(form2.data.contractFile)"
+                      v-if="form2.data.contractFile">预览:
+                  {{ form2.data.contractFile[form2.data.contractFile.length - 1].split('-').pop() }}
+                </view>
+                <view class="tips text-24 text-gray">
+                  仅支持PDF文件,如有其他附件或多个单据签约请合并成一个PDF文档上传。且仅支持纵向文档上传,横向文档显示不完整。电子签署文件中需添加以下内容以增强双方约束力和文件法律效力:签约双方均自愿通过以“电子签约”形式进行签约，电子签名和加盖电子印章双方均予以认可具有法律效力。
+                </view>
+              </template>
+              <template v-slot:signEndDate>
+                <el-date-picker
+                  :popper-class="'currentDatePickerClass'"
+                  v-model="form2.data.signEndDate"
+                  type="datetime"
+                  placeholder="选择签署截止日期">
+                </el-date-picker>
+              </template>
+              <template v-slot:tips>
+                <view class="tips text-24 text-gray">注意事项(电子签名不适用文件):</view>
+                <view class="tips text-24 text-gray">1.婚姻、继承、收养等人身关系的；</view>
+                <view class="tips text-24 text-gray">2.涉及停止供水、供热、供气等公用事业服务的；</view>
+                <view class="tips text-24 text-gray">3.其他法律、行政法规规定的不适用电子文书的其他形式；</view>
+              </template>
+              <template v-slot:third>
+                <div v-for="(item, index) in form2.data.thirdList" :key="index"
+                     class="flex justify-start items-center mb-10 ">
+                  <span>第{{ numToChForThird[index] }}方</span>
+                  <div class="mx-15">
+                    <el-input v-model="form2.data.thirdList[index].phone"
+                              placeholder="请输入第三方手机号"/>
+                  </div>
+                  <div>
+                    <el-input v-model="form2.data.thirdList[index].signKeyword"
+                              placeholder="请输入第三方签章关键字"/>
+                  </div>
+                  <div class="flex justify-start items-center">
+                    <i class="el-icon-circle-plus pointer text-main text-50 ml-35"
+                       @click="addThird"/>
+                    <i class="el-icon-remove pointer text-50 ml-35"
+                       @click="removeThird(index)"/>
+                    <i title="上移" class="el-icon-arrow-up pointer text-50 ml-35" v-if="index > 0"
+                       @click="thirdMoveUp(index)"/>
+                    <i title="下移" class="el-icon-arrow-down pointer text-50 ml-35"
+                       @click="thirdMoveDown(index)"
+                       v-if="index < form2.data.thirdList.length - 1"/>
+                  </div>
+                </div>
+                <p class="text-25 text-gray mt-20">如无第三方签约可忽略，签章关键字使用方法同下。</p>
+                <p class="text-25 text-gray mt-20">手机号请连续输入，请勿添加空格和断开输入，系统无法准确识别。</p>
+              </template>
+              <template v-slot:footer="{ loading }">
+                <view style="text-align: center;">
+                  <el-button :loading="loading" type="primary" @click="form2.props.action">提交</el-button>
+                </view>
+              </template>
+            </vk-data-form>
+          </view>
+          <view v-if="isSignIntro" class="bg-white p-20">
+            <div v-html="signIntro"></div>
+          </view>
+          <view v-if="isSignFlow" class="bg-white p-20">
+            <div v-html="signFlow"></div>
+          </view>
+          <view v-if="isSignTips" class="bg-white p-20">
+            <div v-html="signTips"></div>
+          </view>
+        </el-col>
+      </el-row>
 
-        </view>
-        <common-footer></common-footer>
-
-        <el-dialog :visible.sync="form1.props.show">
-            <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"
-                          :rules="form1.props.rules" :form-type="form1.props.formType"
-                          :loading.sync="form1.props.loading"
-                          :auto-close="true" label-width="140px" @success="onFormSuccess"></vk-data-form>
-        </el-dialog>
-
-        <!-- 上传合同弹窗 -->
     </view>
+    <common-footer></common-footer>
+
+    <el-dialog :visible.sync="form1.props.show" width="70%">
+      <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"
+                    :rules="form1.props.rules" :form-type="form1.props.formType"
+                    :loading.sync="form1.props.loading" :show-cancel="false"
+                    :auto-close="true" label-width="140px" @success="onFormSuccess">
+        <template v-slot:contractFile>
+          <vk-data-upload v-model="form1.data.contractFile" :cloudPathRemoveChinese="false" list-type="text"
+                          accept=".pdf" :on-success="uploadSuccess1" ref="uploader1" :before-upload="beforeUpload"
+                          :show-file-list="false">
+          </vk-data-upload>
+          <view class="text-main text-24 my-15 pointer" @click="openPreview(form1.data.contractFile)"
+                v-if="form1.data.contractFile">预览:
+            {{ form1.data.contractFile[form1.data.contractFile.length - 1].split('-').pop() }}
+          </view>
+          <view class="tips text-24 text-gray">
+            仅支持PDF文件,如有其他附件或多个单据签约请合并成一个PDF文档上传。且仅支持纵向文档上传,横向文档显示不完整。电子签署文件中需添加以下内容以增强双方约束力和文件法律效力:签约双方均自愿通过以“电子签约”形式进行签约，电子签名和加盖电子印章双方均予以认可具有法律效力。
+          </view>
+        </template>
+        <template v-slot:download>
+          <el-button size="mini" type="text" @click="downloadContractTemplate">点击下载</el-button>
+        </template>
+        <template v-slot:third>
+          <div v-for="(item, index) in form1.data.thirdList" :key="index"
+               class="flex justify-start items-center mb-10 ">
+            <span>第{{ numToChForThird[index] }}方</span>
+            <div class="mx-15">
+              <el-input v-model="form1.data.thirdList[index].phone"
+                        placeholder="请输入第三方手机号"/>
+            </div>
+            <div>
+              <el-input v-model="form1.data.thirdList[index].signKeyword"
+                        placeholder="请输入第三方签章关键字"/>
+            </div>
+            <div class="flex justify-start items-center">
+              <i class="el-icon-circle-plus pointer text-main text-50 ml-35"
+                 @click="addThird1"/>
+              <i class="el-icon-remove pointer text-50 ml-35"
+                 @click="removeThird1(index)"/>
+              <i title="上移" class="el-icon-arrow-up pointer text-50 ml-35" v-if="index > 0"
+                 @click="thirdMoveUp1(index)"/>
+              <i title="下移" class="el-icon-arrow-down pointer text-50 ml-35"
+                 @click="thirdMoveDown1(index)"
+                 v-if="index < form1.data.thirdList.length - 1"/>
+            </div>
+          </div>
+          <p class="text-25 text-gray mt-20">如无第三方签约可忽略，签章关键字使用方法同下。</p>
+          <p class="text-25 text-gray mt-20">手机号请连续输入，请勿添加空格和断开输入，系统无法准确识别。</p>
+        </template>
+        <template v-slot:footer="{ loading }">
+          <view style="text-align: center;">
+            <el-button :loading="loading" type="primary" @click="form1.props.action">提交</el-button>
+          </view>
+        </template>
+      </vk-data-form>
+    </el-dialog>
+
+    <el-dialog title="金久信签约宝次数" :visible.sync="dialogVisible" width="50%">
+      <p>请选择购买次数</p>
+      <div class="flex justify-center items-center">
+        <div class="p-20 rounded m-20 shadow flex flex-col justify-center items-center flex-1 pointer"
+             :class="[selectedQyb === item._id ? 'buy-quote-mode-active' : '']"
+             v-for="(item, index) in qybPackageList" :key="index"
+             @click="selectedQyb = item._id">
+          <p>{{ item.amount }}元</p>
+          <p>可获得{{ item.getNum }}次</p>
+        </div>
+      </div>
+      <div class="mt-20 text-main font-bold">
+        剩余金久信签约宝次数:{{ userInfo.qybNum }}次
+      </div>
+      <div class="mt-20 flex justify-center items-center">
+        <el-button type="primary" :disabled="!selectedQyb" @click.native="doBuyQyb">确定</el-button>
+        <el-button plain @click.native="dialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="申请发票" :visible.sync="showInvoice" width="50%">
+      <p>请输入开票信息</p>
+      <el-form ref="form" label-width="140px">
+        <el-form-item label="名称" required>
+          <el-input v-model="invoiceForm.name" placeholder="请输入企业名称或个人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="税号/证号" required>
+          <el-input v-model="invoiceForm.code" placeholder="请输入税号或身份证号"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" required>
+          <el-input v-model="invoiceForm.phone" placeholder="请输入手机号"></el-input>
+        </el-form-item>
+        <el-form-item label="电子邮箱" required>
+          <el-input v-model="invoiceForm.email" placeholder="请输入电子邮箱"></el-input>
+        </el-form-item>
+        <el-form-item label="开户行">
+          <el-input v-model="invoiceForm.bankName" placeholder="请输入开户行"></el-input>
+        </el-form-item>
+        <el-form-item label="银行账号">
+          <el-input v-model="invoiceForm.bankAccount" placeholder="请输入银行账号"></el-input>
+        </el-form-item>
+        <el-form-item label="地址" required>
+          <el-input v-model="invoiceForm.address" placeholder="请输入地址"></el-input>
+        </el-form-item>
+        <el-form-item label="单位/个人电话">
+          <el-input v-model="invoiceForm.tel" placeholder="请输入单位/个人电话"></el-input>
+        </el-form-item>
+
+      </el-form>
+      <div class="mt-20 flex justify-center items-center">
+        <el-button type="primary" @click.native="doInvoice">确定</el-button>
+        <el-button plain @click.native="showInvoice = false">取消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="支付凭证" :visible.sync="showPayVoucher" width="50%">
+      <el-image :src="payVoucher" :preview-src-list="[payVoucher]"/>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
 import {Agreement} from "@icon-park/vue";
+import dayjs from "dayjs";
+import {Loading} from "element-ui";
+
 
 export default {
-    components: {Agreement},
-    data() {
-        return {
-            pageIndex: 1,
-            menuIndex: '0',
-            isSign: false,
-            formData: {
-                status: 0,
-                tradeMethod: null
-            },
-            tableData: {},
-            // 表单相关开始-----------------------------------------------------------
-            form1: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    contractId: '',
-                    signEndDate: '',
-                    title: '',
-                    contractFile: '',
-                    buyerSignKeyword: '',
-                    sellerSignKeyword: '',
-                    otherFile: '',
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: 'client/contract/kh/launch',
-                    // 表单字段显示规则
-                    columns: [{
-                        key: "title",
-                        title: "标题",
-                        type: "text"
-                    },
-                        {
-                            key: "signEndDate",
-                            title: "签署截止日期",
-                            type: "date",
-                            pickerOptions: {
-                                disabledDate: (date) => {
-                                    const now = new Date()
-                                    return now > date
-                                }
-                            }
-
-                        },
-                        {
-                            key: "contractFile",
-                            title: "签署文档",
-                            type: "file",
-                            limit: 1,
-                            accept: ".pdf",
-                            tips: "仅支持PDF文件",
-                        },
-                        {
-                            key: "buyerSignKeyword",
-                            title: "买家签章关键字",
-                            type: "text",
-                            tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-                        },
-                        {
-                            key: "sellerSignKeyword",
-                            title: "卖家签章关键字",
-                            type: "text",
-                            tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-                        },
-                        {
-                            key: "otherFile",
-                            title: "附件",
-                            type: "file"
-                        },
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        title: [{
-                            required: true,
-                            message: "标题不能为空",
-                            trigger: "change"
-                        },],
-                        signEndDate: [{
-                            required: true,
-                            message: "签署截止日期不能为空",
-                            trigger: "change"
-                        }],
-                        buyerSignKeyword: [{
-                            required: true,
-                            message: "买家签章关键字不能为空",
-                            trigger: "change"
-                        }],
-                        sellerSignKeyword: [{
-                            required: true,
-                            message: "卖家签章关键字不能为空",
-                            trigger: "change"
-                        }],
-                        contractFile: [{
-                            required: true,
-                            message: "签署文档不能为空",
-                            trigger: "change"
-                        },]
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false
-                }
-            },
-            form2: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    contractId: '',
-                    signEndDate: '',
-                    title: '',
-                    contractFile: '',
-                    buyerSignKeyword: '',
-                    sellerSignKeyword: '',
-                    otherFile: '',
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: 'client/contract/kh/addSign',
-                    // 表单字段显示规则
-                    columns: [
-                        {
-                            key: "title",
-                            title: "标题",
-                            type: "text"
-                        },
-                        {
-                            key: "phone",
-                            title: "对方手机号",
-                            type: "text"
-                        },
-                        {
-                            key: "userType",
-                            title: "对方身份",
-                            type: "select",
-                            data: [
-                                {
-                                    value: 1,
-                                    label: "买家"
-                                },
-                                {
-                                    value: 2,
-                                    label: "卖家"
-                                }
-                            ]
-                        },
-                        {
-                            key: "signEndDate",
-                            title: "签署截止日期",
-                            type: "date",
-                            pickerOptions: {
-                                disabledDate: (date) => {
-                                    const now = new Date()
-                                    return now > date
-                                }
-                            }
-                        },
-                        {
-                            key: "contractFile",
-                            title: "签署文档",
-                            type: "file",
-                            limit: 1,
-                            accept: ".pdf",
-                            tips: "仅支持PDF文件",
-                        },
-                        {
-                            key: "buyerSignKeyword",
-                            title: "买家签章关键字",
-                            type: "text",
-                            tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-                        },
-                        {
-                            key: "sellerSignKeyword",
-                            title: "卖家签章关键字",
-                            type: "text",
-                            tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-                        },
-                        {
-                            key: "otherFile",
-                            title: "附件",
-                            type: "file"
-                        },
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        title: [{
-                            required: true,
-                            message: "标题不能为空",
-                            trigger: "change"
-                        },],
-                        phone: [{
-                            required: true,
-                            message: "标题不能为空",
-                            trigger: "change"
-                        },],
-                        signEndDate: [{
-                            required: true,
-                            message: "签署截止日期不能为空",
-                            trigger: "change"
-                        }],
-                        buyerSignKeyword: [{
-                            required: true,
-                            message: "买家签章关键字不能为空",
-                            trigger: "change"
-                        }],
-                        sellerSignKeyword: [{
-                            required: true,
-                            message: "卖家签章关键字不能为空",
-                            trigger: "change"
-                        }],
-                        contractFile: [{
-                            required: true,
-                            message: "签署文档不能为空",
-                            trigger: "change"
-                        },]
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false
-                }
-            },
-            // 表单相关结束-----------------------------------------------------------
-        }
-    },
-    onLoad(options) {
-        if (options.tab) {
-            if (options.tab === 'sign') {
-                this.isSign = true
-            } else {
-                this.menuIndex = String(options.tab)
-                this.formData.status = Number(options.tab)
-                this.isSign = false
-                this.query(1)
+  components: {Agreement},
+  data() {
+    return {
+      numToChForThird: ['三', '四', '五', '六', '七', '八', '九', '十'],
+      userInfo: {
+        qybNum: 0
+      },
+      dialogVisible: false,
+      qybPackageList: [],
+      selectedQyb: null,
+      contractTemplate: '',
+      pageIndex: 1,
+      menuIndex: '0',
+      isSign: false,
+      isSignIntro: false,
+      signIntro: '',
+      signFlow: '',
+      signFlowTitle: '',
+      signType: '1',
+      signTypeFilter: '2',
+      keyword: '',
+      formData: {
+        status: 0,
+        tradeMethod: null,
+        type: 'sign'
+      },
+      showPayVoucher: false,
+      payVoucher: '',
+      isSignLog: false,
+      isSignFlow: false,
+      signLog: {},
+      signBuyLog: {},
+      signLogType: 'log',
+      showInvoice: false,
+      isSignTips: false,
+      signTips: '',
+      invoiceForm: {
+        id: null,
+        name: null,
+        code: null,
+        phone: null,
+        email: null,
+        bankName: null,
+        bankAccount: null,
+        address: null,
+        tel: null,
+      },
+      tableData: {},
+      // 表单相关开始-----------------------------------------------------------
+      form1: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          contractId: '',
+          signEndDate: '',
+          title: '',
+          contractFile: '',
+          buyerSignKeyword: '',
+          sellerSignKeyword: '',
+          otherFile: '',
+          thirdList: [{phone: '', signKeyword: ''}],
+        },
+        // 表单属性
+        props: {
+          // 表单请求地址
+          action: async () => {
+            const thirdKeywords = []
+            for (let i = 0; i < this.form1.data.thirdList.length; i++) {
+              const item = this.form1.data.thirdList[i]
+              if (item.phone && item.signKeyword) {
+                thirdKeywords.push(item.signKeyword)
+              }
             }
-        }else {
-            this.menuIndex = '0'
-            this.formData.status = 0
-            this.isSign = false
-            this.query(1)
-        }
-    },
-    methods: {
-        menuSelect(e) {
-            this.menuIndex = String(e)
-            this.formData.status = Number(e)
-            this.isSign = false
-            this.query(1)
-        },
-        selectSign() {
-            this.isSign = true
-            this.menuIndex = ''
-        },
-        async query(pageIndex) {
-            this.tableData = await vk.callFunction({
-                url: 'client/contract/kh/getList',
-                title: '请求中...',
-                data: {
-                    pageIndex,
-                    pageSize: 10,
-                    status: this.formData.status
-                },
+            uni.showLoading({title: '查验中'})
+            let file = this.form1.data.contractFile[this.form1.data.contractFile.length - 1]
+            if (Array.isArray(file)) file = file[file.length - 1]
+            vk.request({
+              method: "POST",
+              url: 'https://hcsc.gxwebsoft.com/api/read-pdf',
+              header: {
+                "content-type": "application/json; charset=utf-8",
+              },
+              data: {
+                file,
+                buyerSignKeyword: this.form1.data.buyerSignKeyword,
+                sellerSignKeyword: this.form1.data.sellerSignKeyword,
+                thirdKeywords
+              },
+              success: async (pdfRes) => {
 
-            });
-        },
-        /**
-         * 创建合同
-         * @param contract
-         */
-        createContract(contract) {
-            this.form1.data.contractId = contract._id
-            this.form1.props.action = 'client/contract/kh/launch'
-            this.form1.props.show = true
-        },
-        async changeContract(contract) {
-            this.form1.data.contractId = contract._id
-            const res = await vk.callFunction({
-                url: 'client/contract/kh/getDetail',
-                title: '请求中...',
-                data: {
-                    contractId: contract._id
-                },
-            });
-            this.form1.data.signEndDate = res.signEndDate
-            this.form1.data.title = res.docTitle
-            this.form1.data.contractFile = res.contractBase
-            this.form1.data.buyerSignKeyword = res.buyerSignKeyword
-            this.form1.data.sellerSignKeyword = res.sellerSignKeyword
-            this.form1.data.otherFile = res.otherFile
-            this.form1.props.show = true
-        },
-        onFormSuccess() {
-            this.form1.props.show = false
-            this.form1.data.contractId = null
-            this.formData.status = 1
-            this.menuIndex = '1'
-            this.isSign = false
-            this.$refs.form2.resetForm()
-            this.query(1)
-        },
-        /**
-         * 签署合同
-         * @param {Object} contract
-         */
-        extSign(contract) {
-            vk.callFunction({
-                url: 'client/contract/kh/extSign',
-                title: '请求中...',
-                data: {
-                    contractId: contract._id
-                },
-                success: (res) => {
-                    window.open(res.data)
+              },
+              fail: (pdfRes) => {
+                uni.hideLoading()
+                this.$message.error(pdfRes.content.msg)
+              },
+              complete: async (pdfRes) => {
+                if (pdfRes.code !== 200) this.$message.error(pdfRes.content.msg)
+                else {
+                  uni.hideLoading()
+                  this.form1.props.loading = true
+                  this.form1.data.thirdList = this.form1.data.thirdList.filter(item => item.phone && item.signKeyword)
+                  if (this.form1.data.thirdList.length > 0) {
+                    for (let i = 0; i < this.form1.data.thirdList.length; i++) {
+                      const item = this.form1.data.thirdList[i]
+                      if (item.phone === '') {
+                        vk.toast('请填写手机号')
+                        this.form1.props.loading = false
+                        return false
+                      }
+                      if (item.signKeyword === '') {
+                        vk.toast('请填写签章关键字')
+                        this.form1.props.loading = false
+                        return false
+                      }
+                      if (item.phone === this.form1.data.phone) {
+                        vk.toast('第三方手机号不能与接收方手机号相同')
+                        this.form1.props.loading = false
+                        return false
+                      }
+                    }
+                  }
+                  if (!this.form1.data.signEndDate) {
+                    vk.toast('请选择签署截止时间')
+                    this.form1.props.loading = false
+                    return false
+                  }
+                  if (dayjs(this.form1.data.signEndDate).isBefore(dayjs())) {
+                    vk.toast('签署截止日期不能早于当前时间')
+                    this.form1.props.loading = false
+                    return false
+                  }
+                  const res = await this.$confirm(`1、您确认，若全体各签约方未完成全部签约流程，本签约文件不发生法律效力，系统无法对该签约文件予以保存及提供司法调证服务;<br>2、您确认，当前签约的实名主体名称、手机号码与注册认证阶段提交的信息未发生变更;若发生变更，必须及时进行重新认证后方可继续签约，避免产生严重法律风险与经济损失;<br>3、您确认，本次签约为本系统实名认证主体操作，如若不是实名认证主体操作，授权委托人需本系统进行授权认证后签约;<br>4、您确认，您与其他签约方均系在平等、自愿的基础上完成本次签约;<br>5、你确认，此次签约内容符合《中华人民共和国电子签名法》《民法典》生效保护范畴;<br>6、如因法律法规、监管部门政策更新等原因，系统提示您重新进行实名认证、证书续期等重要提示时，请您必须在签约前完成，否则造成任何损失，平台不承担任何责任;以上签约条件您均已经知悉并确认，否则您有权拒绝本次签约。`, '提示', {
+                    confirmButtonText: '知悉同意',
+                    showCancelButton: false,
+                    type: 'warning',
+                    dangerouslyUseHTMLString: true
+                  })
+                  if (res === 'confirm') {
+                    await vk.callFunction({
+                      url: 'client/contract/kh/launch',
+                      data: this.form1.data
+                    })
+                    vk.redirectTo({url: '/pages/contract/index?tab=1'})
+                  }
                 }
-            });
-        },
-        viewContract(contract) {
-            vk.callFunction({
-                url: 'client/contract/kh/viewContract',
-                title: '请求中...',
-                data: {
-                    contractId: contract._id
-                },
-                success: (res) => {
-                    window.open(res.data)
-                    this.query(1)
+                uni.hideLoading()
+              },
+            })
+
+          },
+          // 表单字段显示规则
+          columns: [
+            {
+              key: "title",
+              title: "标题",
+              type: "text"
+            },
+            {
+              key: "third",
+              title: "",
+              type: "html",
+              tips: "如无第三方签约可忽略，签章关键字使用方法同下。"
+            },
+            {
+              key: "signEndDate",
+              title: "签署截止日期",
+              type: "date",
+              tips: '发起方填写签署截止日期和时间即为各签约方共同认可的签署时间，请酌情填写仔细阅读签署文件。',
+              dateType: "datetime",
+              pickerOptions: {
+                disabledDate: (date) => {
+                  const now = new Date()
+                  return now > date
                 }
-            });
+              }
+            },
+            {
+              key: "contractFile",
+              title: "签署文档",
+              type: "file",
+              limit: 1,
+              accept: ".pdf",
+              tips: "仅支持PDF文件,如有其他附件或多个单据签约请合并成一个PDF文档上传。且仅支持纵向文档上传,横向文档显示不完整。"
+            },
+            // {
+            //   key: "download",
+            //   title: "合同模板下载",
+            //   type: "html"
+            // },
+            {
+              key: "buyerSignKeyword",
+              title: "签约发起方关键字",
+              type: "text",
+              tips: '先点击上传文档后，在线预览文档，点击ctrl+f，复制粘贴或输入预盖章部位关键字至弹框内，再次点击ctrl+f进行核验确认位置和内容，核实无误后可返回签署页面输入测验关键字后进行签署(如同一关键字文档多次使用无误后可考虑省略检测流程)。系统将按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。',
+              placeholder: '发起方盖章关键字',
+            },
+            {
+              key: "sellerSignKeyword",
+              title: "签约接收方关键字",
+              type: "text",
+              placeholder: '签约接收方关键字',
+              tips: '先点击上传文档后，在线预览文档，点击ctrl+f，复制粘贴或输入预盖章部位关键字至弹框内，再次点击ctrl+f进行核验确认位置和内容，核实无误后可返回签署页面输入测验关键字后进行签署(如同一关键字文档多次使用无误后可考虑省略检测流程)。系统将按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+            },
+            // {
+            //     key: "otherFile",
+            //     title: "附件",
+            //     type: "file",
+            //     accept: ".pdf",
+            //     tips: "仅支持PDF文件(附件将按顺序附在合同末尾一并签章)",
+            // },
+          ],
+          // 表单验证规则
+          rules: {
+            title: [{
+              required: true,
+              message: "标题不能为空",
+              trigger: "change"
+            },],
+            signEndDate: [{
+              required: true,
+              message: "签署截止日期不能为空",
+              trigger: "change"
+            }],
+            buyerSignKeyword: [{
+              required: true,
+              message: "签约发起方关键字不能为空",
+              trigger: "change"
+            }],
+            sellerSignKeyword: [{
+              required: true,
+              message: "签约接收方关键字不能为空",
+              trigger: "change"
+            }],
+            contractFile: [{
+              required: true,
+              message: "签署文档不能为空",
+              trigger: "change"
+            },]
+          },
+          // add 代表添加 update 代表修改
+          formType: "",
+          // 表单是否在请求中
+          loading: false,
+          // 是否显示表单1 的弹窗
+          show: false,
         }
+      },
+      form2: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          contractId: '',
+          signEndDate: '',
+          title: '',
+          contractFile: '',
+          buyerSignKeyword: '',
+          sellerSignKeyword: '',
+          signType: '1',
+          tradeMethod: 0,
+          payBy: 0,
+          otherFile: [],
+          thirdList: [{phone: '', signKeyword: ''}],
+        },
+        // 表单属性
+        props: {
+          // 表单请求地址
+          action: async () => {
+            const thirdKeywords = []
+            for (let i = 0; i < this.form2.data.thirdList.length; i++) {
+              const item = this.form2.data.thirdList[i]
+              if (item.phone && item.signKeyword) {
+                thirdKeywords.push(item.signKeyword)
+              }
+            }
+            uni.showLoading({title: '查验中'})
+            vk.request({
+              method: "POST",
+              url: 'https://hcsc.gxwebsoft.com/api/read-pdf',
+              header: {
+                "content-type": "application/json; charset=utf-8",
+              },
+              data: {
+                file: this.form2.data.contractFile[this.form2.data.contractFile.length - 1],
+                buyerSignKeyword: this.form2.data.buyerSignKeyword,
+                sellerSignKeyword: this.form2.data.sellerSignKeyword,
+                thirdKeywords
+              },
+              success: async (pdfRes) => {
+
+              },
+              fail: (pdfRes) => {
+                uni.hideLoading()
+                this.$message.error(pdfRes.content.msg)
+              },
+              complete: async (pdfRes) => {
+                if (pdfRes.code !== 200) this.$message.error(pdfRes.content.msg)
+                else {
+                  uni.hideLoading()
+                  this.form2.props.loading = true
+                  this.form2.data.thirdList = this.form2.data.thirdList.filter(item => item.phone && item.signKeyword)
+                  if (this.form2.data.thirdList.length > 0) {
+                    for (let i = 0; i < this.form2.data.thirdList.length; i++) {
+                      const item = this.form2.data.thirdList[i]
+                      if (item.phone === '') {
+                        vk.toast('请填写手机号')
+                        this.form2.props.loading = false
+                        return false
+                      }
+                      if (item.signKeyword === '') {
+                        vk.toast('请填写签章关键字')
+                        this.form2.props.loading = false
+                        return false
+                      }
+                      if (item.phone === this.form2.data.phone) {
+                        vk.toast('第三方手机号不能与接收方手机号相同')
+                        this.form2.props.loading = false
+                        return false
+                      }
+                    }
+                  }
+                  if (!this.form2.data.signEndDate) {
+                    vk.toast('请选择签署截止时间')
+                    this.form2.props.loading = false
+                    return false
+                  }
+                  if (this.form2.data.payBy === undefined || this.form2.data.payBy === '' || this.form2.data.payBy === null) {
+                    vk.toast('请选择费用承担方')
+                    this.form2.props.loading = false
+                    return false
+                  }
+                  if (dayjs(this.form2.data.signEndDate).isBefore(dayjs())) {
+                    vk.toast('签署截止日期不能早于当前时间')
+                    this.form2.props.loading = false
+                    return false
+                  }
+            const res = await this.$confirm(`1、您确认，若全体各签约方未完成全部签约流程，本签约文件不发生法律效力，系统无法对该签约文件予以保存及提供司法调证服务;<br>2、您确认，当前签约的实名主体名称、手机号码与注册认证阶段提交的信息未发生变更;若发生变更，必须及时进行重新认证后方可继续签约，避免产生严重法律风险与经济损失;<br>3、您确认，本次签约为本系统实名认证主体操作，如若不是实名认证主体操作，授权委托人需本系统进行授权认证后签约;<br>4、您确认，您与其他签约方均系在平等、自愿的基础上完成本次签约;<br>5、你确认，此次签约内容符合《中华人民共和国电子签名法》《民法典》生效保护范畴;<br>6、如因法律法规、监管部门政策更新等原因，系统提示您重新进行实名认证、证书续期等重要提示时，请您必须在签约前完成，否则造成任何损失，平台不承担任何责任;以上签约条件您均已经知悉并确认，否则您有权拒绝本次签约。`, '提示', {
+              confirmButtonText: '知悉同意',
+              showCancelButton: false,
+              type: 'warning',
+              dangerouslyUseHTMLString: true
+                  })
+                  if (res === 'confirm') {
+                    await vk.callFunction({
+                      url: 'client/contract/kh/addSign',
+                      data: this.form2.data
+                    })
+                    vk.redirectTo({url: '/pages/contract/index?tab=1'})
+                  }
+                }
+                console.log('complete:', pdfRes)
+                uni.hideLoading()
+              },
+            })
+
+          },
+          // 表单字段显示规则
+          columns: [
+            {
+              key: "signType",
+              title: "",
+              type: "radio",
+              data: [
+                {
+                  value: '1',
+                  label: "单据签约"
+                },
+                {
+                  value: '2',
+                  label: "合同签约"
+                }
+              ]
+            },
+            // {
+            //   key: "tradeMethod",
+            //   title: "交易方式",
+            //   type: "radio",
+            //   data: [
+            //     {
+            //       value: 0,
+            //       label: "自主交易"
+            //     },
+            //     {
+            //       value: 1,
+            //       label: "金久信公正"
+            //     }
+            //   ],
+            //   showRule: (data) => {
+            //     return data.signType === '2';
+            //   }
+            // },
+            {
+              key: "payBy",
+              title: "签约费用",
+              type: "radio",
+              data: [
+                {
+                  value: 0,
+                  label: "发起方承担"
+                },
+                {
+                  value: 1,
+                  label: "接收方承担"
+                },
+                {
+                  value: 2,
+                  label: "第三方承担"
+                },
+              ]
+            },
+            // {
+            //   key: "payByThird",
+            //   title: "承担签约费用的第三方手机号",
+            //   type: "text",
+            //   showRule: (data) => {
+            //     return data.payBy === 2;
+            //   }
+            // },
+            {
+              key: "title",
+              title: "标题",
+              placeholder: `请输入自定义合同或单据名称`,
+              type: "text"
+            },
+            {
+              key: "phone",
+              title: "对方手机号",
+              type: "text",
+              placeholder: "请输入对方金久信实名认证手机号码",
+              tips: '手机号请连续输入，请勿添加空格和断开输入，系统无法准确识别。'
+            },
+            {
+              key: "userType",
+              title: "对方身份",
+              type: "select",
+              data: [
+                {
+                  value: 1,
+                  label: "买家"
+                },
+                {
+                  value: 2,
+                  label: "卖家"
+                },
+                {
+                  value: 3,
+                  label: "甲方"
+                },
+                {
+                  value: 4,
+                  label: "乙方"
+                },
+                {
+                  value: 5,
+                  label: "授权签约方"
+                },
+              ]
+            },
+            {
+              key: "signEndDate",
+              title: "签署截止时间",
+              tips: '发起方填写签署截止日期和时间即为各签约方共同认可的签署时间，请酌情填写仔细阅读签署文件。',
+              pickerOptions: {
+                disabledDate: (date) => {
+                  const now = new Date()
+                  return now > date
+                }
+              }
+            },
+            {
+              key: "contractFile",
+              title: "签署文档",
+              type: "file",
+              limit: 1,
+              accept: ".pdf",
+              tips: "仅支持PDF文件,如有其他附件或多个单据签约请合并成一个PDF文档上传。且仅支持纵向文档上传,横向文档显示不完整。电子签署文件中需添加以下内容以增强双方约束力和文件法律效力:签约双方均自愿通过以“电子签约”形式进行签约，电子签名和加盖电子印章双方均予以认可具有法律效力。",
+            },
+            // {
+            //     key: "download",
+            //     title: "单据签约模板下载",
+            //     type: "html",
+            //     showRule: () => {
+            //         return this.signType === '1'
+            //     }
+            // },
+            {
+              key: "buyerSignKeyword",
+              title: "签约发起方关键字",
+              type: "text",
+              placeholder: '发起方盖章关键字',
+              tips: '先点击上传文档后，在线预览文档，点击ctrl+f，复制粘贴或输入预盖章部位关键字至弹框内，再次点击ctrl+f进行核验确认位置和内容，核实无误后可返回签署页面输入测验关键字后进行签署(如同一关键字文档多次使用无误后可考虑省略检测流程)。系统将按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+            },
+            {
+              key: "sellerSignKeyword",
+              title: "签约接收方关键字",
+              type: "text",
+              placeholder: '签约接收方关键字',
+              tips: '先点击上传文档后，在线预览文档，点击ctrl+f，复制粘贴或输入预盖章部位关键字至弹框内，再次点击ctrl+f进行核验确认位置和内容，核实无误后可返回签署页面输入测验关键字后进行签署(如同一关键字文档多次使用无误后可考虑省略检测流程)。系统将按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+            },
+            {
+              key: "third",
+              title: "",
+              type: "html"
+            },
+            {
+              key: "otherFile",
+              title: "合同附件",
+              type: "file",
+              showRule: () => {
+                return this.signType === '2'
+              }
+            },
+            {
+              key: "tips",
+              title: "",
+              type: "text",
+              placeholder: '',
+            },
+          ],
+          // 表单验证规则
+          rules: {
+            title: [{
+              required: true,
+              message: "标题不能为空",
+              trigger: "change"
+            },],
+            phone: [{
+              required: true,
+              message: "请输入对方金久信实名注册手机号码 不能为空",
+              trigger: "change"
+            },],
+            signEndDate: [{
+              required: true,
+              message: "签署截止日期不能为空",
+              trigger: "change"
+            }],
+            buyerSignKeyword: [{
+              required: true,
+              message: "签约发起方关键字不能为空",
+              trigger: "change"
+            }],
+            sellerSignKeyword: [{
+              required: true,
+              message: "签约接收方关键字不能为空",
+              trigger: "change"
+            }],
+            contractFile: [{
+              required: true,
+              message: "签署文档不能为空",
+              trigger: "change"
+            },],
+            payBy: [{
+              required: true,
+              message: "请选择签约承担方",
+              trigger: "change"
+            },]
+          },
+          // add 代表添加 update 代表修改
+          formType: "",
+          // 表单是否在请求中
+          loading: false,
+          // 是否显示表单1 的弹窗
+          show: false,
+        },
+      },
+      // 表单相关结束-----------------------------------------------------------
     }
+  },
+  onLoad(options) {
+    if (options.tab) {
+      if (options.tab === 'sign') {
+        // this.menuIndex = null
+        // this.formData.tradeMethod = null
+        // this.isSign = true
+        // this.isSignIntro = false
+        // this.isSignFlow = false
+        // this.isSignLog = false
+        // this.isSignTips = false
+        this.selectSign()
+      } else if (options.tab === 'signPayLog') {
+        this.getSignBuyLog(1)
+      } else {
+        this.menuIndex = String(options.tab)
+        if (options.tradeMethod) this.formData.tradeMethod = (parseInt(options.tradeMethod))
+        this.formData.status = Number(options.tab)
+        this.isSign = false
+        if (options.result_desc) {
+          uni.showLoading({title: '请求中...'})
+          setTimeout(async () => {
+            await this.query(1)
+            uni.hideLoading()
+          }, 1500)
+        } else this.query(1)
+      }
+    } else {
+      this.menuIndex = '0'
+      this.formData.status = 0
+      this.isSign = false
+      this.query(1)
+    }
+    this.getCommonContractUrl()
+    this.getQybPackage()
+    this.getSignFlow()
+  },
+  onShow() {
+    this.userInfo = vk.getVuex('$user.userInfo')
+    this.getUserInfo()
+  },
+  methods: {
+    dayjs,
+    menuSelect(e) {
+      this.menuIndex = String(e)
+      this.formData.status = Number(e)
+      this.isSign = false
+      this.isSignIntro = false
+      this.isSignLog = false
+      this.isSignFlow = false
+      this.isSignTips = false
+      this.query(1)
+    },
+    selectSign() {
+      this.isSign = true
+      this.isSignIntro = false
+      this.isSignLog = false
+      this.isSignFlow = false
+      this.isSignTips = false
+      this.menuIndex = ''
+    },
+    selectSignLog() {
+      this.isSign = false
+      this.isSignIntro = false
+      this.isSignLog = true
+      this.isSignFlow = false
+      this.isSignTips = false
+      this.menuIndex = ''
+      this.getSignLog(1)
+    },
+    async selectSignTips() {
+      this.isSign = false
+      this.isSignIntro = false
+      this.isSignLog = false
+      this.isSignTips = true
+      this.menuIndex = ''
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '614937966875c18505570c357541c6e0'
+        },
+      })
+      this.signTips = res.content
+    },
+    async getSignLog(pageIndex) {
+      this.signLogType = 'log'
+      this.signLog = await vk.callFunction({
+        url: 'client/qyb/list/kh/payList',
+        data: {
+          pageIndex: pageIndex,
+          pageSize: 10
+        }
+      })
+      this.signLog.rows = this.signLog.rows.filter(item => !!item.contract)
+      this.$forceUpdate()
+    },
+    async getSignBuyLog(pageIndex) {
+      this.isSign = false
+      this.isSignIntro = false
+      this.isSignFlow = false
+      this.isSignLog = true
+      this.isSignTips = false
+      this.menuIndex = ''
+      this.signLogType = 'payLog'
+      this.signBuyLog = await vk.callFunction({
+        url: 'client/order/kh/getList',
+        data: {
+          isSeller: 0,
+          keyword: null,
+          orderStatus: 4,
+          pageIndex,
+          pageSize: 10,
+          signMethod: null,
+          type: [12, 13]
+        }
+      })
+      this.$forceUpdate()
+    },
+    async selectSignIntro(pageIndex) {
+      this.isSign = false
+      this.isSignIntro = true
+      this.isSignLog = false
+      this.isSignTips = false
+      this.isSignFlow = false
+      this.menuIndex = ''
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'ef45322e671cece4110ec73b36ca2b7d'
+        },
+      })
+      this.signIntro = res.content
+    },
+    async selectSignFlow() {
+      this.isSign = false
+      this.isSignIntro = false
+      this.isSignLog = false
+      this.isSignFlow = true
+      this.isSignTips = false
+      this.menuIndex = ''
+    },
+    changeAuthInfo() {
+      vk.navigateTo({url: '/pages/user/user?menu=fadada'})
+    },
+    async getSignFlow() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'd77d384f686b9bd204bd4dc744cf75d0'
+        },
+      })
+      this.signFlow = res.content
+      this.signFlowTitle = res.name
+    },
+    async query(pageIndex) {
+      this.tableData = await vk.callFunction({
+        url: 'client/contract/kh/getList',
+        title: '请求中...',
+        data: {
+          pageIndex,
+          pageSize: 10,
+          status: this.formData.status,
+          tradeMethod: this.formData.tradeMethod,
+          type: this.formData.type,
+          keyword: this.keyword,
+          signType: this.signTypeFilter === '1' ? '1' : '2',
+        },
+      });
+      // this.tableData.rows.forEach(item => {
+      //   if (item.contract.type === 'sign' && !item.contract.payUser.user) console.log(item.contract.docTitle, item.contract._id)
+      // })
+      this.$forceUpdate()
+    },
+    /**
+     * 创建合同
+     * @param contract
+     */
+    createContract(contract) {
+      this.form1.data.contractId = contract._id
+      this.form1.props.action = 'client/contract/kh/launch'
+      this.form1.props.show = true
+    },
+    async changeContract(contract) {
+      this.form1.data.contractId = contract._id
+      const {data} = await vk.callFunction({
+        url: 'client/contract/kh/getDetail',
+        title: '请求中...',
+        data: {
+          contractId: contract._id
+        },
+      });
+      this.form1.data.signEndDate = dayjs(data.signEndDate).toDate()
+      // console.log(this.form1.data.signEndDate, dayjs(data.signEndDate), dayjs(data.signEndDate).date())
+      this.form1.data.title = data.docTitle
+      if (Array.isArray(data.contractBase)) this.form1.data.contractFile = data.contractBase
+      else this.form1.data.contractFile = [data.contractBase]
+      console.log('this.form1.data.contractFile', this.form1.data.contractFile)
+      this.form1.data.buyerSignKeyword = data.buyerSignKeyword
+      this.form1.data.sellerSignKeyword = data.sellerSignKeyword
+      this.form1.data.otherFile = data.otherFile
+      this.form1.props.show = true
+      this.form1.data.thirdList = data.partyList.filter(item => item.role === 'third').map(item => {
+        return {
+          phone: item.user.mobile,
+          signKeyword: item.keyword
+        }
+      })
+      console.log(this.form1.data)
+      if (!this.form1.data.thirdList || !this.form1.data.thirdList.length) {
+        this.form1.data.thirdList = [{
+          phone: '',
+          signKeyword: ''
+        }]
+      }
+    },
+    onFormSuccess() {
+      this.form1.props.show = false
+      // this.form1.data.contractId = null
+      // this.formData.status = 1
+      // this.menuIndex = '1'
+      // this.isSign = false
+      // this.$refs.form2.resetForm()
+      // this.$refs.form1.resetForm()
+      // this.query(1)
+      vk.redirectTo({url: '/pages/contract/index?tab=1'})
+    },
+    /**
+     * 签署合同
+     * @param sign
+     * @param contract
+     */
+    async extSign(sign, contract) {
+      if (sign) return
+      try {
+        await this.$confirm(`1、您确认，若全体各签约方未完成全部签约流程，本签约文件不发生法律效力，系统无法对该签约文件予以保存及提供司法调证服务;<br>2、您确认，当前签约的实名主体名称、手机号码与注册认证阶段提交的信息未发生变更;若发生变更，必须及时进行重新认证后方可继续签约，避免产生严重法律风险与经济损失;<br>3、您确认，本次签约为本系统实名认证主体操作，如若不是实名认证主体操作，授权委托人需本系统进行授权认证后签约;<br>4、您确认，您与其他签约方均系在平等、自愿的基础上完成本次签约;<br>5、你确认，此次签约内容符合《中华人民共和国电子签名法》《民法典》生效保护范畴;<br>6、如因法律法规、监管部门政策更新等原因，系统提示您重新进行实名认证、证书续期等重要提示时，请您必须在签约前完成，否则造成任何损失，平台不承担任何责任;以上签约条件您均已经知悉并确认，否则您有权拒绝本次签约。`, '提示', {
+          confirmButtonText: '知悉同意',
+          showCancelButton: false,
+          type: 'warning',
+          dangerouslyUseHTMLString: true
+        })
+      } catch (e) {
+        return
+      }
+      vk.callFunction({
+        url: 'client/contract/kh/extSign',
+        title: '请求中...',
+        data: {
+          contractId: contract._id,
+          isSignOnly: true,
+        },
+        success: (res) => {
+          window.open(res.data)
+        }
+      });
+    },
+    showStopSign(contract) {
+      vk.callFunction({
+        url: 'client/contract/kh/extSign',
+        title: '请求中...',
+        data: {
+          contractId: contract._id
+        },
+        success: (res) => {
+          window.open(res.data)
+        }
+      });
+    },
+    viewContract(contract) {
+      vk.callFunction({
+        url: 'client/contract/kh/viewContract',
+        title: '请求中...',
+        data: {
+          contractId: contract._id
+        },
+        success: (res) => {
+          const userAgent = window.navigator.userAgent.toLowerCase();
+          // if (userAgent.match(/micromessenger/i)) {
+          //   window.open(`https://www.jinjiuxinzg.cn/pdfjs/web/viewer.html?file=${encodeURIComponent(res.data)}`)
+          // } else {
+          window.open(res.data)
+          // }
+          // window.open(res.data)
+          this.query(1)
+        }
+      });
+    },
+    navTo(url) {
+      vk.navigateTo({
+        url: url
+      })
+    },
+    showParty(userContract) {
+      // let content = ''
+      // userContract.contract.partyList.forEach(party => {
+      //   // if (party.userId !== userContract.userId) partyUser = party.user
+      //   const partyUser = party.user
+      //   if (partyUser) {
+      //     const name = partyUser.nickname
+      //     let role = party.role === 'buyer' ? '购买方' : '销售方'
+      //     if (party.role === 'third') role = '第三方'
+      //     content += `<view class="flex flex-col justify-start items-start py-10 border-bottom">
+      //                           <view>身份:${role}</view>
+      //                           <view>联系人:${name}</view>
+      //                           <view>联系方式:${partyUser.mobile}</view></view>`
+      //   }
+      // })
+      console.log(123123)
+      let content = ''
+      const buyer = userContract.contract.partyList.find(item => item.role !== 'third' && userContract.contract.userId === item.userId)
+      const seller = userContract.contract.partyList.find(item => item.role !== 'third' && userContract.contract.userId !== item.userId)
+      const thirdList = userContract.contract.partyList.filter(item => item.role === 'third')
+      content += `<view class="flex flex-col justify-start items-start py-10 border-bottom">
+                                <view>身份:发起方</view>
+                                <view>联系人:${(buyer && buyer.user) ? buyer.user.nickname : ''}</view>
+                                <view>联系方式:${(buyer && buyer.user) ? buyer.user.mobile : ''}</view></view>`
+      content += `<view class="flex flex-col justify-start items-start py-10 border-bottom">
+                                <view>身份:接收方</view>
+                                <view>联系人:${(seller && seller.user) ? seller.user.nickname : ''}</view>
+                                <view>联系方式:${(seller && seller.user) ? seller.user.mobile : ''}</view></view>`
+      thirdList.forEach((item, index) => {
+        content += `<view class="flex flex-col justify-start items-start py-10 border-bottom">
+                                <view>身份:第${this.numToChForThird[index]}方</view>
+                                <view>联系人:${item.user ? item.user.nickname : ''}</view>
+                                <view>联系方式:${item.user ? item.user.mobile : ''}</view></view>`
+      })
+      this.$confirm(content, '', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true
+      })
+    },
+    changeTradeMethod(tradeMethod) {
+      this.formData.tradeMethod = tradeMethod
+      this.formData.type = null
+      this.query(1)
+    },
+    changeType(type) {
+      this.formData.tradeMethod = null
+      this.formData.type = type
+      // if (type === 'sign' && this.userInfo.qybNum === 0) {
+      //     this.$confirm(`金久信签约宝次数已用完，请先购买`, '', {
+      //         confirmButtonText: '去购买',
+      //     })
+      // }
+      this.query(1)
+    },
+    openDownload(otherFile) {
+      for (let file in otherFile) {
+        window.open(otherFile)
+      }
+    },
+    async getCommonContractUrl() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d36befe975f63af1f24e7'
+        },
+      })
+      this.contractTemplate = res.content
+    },
+    openPreview(url) {
+      let openUrl = url
+      if (Array.isArray(url)) openUrl = url[url.length - 1]
+      if (!openUrl) return
+      window.open(`https://www.jinjiuxinzg.cn/pdfjs/web/viewer.html?file=${encodeURIComponent(openUrl)}`, '_blank')
+    },
+    downloadContractTemplate() {
+      window.open(this.contractTemplate)
+    },
+    async delContract(contract) {
+      this.$confirm('请您确认文件无用或已经完成履约后再删除文件，删除后平台将无法为您提供相关数据，您将无法查询已经删除文件。请您谨慎操作。', '温馨提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        await vk.callFunction({
+          url: 'client/contract/kh/del',
+          data: {
+            id: contract._id
+          },
+          success: (res) => {
+            this.query(1)
+          }
+        })
+        this.getUserInfo()
+      })
+    },
+    async payDownloadContract(contract) {
+      const amountRes = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'ded3e568662e5817000026633aad1e69'
+        },
+      })
+      if (!contract.canDownloadUidList || !contract.canDownloadUidList.includes(this.userInfo.uid)) {
+        if (contract.certificate && !contract.certificate.paidConfirm) {
+          if (contract.certificate.paymentMethod === 'online') {
+            return vk.navigateTo({
+              url: `/pages/index/shop/pay?id=${contract.certificate.orderId}`
+            })
+          }else return vk.toast('请先等待后台确认支付')
+        }
+        vk.navigateTo({
+          url: `/pages/contract/certificate?contractId=${contract._id}&transactionId=${contract.transactionId}&amount=${amountRes.content}`
+        })
+      } else {
+        this.$confirm(`您提交申请后，平台将在两个工作日内向您提供合法生效文件，客服电话：0771-3923001`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          // let loadingInstance1 = Loading.service({fullscreen: true, text: '加载中...'});
+          // const res = await vk.callFunction({
+          //   url: 'client/contract/kh/report',
+          //   data: {
+          //     contractNum: contract.transactionId
+          //   }
+          // });
+          // loadingInstance1.close()
+          // if (res) {
+          //   window.open(res.data.downloadUrl)
+          // }
+          if (contract.certificate) {
+            if (contract.certificate.deliveryMethods.paper) {
+              vk.toast('您的司法调证文件已发货,请注意查收')
+            } else {
+              if (contract.certificate.downloadUrl) window.open(contract.certificate.downloadUrl)
+              else vk.toast('文件生成中,请耐心等待')
+            }
+          } else vk.toast('操作失败，请联系客服')
+        })
+
+      }
+    },
+    async downloadContract(contract_id) {
+      let loadingInstance1 = Loading.service({fullscreen: true, text: '加载中...'});
+      const res = await vk.callFunction({
+        url: 'client/contract/pub/getDownload',
+        data: {
+          contract_id
+        }
+      });
+      loadingInstance1.close()
+      if (res) {
+        window.open(`https://textapi.fadada.com/api2/downLoadContract.api?app_id=502704&timestamp=${res.data.timestamp}&v=2.0&msg_digest=${res.data.msg_digest}&contract_id=${contract_id}`)
+      }
+    },
+    getUserInfo() {
+      vk.userCenter.getCurrentUserInfo({
+        success: ({userInfo}) => {
+          this.userInfo = userInfo
+          if (!this.userInfo.mobile) {
+            this.$confirm('请先绑定手机号', '提示', {
+              confirmButtonText: '确定',
+              showCancelButton: false,
+              type: 'warning'
+            }).then(() => {
+              vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + this.userInfo.accountType)
+            }).catch(() => {
+              vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + this.userInfo.accountType)
+            })
+            return
+          }
+          if (!this.userInfo.fadadaConfirm) {
+            this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+              confirmButtonText: '确定',
+              showCancelButton: false,
+              type: 'warning',
+              showClose: false,
+              closeOnClickModal: false,
+              closeOnPressEscape: false
+            }).then(() => {
+              vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+            })
+          }
+          this.invoiceForm.phone = this.userInfo.mobile
+          this.invoiceForm.email = this.userInfo.businessCard ? this.userInfo.businessCard.email : ''
+          if (this.userInfo.accountType === 2) {
+            if (this.userInfo.fadadaConfirm && this.userInfo.company) {
+              this.invoiceForm.name = this.userInfo.company.companyName
+              this.invoiceForm.code = this.userInfo.company.organization
+              this.invoiceForm.address = this.userInfo.company.addressDetail
+              this.invoiceForm.tel = this.userInfo.company.mobile
+              this.invoiceForm.bankName = this.userInfo.company.companyBankName
+              this.invoiceForm.bankAccount = this.userInfo.company.companyAccount
+            }
+          } else {
+            this.invoiceForm.name = this.userInfo.person.personName
+            this.invoiceForm.code = this.userInfo.person.idCard
+            this.invoiceForm.address = this.userInfo.person.address
+            this.invoiceForm.tel = this.userInfo.mobile
+          }
+        }
+      });
+    },
+    async getQybPackage() {
+      const {rows} = await vk.callFunction({
+        url: 'client/qyb/list/pub/getList',
+        data: {
+          pageIndex: 1,
+          pageSize: 500
+        }
+      });
+      this.qybPackageList = rows
+    },
+    async doBuyQyb() {
+      const {data} = await vk.callFunction({
+        url: 'client/qyb/list/kh/buy',
+        title: '请求中...',
+        data: {
+          qybId: this.selectedQyb,
+        }
+      })
+      this.dialogVisible = false
+      vk.navigateTo({
+        url: `/pages/index/shop/pay?id=${data}`
+      })
+    },
+    addThird() {
+      if (this.form2.data.thirdList.length < 8) this.form2.data.thirdList.push({
+        phone: '',
+        signKeyword: '',
+      })
+    },
+    removeThird(index) {
+      if (this.form2.data.thirdList.length === 1) return
+      this.form2.data.thirdList.splice(index, 1)
+    },
+    thirdMoveUp(index) {
+      let tmpList = JSON.parse(JSON.stringify(this.form2.data.thirdList));
+      [tmpList[index], tmpList[index - 1]] = [tmpList[index - 1], tmpList[index]];
+      this.form2.data.thirdList = tmpList
+      this.$forceUpdate()
+    },
+    thirdMoveDown(index) {
+      let tmpList = JSON.parse(JSON.stringify(this.form2.data.thirdList));
+      [tmpList[index], tmpList[index + 1]] = [tmpList[index + 1], tmpList[index]];
+      this.form2.data.thirdList = tmpList
+      this.$forceUpdate()
+    },
+    addThird1() {
+      if (this.form1.data.thirdList.length < 8) this.form1.data.thirdList.push({
+        phone: '',
+        signKeyword: '',
+      })
+    },
+    removeThird1(index) {
+      if (this.form1.data.thirdList.length === 1) return
+      this.form1.data.thirdList.splice(index, 1)
+    },
+    thirdMoveUp1(index) {
+      let tmpList = JSON.parse(JSON.stringify(this.form1.data.thirdList));
+      [tmpList[index], tmpList[index - 1]] = [tmpList[index - 1], tmpList[index]];
+      this.form1.data.thirdList = tmpList
+      this.$forceUpdate()
+    },
+    thirdMoveDown1(index) {
+      let tmpList = JSON.parse(JSON.stringify(this.form1.data.thirdList));
+      [tmpList[index], tmpList[index + 1]] = [tmpList[index + 1], tmpList[index]];
+      this.form1.data.thirdList = tmpList
+      this.$forceUpdate()
+    },
+    openInvoice(id) {
+      this.invoiceForm.id = id
+      this.showInvoice = true
+    },
+    async doInvoice() {
+      if (!this.invoiceForm.name) return this.$message.error('请输入发票抬头')
+      if (!this.invoiceForm.code) return this.$message.error('请输入纳税人识别号')
+      if (!this.invoiceForm.phone) return this.$message.error('请输入手机号码')
+      if (!this.invoiceForm.email) return this.$message.error('请输入邮箱')
+      if (!this.invoiceForm.address) return this.$message.error('请输入地址')
+      await vk.callFunction({
+        url: 'client/order/kh/changeInvoice',
+        data: {
+          ...this.invoiceForm,
+          isInvoice: 1
+        }
+      })
+      this.showInvoice = false
+      this.$message.success('申请成功')
+      await this.getSignBuyLog(1)
+    },
+    copyInvoice(row) {
+      //   const url = row.invoiceUrl[0]
+      //   document.oncopy = function (e) {
+      //     e.clipboardData.setData('text', url);
+      //     e.preventDefault();
+      //     document.oncopy = null;
+      //   }
+      //   document.execCommand('Copy');
+      //   this.$message({
+      //     type: 'success',
+      //     message: '已复制'
+      //   })
+      let openUrl = row.invoiceUrl
+      if (Array.isArray(openUrl)) openUrl = openUrl[openUrl.length - 1]
+      const userAgent = window.navigator.userAgent.toLowerCase();
+      // 检测 userAgent 中是否包含 'micromessenger' 字符串
+      if (userAgent.match(/micromessenger/i)) {
+        window.open(`https://www.jinjiuxinzg.cn/pdfjs/web/viewer.html?file=${encodeURIComponent(openUrl)}`)
+      } else {
+        window.open(openUrl)
+      }
+    },
+    openPayVoucher(row) {
+      const userAgent = window.navigator.userAgent.toLowerCase();
+      // 检测 userAgent 中是否包含 'micromessenger' 字符串
+      if (userAgent.match(/micromessenger/i)) {
+        this.payVoucher = row.payVoucher
+        this.showPayVoucher = true
+      } else {
+        window.open(row.payVoucher)
+      }
+      // window.open(row.payVoucher)
+    },
+    beforeUpload(file) {
+      if ((new RegExp(/\s+/g).test(file.name))) {
+        vk.toast('文件名不能有空格')
+        return false
+      }
+    },
+    uploadSuccess(response, file, fileList) {
+      console.log(response, file, fileList)
+      this.openPreview(response.url)
+      this.$refs.uploader.clearFiles();
+    },
+    uploadSuccess1(response, file, fileList) {
+      console.log(response, file, fileList)
+      this.openPreview(response.url)
+      this.$refs.uploader1.clearFiles();
+    },
+  }
 }
 </script>
 
+<style lang="scss">
+.el-picker-panel.currentDatePickerClass {
+  .el-button--text.el-picker-panel__link-btn {
+    display: none;
+  }
+}
+
+.currentDatePickerClass > > > .el-picker-panel__link-btn {
+  display: none
+}
+</style>
+
 <style scoped lang="scss">
 .w-1200 {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .contract-list {
-    background-color: #FFFFFF;
-    padding: 10px 20px 20px;
+  background-color: #FFFFFF;
+  padding: 10px 20px 20px;
 }
 
 .paginatio {
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 
 .contract-box {
-    display: flex;
-    justify-content: space-between;
-    border-bottom: solid 1px #e8e8e8;
-    padding: 10rpx 0;
-}
-
-.contract-left {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: solid 1px #e8e8e8;
+  padding: 10rpx 0;
 }
 
 .contract-right {
-    text-align: right;
-    font-size: 13px;
+  text-align: right;
+  font-size: 13px;
 }
 
 .trade-method {
-    display: flex;
-    margin-bottom: 20px;
-    border-bottom: solid 2px #f4f4f4;
+  display: flex;
+  margin-bottom: 20px;
+  border-bottom: solid 2px #f4f4f4;
 }
 
 .trade-method-item {
-    cursor: pointer;
-    font-size: 18px;
-    margin-right: 15px;
-    height: 40px;
-    line-height: 40px;
+  cursor: pointer;
+  font-size: 18px;
+  margin-right: 15px;
+  height: 40px;
+  line-height: 40px;
 }
 
 .trade-method-item.active {
-    color: #A92924;
-    border-bottom: solid 2px #A92924;
+  color: #A92924;
+  border-bottom: solid 2px #A92924;
 }
 
 .contract-left-top {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 
 }
 
 .contract-product {
-    margin: 0 10px;
+  margin: 0 10px;
 }
 
 .contract-left-center {
-    height: 40px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    color: #999999;
-    font-size: 12px;
-    flex-direction: column;
-    margin-top: 5px;
+  //height: 40px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
+  color: #999999;
+  font-size: 12px;
+  flex-direction: column;
+  margin-top: 5px;
 }
 
 .contract-left-bottom {
-    display: flex;
+  display: flex;
 }
 
 .contract-status {
-    display: flex;
+  display: flex;
 }
 
 .contract-status-tag {
-    margin-left: 2px;
+  margin-left: 2px;
 }
 
 .sign {
-    padding: 20px 20px 20px 25px;
-    font-size: 14px;
+  padding: 20px 20px 20px 25px;
+  font-size: 14px;
 
-    .icon {
-        line-height: 18px;
-    }
+  .icon {
+    line-height: 18px;
+  }
 }
-</style>
\ No newline at end of file
+
+.buy-quote-mode-active {
+  border: 1px solid #a92924;
+  background-color: #f1c7c7;
+  color: #333;
+}
+</style>
diff --git a/pages/enquiry/components/template.vue b/pages/enquiry/components/template.vue
index 1e4d149..72810b6 100644
--- a/pages/enquiry/components/template.vue
+++ b/pages/enquiry/components/template.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="border-bottom pt-20">
-        <el-form ref="form" :model="form1" label-width="80px" :rules="form1.props.rules">
+        <el-form ref="form" :model="form1" label-width="140px" :rules="form1.props.rules">
             <view class="flex flex-wrap justify-start items-start">
                 <view class="w-25p">
                     <el-form-item label="商品名称">
@@ -15,49 +15,51 @@
                     </el-form-item>
                 </view>
                 <view class="w-25p" v-for="(item, index) in goodsAttributes" :key="index">
-                    <el-form-item :label="item.label">
-                        <el-select v-model="form1.data.model[item.label]" placeholder="请选择">
-                            <el-option
-                                v-for="(item, index) in item.values"
-                                :key="index"
-                                :label="item"
-                                :value="item">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    <template v-if="goodsAttributes && goodsAttributes.length > 0">
+                        <el-form-item :label="item.label" v-if="item.label">
+                            <el-select v-model="form1.data.model[index].value" placeholder="请选择">
+                                <el-option
+                                    v-for="(value, valueIndex) in item.values" :key="valueIndex" :label="value"
+                                    :value="value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
                 </view>
             </view>
             <el-row :gutter="10">
-                <el-col :span="10">
-                    <el-form-item label="单件长度">
-                        <el-input placeholder="请输入内容" v-model="form1.data.singleLength" class="input-with-select">
-                            <el-select v-model="form1.data.singleLengthUnit" slot="append" placeholder="请选择">
-                                <template v-if=" attributes.find(attr => attr.label === '单件长度')">
-                                    <el-option
-                                        v-for="(item, index) in attributes.find(attr => attr.label === '单件长度').options"
-                                        :key="index"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </template>
-                            </el-select>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="材质">
-                        <el-select v-model="form1.data.materialQuality" placeholder="请选择">
-                            <template v-if=" attributes.find(attr => attr.label === '材质')">
-                                <el-option
-                                    v-for="(item, index) in attributes.find(attr => attr.label === '材质').options"
-                                    :key="index"
-                                    :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </template>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
+<!--                <el-col :span="10">-->
+<!--                    <el-form-item label="单件长度">-->
+<!--                        <el-input placeholder="请输入内容" v-model="form1.data.singleLength" class="input-with-select"-->
+<!--                                  type="number">-->
+<!--                            <template slot="append">米</template>-->
+<!--&lt;!&ndash;                            <el-select v-model="form1.data.singleLengthUnit" slot="append" placeholder="请选择">&ndash;&gt;-->
+<!--&lt;!&ndash;                                <template v-if=" attributes.find(attr => attr.label === '单件长度')">&ndash;&gt;-->
+<!--&lt;!&ndash;                                    <el-option&ndash;&gt;-->
+<!--&lt;!&ndash;                                        v-for="(item, index) in attributes.find(attr => attr.label === '单件长度').options"&ndash;&gt;-->
+<!--&lt;!&ndash;                                        :key="index"&ndash;&gt;-->
+<!--&lt;!&ndash;                                        :label="item.label"&ndash;&gt;-->
+<!--&lt;!&ndash;                                        :value="item.value">&ndash;&gt;-->
+<!--&lt;!&ndash;                                    </el-option>&ndash;&gt;-->
+<!--&lt;!&ndash;                                </template>&ndash;&gt;-->
+<!--&lt;!&ndash;                            </el-select>&ndash;&gt;-->
+<!--                        </el-input>-->
+<!--                    </el-form-item>-->
+<!--                </el-col>-->
+                <!--                <el-col :span="6">-->
+                <!--                    <el-form-item label="尺寸">-->
+                <!--                        <el-select v-model="form1.data.materialQuality" placeholder="请选择">-->
+                <!--                            <template v-if=" attributes.find(attr => attr.label === '尺寸')">-->
+                <!--                                <el-option-->
+                <!--                                    v-for="(item, index) in attributes.find(attr => attr.label === '尺寸').options"-->
+                <!--                                    :key="index"-->
+                <!--                                    :label="item.label"-->
+                <!--                                    :value="item.value">-->
+                <!--                                </el-option>-->
+                <!--                            </template>-->
+                <!--                        </el-select>-->
+                <!--                    </el-form-item>-->
+                <!--                </el-col>-->
                 <el-col :span="6">
                     <el-form-item label="交货服务">
                         <el-select v-model="form1.data.deliverService" placeholder="请选择">
@@ -72,24 +74,6 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="采购数量">
-                        <el-input v-model="form1.data.procureNumber" class="input-with-select">
-                            <el-select v-model="form1.data.procureUnit" slot="append" placeholder="请选择">
-                                <template v-if=" attributes.find(attr => attr.label === '单位')">
-                                    <el-option
-                                        v-for="(item, index) in attributes.find(attr => attr.label === '单位').options"
-                                        :key="index"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </template>
-                            </el-select>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
                 <el-col :span="6">
                     <el-form-item label="计价形式">
                         <el-select v-model="form1.data.pricingForm" placeholder="请选择">
@@ -106,53 +90,38 @@
                 </el-col>
             </el-row>
             <el-row :gutter="10">
-                <el-col :span="6">
-                    <el-form-item label="交货时限">
-                        <el-date-picker
-                            v-model="form1.data.deliveryTime"
-                            type="date"
-                            placeholder="选择日期">
-                        </el-date-picker>
+                <el-col :span="12">
+                    <el-form-item label="采购数量">
+                        <el-input v-model="form1.data.procureNumber" class="input-with-select" type="number">
+                            <el-select v-model="form1.data.procureUnit" slot="append" placeholder="请选择">
+                                <template v-if=" attributes.find(attr => attr.label === '单位')">
+                                    <el-option
+                                        v-for="(item, index) in attributes.find(attr => attr.label === '单位').options"
+                                        :key="index"
+                                        :label="item.label"
+                                        :value="item.value">
+                                    </el-option>
+                                </template>
+                            </el-select>
+                        </el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="18">
-                    <el-form-item label="交货地点" class="ml-10">
-                        <el-row :gutter="10">
-                            <el-col :span="5">
-                                <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
-                                    <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                               :label="item.name"/>
-                                    <!--                                    <span slot="prefix">省</span>-->
-                                </el-select>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
-                                    <template v-if="provinceIndex !== null">
-                                        <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
-                                                   :value="index"
-                                                   :label="item.name"/>
-                                    </template>
-                                    <!--                                    <span slot="prefix">市</span>-->
-                                </el-select>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
-                                    <template v-if="provinceIndex !== null && cityIndex !== null">
-                                        <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
-                                                   :key="index" :value="index"
-                                                   :label="item.name"/>
-                                    </template>
-                                    <!--                                    <span slot="prefix">区/县</span>-->
-                                </el-select>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-input v-model="form1.data.addressDetail"
-                                          placeholder="详细地址或几公里范围内"></el-input>
-                            </el-col>
-                        </el-row>
+                <el-col :span="12">
+                    <el-form-item label="装货、卸货费用承担">
+                        <el-select v-model="form1.data.loadPaidBy" placeholder="请选择" style="width: 100%">
+                            <template v-if="attributes.find(attr => attr.label === '装货、卸货费用承担')">
+                                <el-option
+                                    v-for="(item, index) in attributes.find(attr => attr.label === '装货、卸货费用承担').options"
+                                    :key="index"
+                                    :label="item.label"
+                                    :value="item.label">
+                                </el-option>
+                            </template>
+                        </el-select>
                     </el-form-item>
                 </el-col>
             </el-row>
+
         </el-form>
     </view>
 </template>
@@ -183,6 +152,11 @@ export default {
     },
     data() {
         return {
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() < Date.now();
+                },
+            },
             provinceData: provinces,
             cityData: citys,
             areaData: areas,
@@ -211,6 +185,7 @@ export default {
                     deliverService: null,
                     standard: null,
                     pricingForm: null,
+                    loadPaidBy: '供货方承担装车费用，采购方承担卸货费用',
                     deliveryTime: null,
                     len: null,
                     extraAttributes: {},
@@ -277,8 +252,6 @@ export default {
                                 } else {
                                     this.form1.props.columns[2].columns = []
                                 }
-
-
                             }
                         },
                         {
@@ -499,6 +472,7 @@ export default {
         getGoodsList() {
             vk.callFunction({
                 url: 'client/enquiry/template/pub/getList',
+                pageSize: 500,
                 title: '请求中',
                 success: ({rows}) => {
                     this.goodsList = rows
@@ -506,10 +480,17 @@ export default {
             })
         },
         selectGoods(val) {
+            this.form1.data.model = []
             this.goodsList.forEach(({_id, name, extraAttributes}) => {
                 if (_id === val) {
                     this.form1.data.goodsName = name
                     this.goodsAttributes = extraAttributes
+                    this.goodsAttributes.forEach(attr => {
+                        if (attr.label) this.form1.data.model.push({
+                            label: attr.label,
+                            value: null
+                        })
+                    })
                 }
             })
         },
@@ -525,13 +506,19 @@ export default {
 
     },
     watch: {
-        "form1.data"(val) {
-            this.$emit('input', val)
-            console.log("this.$emit('input', val.data)");
+        "form1.data": {
+            immediate: true,
+            handler(val) {
+                this.$emit('input', val)
+                console.log("this.$emit('input', val.data)");
+            }
         },
-        value(val) {
-            this.form1.data = val
-            console.log("this.form1.data = val", val);
+        value: {
+            immediate: true,
+            handler(val) {
+                this.form1.data = val
+                console.log("this.form1.data = val", val);
+            }
         }
 
     }
diff --git a/pages/enquiry/detail.vue b/pages/enquiry/detail.vue
index f0f7708..b5e45d0 100644
--- a/pages/enquiry/detail.vue
+++ b/pages/enquiry/detail.vue
@@ -16,12 +16,13 @@
 
         <view class="page-main" v-if="sheet">
             <view class="flex justify-between items-center">
-                <text class="text-gray">加工询价单编号:{{ sheet.orderNo }}</text>
+                <text class="text-gray">询价单编号:{{ sheet.enquiryNo }}</text>
                 <text class="text-gray">发布时间:{{ sheet._add_time_str }}</text>
             </view>
             <view class="my-25 flex justify-between items-center">
                 <view class="flex justify-start items-center">
                     <text class="text-40 font-bold">{{ sheet.title }}</text>
+                    <el-tag type="success" v-if="sheet.tradeMethod === 0" size="small" class="ml-20">自主交易</el-tag>
                     <view class="ml-20 flex justify-start items-center">
                         <building-one theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
                         <view class="text-main ">
@@ -34,15 +35,15 @@
                     </view>
                 </view>
                 <view class="flex justify-end items-end"
-                      v-if="sheet.answerEndTime && dayjs().diff(dayjs(sheet.answerEndTime), 'second') > 0">
+                      v-if="sheet.answerEndTime && dayjs(sheet.answerEndTime).diff(dayjs(), 'second') > 0">
                     <text>距离报价结束还有：</text>
                     <view class="border-main countdown text-main">{{
-                            dayjs().diff(dayjs(sheet.answerEndTime), 'day')
+                            dayjs(sheet.answerEndTime).diff(dayjs(), 'day')
                         }}
                     </view>
                     <text>天</text>
                     <view class="border-main countdown text-main">
-                        {{ (dayjs().diff(dayjs(sheet.answerEndTime), 'hour')) % 24 }}
+                        {{ (dayjs(sheet.answerEndTime).diff(dayjs(), 'hour')) % 24 }}
                     </view>
                     <text>时</text>
                 </view>
@@ -50,19 +51,71 @@
             <view class="my-25 flex justify-between items-center pb-20 border-bottom">
                 <view class="flex justify-start items-center">
                     <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
-                    <text class="ml-15 text-gray">
+                    <text class="ml-15 text-gray" v-if="sheet.user">
                         {{
-                            sheet.user.accountType === 1 ? sheet.user.person.personName : sheet.user.company.companyName
+                            sheet.user.accountType === 1 ? sheet.user.person.personName.replace(/^(.).*$/,"$1**") : sheet.user.company.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/,"$1$2***$3$4$5$6")
                         }}
                     </text>
                 </view>
-                <el-button type="primary" @click.native="toQuote"
-                           v-if="vk.getVuex('$user.userInfo._id') !== sheet.userId && sheet.status === 0">我要报价
+                <el-button type="primary" @click.native="toQuote" :disabled="sheet.disabled"
+                           v-if="vk.getVuex('$user.userInfo._id') !== sheet.userId && sheet.status === 0">{{
+                        sheet.disabled ? '已超时无法报价' : '我要报价'
+                    }}
                 </el-button>
                 <el-button type="primary" @click.native="showDialog = true"
                            v-else-if="vk.getVuex('$user.userInfo._id') === sheet.userId">查看收到的申请报价
                 </el-button>
             </view>
+<!--            <view class="item-wrap">-->
+<!--                <view class="form-title-wrap">-->
+<!--                    <view class="goods-sheet-title">-->
+<!--                        <view class="form-title">-->
+<!--                            主要商品-->
+<!--                        </view>-->
+<!--                    </view>-->
+<!--                </view>-->
+<!--                <view class="mt-20" v-if="sheet.fillType === 1">{{-->
+<!--                        sheet.productList.map(item => item.goodsName + `${item.materialQuality ? `(${item.materialQuality})` : ''}`).join(',')-->
+<!--                    }}-->
+<!--                </view>-->
+<!--                <view v-else class="mt-20">-->
+<!--                    <el-descriptions :title="item.goodsName" v-for="(item, index) in sheet.productList" :key="index"-->
+<!--                                     class="pb-20 border-bottom">-->
+<!--                        <el-descriptions-item :label="model.label" v-for="(model, modelIndex) in item.model"-->
+<!--                                              :key="modelIndex">{{ model.value }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="单价长度">{{-->
+<!--                                item.singleLength ? item.singleLength : ''-->
+<!--                            }}{{ item.singleLengthUnit ? item.singleLengthUnit : '' }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="交货服务">{{-->
+<!--                                item.deliverService ? item.deliverService : '无'-->
+<!--                            }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="采购数量">{{-->
+<!--                                item.procureNumber ? item.procureNumber : ''-->
+<!--                            }}{{ item.procureUnit ? item.procureUnit : '' }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="计价形式">{{-->
+<!--                                item.pricingForm ? item.pricingForm : '无'-->
+<!--                            }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="交货时限">{{-->
+<!--                                sheet.deliveryTime ? sheet.deliveryTime : '无'-->
+<!--                            }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="交货地点">{{-->
+<!--                                sheet.fullAddress-->
+<!--                            }}-->
+<!--                        </el-descriptions-item>-->
+<!--                        <el-descriptions-item label="装货、卸货费用承担">{{-->
+<!--                                item.loadPaidBy ? item.loadPaidBy : '无'-->
+<!--                            }}-->
+<!--                        </el-descriptions-item>-->
+<!--                    </el-descriptions>-->
+<!--                </view>-->
+<!--            </view>-->
+
             <view class="item-wrap">
                 <view class="form-title-wrap">
                     <view class="goods-sheet-title">
@@ -71,13 +124,35 @@
                         </view>
                     </view>
                 </view>
-                <view class="mt-15 mr-15" v-for="(item, index) in sheet.files" :key="index">
-                    <el-image :src="item" style="width: 100px; height: 100px" fit="cover"
-                              :preview-src-list="sheet.files"/>
-                </view>
+                <template v-if="sheet.files">
+                    <view class="mt-15 mr-15" v-for="(item, index) in sheet.files" :key="index">
+                        <file-type :item="item" @click.native="openDownload(item)"/>
+                    </view>
+                </template>
+                <template v-if="sheet.multiFiles">
+                    <view class="mt-15 mr-15" v-for="(item, index) in sheet.multiFiles" :key="index">
+                        <template v-if="['doc', 'docx'].includes(item.split('.').pop())">
+                            <file-word theme="outline" class="pointer" size="40" fill="#4a90e2" strokeLinecap="square"
+                                       @click.native="openDownload(item)"/>
+                        </template>
+                        <template v-else-if="['xls', 'xlsx'].includes(item.split('.').pop())">
+                            <file-excel theme="outline" class="pointer" size="40" fill="#417505" strokeLinecap="square"
+                                        @click.native="openDownload(item)"/>
+                        </template>
+                        <template v-else-if="['pdf'].includes(item.split('.').pop())">
+                            <file-pdf-one theme="outline" class="pointer" size="40" fill="#f5a623"
+                                          strokeLinecap="square"
+                                          @click.native="openDownload(item)"/>
+                        </template>
+                        <template v-else>
+                            <el-image :src="item" style="width: 100px; height: 100px" fit="cover"
+                                      :preview-src-list="[item]"/>
+                        </template>
+                    </view>
+                </template>
             </view>
 
-            <view class="item-wrap">
+            <view class="item-wrap" v-if="sheet.remark">
                 <view class="form-title-wrap">
                     <view class="goods-sheet-title">
                         <view class="form-title">
@@ -98,8 +173,13 @@
                 </view>
                 <view class="mt-15">是否含税：{{ sheet.invoice ? '含税' : '不含税' }}</view>
                 <view class="mt-15">开票时间：{{ WRITE_INVOICE_TIME[sheet.writeInvoiceTime] }}</view>
-                <view class="mt-15">发票种类：{{ INVOICE_TYPE[sheet.invoiceType] }}</view>
-                <view class="mt-15">其他要求：{{ sheet.invoiceOther }}</view>
+
+                <view class="mt-15" v-if="sheet.invoiceOther">税票要求：{{ sheet.invoiceOther }}</view>
+                <template v-else>
+                    <view class="mt-15">纳税人身份：{{ sheet.taxType ? sheet.taxType : '无' }}</view>
+                    <view class="mt-15">发票种类：{{ sheet.invoiceType ? sheet.invoiceType : '无' }}</view>
+                    <view class="mt-15">税率：{{ sheet.taxRate ? sheet.taxRate : '无' }}</view>
+                </template>
             </view>
 
             <view class="item-wrap">
@@ -110,9 +190,28 @@
                         </view>
                     </view>
                 </view>
-                <view class="mt-15">随货资料：{{ sheet.transportDocuments.join() }}</view>
-                <view class="mt-15">其他要求：{{ sheet.otherTransportDocuments }}</view>
+                <view class="mt-15" v-if="sheet.transportDocuments && sheet.transportDocuments.length > 0">
+                    随货资料：{{ sheet.transportDocuments.join() }}
+                </view>
+                <view class="mt-15" v-if="sheet.otherTransportDocuments">其他要求：{{
+                        sheet.otherTransportDocuments
+                    }}
+                </view>
                 <view class="mt-15">运输限制要求：{{ sheet.transportLimit ? '有' : '无' }}</view>
+                <view class="mt-15" v-if="sheet.transportLimit && sheet.otherTransportRequest">
+                    运输限制说明：{{ sheet.otherTransportRequest }}
+                </view>
+            </view>
+
+            <view class="item-wrap">
+                <view class="form-title-wrap">
+                    <view class="goods-sheet-title">
+                        <view class="form-title">
+                            交易模式
+                        </view>
+                    </view>
+                </view>
+                <view class="mt-15">{{ sheet.tradeMethod === 0 ? '自主交易' : '金久信公证' }}</view>
             </view>
 
             <view class="item-wrap">
@@ -123,7 +222,13 @@
                         </view>
                     </view>
                 </view>
-                <view class="mt-15">付款方式：{{ PROCESS_PAY_METHOD[sheet.payMethod] }}</view>
+                <view class="mt-15">付款方式：{{ PROCESS_PAY_METHOD[sheet.payMethod] }}{{
+                        sheet.payMethod === 0 ? `${sheet.advancePayRate}%货到付全款` : ''
+                    }}{{
+                        sheet.payMethod === 3 ? `${sheet.reputationPayDay}天` :
+                            (sheet.payMethod === 4 ? `:${sheet.otherPayMethod}` : '')
+                    }}
+                </view>
                 <view class="mt-15">报价形式：{{ sheet.offerType === 0 ? '整单报价' : '可分项报价' }}</view>
                 <view class="mt-15">报价期限：
                     <text v-if="sheet.answerStartTime && sheet.answerEndTime">{{
@@ -134,6 +239,79 @@
             </view>
 
             <view class="item-wrap">
+                <view class="form-title-wrap">
+                    <view class="goods-sheet-title">
+                        <view class="form-title">
+                            采购商信息
+                        </view>
+                    </view>
+                </view>
+                <view class="mt-15">项目名称：{{ sheet.projectName ? sheet.projectName : '' }}</view>
+                <view class="mt-15">项目地址：{{ sheet.fullAddress }}</view>
+                <template v-if="sheet.isMine || sheet.hasQuote || userInfo.userLevel > 0">
+                    <view class="mt-15" v-if="sheet.companyName">公司信息：{{
+                            sheet.companyName ? sheet.companyName : ''
+                        }}
+                    </view>
+                    <view class="mt-15" v-if="sheet.companyMobile">公司联系方式：{{
+                            sheet.companyMobile ? sheet.companyMobile : ''
+                        }}
+                    </view>
+                    <view class="mt-15">授权业务咨询人：{{
+                            sheet.businessName ? sheet.businessName : ''
+                        }}
+                    </view>
+                    <view class="mt-15">业务咨询联系方式：{{
+                            sheet.businessMobile ? sheet.businessMobile : ''
+                        }}
+                    </view>
+                </template>
+                <template v-else>
+                    <view class="mt-15" v-if="sheet.companyName">公司信息：{{
+                            sheet.companyName ? sheet.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6") : ''
+                        }}
+                    </view>
+                    <view class="mt-15" v-if="sheet.companyMobile">公司联系方式：{{
+                            sheet.companyMobile ? sheet.companyMobile.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+                        }}
+                    </view>
+                    <view class="mt-15">授权业务咨询人：{{
+                            sheet.businessName ? sheet.businessName.replace(/^(.).*(.)$/, "$1***$2") : ''
+                        }}
+                    </view>
+                    <view class="mt-15">业务咨询联系方式：{{
+                            sheet.businessMobile ? sheet.businessMobile.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+                        }}
+                    </view>
+                </template>
+            </view>
+
+            <view class="item-wrap">
+                <view class="form-title-wrap">
+                    <view class="goods-sheet-title">
+                        <view class="form-title">
+                            交易保证金要求
+                        </view>
+                    </view>
+                </view>
+                <view class="mt-15">{{ sheet.earnestMoney ? sheet.earnestMoney.toFixed(2) : '无' }}</view>
+            </view>
+
+            <view class="item-wrap">
+                <view class="form-title-wrap">
+                    <view class="goods-sheet-title">
+                        <view class="form-title">
+                            签约模式
+                        </view>
+                    </view>
+                </view>
+                <view class="mt-15">{{
+                        sheet.signMethod === 0 ? '线上签约-标准合同' : (sheet.signMethod !== 1 ? '线上签约-双方协商合同' : '线下签约')
+                    }}
+                </view>
+            </view>
+
+            <view class="item-wrap" v-if="sheet.signMethod === 0">
                 <view class="form-title-wrap">
                     <view class="goods-sheet-title">
                         <view class="form-title">
@@ -157,21 +335,36 @@
                 <view class="mt-15">
                     本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
                 </view>
-                <view class="mt-15">采购方补充条款： 供货方逾期供货承担采购方一切损失</view>
-                <view class="mt-15"> 供应方补充条款：</view>
+                <view class="mt-15">采购方补充条款： {{ sheet.supplementary }}</view>
+                <!--                <view class="mt-15">供应方补充条款：</view>-->
             </view>
 
+            <template v-else-if="sheet.signMethod === 2">
+                <view class="item-wrap">
+                    <view class="form-title-wrap">
+                        <view class="goods-sheet-title">
+                            <view class="form-title">
+                                合同附件
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view v-for="(item, index) in sheet.contractAttachment" :key="index" class="mr-25 my-25">
+                    <file-type :item="item" @click.native="openDownload(item)"/>
+                </view>
+            </template>
+
             <view class="item-wrap">
                 <view class="form-title-wrap">
                     <view class="goods-info-title">
                         <view class="form-title">
-                            已收到的加工申请
+                            {{ sheet.quoteList.length }}家已报价
                         </view>
                     </view>
                 </view>
                 <!-- 报价列表 -->
-                <vk-data-table :data="sheet.quoteList" :columns="table1.columns" title="adasda "
-                               :customRightBtns="table1.customRightBtns"></vk-data-table>
+<!--                <vk-data-table :data="sheet.quoteList" :columns="table1.columns"-->
+<!--                               :customRightBtns="table1.customRightBtns"></vk-data-table>-->
             </view>
         </view>
 
@@ -185,16 +378,26 @@
             <view class="mt-15">
                 <view class="request-header">
                     <text class="flex-1">供应商</text>
-                    <text class="flex-1">报价时间</text>
+                    <text class="flex-1">{{ sheet.type === 2 && sheet.rentType === 1 ? '询价' : '报价' }}时间</text>
                     <text class="flex-1">联系方式</text>
-                    <text class="flex-1">报价</text>
+                    <text class="flex-1">{{ sheet.type === 2 && sheet.rentType === 1 ? '询价内容' : '报价' }}</text>
+                    <text class="flex-1">附件</text>
+                    <text class="flex-1">详情</text>
+                    <text class="flex-1">供应商合同补充条款</text>
                     <text class="flex-1">操作</text>
                 </view>
                 <view class="quote" v-for="(item, index) in sheet.quoteList" :key="index">
                     <text class="flex-1">{{ item.subjectName }}</text>
                     <text class="flex-1">{{ item._add_time_str }}</text>
                     <text class="flex-1">{{ item.subjectMobile }}</text>
-                    <text class="flex-1">{{ item.totalPrice }}元</text>
+                    <text class="flex-1">{{ item.totalPrice }}{{ sheet.type === 2 && sheet.rentType === 1 ? '' : '元' }}</text>
+                    <view class="flex-1">
+                        <view class="mt-15 mr-15" v-for="(file, fileIndex) in item.files" :key="fileIndex">
+                            <file-type :item="file" @click.native="openDownload(file)"/>
+                        </view>
+                    </view>
+                    <text class="flex-1">{{ item.remark }}</text>
+                    <text class="flex-1">{{ item.supplierExt ? item.supplierExt : '无' }}</text>
                     <text class="flex-1">
                         <el-button type="primary" v-if="sheet.status === 0" @click.native="confirm(item)">选择
                         </el-button>
@@ -206,19 +409,31 @@
 </template>
 
 <script>
-import {BuildingOne, IdCard} from "@icon-park/vue";
+import {BuildingOne, IdCard, FileWord, FileExcel, FilePdfOne} from "@icon-park/vue";
 import dayjs from "dayjs";
 import {WRITE_INVOICE_TIME, INVOICE_TYPE, PROCESS_PAY_METHOD} from '@/util'
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import FileType from "../../components/file-type/file-type.vue";
 
 export default {
-    components: {BuildingOne, IdCard},
+    components: {FileType, BuildingOne, IdCard, FileWord, FileExcel, FilePdfOne},
     data() {
         return {
+            userInfo: {
+                userLevel: 0
+            },
+            accountNum: 0,
+            provinceData: provinces,
+            cityData: citys,
+            areaData: areas,
             WRITE_INVOICE_TIME,
             INVOICE_TYPE,
             PROCESS_PAY_METHOD,
             enquiryId: undefined,
             showDialog: false,
+            hasQuote: false,
             productList: [],
             sheetTitle: '',
             sheet: {
@@ -234,18 +449,7 @@ export default {
                     key: "subjectName",
                     title: "供应商",
                     type: "text",
-                    width: 300,
-                    formatter: (val, row, column, index) => {
-                        if (vk.getVuex('$user.userInfo._id') == this.sheet.userId) {
-                            return val
-                        }
-                        if (row.accountType == 1) {
-                            return vk.pubfn.hidden(val, 1, 1);
-                        } else {
-                            return vk.pubfn.hidden(val, 2, 4);
-                        }
-                    }
-
+                    width: 300
                 },
                     {
                         key: "_add_time_str",
@@ -263,7 +467,7 @@ export default {
                             if (row.managerMobile) {
                                 str = row.managerMobile
                             }
-                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId) {
+                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId || row.userId == vk.getVuex('$user.userInfo._id')) {
                                 return str
                             }
                             return vk.pubfn.hidden(str, 3, 4);
@@ -279,103 +483,100 @@ export default {
                             if (row.managerMobile) {
                                 str = row.managerMobile
                             }
-                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId) {
-                                return val
+                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId || row.userId == vk.getVuex('$user.userInfo._id')) {
+                                return `${val}元`
                             }
                             return "******";
                         }
                     },
-
+                    {
+                        key: "remark",
+                        title: "详情",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            let str = val
+                            if (row.managerMobile) {
+                                str = row.managerMobile
+                            }
+                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId || row.userId == vk.getVuex('$user.userInfo._id')) {
+                                return val
+                            }
+                            return "******";
+                        }
+                    }
 
                 ],
-                customRightBtns: [
-                    {
-                        title: '合同',
-                        type: 'primary',
-                        icon: 'el-icon-search',
-                        show: (row) => {
-                            return vk.getVuex('$user.userInfo._id') == this.sheet.userId && row.status == 1
-                        },
-                        onClick: (item) => {
-                            vk.navigateTo('/pages/contract/index');
-                        },
-                    },
-
-                    {
-                        title: '选择',
-                        type: 'primary',
-                        icon: 'el-icon-search',
-                        show: (row) => {
-                            return vk.getVuex('$user.userInfo._id') == this.sheet.userId && row.status == 0
-                        },
-                        onClick: (item) => {
-                            vk.callFunction({
-                                url: 'client/enquiry/quote/kh/confirmQuote',
-                                title: '请求中...',
-                                data: {
-                                    quoteId: item._id,
-                                },
-                                success: (data) => {
-                                    vk.navigateTo('/pages/contract/index');
-                                }
-                            });
-                        },
-                    },
-                    {
-                        title: '查看报价详情',
-                        type: 'primary',
-                        icon: 'el-icon-search',
-                        disabled: (item) => {
-                            return vk.getVuex('$user.userInfo._id') != this.sheet.userId
-                        },
-                        onClick: (item) => {
-                            this.showDialog = true
-                        }
-                    },
-                ]
             },
         };
     },
     onLoad(options = {}) {
-        const {
-            id
-        } = options
+        const {id} = options
         if (!id) {
             vk.navigateTo('/pages/enquiry/list');
             return
         }
-
         this.enquiryId = id
-
         this.getEnquiryDetail()
+        this.getUserInfo()
     },
     methods: {
         dayjs,
+        async getUserInfo(){
+            const {userInfo, accountNum} = await vk.callFunction({
+                url: 'user/kh/getMyUserInfo'
+            })
+            this.userInfo = userInfo
+            this.accountNum = accountNum
+        },
         /**
          * 打开报价窗口
          */
-        toQuote() {
-            // 获取用户信息
-            vk.userCenter.getCurrentUserInfo({
-                success: (data) => {
-                    const {
-                        userInfo
-                    } = data
-                    if (userInfo.quoteTimes > 3) {
-
-                    }
-
-                    this.$confirm(`今日报价次数${userInfo.quoteTimes || 0}, 是否继续?`, '提示', {
+        async toQuote() {
+            if (!this.userInfo.fadadaConfirm || [-1, 2].includes(this.userInfo.authStatus)) {
+                this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (vk.pubfn.isNull(this.userInfo.businessCard)) {
+                this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (this.accountNum === 0) {
+                this.$confirm('请先到个人中心添加收款账户', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=account'});
+                })
+            } else {
+                if (this.userInfo.businessCard.status !== 1) {
+                    this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
-                        type: 'warning',
-                        center: true
-                    }).then(res => {
-                        vk.navigateTo('/pages/enquiry/quote?enquiryId=' + this.enquiryId);
+                        type: 'warning'
                     })
-
+                    return
                 }
-            });
+                if (this.sheet.earnestMoney && this.sheet.earnestMoney > 0 && this.userInfo.paidEnsure < this.sheet.earnestMoney) {
+                    this.$confirm('保证金不足,是否去充值保证金?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        vk.navigateTo({url: '/pages/user/user?menu=grade'});
+                    })
+                    return
+                }
+                vk.navigateTo('/pages/enquiry/quote?enquiryId=' + this.enquiryId);
+            }
         },
         /**
          * 获取询价单详情
@@ -388,23 +589,12 @@ export default {
                     _id: this.enquiryId
                 },
                 success: (res) => {
-                    const {
-                        productList
-                    } = res.data
-                    let title = []
-                    productList.forEach(item => {
-                        const keys = Object.keys(item.extraAttributes)
-                        keys.forEach(citem => {
-                            item.extraAttributes[citem] = JSON.parse(item.extraAttributes[
-                                citem])
-                        })
-                        title.push(item.goodsName)
-                    })
-                    this.productList = productList
-
-                    delete res.data.productList
-
-                    this.sheet = {...res.data, ...{title: title.join()}}
+                    this.sheet = res.data
+                    this.sheet.disabled = (!this.sheet.answerEndTime || dayjs(this.sheet.answerEndTime).isBefore(dayjs()))
+                    this.sheet.fullAddress = ''
+                    if (this.sheet.deliveryTime) this.sheet.deliveryTime = dayjs(this.sheet.deliveryTime).format('YYYY-MM-DD HH:mm:ss')
+                    this.sheet.fullAddress = (this.sheet.addressRegion && this.sheet.addressRegion.province) ? `${this.sheet.addressRegion.province.name}${this.sheet.addressRegion.city.name}${this.sheet.addressRegion.area.name}` : ''
+                    if (this.sheet.addressRegion.addressDetail) this.list.rows[index].fullAddress += this.sheet.addressRegion.addressDetail
                 }
             });
         },
@@ -416,13 +606,27 @@ export default {
                     quoteId: item._id,
                 },
                 success: (data) => {
-                    vk.navigateTo('/pages/contract/index');
+                    this.showDialog = false
+                    if (this.sheet.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+                    else {
+                        if (this.sheet.signMethod === 1) vk.navigateTo('/pages/store/buyer')
+                        else vk.navigateTo('/pages/contract/index?tab=0')
+                    }
                     this.$message({
                         type: 'success',
                         message: '报价确认成功'
                     })
                 }
             });
+        },
+        openDownload(url) {
+            if (this.sheet.isMine || this.sheet.hasQuote || this.userInfo.userLevel > 0)
+                window.open(url)
+            else{
+                this.$message({
+                    message: '请先完成报价/升级会员'
+                })
+            }
         }
     }
 }
diff --git a/pages/enquiry/list.vue b/pages/enquiry/list.vue
index 7791603..8b00ed0 100644
--- a/pages/enquiry/list.vue
+++ b/pages/enquiry/list.vue
@@ -1,162 +1,155 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <!-- <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-            </el-breadcrumb>
-        </view> -->
-
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-            <view class="goods-options">
-                <el-row class="">
-                    <el-button @click="toRelease" type="primary" round>发布询价单</el-button>
-                    <el-button @click="toMyEnquiry" type="primary" round plain class="post-btn">我发布的询价单
-                    </el-button>
-                </el-row>
-            </view>
-        </view>
-
-
-        <!-- 筛选表单 -->
-        <view class="filter-outer">
-            <el-form @submit.native.prevent label-width="80px">
-                <el-form-item label="关键词:" class="border-bottom pb-30">
-                    <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
-                        <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                        <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
-                        </el-button>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="分类:" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="clickedCateIndex = -1" class="pointer mr-25"
-                              :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in categoryTreeData" :key="index">
-                            <text @click="clickedCateIndex = index" class="pointer mr-25"
-                                  :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                    </view>
-                    <view class="child-cate flex justify-start items-center flex-wrap">
-                        <template v-if="clickedCateIndex === -1">
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
-                            </text>
-                        </template>
-                        <template v-else>
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
-                                {{ item.name }}
-                            </text>
-                        </template>
-                        <!--                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" >查看更多-->
-                        <!--                        </text>-->
-                    </view>
-                </el-form-item>
-                <el-form-item label="材质:" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="selectTexture(-1)" class="pointer mr-25"
-                              :class="[checkTextureList.length === 0 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in attributes" :key="index">
-                            <text @click="selectTexture(item.value)" class="pointer mr-25"
-                                  :class="[checkTextureList.includes(item.value) ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10 || showAllTexture">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25"
-                              v-if="attributes.length > 10">查看更多
-                        </text>
-                    </view>
-                </el-form-item>
-                <el-form-item label="供应商:" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="selectCompany(-1)" class="pointer mr-25"
-                              :class="[checkCompanyList.length === 0 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in companyList" :key="index">
-                            <text @click="selectCompany(item._id)" class="pointer mr-25"
-                                  :class="[checkCompanyList.includes(item._id) ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10 || showAllCompany">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                        <text @click="showAllCompany = !showAllCompany" class="pointer mr-25"
-                              v-if="companyList.length > 10">查看更多
-                        </text>
-                    </view>
-                </el-form-item>
-                <el-form-item label="已选择">
-                    <view class="tags">
-                        <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
-                    </view>
-                </el-form-item>
-            </el-form>
-        </view>
-
-        <!-- 商品列表 -->
-        <view class="sheet-list">
-            <el-table :data="list.rows" style="width: 100%">
-                <el-table-column align="center" label="品名/材质">
-                    <template v-slot="{ row }">
-                        <p class="text-main">{{ row.productList.map(item => `${item.goodsName}(${item.materialQuality})`).join("/") }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="采购量">
-                    <template v-slot="{ row }">
-                        <p class="text-main">
-                            {{ row.productList.map(item => item.procureNumber + item.procureUnit).join("/") }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="fullAddress" label="收货地"/>
-                <el-table-column align="center" label="采购企业">
-                    <template v-slot="{ row }">
-                        <p>{{
-                                row.user.accountType === 1 ? row.user.person.personName : row.user.company.companyName
-                            }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="报价情况">
-                    <template v-slot="{ row }">
-                        <p>{{ `${row.quoteNum}家已报价` }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="_add_time_str" label="发布时间"/>
-                <el-table-column align="center" label="操作">
-                    <template v-slot="{ row }">
-                        <el-button size="mini" type="primary" plain
-                                   @click.native="vk.navigateTo('/pages/enquiry/detail?id=' + row._id)">详情
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div class="mt-20 text-center">
-                <el-pagination @current-change="search" background layout="prev, pager, next"
-                               :total="list.total" :page-size="pageSize"/>
-            </div>
-        </view>
-
-        <right-bar></right-bar>
-        <common-footer></common-footer>
+    <view class="carousel">
+      <common-swiper page="enquiry"/>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布询价单</el-button>
+          <el-button @click="toMyEnquiry" type="primary" round plain class="post-btn">我发布的询价单
+          </el-button>
+          <el-button @click="toMyQuote" type="primary" round plain class="post-btn">我的报价
+          </el-button>
+        </el-row>
+      </view>
     </view>
+
+
+    <!-- 筛选表单 -->
+    <view class="filter-outer">
+      <el-form @submit.native.prevent label-width="80px">
+        <el-form-item label="关键词:" class="border-bottom pb-30">
+          <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
+            </el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="分类:" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectAll" class="pointer mr-25"
+                  :class="[checkCategoryList.length === 0 ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in allProductList" :key="index">
+              <text @click="selectCate(item.name)" class="pointer mr-25"
+                    :class="[checkCategoryList.includes(item.name) ? 'text-main selected-cate' : '']">
+                {{ item.name }}
+              </text>
+            </view>
+            <text @click="selectCate(-2)" class="pointer mr-25"
+                  :class="[checkCategoryList.includes(-2) ? 'text-main selected-cate' : '']">
+              其他
+            </text>
+          </view>
+          <!--                    <view class="child-cate flex justify-start items-center flex-wrap">-->
+          <!--                        <template v-if="clickedCateIndex === -1">-->
+          <!--                            <text class="pointer mr-25" @click="selectCate(item._id)"-->
+          <!--                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"-->
+          <!--                                  v-for="(item, index) in allChildCate" :key="index">{{ item.name }}-->
+          <!--                            </text>-->
+          <!--                        </template>-->
+          <!--                        <template v-else-if="clickedCateIndex > -1">-->
+          <!--                            <text class="pointer mr-25" @click="selectCate(item._id)"-->
+          <!--                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"-->
+          <!--                                  v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">-->
+          <!--                                {{ item.name }}-->
+          <!--                            </text>-->
+          <!--                        </template>-->
+          <!--                        &lt;!&ndash;                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" >查看更多&ndash;&gt;-->
+          <!--                        &lt;!&ndash;                        </text>&ndash;&gt;-->
+          <!--                    </view>-->
+        </el-form-item>
+        <el-form-item label="区域筛选">
+          <el-cascader :options="areaOptions" :props="{label: 'name', value: 'code', checkStrictly: true}"
+                       v-model="address"
+                       clearable style="width: 300px;" @change="selectArea"/>
+        </el-form-item>
+        <el-form-item label="已选择">
+          <view class="tags">
+            <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
+          </view>
+        </el-form-item>
+      </el-form>
+    </view>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad11.length">
+        <el-carousel :height="`100px`" :style="{width: '600px'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad11" :key="index" :style="{width: '600px'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '600px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad112.length">
+        <el-carousel :height="`100px`" :style="{width: '600px'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad112" :key="index" :style="{width: '600px'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '600px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 商品列表 -->
+    <view class="sheet-list">
+      <view class="flex justify-start items-center my-20">
+        <el-button @click="changeStatus('notPick')" type="primary" :plain="status === 'picked'" round>正在询价
+        </el-button>
+        <el-button @click="changeStatus('picked')" type="primary" :plain="status === 'notPick'" round>合作成交
+        </el-button>
+      </view>
+      <el-table :data="list.rows" style="width: 100%">
+        <el-table-column align="center" label="品名/材质">
+          <template v-slot="{ row }">
+            <p v-if="row.productList && row.productList.length" class="text-main">{{
+                row.productList.map(item => `${item.goodsName}${item.materialQuality ? `(${item.materialQuality})` : ''}`).join("/")
+              }}</p>
+            <p class="text-main" v-else>{{ row.projectName }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购量">
+          <template v-slot="{ row }">
+            <p class="text-main">
+              {{
+                row.productList.map(item => (item.procureNumber ? item.procureNumber : '') + (item.procureUnit ? item.procureUnit : '')).join("/")
+              }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="fullAddress" label="收货地"/>
+        <el-table-column align="center" label="采购企业">
+          <template v-slot="{ row }">
+            <p v-if="row.user">{{
+                row.user.accountType === 1 ? row.user.person.personName.replace(/^(.).*(.)$/, "$1*$2") : row.user.company.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6")
+              }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报价情况">
+          <template v-slot="{ row }">
+            <p>{{ `${row.quoteNum}家已报价` }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="_add_time_str" label="发布时间"/>
+        <el-table-column align="center" label="操作">
+          <template v-slot="{ row }">
+            <el-button size="mini" type="primary" plain
+                       @click.native="vk.navigateTo('/pages/enquiry/detail?id=' + row._id)">详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="mt-20 text-center">
+        <el-pagination @current-change="search" background layout="prev, pager, next"
+                       :total="list.total" :page-size="pageSize"/>
+      </div>
+    </view>
+
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -165,386 +158,413 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    data() {
-        return {
-            allChildCate: [],
-            categoryTreeData: [],
-            companyList: [],
-            clickedCateIndex: -1,
-            showAllProvince: false,
-            showAllTexture: false,
-            showAllCompany: false,
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            checkCategoryList: [],
-            checkTextureList: [],
-            checkCompanyList: [],
-            attributes: [],
-            keyword: '',
-            list: {
-                rows: [],
-                total: 0
-            },
-            pageSize: 20,
-            queryParam: {},
-            // 表格相关开始 -----------------------------------------------------------
-            table1: {
-                // 表格数据请求地址
-                action: (obj = {}) => {
-                    let {data, success, fail, complete} = obj;
-                    console.log(data)
-                    vk.callFunction({
-                        url: `client/enquiry/sheet/pub/getList`,
-                        data: data,
-                        success: (res) => {
-                            if (typeof success === "function") {
-                                success({
-                                    rows: res.rows, // 列表数据
-                                    total: res.total, // 总记录数
-                                });
-                            }
-                        },
-                        fail: (err => {
-
-                        }),
-                        complete: (res) => {
-                            if (typeof complete === "function") complete(res);
-                        }
-                    })
-                },
-                customRightBtns: [{
-                    title: '详情',
-                    icon: 'el-icon-search',
-                    type: 'primary',
-                    onClick: (item) => {
-                        vk.navigateTo('/pages/enquiry/detail?id=' + item._id);
-                    }
-                },],
-                // 表格字段显示规则
-                columns: [
-                    {
-                        key: "productList",
-                        title: "品名/材质",
-                        type: "text",
-                        formatter: (val, row, column, index) => {
-                            // console.log(val)
-                            return val.map(item => item.goodsName).join("/")
-                        }
-                    },
-                    {
-                        key: "productList",
-                        title: "采购量",
-                        type: "text",
-                        formatter: (val, row, column, index) => {
-                            return val.map(item => item.procureNumber + item.procureUnit).join("/")
-                        }
-                    },
-                    {
-                        key: "productList",
-                        title: "收货地",
-                        type: "text",
-                        formatter: (val, row, column, index) => {
-                            let str = ''
-                            if (val.length > 0 && val[0].addressRegion.length > 0) {
-                                let provinceIndex = 0, cityIndex = 0, areaIndex = 0
-                                this.provinceData.forEach((item, index) => {
-                                    if (parseInt(val[0].addressRegion[0]) === parseInt(item.code)) {
-                                        provinceIndex = index
-                                        str = item.name
-                                    }
-                                })
-                                this.cityData[provinceIndex].forEach((item, index) => {
-                                    if (parseInt(val[0].addressRegion[1]) === parseInt(item.code)) {
-                                        cityIndex = index
-                                        str += item.name
-                                    }
-                                })
-                                this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
-                                    if (parseInt(val[0].addressRegion[2]) === parseInt(item.code)) {
-                                        areaIndex = index
-                                        str += item.name
-                                    }
-                                })
-                                str += val[0].addressDetail
-                            }
-                            return str
-                        }
-                    },
-                    {
-                        key: "user",
-                        title: "采购企业",
-                        type: "text",
-                        formatter: (val, row, column, index) => {
-                            if (val.accountType === 1) {
-                                return val.person.personName
-                            } else {
-                                return val.company.companyName
-                            }
-                        }
-                    },
-                    {
-                        key: "",
-                        title: "报价情况",
-                        type: "text",
-                        formatter: (val, row, column, index) => {
-                            return `${val.quoteNum}家已报价`
-                        }
-                    },
-                    {
-                        key: "_add_time_srt",
-                        title: "发布时间",
-                        type: "time",
-                    },
-
-                ],
-                // 多选框选中的值
-                multipleSelection: [],
-                // 当前高亮的记录
-                selectItem: "",
-
-            },
-            // 表格相关结束 -----------------------------------------------------------
-        };
+  data() {
+    return {
+      allChildCate: [],
+      categoryTreeData: [],
+      companyList: [],
+      clickedCateIndex: -1,
+      showAllProvince: false,
+      showAllTexture: false,
+      showAllCompany: false,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      checkCategoryList: [],
+      allProductList: [],
+      checkTextureList: [],
+      checkCompanyList: [],
+      attributes: [],
+      keyword: '',
+      list: {
+        rows: [],
+        total: 0
+      },
+      pageSize: 20,
+      queryParam: {},
+      areaOptions: [],
+      address: [],
+      area: null,
+      status: 'notPick',
+      ad11: [],
+      ad112: [],
+    };
+  },
+  onShow() {
+    // this.search(1)
+    vk.callFunction({
+      url: 'client/enquiry/template/pub/getList',
+      title: '请求中...',
+      data: {},
+      success: (data) => {
+        this.categoryTreeData = data.rows
+        this.allChildCate = []
+        this.categoryTreeData.forEach(item => {
+          item.children.forEach(child => {
+            this.allChildCate.push(child)
+          })
+        })
+      }
+    });
+    // this.getAttributes()
+    // this.getCompany()
+    // this.getStealFactory()
+    this.search()
+  },
+  onLoad(options) {
+    this.getCate()
+    if (options && options.keyword) this.keyword = options.keyword
+    this.areaOptions = provinces.map(item => {
+      item.children = [];
+      return item
+    })
+    this.areaOptions.forEach((province, index) => {
+      citys[index].forEach(city => {
+        city.children = []
+        this.areaOptions[index].children.push(city)
+      })
+    })
+    this.areaOptions.forEach((province, index) => {
+      province.children.forEach((city, cityIndex) => {
+        this.areaOptions[index].children[cityIndex].children.push(...areas[index][cityIndex])
+      })
+    })
+  },
+  methods: {
+    async getCate() {
+      const {rows} = await vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+      });
+      this.allProductList = []
+      this.productCateList = rows.map(item => {
+        item.children.forEach(child => {
+          this.allProductList.push({
+            ...child,
+            parentName: item.name
+          })
+        })
+        item.idList = []
+        return item
+      })
     },
-    onShow() {
-        // this.search(1)
-        vk.callFunction({
-            url: 'client/spot/category/pub/getTree',
-            title: '请求中...',
-            data: {},
-            success: (data) => {
-                this.categoryTreeData = data.rows
-                this.allChildCate = []
-                this.categoryTreeData.forEach(item => {
-                    item.children.forEach(child => {
-                        this.allChildCate.push(child)
-                    })
-                })
-            }
-        });
-        this.getAttributes()
-        this.getCompany()
-        this.search()
+    selectCate(name) {
+      if (name === -2) {
+        this.clickedCateIndex = -2
+        this.checkCategoryList = [-2]
+        this.search(1)
+      } else {
+        // const index = this.checkCategoryList.indexOf(name)
+        // if (index === -1) this.checkCategoryList.push(name)
+        // else this.checkCategoryList.splice(index, 1)
+        this.checkCategoryList = [name]
+        this.search(1)
+      }
     },
-    methods: {
-        selectCate(id) {
-            const index = this.checkCategoryList.indexOf(id)
-            if (index === -1) this.checkCategoryList.push(id)
-            else this.checkCategoryList.splice(index, 1)
-            this.search(1)
-        },
-        selectTexture(id) {
-            if (id === -1) this.checkTextureList = []
-            else {
-                const index = this.checkTextureList.indexOf(id)
-                if (index === -1) this.checkTextureList.push(id)
-                else this.checkTextureList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        selectCompany(id) {
-            if (id === -1) this.checkCompanyList = []
-            else {
-                const index = this.checkCompanyList.indexOf(id)
-                if (index === -1) this.checkCompanyList.push(id)
-                else this.checkCompanyList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        toMyEnquiry() {
-            vk.navigateTo({
-                url: '/pages/enquiry/my'
-            })
-        },
-        async toRelease() {
-            const {userInfo} = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=business-card'});
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/enquiry/release'
-                })
-            }
-
-
-        },
-        search(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/enquiry/sheet/pub/getList',
-                data: {
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    keyword: this.keyword,
-                    companyList: this.checkCompanyList,
-                    categoryIds: this.checkCategoryList
-                },
-                success: (data) => {
-                    this.list = data
-                        this.list.rows.forEach((val, index) => {
-                        let fullAddress = ''
-                        if (val.productList !== undefined && val.productList.length > 0 && val.productList[0].addressRegion !== undefined && val.productList[0].addressRegion.length > 0) {
-                            let provinceIndex = 0, cityIndex = 0, areaIndex = 0
-                            this.provinceData.forEach((item, index) => {
-                                if (val.productList[0].addressRegion !== undefined && parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) {
-                                    provinceIndex = index
-                                    fullAddress = item.name
-                                }
-                            })
-                            this.cityData[provinceIndex].forEach((item, index) => {
-                                if (val.productList[0].addressRegion !== undefined && parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) {
-                                    cityIndex = index
-                                    fullAddress += item.name
-                                }
-                            })
-                            this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
-                                if (val.productList[0].addressRegion !== undefined && parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) {
-                                    areaIndex = index
-                                    fullAddress += item.name
-                                }
-                            })
-                            fullAddress += val.productList[0].addressDetail
-                        }
-                        this.list.rows[index].fullAddress = fullAddress
-                    })
-                }
-            });
-
-        },
-        getAttributes() {
-            vk.callFunction({
-                url: 'client/enquiry/attributes/pub/getList',
-                title: '请求中...',
-                data: {},
-                success: (data) => {
-                    this.attributes = data.rows.find(attr => attr.label === '材质').options.map(item => {
-                        item.name = item.label
-                        return item
-                    })
-                }
-            });
-        },
-        getCompany() {
-            vk.callFunction({
-                url: 'client/user/pub/getCompany',
-                title: '请求中...',
-                data: {},
-                success: (data) => {
-                    this.companyList = data.rows.map(item => {
-                        item.name = item.company.companyName
-                        return item
-                    })
-                }
-            });
-        },
-
+    selectTexture(name) {
+      if (name === -1) this.checkTextureList = []
+      else {
+        const index = this.checkTextureList.indexOf(name)
+        if (index === -1) this.checkTextureList.push(name)
+        else this.checkTextureList.splice(index, 1)
+      }
+      this.search(1)
     },
-    computed: {
-        checkCategoryArr() {
-            const arr = []
-            this.allChildCate.forEach(item => {
-                if (this.checkCategoryList.includes(item._id)) arr.push(item)
-            })
-            this.attributes.forEach(item => {
-                if (this.checkTextureList.includes(item.value)) {
-                    arr.push(item)
-                }
-            })
-            this.companyList.forEach(item => {
-                if (this.checkCompanyList.includes(item._id)) {
-                    arr.push(item)
-                }
-            })
-
-            return arr
+    selectCompany(name) {
+      if (name === -1) this.checkCompanyList = []
+      else {
+        const index = this.checkCompanyList.indexOf(name)
+        if (index === -1) this.checkCompanyList.push(name)
+        else this.checkCompanyList.splice(index, 1)
+      }
+      this.search(1)
+    },
+    toMyEnquiry() {
+      vk.navigateTo({
+        url: '/pages/enquiry/my'
+      })
+    },
+    toMyQuote() {
+      vk.navigateTo({
+        url: '/pages/enquiry/quote/my'
+      })
+    },
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
         }
+        vk.navigateTo({
+          url: '/pages/enquiry/release'
+        })
+      }
+    },
+    selectArea(e) {
+      this.area = e
+      this.search(1)
+    },
+    changeStatus(status) {
+      this.status = status
+      this.search(1)
+    },
+    search(pageIndex = 1) {
+      let cateList = [], material = []
+      if (this.checkCategoryList.length === 1 && this.checkCategoryList[0] === -2) cateList.push(0)
+      else {
+        cateList = this.checkCategoryList
+      }
+      vk.callFunction({
+        url: 'client/enquiry/sheet/pub/getList',
+        title: '请求中...',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          keyword: this.keyword,
+          companyList: this.checkCompanyList,
+          // categoryIds: this.checkCategoryList
+          cateList,
+          material: this.checkTextureList,
+          area: this.area,
+          status: this.status,
+        },
+        success: (data) => {
+          this.list = data
+          this.list.rows.forEach((val, index) => {
+            this.list.rows[index].fullAddress = (val.addressRegion && val.addressRegion.province) ? `${val.addressRegion.province.name}${val.addressRegion.city.name}${val.addressRegion.area.name}` : ''
+            if (val.addressDetail) this.list.rows[index].fullAddress += val.addressDetail
+          })
+          this.getAd11()
+          this.getAd112()
+        }
+      });
+
+    },
+    getAttributes() {
+      vk.callFunction({
+        url: 'client/enquiry/attributes/pub/getList',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.attributes = data.rows.find(attr => attr.label === '材质').options.map(item => {
+            item.name = item.label
+            return item
+          })
+        }
+      });
+    },
+    getCompany() {
+      vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.companyList = data.rows.map(item => {
+            item.name = item.company.companyName
+            return item
+          })
+        }
+      });
+    },
+    selectAll() {
+      this.clickedCateIndex = -1
+      this.checkCategoryList = []
+      this.search(1)
+    },
+    async getAd11() {
+      this.ad11 = []
+      if (!this.area || this.area.length === 0) {
+        const res = await vk.callFunction({
+          url: 'client/ad/pub/getList',
+          data: {
+            adKey: 11
+          }
+        })
+        if (res.data) this.ad11 = res.data
+      } else {
+        const {rows} = await vk.callFunction({
+          url: 'client/user/pub/getCompany',
+          data: {
+            pageIndex: 1,
+            pageSize: 10,
+            isCoop: 1,
+            province: [this.area[0]]
+          }
+        })
+        rows.forEach(item => {
+          if (item.businessCard.album && item.businessCard.album.length > 0) {
+            this.ad11.push({
+              swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+              companyId: item._id
+            })
+          }
+        })
+      }
+    },
+    async getAd112() {
+      this.ad112 = []
+      if (!this.area || this.area.length === 0) {
+        const res = await vk.callFunction({
+          url: 'client/ad/pub/getList',
+          data: {
+            adKey: 112
+          }
+        })
+        if (res.data) this.ad112 = res.data
+      } else {
+        const {rows} = await vk.callFunction({
+          url: 'client/user/pub/getCompany',
+          data: {
+            pageIndex: 1,
+            pageSize: 10,
+            isCoop: 1,
+            province: [this.area[0]]
+          }
+        })
+        rows.forEach(item => {
+          if (item.businessCard.album && item.businessCard.album.length > 0) {
+            this.ad112.push({
+              swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+              companyId: item._id
+            })
+          }
+        })
+      }
+    },
+
+  },
+  computed: {
+    checkCategoryArr() {
+      const arr = []
+      if (this.checkCategoryList.length === 1 && this.checkCategoryList[0] !== -2)arr.push({name: this.checkCategoryList[0]})
+      this.attributes.forEach(item => {
+        if (this.checkTextureList.includes(item.value)) {
+          arr.push(item)
+        }
+      })
+      if (this.area && this.area.length) {
+        const nameArr = []
+        if (this.area.length > 0) {
+          const province = this.provinceData.find(item => item.code === this.area[0])
+          nameArr.push(province.name)
+          if (this.area.length > 1) {
+            const city = province.children.find(item => item.code === this.area[1])
+            nameArr.push(city.name)
+            if (this.area.length > 2) {
+              const area = city.children.find(item => item.code === this.area[2])
+              nameArr.push(area.name)
+            }
+          }
+        }
+        console.log(nameArr)
+        if (nameArr.length) arr.push({name: nameArr.join('/')})
+      }
+
+      return arr
     }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
+  display: flex;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 
 .sheet-list {
-    width: 1200px;
-    margin: 20px auto;
-    // display: flex;
+  width: 1200px;
+  margin: 20px auto;
+  // display: flex;
 
 }
 
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 .post-btn {
-    background: none;
+  background: none;
+  color: #A92924;
 }
 
 .post-btn:hover {
-    background: #f6eae9;
-    color: #A92924;
+  background: #f6eae9;
+  color: #A92924;
 }
 
 .selected-cate {
-    border-bottom: 2px solid #BD3124;
-    line-height: 40rpx;
+  border-bottom: 2px solid #BD3124;
+  line-height: 40rpx;
 }
 
 .child-cate {
-    background-color: #DB8382;
-    color: white;
-    margin-top: 10rpx;
-    border-radius: 15rpx;
-    padding: 0 20rpx;
+  background-color: #DB8382;
+  color: white;
+  margin-top: 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
 }
 </style>
diff --git a/pages/enquiry/my.vue b/pages/enquiry/my.vue
index 5ca20c9..5995123 100644
--- a/pages/enquiry/my.vue
+++ b/pages/enquiry/my.vue
@@ -1,42 +1,43 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <!-- <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-            </el-breadcrumb>
-        </view> -->
+    <!-- <view class="page-nav">
+        <el-breadcrumb separator="/">
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+        </el-breadcrumb>
+    </view> -->
 
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-            <view class="goods-options">
-                <el-row class="">
-                    <el-button @click="toRelease" type="primary" round>发布询价单</el-button>
-                    <!-- <el-button type="primary" round plain>我发布的询价单</el-button> -->
-                </el-row>
-            </view>
-        </view>
-
-        <!-- 商品列表 -->
-        <view class="sheet-list">
-            <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
-                           :customRightBtns="table1.customRightBtns"
-                           :pagination="true" :query-form-param="queryForm1"></vk-data-table>
-        </view>
-
-
-        <common-footer></common-footer>
+    <view class="carousel">
+      <!--            <el-carousel height="170px">-->
+      <!--                <el-carousel-item v-for="item in 4" :key="item">-->
+      <!--                    <image class="carousel-img"-->
+      <!--                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"-->
+      <!--                           mode="aspectFill"></image>-->
+      <!--                </el-carousel-item>-->
+      <!--            </el-carousel>-->
+      <common-swiper page="enquiry-mine" :height="200"/>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布询价单</el-button>
+          <!-- <el-button type="primary" round plain>我发布的询价单</el-button> -->
+        </el-row>
+      </view>
     </view>
+
+    <!-- 商品列表 -->
+    <view class="sheet-list">
+      <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
+                     :customRightBtns="table1.customRightBtns"
+                     :pagination="true" :query-form-param="queryForm1"></vk-data-table>
+    </view>
+
+
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -45,237 +46,219 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            keyword: '',
-            // 表格相关开始 -----------------------------------------------------------
-            queryForm1: {
-                formData: {
-                    userId: vk.getVuex('$user.userInfo._id')
-                },
-                columns: [
-                    {key: "userId", title: "发布人ID", type: "text", width: 160, mode: "="},
-                ]
-            },
-            table1: {
-                // 表格数据请求地址
-                action: "client/enquiry/sheet/pub/getList",
-                customRightBtns: [
-                    {
-                        title: '详情',
-                        icon: 'el-icon-search',
-                        type: 'primary',
-                        onClick: (item) => {
-                            vk.navigateTo('/pages/enquiry/detail?id=' + item._id);
-                        }
-                    },
-                    {
-                        title: '删除',
-                        icon: 'el-icon-delete',
-                        type: 'primary',
-                        onClick: (item) => {
-                            this.$confirm('').then(() => {
-
-                            }).then(() => {
-                                vk.callFunction({
-                                    url: 'client/enquiry/sheet/kh/delete',
-                                    title: '请求中...',
-                                    data: {
-                                        _id: item._id
-                                    },
-                                }).then(res => {
-                                    this.$refs.table1.refresh()
-                                })
-                            })
-
-
-                        }
-                    },
-                ],
-                // 表格字段显示规则
-                columns: [
-                    {
-                        key: "productList",
-                        title: "品名/材质",
-                        type: "text",
-                        width: 280,
-                        formatter: (val, row, column, index) => {
-                            return val.map(item => `${item.goodsName}(${item.materialQuality})`).join("/")
-                        }
-                    },
-                    {
-                        key: "productList",
-                        title: "采购量",
-                        type: "text",
-                        width: 100,
-                        formatter: (val, row, column, index) => {
-                            return val.map(item => item.procureNumber + item.procureUnit).join("/")
-                        }
-                    },
-                    {
-                        key: "productList",
-                        title: "收货地",
-                        type: "text",
-                        minWidth: 200,
-                        formatter: (val, row, column, index) => {
-                            let fullAddress = ""
-                            try {
-                                let provinceIndex = 0, cityIndex = 0, areaIndex = 0
-                                this.provinceData.forEach((item, index) => {
-                                    if (row.productList[0].addressRegion !== undefined && parseInt(row.productList[0].addressRegion[0]) === parseInt(item.code)) {
-                                        provinceIndex = index
-                                        fullAddress = item.name
-                                    }
-                                })
-                                this.cityData[provinceIndex].forEach((item, index) => {
-                                    if (row.productList[0].addressRegion !== undefined && parseInt(row.productList[0].addressRegion[1]) === parseInt(item.code)) {
-                                        cityIndex = index
-                                        fullAddress += item.name
-                                    }
-                                })
-                                this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
-                                    if (row.productList[0].addressRegion !== undefined && parseInt(row.productList[0].addressRegion[2]) === parseInt(item.code)) {
-                                        areaIndex = index
-                                        fullAddress += item.name
-                                    }
-                                })
-                                fullAddress += row.productList[0].addressDetail
-                            } catch (err) {
-                                fullAddress = ""
-                            }
-
-                            return fullAddress
-                        }
-                    },
-                    {
-                        key: "user",
-                        title: "采购单位",
-                        type: "text",
-                        width: 280,
-                        formatter: (val, row, column, index) => {
-                            if (val.accountType == 1) {
-                                return val.person.personName
-                            } else {
-                                return val.company.companyName
-                            }
-                        }
-
-                    },
-                    // {
-                    // 	key: "_add_time_srt",
-                    // 	title: "添加时间",
-                    // 	type: "time",
-                    // 	width: 160
-                    // },
-
-                ],
-                // 多选框选中的值
-                multipleSelection: [],
-                // 当前高亮的记录
-                selectItem: "",
-
-            },
-            // 表格相关结束 -----------------------------------------------------------
-        };
-    },
-    onLoad() {
-
-    },
-    methods: {
-        toRelease() {
-
-            if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.getCertUrl()
-                })
-            } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo('/pages/user/user?menu=business-card');
-                })
-            } else {
-                uni.navigateTo({
-                    url: '/pages/enquiry/release'
-                })
-            }
-
-
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      keyword: '',
+      // 表格相关开始 -----------------------------------------------------------
+      queryForm1: {
+        formData: {
+          userId: vk.getVuex('$user.userInfo._id')
         },
-    },
-    computed: {
-        checkCategoryArr() {
-            let arr = []
-            this.checkCategoryList.forEach(item => {
-                arr.push(...item)
-            })
-
-            this.checkProvinceList.forEach(item => {
-                arr.push({
-                    ...item
+        columns: [
+          {key: "userId", title: "发布人ID", type: "text", width: 160, mode: "="},
+        ]
+      },
+      table1: {
+        // 表格数据请求地址
+        action: "client/enquiry/sheet/kh/getList",
+        customRightBtns: [
+          {
+            title: '详情',
+            icon: 'el-icon-search',
+            type: 'primary',
+            onClick: (item) => {
+              vk.navigateTo('/pages/enquiry/detail?id=' + item._id);
+            }
+          },
+          {
+            title: '删除',
+            icon: 'el-icon-delete',
+            type: 'primary',
+            onClick: (item) => {
+              this.$confirm('如果你要删除此条信息，之前其他客户填写的留言将无法查看', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                vk.callFunction({
+                  url: 'client/enquiry/sheet/kh/delete',
+                  title: '请求中...',
+                  data: {
+                    _id: item._id
+                  },
+                }).then(res => {
+                  this.$refs.table1.refresh()
                 })
-            })
-            return arr
-        }
+              })
+            }
+          },
+        ],
+        // 表格字段显示规则
+        columns: [
+          {
+            key: "enquiryNo",
+            title: "单号",
+            type: "text",
+          },
+          {
+            key: "title",
+            title: "品名/材质",
+            type: "text"
+          },
+          {
+            key: "productList",
+            title: "采购量",
+            type: "text",
+            formatter: (val, row, column, index) => {
+              if (row.fillType === 0) return val.map(item => (item.procureNumber ? item.procureNumber : '') + (item.procureUnit ? item.procureUnit : '')).join("/")
+              else return row.procureUnit ? `${row.procureNumber}${row.procureUnit}` : ''
+            }
+          },
+          {
+            key: "addressRegion",
+            title: "收货地",
+            type: "text",
+            formatter: (val, row, column, index) => {
+              let fullAddress = (val && val.province) ? `${val.province.name}${val.city.name}${val.area.name}` : ''
+              if (row.addressDetail) fullAddress += ` ${row.addressDetail}`
+              return fullAddress
+            }
+          },
+          {
+            key: "user",
+            title: "采购单位",
+            type: "text",
+            formatter: (val, row, column, index) => {
+              if (!val) return ''
+              if (val.accountType == 1) {
+                return val.person.personName
+              } else {
+                return val.company.companyName
+              }
+            }
+          },
+          {
+            key: "quoteNum",
+            title: "报价数",
+            type: "text",
+            formatter: (val, row, column, index) => {
+              return `${val}家已报价`
+            }
+          },
+          {
+            key: "_add_time_str",
+            title: "发布时间",
+            type: "time",
+            width: 160
+          },
+        ],
+        // 多选框选中的值
+        multipleSelection: [],
+        // 当前高亮的记录
+        selectItem: "",
 
+      },
+      // 表格相关结束 -----------------------------------------------------------
+    };
+  },
+  onLoad() {
+
+  },
+  methods: {
+    toRelease() {
+
+      if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo('/pages/user/user?menu=fadada');
+        })
+      } else {
+        uni.navigateTo({
+          url: '/pages/enquiry/release'
+        })
+      }
+
+
+    },
+  },
+  computed: {
+    checkCategoryArr() {
+      let arr = []
+      this.checkCategoryList.forEach(item => {
+        arr.push(...item)
+      })
+
+      this.checkProvinceList.forEach(item => {
+        arr.push({
+          ...item
+        })
+      })
+      return arr
     }
+
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
+  display: flex;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 
 .sheet-list {
-    width: 1200px;
-    margin: 20px auto;
-    // display: flex;
+  width: 1200px;
+  margin: 20px auto;
+  // display: flex;
 
 }
 
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 </style>
\ No newline at end of file
diff --git a/pages/enquiry/quote.vue b/pages/enquiry/quote.vue
index ca8ab38..0c1dd13 100644
--- a/pages/enquiry/quote.vue
+++ b/pages/enquiry/quote.vue
@@ -1,196 +1,246 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item>
-                    <navigator style="display: inline-block;" url="/pages/enquiry/list">询价单</navigator>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>填写报价信息</el-breadcrumb-item>
-            </el-breadcrumb>
-        </view>
-
-        <view class="page-main">
-            <vk-data-form
-                ref="form1"
-                v-model="form1.data"
-                :action="form1.props.action"
-                :columns="form1.props.columns"
-                :rules="form1.props.rules"
-                :form-type="form1.props.formType"
-                :loading.sync="form1.props.loading"
-                :auto-close="true"
-                label-width="140px"
-                @success="onFormSuccess"
-            ></vk-data-form>
-        </view>
-
-        <common-footer></common-footer>
+    <view class="page-nav">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/enquiry/list">询价单</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>填写报价信息</el-breadcrumb-item>
+      </el-breadcrumb>
     </view>
+
+    <view class="page-main">
+      <quote-remain-num v-if="reloaded" :amount="sheet.quoteAmount" type="enquiry" :id="enquiryId"/>
+      <vk-data-form
+        ref="form1"
+        v-model="form1.data"
+        :action="form1.props.action"
+        :columns="form1.props.columns"
+        :rules="form1.props.rules"
+        :form-type="form1.props.formType"
+        :loading.sync="form1.props.loading"
+        :auto-close="false"
+        :need-alert="false"
+        :show-cancel="false"
+        label-width="160px"
+        @success="onFormSuccess"
+        @fail="onFormFail"
+      >
+        <template v-slot:totalPrice>
+          <el-input v-model="form1.data.totalPrice" placeholder="请输入货款总价"
+                    @change="formatNumber"></el-input>
+        </template>
+      </vk-data-form>
+    </view>
+
+
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
 export default {
-    data() {
-        return {
-            // 表单相关开始-----------------------------------------------------------
-            form1: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    // radio: 1,
-                    // checkbox : [1,2]
-                    sheetId: null
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: "client/enquiry/quote/kh/addQuote",
-                    // 表单字段显示规则
-                    columns: [
-                        {key: "totalPrice", title: "货款总价", type: "number"},
-                        {key: "totalPriceStr", title: "人民币大写", type: "text"},
-                        {key: "remark", title: "报价单详情", type: "editor"},
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        text: [
-                            {required: true, message: "text不能为空", trigger: "change"},
-                        ]
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false
-                }
+  data() {
+    return {
+      sheet: null,
+      enquiryId: null,
+      reloaded: false,
+      // 表单相关开始-----------------------------------------------------------
+      form1: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          // radio: 1,
+          // checkbox : [1,2]
+          sheetId: null,
+          totalPrice: null,
+        },
+        // 表单属性
+        props: {
+          // 表单请求地址
+          action: "client/enquiry/quote/kh/addQuote",
+          // 表单字段显示规则
+          columns: [
+            {
+              key: "totalPrice",
+              title: "货款总价(人民币:元)",
+              type: "html"
             },
-            // 表单相关结束-----------------------------------------------------------
-        };
-    },
-    onLoad(options = {}) {
-        console.log(options)
-        const {
-            enquiryId
-        } = options
-        if (!enquiryId) {
-            vk.navigateTo('/pages/process/sheet/list');
-            return
-        }
-
-        this.enquiryId = enquiryId
-        this.form1.data.sheetId = enquiryId
-        this.getEnquiryDetail()
-    },
-    computed: {
-
-        totalPriceStr() {
-            if (this.totalPrice == 0) {
-                return "零元"
-            }
-            return vk.myfn.convertCurrency(this.totalPrice / 100)
-        }
-    },
-    methods: {
-        onFormSuccess() {
-            vk.navigateBack()
-        },
-        // 提交报价单
-        async submit() {
-
-            const data = await vk.userCenter.getCurrentUserInfo();
-            const {userInfo} = data
-            if (userInfo.quoteTimes > 3) {
-
-            }
-
-            this.$confirm(`今日报价次数${userInfo.quoteTimes || 0}, 是否继续?`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-                center: true
-            }).then(res => {
-                vk.callFunction({
-                    url: 'client/enquiry/quote/kh/addQuote',
-                    title: '请求中...',
-                    // data: {
-                    //     sheet: this.sheet,
-                    //     totalPrice: this.totalPrice
-                    // },
-                    success: (data) => {
-                        this.$message({
-                            message: "报价成功",
-                            type: 'success'
-                        })
-                    }
-                });
-            })
-
-
-        },
-        /**
-         * 获取询价单详情
-         */
-        getEnquiryDetail() {
-            vk.callFunction({
-                url: 'client/enquiry/sheet/pub/getDetail',
-                title: '请求中...',
-                data: {
-                    _id: this.enquiryId
-                },
-                success: (res) => {
-
-                    res.data.productList.forEach(item => {
-                        item.unitPrice = 0
-                        const keys = Object.keys(item.extraAttributes)
-                        keys.forEach(citem => {
-                            item.extraAttributes[citem] = JSON.parse(item.extraAttributes[
-                                citem])
-                        })
-                    })
-
-
-                    this.sheet = res.data
-                }
-            });
+            // {key: "totalPrice", title: "货款总价(人民币:元)", type: "number", precision: 2},
+            {
+              key: "files",
+              title: "附件",
+              type: "file",
+              accept: '.pdf',
+              tips: '仅支持PDF文档，报价附件将生成标准合同附件，请认真审阅。'
+            },
+            {key: "remark", title: "报价单详情", type: "textarea"},
+            {key: "supplierExt", title: "供应商合同补充条款", type: "textarea", autosize: {minRows: 4, maxRows: 10},},
+          ],
+          // 表单验证规则
+          rules: {
+            totalPrice: [
+              {required: true, message: "货款总价不能为空", trigger: "change,blur"},
+            ]
+          },
+          // add 代表添加 update 代表修改
+          formType: "",
+          // 表单是否在请求中
+          loading: false,
+          // 是否显示表单1 的弹窗
+          show: false
         }
+      },
+      // 表单相关结束-----------------------------------------------------------
+    };
+  },
+  onLoad(options = {}) {
+    console.log(options)
+    const {
+      enquiryId
+    } = options
+    if (!enquiryId) {
+      vk.navigateTo('/pages/process/sheet/list');
+      return
     }
+
+    this.enquiryId = enquiryId
+    this.form1.data.sheetId = enquiryId
+    this.getEnquiryDetail()
+  },
+  computed: {
+
+    totalPriceStr() {
+      if (this.totalPrice == 0) {
+        return "零元"
+      }
+      return vk.myfn.convertCurrency(this.totalPrice / 100)
+    }
+  },
+  methods: {
+    onFormSuccess() {
+      vk.redirectTo({url: `/pages/enquiry/detail?id=${this.enquiryId}`})
+    },
+    onFormFail(data) {
+      if (data.data.code === 12) {
+        this.$confirm(data.data.msg, '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          type: 'warning'
+        }).then(() => {
+          vk.redirectTo({url: `/pages/user/user?menu=grade`})
+        })
+      } else {
+        this.$confirm(data.data.msg, '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          type: 'warning'
+        }).then(() => {
+          vk.navigateBack()
+        })
+      }
+    },
+
+    // 提交报价单
+    async submit() {
+
+      const data = await vk.userCenter.getCurrentUserInfo();
+      const {userInfo} = data
+      if (userInfo.remainQuoteNum === 0 || !userInfo.remainQuoteNum) {
+
+      }
+
+      // this.$confirm(`今日报价次数${userInfo.quoteTimes || 0}, 是否继续?`, '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning',
+      //     center: true
+      // }).then(res => {
+      //
+      // })
+
+      vk.callFunction({
+        url: 'client/enquiry/quote/kh/addQuote',
+        title: '请求中...',
+        // data: {
+        //     sheet: this.sheet,
+        //     totalPrice: this.totalPrice
+        // },
+        success: (data) => {
+          this.$message({
+            message: "报价成功",
+            type: 'success'
+          })
+        },
+        fail: err => {
+          console.log(err)
+
+        }
+      })
+
+
+    },
+    /**
+     * 获取询价单详情
+     */
+    getEnquiryDetail() {
+      vk.callFunction({
+        url: 'client/enquiry/sheet/pub/getDetail',
+        title: '请求中...',
+        data: {
+          _id: this.enquiryId
+        },
+        success: (res) => {
+          this.sheet = res.data
+        }
+      });
+    },
+    formatNumber(e) {
+      this.form1.data.totalPrice = parseFloat(this.form1.data.totalPrice).toFixed(2)
+    }
+  },
+  onShow() {
+    this.reloaded = false
+    setTimeout(() => {
+      this.reloaded = true
+    }, 500)
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .page-main {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .description {
-    margin-bottom: 40px;
-    width: 800px;
+  margin-bottom: 40px;
+  width: 800px;
 }
 
 .quote {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .quote-form {
-    width: 260px;
+  width: 260px;
 }
 
 .form-footer {
-    height: 40px;
-    line-height: 40px;
-    background: #fff;
-    padding-top: 0;
-    text-align: center;
-    display: block;
+  height: 40px;
+  line-height: 40px;
+  background: #fff;
+  padding-top: 0;
+  text-align: center;
+  display: block;
 }
 </style>
\ No newline at end of file
diff --git a/pages/enquiry/quote/my.vue b/pages/enquiry/quote/my.vue
new file mode 100644
index 0000000..18ef06e
--- /dev/null
+++ b/pages/enquiry/quote/my.vue
@@ -0,0 +1,184 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+
+        <!-- <view class="page-nav">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+            </el-breadcrumb>
+        </view> -->
+
+        <view class="carousel">
+            <el-carousel height="170px">
+                <el-carousel-item v-for="item in 4" :key="item">
+                    <image class="carousel-img"
+                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
+                           mode="aspectFill"></image>
+                </el-carousel-item>
+            </el-carousel>
+            <view class="goods-options">
+                <el-row class="">
+                    <el-button @click="toRelease" type="primary" round>发布询价单</el-button>
+                    <!-- <el-button type="primary" round plain>我发布的询价单</el-button> -->
+                </el-row>
+            </view>
+        </view>
+
+        <!-- 商品列表 -->
+        <view class="sheet-list">
+            <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
+                           :customRightBtns="table1.customRightBtns"
+                           :pagination="true"></vk-data-table>
+        </view>
+        <common-footer></common-footer>
+    </view>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            keyword: '',
+            // 表格相关开始 -----------------------------------------------------------
+            table1: {
+                // 表格数据请求地址
+                action: "client/enquiry/quote/kh/getList",
+                customRightBtns: [
+                    {
+                        title: '详情',
+                        icon: 'el-icon-search',
+                        type: 'primary',
+                        onClick: (item) => {
+                            vk.navigateTo('/pages/enquiry/detail?id=' + item.sheetId);
+                        }
+                    },
+                ],
+                // 表格字段显示规则
+                columns: [
+                    {
+                        key: "sheet.title",
+                        title: "供应标题",
+                        type: "text",
+                    },
+                    {
+                        key: "totalPrice",
+                        title: "金额",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            return `${val}元`
+                        }
+                    },
+                    {
+                        key: "status",
+                        title: "状态",
+                        type: "select",
+                        data: [
+                            {value: 0, label: '待选商'},
+                            {value: 1, label: '已被选商'},
+                        ]
+                    },
+                    {
+                        key: "remark",
+                        title: "备注",
+                        type: "text",
+                    },
+                    {
+                        key: "_add_time_str",
+                        title: "发布时间",
+                        type: "time",
+                        width: 160
+                    },
+                ],
+                // 多选框选中的值
+                multipleSelection: [],
+                // 当前高亮的记录
+                selectItem: "",
+
+            },
+            // 表格相关结束 -----------------------------------------------------------
+        };
+    },
+    onLoad() {
+
+    },
+    methods: {
+        toRelease() {
+
+            if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
+                this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                  vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
+                this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo('/pages/user/user?menu=fadada');
+                })
+            } else {
+                uni.navigateTo({
+                    url: '/pages/enquiry/release'
+                })
+            }
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.carousel {
+    width: 1200px;
+    margin: 20px auto;
+}
+
+.carousel-img {
+    width: 100%;
+    height: 100%;
+}
+
+.goods-options {
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.filter-outer {
+    width: 1200px;
+    margin: 20px auto;
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.tags {
+    display: flex;
+
+    .el-tag {
+        margin-right: 10px;
+    }
+}
+
+
+.sheet-list {
+    width: 1200px;
+    margin: 20px auto;
+    // display: flex;
+
+}
+
+
+.paginatio {
+    float: none;
+    width: 1200px;
+    margin: 20px auto;
+    display: flex;
+    justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/enquiry/release.vue b/pages/enquiry/release.vue
index 735e2e3..df5a6f8 100644
--- a/pages/enquiry/release.vue
+++ b/pages/enquiry/release.vue
@@ -1,404 +1,544 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-
-        <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item>
-                    <navigator style="display: inline-block;" url="/pages/enquiry/list">询价单</navigator>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>发布询价单</el-breadcrumb-item>
-            </el-breadcrumb>
-        </view>
-
-        <view class="form-view">
-
-            <view class="m-20">
-                <view class="title-main">请填写询价单</view>
-                <view class="title-sub">询价信息越完整，供应商报价越精准</view>
-
-                <view class="form-type-box">
-                    <view @click="form1.data.fillType = 0" :class="{active: form1.data.fillType == 0}"
-                          class="form-type-item">手动填写
-                    </view>
-                    <view @click="form1.data.fillType = 1" :class="{active: form1.data.fillType == 1}"
-                          class="form-type-item">批量上传
-                    </view>
-                </view>
-            </view>
-            <!-- 手动填写 -->
-            <template v-if="form1.data.fillType === 0">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            商品信息
-                        </view>
-                        <text class="enquiry-no">询价单编号: {{ form1.data.enquiryNo }}</text>
-                    </view>
-                    <view class="sales-code flex justify-end items-center">
-                        <text>金九信业务员编号:</text>
-                        <el-input v-model="salesCode" placeholder="请输入编号没有则留空" size="small"/>
-                    </view>
-                </view>
-                <view class="p-20">
-                    <view v-for="(item, index) in productList" :key="index">
-                        <enquiry-template :ref="'product' + index" v-model="productList[index]"
-                                          :base-attributes="baseAttributes" :productIndex="index"/>
-                    </view>
-                </view>
-            </template>
-            <!-- 批量上传 -->
-            <template v-else>
-                <view class="form-title-wrap mt-20">
-                    <view class="goods-info-title mb-20">
-                        <view class="form-title">
-                            采购单或附件上传
-                        </view>
-                    </view>
-                    <text class="ml-20 text-main text-28">上传自有采购单图片或文档，支持jpg/png/word/excel</text>
-                </view>
-                <vk-data-upload v-model="form1.data.multiFiles" accept="*"></vk-data-upload>
-                <view class="form-title-wrap mt-20">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            主要商品分类筛选
-                        </view>
-                    </view>
-                </view>
-                <view class="flex flex-wrap justify-start items-start my-20">
-                    <text v-for="(item, index) in goodsList" :key="index" @click="changeMultiGoods(item)"
-                          :class="[productIdList.includes(item._id) ? 'text-main' : '']"
-                          class="mr-25 mb-20 pointer">{{ item.name }}
-                    </text>
-                </view>
-            </template>
-
-            <view v-if="form1.data.fillType === 0" class="btn-add-outer">
-                <el-button @click="addProduct" type="primary" size="small" plain icon="el-icon-plus"
-                           class="empty-bg-plain-btn">添加商品
-                </el-button>
-                <el-button v-show="productList.length > 1" @click="removeProduct" type="warning" size="small">删除商品
-                </el-button>
-            </view>
-            <el-form ref="form1" :model="form1.data" label-width="80px">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            采购商其他要求
-                        </view>
-                    </view>
-                </view>
-
-                <view class="p-30">
-                    <el-radio-group v-model="hasRequire" class="my-20">
-                        <el-radio :label="true">有</el-radio>
-                        <el-radio :label="false">无</el-radio>
-                    </el-radio-group>
-                    <view class="pos-r">
-                        <el-input type="textarea" v-model="form1.data.remark" :disabled="!hasRequire"
-                                  placeholder="复杂加工提供图纸、简单加工详细说明加工内容，如：镀锌、刷漆、防腐、折弯、裁剪等"
-                                  :rows="15"/>
-                        <view></view>
-                        <view class="remark-upload">
-                            <vk-data-upload v-model="form1.data.files">
-                                <!--                                <i class="el-icon-plus"/>-->
-                            </vk-data-upload>
-                        </view>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            发票要求
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20">
-                        <el-radio-group v-model="form1.data.invoice">
-                            <el-radio :label="true">含税</el-radio>
-                            <el-radio :label="false">不含税</el-radio>
-                        </el-radio-group>
-                    </view>
-                    <template v-if="form1.data.invoice">
-
-                        <view class="mb-20 flex justify-start items-center">
-                            <text>开票时间：</text>
-                            <el-radio-group v-model="form1.data.writeInvoiceTime">
-                                <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
-                                <el-radio :label="1">付款后次月</el-radio>
-                                <el-radio :label="2">付款前</el-radio>
-                            </el-radio-group>
-                        </view>
-                        <view class="mb-20 flex justify-start items-center">
-                            <text>发票种类：</text>
-                            <el-radio-group v-model="form1.data.invoiceType">
-                                <el-radio :label="0">增值税专用发票13%</el-radio>
-                                <el-radio :label="1">增值税普通发票</el-radio>
-                                <el-radio :label="2">普通发票</el-radio>
-                            </el-radio-group>
-                            <view class="ml-20 flex justify-start items-center">
-                                <text class="label-width">其他要求：</text>
-                                <el-input v-model="form1.data.invoiceOther" placeholder="请输入" size="small"/>
-                            </view>
-                        </view>
-                    </template>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            运输要求
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>随货资料：</text>
-                        <el-checkbox-group v-model="form1.data.transportDocuments">
-                            <el-checkbox label="合格证"/>
-                            <el-checkbox label="检测报告"/>
-                            <el-checkbox label="销售清单"/>
-                            <el-checkbox label="磅重"/>
-                        </el-checkbox-group>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text class="label-width">其他要求：</text>
-                        <el-input v-model="form1.data.otherTransportDocuments" placeholder="请输入"/>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>运输限制：</text>
-                        <el-radio-group v-model="form1.data.transportLimit">
-                            <el-radio :label="false">无</el-radio>
-                            <el-radio :label="true">有</el-radio>
-                        </el-radio-group>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易模式
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>交易模式：</text>
-                        <el-radio-group v-model="form1.data.tradeMethod">
-                            <el-radio :label="0">自主交易</el-radio>
-                            <el-radio :label="1">金久信公证</el-radio>
-                        </el-radio-group>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易说明
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>付款方式：</text>
-                        <el-radio v-model="form1.data.payMethod" :label="0">预付</el-radio>
-                        <view class="flex justify-start items-center">
-                            <el-input v-model="form1.data.advancePayRate"
-                                      class="advance-pay-rate"/>
-                            <text>%货到付全款</text>
-                        </view>
-                        <view class="mx-20">
-                            <el-radio v-model="form1.data.payMethod" :label="1">货到验收后付款</el-radio>
-                        </view>
-                        <el-radio v-model="form1.data.payMethod" :label="2">提货付全款</el-radio>
-                        <view class="mx-20 flex justify-start items-center">
-                            <el-radio v-model="form1.data.payMethod" :label="3">信誉采购，货到签单后账期：</el-radio>
-                            <el-input v-model="form1.data.reputationPayDay"
-                                      class="advance-pay-rate">
-                                <template slot="suffix">天</template>
-                            </el-input>
-                        </view>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <el-radio v-model="form1.data.payMethod" :label="4">其他付款方式</el-radio>
-                        <el-input v-model="form1.data.otherPayMethod"/>
-                    </view>
-
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>报价形式：</text>
-                        <el-radio v-model="form1.data.offerType" :label="0">整单报价</el-radio>
-                        <el-radio v-model="form1.data.offerType" :label="1">可分项报价</el-radio>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>报价时限：</text>
-                        <view class="flex justify-start items-center">
-                            <el-date-picker
-                                v-model="form1.data.answerStartTime"
-                                type="datetime"/>
-                            <view class="mx-15">~</view>
-                            <el-date-picker
-                                v-model="form1.data.answerEndTime"
-                                type="datetime"/>
-                        </view>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易说明
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text style="width: 140px">交保证金要求：</text>
-                        <el-input v-model="form1.data.earnestMoney" placeholder="请输入交保证金要求（如无要求则留空）"/>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            简易合同备注和其他补充条款
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <el-radio v-model="form1.data.signMethod" :label="0">平台交易</el-radio>
-                        <el-radio v-model="form1.data.signMethod" :label="1">线下签约</el-radio>
-                    </view>
-                    <view v-if="form1.data.signMethod === 0">
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">违约责任:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                1.
-                                乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
-                                2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">解决纠纷的方法:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
-                                2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">不可抗力:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">其他:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">采购方补充条款:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                供货方逾期供货承担采购方一切损失
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            采购商信息
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text style="width: 140px">项目名称：</text>
-                        <el-input v-model="form1.data.projectName" placeholder="请输入交保证金要求（如无要求则留空）"/>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text style="width: 140px">项目地址：</text>
-                        <el-row :gutter="10">
-                            <el-col :span="5">
-                                <el-select v-model="projectProvinceIndex" placeholder="省">
-                                    <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                               :label="item.name"/>
-                                    <!--                                    <span slot="prefix">省</span>-->
-                                </el-select>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-select v-model="projectCityIndex" placeholder="市">
-                                    <template v-if="projectProvinceIndex !== null">
-                                        <el-option v-for="(item, index) in cityData[projectProvinceIndex]" :key="index"
-                                                   :value="index"
-                                                   :label="item.name"/>
-                                    </template>
-                                    <!--                                    <span slot="prefix">市</span>-->
-                                </el-select>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-select v-model="projectAreaIndex" placeholder="区/县">
-                                    <template v-if="projectProvinceIndex !== null && projectCityIndex !== null">
-                                        <el-option
-                                            v-for="(item, index) in areaData[projectProvinceIndex][projectCityIndex]"
-                                            :key="index" :value="index"
-                                            :label="item.name"/>
-                                    </template>
-                                    <!--                                    <span slot="prefix">区/县</span>-->
-                                </el-select>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-input v-model="form1.data.projectAddress"
-                                          placeholder="详细地址或几公里范围内"></el-input>
-                            </el-col>
-                        </el-row>
-                    </view>
-                    <el-row :gutter="10" class="mb-20">
-                        <el-col :span="12" class="flex justify-start items-center">
-                            <text style="width: 160px">公司信息：</text>
-                            <el-input v-model="company.companyName" placeholder=""/>
-                        </el-col>
-                        <el-col :span="12" class="flex justify-start items-center">
-                            <text style="width: 160px">公司联系方式：</text>
-                            <el-input v-model="company.legalMobile"/>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="10">
-                        <el-col :span="12" class="flex justify-start items-center">
-                            <text style="width: 160px">授权业务咨询人：</text>
-                            <el-input placeholder=""/>
-                        </el-col>
-                        <el-col :span="12" class="flex justify-start items-center">
-                            <text style="width: 160px">业务咨询联系方式：</text>
-                            <el-input placeholder=""/>
-                        </el-col>
-                    </el-row>
-                </view>
-
-            </el-form>
-
-            <view class="form-footer">
-                <el-button @click="draft">保存草稿</el-button>
-                <el-button type="primary" @click="submit">提交询价单</el-button>
-            </view>
-            <!-- <el-divider content-position="left">其他设置</el-divider> -->
-        </view>
-        <Gap/>
-        <common-footer></common-footer>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
+    <view class="page-nav">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/enquiry/list">询价单</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>发布询价单</el-breadcrumb-item>
+      </el-breadcrumb>
     </view>
+
+    <view class="form-view">
+
+      <view class="m-20">
+        <view class="title-main">请填写询价单</view>
+        <view class="title-sub">询价信息越完整，供应商报价越精准</view>
+
+        <view class="form-type-box">
+          <view @click="form1.data.fillType = 0" :class="{active: form1.data.fillType === 0}"
+                class="form-type-item">手动填写
+          </view>
+          <view @click="form1.data.fillType = 1" :class="{active: form1.data.fillType === 1}"
+                class="form-type-item">批量上传
+          </view>
+        </view>
+      </view>
+      <view class="text-25 text-main my-15" v-if="form1.data.fillType === 0">温馨提示:
+        手动填写仅支持主流钢材产品数据，如无您采购产品数据请点击"批量上传"下单。
+      </view>
+      <!-- 手动填写 -->
+      <template v-if="form1.data.fillType === 0">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              商品信息
+            </view>
+            <text class="enquiry-no">询价单编号: {{ form1.data.enquiryNo }}</text>
+          </view>
+          <view class="sales-code flex justify-end items-center">
+            <text>金久信业务员编号:</text>
+            <el-input v-model="salesCode" placeholder="请输入编号没有则留空" size="small"/>
+          </view>
+        </view>
+        <view class="p-20">
+          <view v-for="(item, index) in productList" :key="index">
+            <enquiry-template :ref="'product' + index" v-model="productList[index]"
+                              :base-attributes="baseAttributes" :productIndex="index"/>
+          </view>
+        </view>
+      </template>
+      <!-- 批量上传 -->
+      <template v-else>
+        <view class="form-title-wrap mt-20">
+          <view class="goods-info-title mb-20">
+            <view class="form-title">
+              采购单或附件上传
+            </view>
+          </view>
+          <text class="ml-20 text-main text-28">仅支持PDF</text>
+        </view>
+        <vk-data-upload v-model="form1.data.files" accept=".pdf" list-type="text"
+                        :on-preview="previewUpload"></vk-data-upload>
+        <view class="form-title-wrap my-20">
+          <view class="goods-info-title">
+            <view class="form-title">
+              主要商品分类筛选
+            </view>
+          </view>
+        </view>
+        <!--        <view class="flex flex-wrap justify-start items-start my-20">-->
+        <!--          <text v-for="(item, index) in goodsList" :key="index" @click="changeMultiGoods(item)"-->
+        <!--                :class="[productIdList.includes(item._id) ? 'product-item-active' : '']"-->
+        <!--                class="product-item">{{ item.name }}-->
+        <!--          </text>-->
+        <!--          <el-input style="width: 200px" v-model="form1.data.otherCate" placeholder="其他分类"-->
+        <!--                    @change="changeOtherCate"/>-->
+        <!--        </view>-->
+        <div class="flex justify-center items-start">
+          <div v-for="(item, index) in productCateList" class="flex-1 mx-15" :key="index">
+            <div class="flex justify-start items-center">
+              <image :src="item.icon" style="width: 15px; height: 15px"/>
+              <span class="ml-10">{{ item.name }}</span>
+            </div>
+            <div class="ml-25 flex flex-wrap justify-start items-start">
+                        <span class="mr-25 mt-20 pointer" @click="changeMultiGoods(productItem)"
+                              :class="[productIdList.includes(productItem._id) ? 'text-main' : '']"
+                              v-for="(productItem, productIndex) in item.children"
+                              :key="productIndex"> {{ productItem.name }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="flex justify-start items-center flex-wrap mt-20">
+          <span style="margin: 10px 10px 0 0">已选:</span>
+          <div class="flex justify-start items-center pointer"
+               v-for="(productItem, productIndex) in allProductList.filter(all => productIdList.includes(all._id))"
+               :key="productIndex" style="margin: 10px 10px 0 0">
+            <image src="/static/images/check.png" style="width: 12px; height: 12px; margin-right: 5px"/>
+            <span style="line-height: 18px">{{ productItem.parentName }}-{{ productItem.name }}</span>
+          </div>
+        </div>
+        <view class="form-title-wrap mt-20">
+          <view class="goods-info-title">
+            <view class="form-title">
+              预估采购数量
+            </view>
+          </view>
+        </view>
+        <view class="flex justify-start items-center my-20">
+          <el-input v-model="form1.data.procureNumber" style="width: 250px" class="input-with-select"
+                    type="number">
+            <template #prepend>数量</template>
+          </el-input>
+          <el-input v-model="form1.data.procureUnit" style="width: 250px">
+            <template #prepend>单位</template>
+          </el-input>
+        </view>
+      </template>
+
+      <view v-if="form1.data.fillType === 0" class="btn-add-outer">
+        <el-button @click="addProduct" type="primary" size="small" icon="el-icon-plus">添加商品
+        </el-button>
+        <el-button v-show="productList.length > 1" @click="removeProduct" type="warning" size="small">删除商品
+        </el-button>
+      </view>
+
+      <el-form ref="form1" :model="form1.data" label-width="80px">
+        <el-row :gutter="10">
+          <el-col :span="6">
+            <el-form-item label="交货时限">
+              <el-date-picker
+                v-model="form1.data.deliveryTime"
+                type="date" :picker-options="pickerOptions"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="交货地点" class="ml-10">
+              <el-row :gutter="10">
+                <el-col :span="11">
+                  <vk-data-input-address :level="3" v-model="form1.data.addressRegion" class="w-100p"
+                                         @change="changeAddressRegion"/>
+                </el-col>
+                <el-col :span="11">
+                  <el-input v-model="form1.data.addressDetail" @change="changeAddressDetail"
+                            placeholder="详细地址或几公里范围内"></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!--                <view class="form-title-wrap">-->
+        <!--                    <view class="goods-info-title">-->
+        <!--                        <view class="form-title">-->
+        <!--                            钢厂选择-->
+        <!--                        </view>-->
+        <!--                    </view>-->
+        <!--                </view>-->
+        <!--                <view class="my-20">-->
+        <!--                    <el-select v-model="form1.data.stealFactory" placeholder="请选择钢厂">-->
+        <!--                        <el-option v-for="(item, index) in stealFactoryList" :key="index"-->
+        <!--                                   :label="item.name"-->
+        <!--                                   :value="item._id">-->
+        <!--                        </el-option>-->
+        <!--                    </el-select>-->
+        <!--                </view>-->
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              采购商其他要求
+            </view>
+          </view>
+        </view>
+
+        <view class="p-30">
+          <el-radio-group v-model="hasRequire" class="my-20">
+            <el-radio :label="true">有</el-radio>
+            <el-radio :label="false">无</el-radio>
+          </el-radio-group>
+          <view class="pos-r">
+            <el-input type="textarea" v-model="form1.data.remark" :disabled="!hasRequire"
+                      placeholder="生产厂家、品牌要求、复杂加工提供图纸、简单加工详细说明加工内容，如：镀锌、刷漆、防腐、折弯、裁剪等"
+                      :rows="15"/>
+            <view class="remark-upload">
+              <vk-data-upload v-model="form1.data.multiFiles"
+                              :on-preview="previewUpload"
+                              accept=".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf" list-type="text">
+              </vk-data-upload>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              发票要求
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20">
+            <el-radio-group v-model="form1.data.invoice">
+              <el-radio :label="true">含税</el-radio>
+              <el-radio :label="false">不含税</el-radio>
+            </el-radio-group>
+          </view>
+          <template v-if="form1.data.invoice">
+            <view class="mb-20 flex justify-start items-center">
+              <text>开票时间：</text>
+              <el-radio-group v-model="form1.data.writeInvoiceTime">
+                <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
+                <el-radio :label="1">付款后次月</el-radio>
+                <el-radio :label="2">付款前</el-radio>
+              </el-radio-group>
+            </view>
+            <view class="mb-20 flex justify-start items-center">
+              <view class="flex-1 flex justify-start items-center">
+                <text style="width: 30%">纳税人身份：</text>
+                <el-select v-model="form1.data.taxType" placeholder="纳税人身份" style="width: 100%">
+                  <el-option
+                    v-for="item in ['一般纳税人', '小规模公司', '个体工商户']"
+                    :key="item"
+                    :label="item"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </view>
+              <view class="flex-1 flex justify-start items-center ml-20">
+                <text style="width: 30%">发票种类：</text>
+                <el-select v-model="form1.data.invoiceType" placeholder="发票种类" style="width: 100%">
+                  <el-option
+                    v-for="item in ['专用发票', '普通发票']"
+                    :key="item"
+                    :label="item"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </view>
+            </view>
+            <view class="mb-20 flex justify-start items-center">
+              <view class="flex-1 flex justify-start items-center">
+                <text style="width: 30%">税率：</text>
+                <el-select v-model="form1.data.taxRate" placeholder="税率" style="width: 100%">
+                  <el-option
+                    v-for="item in ['13%', '9%', '6%', '4%', '3%', '1%']"
+                    :key="item"
+                    :label="item"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </view>
+              <view class="ml-20 flex justify-start items-center flex-1 ml-20">
+                <text style="width: 30%">手动填写税票要求：</text>
+                <el-input v-model="form1.data.invoiceOther" placeholder="如：一般纳税人 专用发票 税率13%"
+                          size="small"/>
+              </view>
+            </view>
+          </template>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              运输要求
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text>随货资料：</text>
+            <el-checkbox-group v-model="form1.data.transportDocuments">
+              <el-checkbox label="合格证"/>
+              <el-checkbox label="检测报告"/>
+              <el-checkbox label="销售清单"/>
+              <el-checkbox label="磅重"/>
+            </el-checkbox-group>
+            <view style="margin-left: 30px">
+              <el-checkbox label="全选" @change="changeDocumentAll"/>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <text class="label-width">其他要求：</text>
+            <el-input v-model="form1.data.otherTransportDocuments" placeholder="请输入"/>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <text>运输限制：</text>
+            <el-radio-group v-model="form1.data.transportLimit">
+              <el-radio :label="false">无</el-radio>
+              <el-radio :label="true">有</el-radio>
+            </el-radio-group>
+            <view class="ml-20 flex justify-start items-center" v-if="form1.data.transportLimit"
+                  style="width: 400px">
+              <el-input v-model="form1.data.otherTransportRequest" placeholder="请输入运输限制说明"/>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              交易模式
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text>交易模式：</text>
+            <el-radio-group v-model="form1.data.tradeMethod">
+              <el-radio :label="1">金久信公证</el-radio>
+              <el-radio :label="0">自主交易</el-radio>
+            </el-radio-group>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              交易说明
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text>付款方式：</text>
+            <el-radio v-model="form1.data.payMethod" :label="0" @change="changePayMethod(0)">预付</el-radio>
+            <view class="flex justify-start items-center">
+              <el-input v-model="form1.data.advancePayRate" :disabled="form1.data.payMethod !== 0"
+                        class="advance-pay-rate"/>
+              <text>%货到付全款</text>
+            </view>
+            <view class="mx-20">
+              <el-radio v-model="form1.data.payMethod" :label="1" @change="changePayMethod(1)">
+                货到验收后付款
+              </el-radio>
+            </view>
+            <el-radio v-model="form1.data.payMethod" :label="2" @change="changePayMethod(2)">提货付全款
+            </el-radio>
+            <view class="mx-20 flex justify-start items-center">
+              <el-radio v-model="form1.data.payMethod" :label="3" @change="changePayMethod(3)">
+                信誉采购，货到签单后账期：
+              </el-radio>
+              <el-input v-model="form1.data.reputationPayDay" :disabled="form1.data.payMethod !== 3"
+                        class="advance-pay-rate">
+                <template slot="suffix">
+                  <span style="margin-top: 10px">天</span>
+                </template>
+              </el-input>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <el-radio v-model="form1.data.payMethod" :label="4">其他付款方式</el-radio>
+            <el-input v-model="form1.data.otherPayMethod"/>
+          </view>
+
+          <view class="mb-20 flex justify-start items-center">
+            <text>报价形式：</text>
+            <el-radio v-model="form1.data.offerType" :label="0">整单报价</el-radio>
+            <el-radio v-model="form1.data.offerType" :label="1">可分项报价</el-radio>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <text>报价时限：</text>
+            <view class="flex justify-start items-center">
+              <el-date-picker :picker-options="pickerOptions"
+                              v-model="form1.data.answerStartTime"
+                              type="datetime"/>
+              <view class="mx-15">~</view>
+              <el-date-picker :picker-options="pickerOptions"
+                              v-model="form1.data.answerEndTime"
+                              type="datetime"/>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              交易保证金要求
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text style="width: 140px">人民币金额≥</text>
+            <el-input-number v-model="form1.data.earnestMoney" :min="0" :precision="2"
+                             placeholder="请输入交易保证金要求（如无要求则留空）" type="number"
+                             @blur="formatAmount" @focus="resetAmount"/>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              简易合同备注和其他补充条款
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <el-radio v-model="form1.data.signMethod" :label="0">线上签约-标准合同</el-radio>
+            <el-radio v-model="form1.data.signMethod" :label="2">线上签约-双方协商合同</el-radio>
+            <el-radio v-model="form1.data.signMethod" :label="1" v-if="form1.data.tradeMethod === 0">
+              线下签约
+            </el-radio>
+          </view>
+
+          <view class="my-25" v-if="form1.data.signMethod === 2">
+            <view class="p-30">
+              <view class="mb-20 flex justify-start items-center">
+                <text style="width: 140px">合同附件：</text>
+                <vk-data-upload v-model="form1.data.contractAttachment" accept=".pdf" list-type="text"
+                                :on-preview="previewUpload"/>
+              </view>
+            </view>
+          </view>
+          <view v-if="form1.data.signMethod === 0">
+            <view @click="openDownload" class="pointer my-25 text-main">
+              点击查看标准合同
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">违约责任:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                1.
+                乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
+                2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">解决纠纷的方法:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
+                2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">不可抗力:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">其他:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">采购方补充条款:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                <el-input v-if="form1.data.signMethod === 0" v-model="form1.data.supplementary"
+                          placeholder="请输入采购方补充条款"/>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              采购商信息
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text style="width: 140px">项目名称：</text>
+            <el-input v-model="form1.data.projectName" placeholder="请输入项目名称或主要用途"/>
+          </view>
+          <view class="mb-20 flex justify-start items-center w-100p">
+            <text style="width: 140px">项目地址：</text>
+            <el-row :gutter="10" class="w-100p">
+              <el-col :span="11">
+                <vk-data-input-address :level="3" v-model="form1.data.projectAddressRegion"
+                                       class="w-100p"/>
+              </el-col>
+              <el-col :span="11">
+                <el-input v-model="form1.data.projectAddressDetail"
+                          placeholder="详细地址或几公里范围内"></el-input>
+              </el-col>
+            </el-row>
+          </view>
+          <el-row :gutter="10" class="mb-20">
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">{{
+                  userInfo.accountType === 2 ? '公司信息' : '个人信息'
+                }}：
+              </text>
+              <el-input v-model="form1.data.companyName" placeholder=""/>
+            </el-col>
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">{{
+                  userInfo.accountType === 2 ? '公司联系方式' : '个人联系方式'
+                }}：
+              </text>
+              <el-input v-model="form1.data.companyMobile"/>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">授权业务咨询人：</text>
+              <el-select v-model="form1.data.businessName" placeholder="点击选择业务联系人"
+                         class="w-100p" @change="selectContact">
+                <el-option
+                  v-for="(item, index) in contactList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+                <view slot="empty" class="text-gray pointer p-20">
+                  <text>无业务联系人,请到</text>
+                  <text class="text-main mx-15" @click="navTo">个人中心</text>
+                  <text>添加</text>
+                </view>
+              </el-select>
+            </el-col>
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">业务咨询联系方式：</text>
+              <el-input v-model="form1.data.businessMobile" type="number" disabled/>
+            </el-col>
+          </el-row>
+        </view>
+
+      </el-form>
+      <view class="form-footer">
+        <!--                <el-button @click="draft">保存草稿</el-button>-->
+        <el-button type="primary" @click="save" plain>暂存</el-button>
+        <el-button type="primary" @click="submit">提交询价单</el-button>
+      </view>
+      <!-- <el-divider content-position="left">其他设置</el-divider> -->
+    </view>
+    <Gap/>
+    <common-footer></common-footer>
+
+  </view>
 </template>
 
 <script>
-import {reject} from 'lodash';
 import EnquiryTemplate from './components/template.vue'
 import dayjs from "dayjs";
 import Gap from "../../components/gap/gap.vue";
@@ -407,410 +547,447 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    components: {Gap, EnquiryTemplate},
-    data() {
-        return {
-            disabled: false,
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            company: {
-                companyName: '',
-                legalMobile: '',
-            },
-            enquiryNo: '',
-            // 表单相关开始-----------------------------------------------------------
-            productList: [],
-            productIdList: [],
-            baseAttributes: [],
-            categoryTreeData: [],
-            checkCategoryList: [],
-            projectProvinceIndex: null,
-            projectCityIndex: null,
-            projectAreaIndex: null,
-            goodsList: [],
-            form1: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    fillType: 0,
-                    enquiryNo: dayjs().format('YYYYMMDD') + (Math.ceil(Math.random() * 10000)).toString(),
-                    // extraAttributes: {},
-                    // attributes: {},
-                    multiFiles: [],
-                    invoice: false,
-                    invoiceType: 0,
-                    invoiceOther: '',
-                    writeInvoiceTime: 0,
-                    transportDocuments: [],
-                    files: [],
-                    otherTransportDocuments: '',
-                    transportLimit: false,
-                    tradeMethod: 0,
-                    payMethod: 0,
-                    advancePayRate: null,
-                    reputationPayDay: null,
-                    otherPayMethod: '',
-                    offerType: 0,
-                    answerStartTime: '',
-                    answerEndTime: '',
-                    earnestMoney: '',
-                    signMethod: 0,
-                    projectName: '',
-                    province: '',
-                    city: '',
-                    area: '',
-                    projectAddress: '',
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: "client/enquiry/sheet/kh/add",
-                    // 表单字段显示规则
-                    columns: [
-                        {key: "", title: "采购单", type: "bar-title", showRule: 'fillType==1'},
-                        {key: "productFiles", title: "附件文档", type: "file", showRule: 'fillType==1'},
-                        {key: "productCategoryIds", title: "商品分类", type: "bar-title", showRule: 'fillType==1'},
-                        {key: "", title: "采购商其他要求", type: "bar-title"},
+  components: {Gap, EnquiryTemplate},
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+      disabled: false,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      company: {
+        companyName: '',
+        legalMobile: '',
+      },
+      enquiryNo: '',
+      // 表单相关开始-----------------------------------------------------------
+      productList: [],
+      productIdList: [],
+      baseAttributes: [],
+      categoryTreeData: [],
+      checkCategoryList: [],
+      projectProvinceIndex: null,
+      projectCityIndex: null,
+      projectAreaIndex: null,
+      goodsList: [],
+      stealFactoryList: [],
+      dialogVisible: false,
+      singleQuoteAmount: 1,
+      monthlyQuoteAmount: 100,
+      buyQuoteMode: null,
+      form1: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          fillType: 0,
+          enquiryNo: dayjs().format('YYYYMMDD') + (Math.ceil(Math.random() * 10000)).toString(),
+          // extraAttributes: {},
+          // attributes: {},
+          multiFiles: [],
+          stealFactory: null,
+          invoice: false,
+          invoiceType: '',
+          taxType: '',
+          taxRate: '',
+          invoiceOther: '',
+          writeInvoiceTime: 0,
+          transportDocuments: [],
+          files: [],
+          otherTransportDocuments: '',
+          transportLimit: false,
+          otherTransportRequest: '',
+          tradeMethod: 1,
+          payMethod: 0,
+          advancePayRate: null,
+          reputationPayDay: null,
+          otherPayMethod: '',
+          offerType: 0,
+          answerStartTime: '',
+          answerEndTime: '',
+          earnestMoney: '',
+          signMethod: 0,
+          projectName: '',
+          province: '',
+          city: '',
+          area: '',
+          projectAddress: '',
+          businessName: '',
+          businessMobile: '',
+          companyName: '',
+          companyMobile: '',
+          contractAttachment: [],
+          supplementary: '',
+          addressRegion: {},
+          addressDetail: null,
+          projectAddressRegion: {},
+          projectAddressDetail: null,
+          otherCate: null,
+        },
+      },
+      // 表单相关结束-----------------------------------------------------------
+      salesCode: '',
+      hasRequire: false,
+      contactList: [],
+      productCateList: [],
+      allProductList: [],
+      userInfo: null
+    };
+  },
+  async onLoad(option) {
+    // await this.getStealFactory()
 
-                        {key: "remark", title: "其他要求", type: "textarea",},
-                        {key: "", title: "发票要求", type: "bar-title"},
-                        {
-                            key: "invoice", title: "发票要求", type: "radio",
-                            data: [
-                                {value: true, label: "含税"},
-                                {value: false, label: "不含税"}
-                            ],
-                        },
-                        {
-                            key: "writeInvoiceTime",
-                            title: "开票时间",
-                            type: "radio",
-                            data: [
-                                {
-                                    value: '付款当月（限20号之前付款，20号之后付款次月开票）',
-                                    label: "付款当月（限20号之前付款，20号之后付款次月开票）"
-                                },
-                                {value: '付款后次月', label: "付款后次月"},
-                                {value: '付款前', label: "付款前"},
-                            ],
-                            showRule: 'invoice==true'
-                        },
-                        {
-                            key: "nvoiceType",
-                            title: "发票种类",
-                            type: "radio",
-                            data: [
-                                {value: '增值税专用发票13%', label: "增值税专用发票13%"},
-                                {value: '增值税普通发票', label: "增值税普通发票"},
-                                {value: '普通发票', label: "普通发票"},
-                            ],
-                            showRule: 'invoice == true'
-                        },
-                        {key: "", title: "运输要求", type: "bar-title"},
-                        {
-                            key: "transportDocuments",
-                            title: "随货资料",
-                            type: "checkbox",
-                            data: [
-                                {value: '合格证', label: "合格证"},
-                                {value: '检测报告', label: "检测报告"},
-                                {value: '销售清单', label: "销售清单"},
-                                {value: '磅重', label: "磅重"},
-                            ],
-                        },
-                        {key: "otherTransportDocuments", title: "其他资料", type: "text"},
-                        {
-                            key: "transportLimit",
-                            title: "运输限制",
-                            type: "text",
-                        },
-                        {key: "", title: "交易说明", type: "bar-title", component: 'custom-form-section'},
-                        {
-                            key: "tradeMethod",
-                            title: "交易模式",
-                            type: "radio",
-                            data: [
-                                {value: 1, label: "自主交易"},
-                                {value: 0, label: "金久信公证"},
-                            ],
-                        },
-                        // {key: "", title: "交易说明", type: "bar-title"},
-                        {
-                            key: "payMethod",
-                            title: "付款方式",
-                            type: "radio",
-                            data: [
-                                {value: 1, label: "预付x%货到付全款"},
-                                {value: 2, label: "货到验收后付款"},
-                                {value: 3, label: "提货付全款"},
-                                {value: 4, label: "信誉采购"},
-                                {value: 5, label: "其他付款方式"},
-                            ],
-                        },
-                        {
-                            key: "", title: "", type: 'group', showLabel: false, justify: "start", columns: [
-                                {
-                                    key: "advancePayRate",
-                                    title: "预付百分比",
-                                    type: "percentage",
-                                    showRule: "payMethod==1"
-                                },
-                                {key: "otherPayMethod", title: "其他付款方式", type: "text", showRule: "payMethod==5"},
-                                {
-                                    key: "reputationPayDay",
-                                    title: "货到签单后账期天数",
-                                    type: "number",
-                                    showRule: "payMethod==4",
-                                    rightText: '天'
-                                },
-
-                            ]
-                        },
-                        {key: "answerTime", title: "报价时限", type: "date", dateType: "datetime"},
-                        {key: "earnestMoney", title: "保证金要求", type: "text"},
-                        {key: "", title: "合同要求", type: "bar-title"},
-                        {
-                            key: 'signMethod', title: '签约方式', type: 'radio', data: [
-                                {value: 0, label: "法大大"},
-                                {value: 1, label: "线下签约"},
-                            ]
-                        },
-                        {
-                            key: 'contractType', title: '合同选择', type: 'radio', showRule: 'signMethod==0', data: [
-                                {value: 0, label: "标准合同模板"},
-                                {value: 1, label: "自定义合同"},
-                            ]
-                        },
-                        {
-                            key: "breachLiability",
-                            title: "违约责任",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "solveDispute",
-                            title: "解决纠纷的方法",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "forceMajeure",
-                            title: "不可抗力",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "contracOther",
-                            title: "其他",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "buyerSupplement",
-                            title: "采购方补充条款",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "sellerSupplement",
-                            title: "供应方补充条款",
-                            type: "textarea",
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        // {key: "", title: "采购商信息", type: "bar-title"},
-                        {
-                            key: "files",
-                            title: "附件文档",
-                            type: "file",
-                            buttonText: "点击上传",
-                            limit: 9,
-                            accept: ".jpg,.png,.xlsx,.doc,.docx",
-                            tips: '上传自有采购单图片或文档,支持jpg/png/word/excel'
-                        },
-
-
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        answerTime: [
-                            {required: true, message: '报价时限不能为空', trigger: ["change", "blur"]}
-                        ],
-                        productCategoryIds: [
-                            {required: true, message: '商品分类不能为空', trigger: ["change", "blur"]}
-                        ],
-                        productFiles: [
-                            {required: true, message: '采购单不能为空', trigger: ["change", "blur"]}
-                        ],
-                        tradeMethod: [
-                            {required: true, message: '交易模式不能为空', trigger: ["change", "blur"]}
-                        ],
-                        invoice: [
-                            {required: true, message: '发票要求不能为空', trigger: ["change", "blur"]}
-                        ],
-                        writeInvoiceTime: [
-                            {required: true, message: '开票时间不能为空', trigger: ["change", "blur"]}
-                        ],
-                        nvoiceType: [
-                            {required: true, message: '发票类型不能为空', trigger: ["change", "blur"]}
-                        ],
-                        payMethod: [
-                            {required: true, message: '预付百分比不能为空', trigger: ["change", "blur"]}
-                        ],
-                        advancePayRate: [
-                            {required: true, message: '预付百分比不能为空', trigger: ["change", "blur"]}
-                        ],
-                        otherPayMethod: [
-                            {required: true, message: '付款方式不能为空', trigger: ["change", "blur"]}
-                        ],
-                        reputationPayDay: [
-                            {required: true, message: '账期天数不能为空', trigger: ["change", "blur"]}
-                        ],
-                        signMethod: [
-                            {required: true, message: '签约方式不能为空', trigger: ["change", "blur"]}
-                        ],
-                        contractType: [
-                            {required: true, message: '合同模板不能为空', trigger: ["change", "blur"]}
-                        ],
-
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "add",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false,
-                    // beforeAction: (formData) => {
-                    //
-                    //     // console.log('formData: ',JSON.parse(JSON.stringify(formData)));
-                    //     // console.log('product: ',JSON.parse(JSON.stringify(this.productList)));
-                    //     formData.productList = JSON.parse(JSON.stringify(this.productList))
-                    //     formData.productCategoryList = this.checkCategoryArr
-                    //     return formData
-                    // },
-                },
-            },
-            // 表单相关结束-----------------------------------------------------------
-            salesCode: '',
-            hasRequire: false
-        };
-    },
-    computed: {
-        checkCategoryArr() {
-            let arr = []
-            this.checkCategoryList.forEach(item => {
-                arr.push(...item)
-            })
-
-            return arr
-        }
-
-    },
-    onLoad(option) {
-        const company = vk.getVuex('$user.userInfo.company')
-        this.company.companyName = company?.companyName
-        this.company.legalMobile = company?.legalMobile
-        this.getGoodsList()
-        vk.callFunction({
-            url: 'client/spot/category/pub/getTree',
-            title: '请求中...',
-            data: {},
-            success: (data) => {
-                this.categoryTreeData = data.rows
-                for (var i = 0; i < data.rows.length; i++) {
-                    this.checkCategoryList.push([])
-                }
-            }
-        });
-        if (option.id) this.getInfo(option.id)
-    },
-    methods: {
-        getInfo(_id){
-            vk.callFunction({
-                url: 'client/enquiry/sheet/pub/getDetail',
-                title: '请求中...',
-                data: {
-                    _id
-                },
-                success: (res) => {
-                    this.form1.data = res.data
-                    this.productList = res.data.productList
-                }
-            })
-        },
-        getGoodsList() {
-            vk.callFunction({
-                url: 'client/enquiry/template/pub/getList',
-                title: '请求中',
-                success: ({rows}) => {
-                    this.goodsList = rows
-                }
-            })
-        },
-        addProduct() {
-            this.productList.push({})
-        },
-        removeProduct() {
-            if (this.productList.length > 1) {
-                this.productList.splice(this.productList.length - 1, 1)
-            }
-        },
-        onFormSuccess() {
-            vk.navigateTo('/pages/enquiry/list');
-        },
-        // 提交并发布
-        submit() {
-            this.form1.data.isShow = 1
-            this.submitAll()
-        },
-        // 提交并保存草稿
-        draft() {
-            this.form1.data.isShow = 0
-            this.submitAll()
-        },
-        async submitAll() {
-            if (this.form1.data.fillType === 1) {
-                this.productList = []
-                this.productIdList.forEach(goodsId => {
-                    this.productList.push({goodsId})
-                })
-            }
-            this.form1.data.productList = this.productList
-            if (this.projectProvinceIndex !== null) {
-                this.form1.data.province = this.provinceData[this.projectProvinceIndex].code
-                if (this.projectCityIndex !== null) {
-                    this.form1.data.city = this.cityData[this.projectProvinceIndex].code
-                    if (this.projectAreaIndex !== null) {
-                        this.form1.data.area = this.areaData[this.projectProvinceIndex][this.projectCityIndex].code
-                    }
-                }
-            }
-            this.disabled = true
-            // this.$refs.form1.submitForm()
-            vk.callFunction({
-                url: 'client/enquiry/sheet/kh/add',
-                data: this.form1.data,
-                title: '请求中...',
-                success: (data) => {
-                    this.$message({
-                        message: "提交成功",
-                        type: 'success'
-                    })
-                    this.disabled = false
-                    vk.navigateBack()
-                }
-            })
-        },
-        changeMultiGoods(item) {
-            const index = this.productIdList.indexOf(item._id)
-            if (index === -1) this.productIdList.push(item._id)
-            else this.productIdList.splice(index, 1)
-        }
+    await this.check()
+    this.getGoodsList()
+    if (option.id) this.getInfo(option.id)
+    this.addProduct()
+    await this.getCommonContractUrl()
+    await this.getContactList()
+    await this.getCate()
+    if (!!localStorage.getItem("enquiry")) {
+      this.$confirm('您有一份暂存数据，是否恢复?', '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        const savedData = JSON.parse(localStorage.getItem("enquiry"))
+        this.form1.data = savedData.form
+        this.hasRequire = savedData.hasRequire
+        this.productList = savedData.productList
+        this.productList.forEach((item, index) => {
+          console.log(this.$refs[`product${index}`])
+          this.$refs[`product${index}`][0].selectGoods(item.goodsId)
+        })
+      })
     }
+
+  },
+  onShow() {
+    this.userInfo = vk.getVuex('$user.userInfo')
+    console.log(this.userInfo)
+    this.form1.data.companyName = this.userInfo.accountType === 2 ? this.userInfo.company?.companyName : this.userInfo.person?.personName
+    this.form1.data.companyMobile = this.userInfo.accountType === 2 ? this.userInfo.company?.mobile : this.userInfo.person?.mobile
+  },
+  methods: {
+    dayjs,
+    getInfo(_id) {
+      vk.callFunction({
+        url: 'client/enquiry/sheet/pub/getDetail',
+        title: '请求中...',
+        data: {
+          _id
+        },
+        success: (res) => {
+          this.form1.data = res.data
+          this.productList = res.data.productList
+        }
+      })
+    },
+    getGoodsList() {
+      vk.callFunction({
+        url: 'client/enquiry/template/pub/getList',
+        title: '请求中',
+        success: ({rows}) => {
+          this.goodsList = rows
+        }
+      })
+    },
+    async getCate() {
+      const {rows} = await vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+      });
+      this.allProductList = []
+      this.productCateList = rows.map(item => {
+        item.children.forEach(child => {
+          this.allProductList.push({
+            ...child,
+            parentName: item.name
+          })
+        })
+        item.idList = []
+        return item
+      })
+    },
+    addProduct() {
+      this.productList.push({
+        goodsId: null,
+        model: [],
+        otherData: null,
+        materialQuality: null,
+        singleLength: null,
+        singleLengthUnit: null,
+        deliverService: null,
+        standard: null,
+        pricingForm: null,
+        loadPaidBy: null,
+        deliveryTime: null,
+        len: null,
+        extraAttributes: {},
+        attributes: {},
+        // addressRegion: [],
+        // addressDetail: null
+      })
+    },
+    removeProduct() {
+      if (this.productList.length > 1) {
+        this.productList.splice(this.productList.length - 1, 1)
+      }
+    },
+    onFormSuccess() {
+      vk.redirectTo({url: '/pages/enquiry/list'});
+    },
+    // 提交并发布
+    submit() {
+      this.form1.data.isShow = 1
+      this.submitAll()
+    },
+    // 提交并保存草稿
+    draft() {
+      this.form1.data.isShow = 0
+      this.submitAll()
+    },
+    changeAddressRegion(val) {
+      this.form1.data.projectAddressRegion = val
+    },
+    changeAddressDetail(val) {
+      this.form1.data.projectAddressDetail = val
+    },
+    async submitAll() {
+      const stealFactory = [], materialQuality = []
+      if (this.form1.data.fillType === 1) {
+        if (this.productIdList.length === 0 && !this.form1.data.otherCate) return this.$message({
+          message: '请选择商品或输入其他分类',
+          type: 'error'
+        })
+        if (this.form1.data.files.length === 0) return this.$message({
+          message: '请上传附件',
+          type: 'error'
+        })
+        this.productList = []
+        this.goodsList.forEach(goods => {
+          if (this.productIdList.includes(goods._id)) {
+            goods.goodsName = goods.name
+            goods.procureNumber = this.form1.data.procureNumber
+            goods.procureUnit = this.form1.data.procureUnit
+            this.productList.push(goods)
+          }
+        })
+        if (this.form1.data.otherCate) this.productList.push({
+          goodsName: this.form1.data.otherCate,
+          procureNumber: this.form1.data.procureNumber,
+          procureUnit: this.form1.data.procureUnit,
+        })
+      } else {
+        for (let i = 0; i < this.productList.length; i++) {
+          if (!this.productList[i].goodsName) return this.$message({message: '请选择商品', type: 'error'})
+          this.productList[i].model.forEach(model => {
+            if (['钢厂', '品牌厂家'].includes(model.label)) {
+              stealFactory.push(model.value)
+            }
+            if (['材质'].includes(model.label)) materialQuality.push(model.value)
+          })
+        }
+      }
+      // if (!this.form1.data.stealFactory) return this.$message({message: '请选择钢厂', type: 'error'})
+      if (!this.form1.data.projectName) return this.$message({message: '请输入项目名称', type: 'error'})
+      if (JSON.stringify(this.form1.data.projectAddressRegion) === '{}') return this.$message({
+        message: '请选择项目地址',
+        type: 'error'
+      })
+      if (JSON.stringify(this.form1.data.addressRegion) === '{}') return this.$message({
+        message: '请选择交货地点',
+        type: 'error'
+      })
+      if (!this.form1.data.addressDetail) return this.$message({
+        message: '请完善交货地点',
+        type: 'error'
+      })
+
+      if (!this.form1.data.answerEndTime || !this.form1.data.answerStartTime) return this.$message({
+        message: '请选择报价时限',
+        type: 'error'
+      })
+      if (dayjs(this.form1.data.answerEndTime).isBefore(this.form1.data.answerStartTime)) return this.$message({
+        message: '报价结束时限不能早于开始时间',
+        type: 'error'
+      })
+      if (dayjs(this.form1.data.answerStartTime).isAfter(this.form1.data.deliveryTime)) return this.$message({
+        message: '报价时限不能晚于交货时间',
+        type: 'error'
+      })
+      if (this.form1.data.payMethod === 0 && !this.form1.data.advancePayRate) return this.$message({
+        message: '请填写预付比例',
+        type: 'error'
+      })
+      if (this.form1.data.payMethod === 3 && !this.form1.data.reputationPayDay) return this.$message({
+        message: '请填写回款日期',
+        type: 'error'
+      })
+      if (this.form1.data.signMethod === 2 && (!this.form1.data.contractAttachment || this.form1.data.contractAttachment.length === 0)) {
+        return this.$message({
+          message: '请上传合同附件',
+          type: 'error'
+        })
+      }
+      if (!this.form1.data.businessName) {
+        return this.$message({
+          message: '请选择业务联系人',
+          type: 'error'
+        })
+      }
+
+      this.form1.data.productList = this.productList
+      // if (this.projectProvinceIndex !== null) {
+      //     this.form1.data.province = this.provinceData[this.projectProvinceIndex].code
+      //     if (this.projectCityIndex !== null) {
+      //         this.form1.data.city = this.cityData[this.projectProvinceIndex][this.projectCityIndex].code
+      //         if (this.projectAreaIndex !== null) {
+      //             this.form1.data.area = this.areaData[this.projectProvinceIndex][this.projectCityIndex][this.projectAreaIndex].code
+      //         }
+      //     }
+      // }
+      this.disabled = true
+      let title = this.form1.data.productList.map(item => `${item.goodsName}`).join("/")
+      title += ` -${this.form1.data.projectName}`
+      localStorage.removeItem('enquiry')
+      vk.callFunction({
+        url: 'client/enquiry/sheet/kh/add',
+        data: {
+          ...this.form1.data, ...{
+            title,
+            nameList: this.form1.data.productList.map(item => item.goodsName),
+            material: materialQuality,
+            stealFactory
+          }
+        },
+        title: '请求中...',
+        success: (data) => {
+          this.$message({
+            message: "您的信息已经提交，等待管理员审核，请您耐心等待！",
+            type: 'success'
+          })
+          this.disabled = false
+          vk.redirectTo({url: '/pages/enquiry/list'})
+        }
+      })
+    },
+    changeMultiGoods(item) {
+      const index = this.productIdList.indexOf(item._id)
+      if (index === -1) this.productIdList.push(item._id)
+      else this.productIdList.splice(index, 1)
+    },
+    async getStealFactory() {
+      const {rows} = await vk.callFunction({
+        url: 'client/stealFactory/pub/getList',
+        title: '请求中...',
+      })
+      this.stealFactoryList = rows
+    },
+    async getCommonContractUrl() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d36befe975f63af1f24e7'
+        },
+      })
+      this.commonContractUrl = res.content
+    },
+    openDownload() {
+      window.open(this.commonContractUrl)
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.form1.data.businessMobile = contact.phone
+    },
+    formatAmount() {
+      this.form1.data.earnestMoney = parseFloat(this.form1.data.earnestMoney).toFixed(2)
+    },
+    resetAmount() {
+      this.form1.data.earnestMoney = parseFloat(this.form1.data.earnestMoney)
+    },
+    changeOtherCate() {
+      if (this.form1.data.otherCate) {
+        this.productIdList = []
+      }
+    },
+    async check() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          vk.navigateBack()
+        }
+      }
+    },
+    changePayMethod(payMethod) {
+      if ([1, 2].includes(payMethod)) {
+        this.form1.data.advancePayRate = null
+        this.form1.data.reputationPayDay = null
+      }
+    },
+    changeDocumentAll() {
+      if (this.form1.data.transportDocuments.length !== 4) {
+        this.form1.data.transportDocuments = ['合格证', '检测报告', '销售清单', '磅重']
+      } else this.form1.data.transportDocuments = []
+    },
+    previewUpload({url}) {
+      window.open(url)
+    },
+    save() {
+      console.log(this.productList)
+      localStorage.setItem("enquiry", JSON.stringify({
+        form: this.form1.data,
+        hasRequire: this.hasRequire,
+        productList: this.productList,
+      }))
+      this.$message({
+        message: "已保存",
+        type: 'success'
+      })
+    }
+
+  }
 }
 </script>
 
@@ -818,154 +995,180 @@ export default {
 @import "@/common/css/app.scss";
 
 .form-type-box {
-    position: absolute;
-    display: flex;
-    justify-content: space-between;
-    width: 270px;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    margin: auto;
+  position: absolute;
+  display: flex;
+  justify-content: space-between;
+  width: 270px;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
 }
 
 .form-type-item {
-    width: 120px;
-    height: 35px;
-    text-align: center;
-    line-height: 35px;
-    font-size: 14px;
-    background-color: rgba(206, 206, 206, 0.75);
-    color: rgba(0, 0, 0, 1);
-    cursor: pointer;
+  width: 120px;
+  height: 35px;
+  text-align: center;
+  line-height: 35px;
+  font-size: 14px;
+  background-color: rgba(206, 206, 206, 0.75);
+  color: rgba(0, 0, 0, 1);
+  cursor: pointer;
 }
 
 .form-type-item.active {
-    background-color: #A92924;
-    color: #FFFFFF;
+  background-color: #A92924;
+  color: #FFFFFF;
 
 }
 
 .form-view {
-    width: 1200px;
-    margin: 0 auto;
-    background-color: #FFFFFF;
-    padding: 20rpx;
-    border-radius: 20px;
+  width: 1200px;
+  margin: 0 auto;
+  background-color: #FFFFFF;
+  padding: 20rpx;
+  border-radius: 20px;
 }
 
 .m-20 {
-    margin: 20px;
-    position: relative;
+  margin: 20px;
+  position: relative;
 }
 
 .title-main {
-    font-size: 18px;
-    font-weight: bold;
-    text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
 }
 
 .title-sub {
-    font-size: 14px;
-    text-align: center;
+  font-size: 14px;
+  text-align: center;
 }
 
 .btn-add-outer {
-    margin: 0 0 20px 30px;
+  margin: 0 0 20px 30px;
 }
 
 .form-footer {
-    height: 40px;
-    line-height: 40px;
-    background: #fff;
-    padding-top: 0;
-    text-align: center;
-    width: 50%;
+  height: 40px;
+  line-height: 40px;
+  background: #fff;
+  padding-top: 0;
+  text-align: center;
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: auto;
+
+  * {
+    flex: 1;
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: auto;
-
-    * {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin: 0 40px;
-    }
+    margin: 0 40px;
+  }
 }
 
 .tags {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 .form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+  }
 
-    .goods-info-title {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-    }
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
 
-    .form-title {
-        padding-left: 10px;
-        color: $--color-primary;
-        font-size: 18px;
-        line-height: 18px;
-        border-left: 4px solid $--color-primary;
-    }
-
-    .enquiry-no {
-        margin-left: 10px;
-        font-size: 14px;
-    }
+  .enquiry-no {
+    margin-left: 10px;
+    font-size: 14px;
+  }
 }
 
 .sales-code {
-    text {
-        width: 400rpx;
-    }
+  text {
+    width: 400rpx;
+  }
 }
 
 .remark-upload {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    //border: 1px solid #ddd;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 5px;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  //border: 1px solid #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 5px;
 
-    i {
-        color: #ddd;
-        font-size: 18px;
-    }
+  i {
+    color: #ddd;
+    font-size: 18px;
+  }
 }
 
 .label-width {
-    width: 100px;
+  width: 100px;
 }
 
 .advance-pay-rate {
-    width: 100px;
+  width: 100px;
 }
 
 .sign-method-header {
-    width: 120px;
+  width: 120px;
 }
+
+
+.product-item {
+  font-size: 35rpx;
+  margin: 10rpx;
+  padding: 20rpx;
+  cursor: pointer;
+}
+
+.product-item:hover {
+  background-color: #f1c7c7;
+  color: #a92924
+}
+
+
+.product-item-active {
+  background-color: #f1c7c7;
+  color: #a92924
+}
+
 </style>
 
 <style>
 .vk-data-upload .el-upload--picture-card {
-    width: 40px !important;
-    height: 40px !important;
+  width: 40px !important;
+  height: 40px !important;
+}
+
+/deep/ .el-input__suffix {
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0b782a8..7b2a4fe 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,1196 +1,1537 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar alwaysShowCategory></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar alwaysShowCategory></category-bar>
 
-        <!-- banner -->
-        <view class="banner-outer">
-            <el-carousel height="365px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img" src="/static/images/336a76fbf9fe44a07b5cfd4caf6f8bb9.jpg"
-                           mode="scaleToFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-        </view>
-        <!-- banner下 -->
-        <div class="group-inner3">
-            <div class="group-inner3-list">
-                <a href="/support/brand.html" rel="nofollow" target="_blank">
-                    <div class="group-inner3-listleft">
-                        <h2>厂家直营</h2>
-                        <p>产地货源 正规优价</p>
-                    </div>
-                    <div class="group-inner3-listright">
-                        <img src="/static/images/home1.png">
-                    </div>
-                </a>
-            </div>
-
-            <div class="group-inner3-list">
-                <a href="javascript:;" @click="navTo('/pages/spot/goods/goods')" rel="nofollow">
-                    <div class="group-inner3-listleft">
-                        <h2>采购·找现货</h2>
-                        <p>专属采购助手<br>
-                            为您匹配优质供应商</p>
-                    </div>
-                    <div class="group-inner3-listright">
-                        <img src="/static/images/home2.png">
-                    </div>
-                </a>
-            </div>
-
-            <div class="group-inner3-list">
-                <a href="javascript:;" @click="navTo('/pages/enquiry/list')" rel="nofollow">
-                    <div class="group-inner3-listleft">
-                        <h2>供应·找买家 </h2>
-                        <p>快速发布您的产品<br>
-                            让网上生意变的如此简单</p>
-                    </div>
-                    <div class="group-inner3-listright">
-                        <img src="/static/images/home3.png">
-                    </div>
-                </a>
-            </div>
-        </div>
-
-        <view class="register">
-            <view class="left">
-                <view class="text">
-                    <text>免费注册！！</text>
-                    <el-divider class="divider" direction="vertical"/>
-                    <view class="ad-text2">
-                        <text class="yellow">成为平台会员 免费询价</text>
-                        <text class="white">企业专享价 续重免运费 增值权益 免息账期 采购管家</text>
-                    </view>
-                </view>
-
-            </view>
-            <view class="right">
-                <el-button type="warning" round @click.native="navTo('/pages/auth/login/login')">
-                    立即注册
-                    <i class="el-icon-arrow-right"></i>
-                </el-button>
-            </view>
-
-        </view>
-
-
-        <!--        <gap height="100" />-->
-
-        <div style="clear:both;width: 100%;"></div>
-
-        <!-- 询价列表 start -->
-        <view class="enquiry-outer">
-            <view class="" style="height: 20px;"></view>
-            <el-divider>
-                <view class="divider-text">最新询价信息</view>
-            </el-divider>
-            <view class="" style="height: 20px;"></view>
-            <div class="mod-inner2Listcenter clearfix sliper">
-                <ul class="clearfix">
-                    <li v-for="(item, index) in enquirySheetData" class="inli-mask" :key="index"
-                        @click="vk.navigateTo('/pages/enquiry/detail?id=' + item._id);">
-                        <a href="javascript:void(0)" style="display: block;" rel="nofollow">
-                            <div class="detail">
-                                <div class="detail-kind clearfix">
-                                    <div class="tag">报价中</div>
-                                    <div class="kind"><span>{{ item.answerNumber || 0 }}</span>家已报价</div>
-                                </div>
-                                <div class="detail-infor">
-                                    <!-- <span>{{item.}}</span><span>{{}}支</span> -->
-                                </div>
-                                <div class="detail-num">
-									<span v-if="item.user.accountType === 1"
-                                          class="company">{{ item.user.person.personName }}</span>
-                                    <span v-if="item.user.accountType === 2"
-                                          class="company">{{ item.user.company.companyName }}</span>
-                                    <span class="time">{{ item._add_time_str }}</span>
-                                </div>
-                            </div>
-                        </a>
-                    </li>
-
-                    <div class="show-more" @click="navTo('/pages/enquiry/list')"><i class="el-icon-view"></i>查看更多</div>
-                </ul>
-            </div>
-        </view>
-        <!-- 询价列表 end -->
-
-        <!-- 现货市场 start -->
-        <view class="" style="height: 20px;"></view>
-        <view class="spot-outer">
-            <el-divider>
-                <view class="spot-divider-text">现货市场</view>
-            </el-divider>
-            <view class="" style="height: 20px;"></view>
-            <view class="goods-list">
-                <view v-for="(item, index) in spotGoodsData" :key="index" class="goods"
-                      :style="{marginRight:( index % 4 === 0 && index > 0) ? 0 : '25px'}">
-                    <view class="goods-title">{{ item.name }}</view>
-                    <view class="goods-stock">库存：{{ item.stock }}吨</view>
-                    <view class="goods-address">供货地：{{ item.addressStr }}</view>
-                    <!--                    <view class="goods-image">-->
-                    <!--                        <image :src="item.user.businessCard.logo" mode="aspectFit"></image>-->
-                    <!--                    </view>-->
-                    <view v-if="item.user.accountType === 1" class="goods-company">{{ item.user.person.personName }}
-                    </view>
-                    <view v-if="item.user.accountType === 2" class="goods-company">{{ item.user.company.companyName }}
-                    </view>
-                    <el-button class="empty-bg-plain-btn"
-                               @click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary" plain
-                               size="small">立即查看
-                    </el-button>
-                </view>
-            </view>
-            <div class="show-more" @click="navTo('/pages/spot/goods/goods')"><i class="el-icon-view"></i>查看更多</div>
-        </view>
-        <!-- 现货市场 end -->
-        <gap height="50"/>
-
-        <!-- 合作商家 start -->
-        <view class="" style="height: 20px;"></view>
-        <view class="spot-outer">
-            <el-divider>
-                <view class="spot-divider-text">合作商家</view>
-            </el-divider>
-            <view class="" style="height: 20px;"></view>
-            <view class="goods-list">
-                <view v-for="(item, index) in spotGoodsData" :key="index" class="goods"
-                      :style="{marginRight:( index % 4 === 0 && index > 0) ? 0 : '25px'}">
-                    <view class="goods-title">{{ item.name }}</view>
-                    <view class="goods-stock">库存：{{ item.stock }}吨</view>
-                    <view class="goods-address">供货地：{{ item.addressStr }}</view>
-                    <!--                    <view class="goods-image">-->
-                    <!--                        <image :src="item.user.businessCard.logo" mode="aspectFit"></image>-->
-                    <!--                    </view>-->
-                    <view v-if="item.user.accountType === 1" class="goods-company">{{ item.user.person.personName }}
-                    </view>
-                    <view v-if="item.user.accountType === 2" class="goods-company">{{ item.user.company.companyName }}
-                    </view>
-                    <el-button class="empty-bg-plain-btn"
-                               @click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary" plain
-                               size="small">立即查看
-                    </el-button>
-                </view>
-            </view>
-            <div class="show-more"><i class="el-icon-view"></i>查看更多</div>
-        </view>
-        <!-- 合作商家 end -->
-
-
-        <!-- 金久信服务商展示 start -->
-        <view class="w1200">
-            <view class="" style="height: 20px;"></view>
-            <el-divider>
-                <view class="divider-text">金久信服务商展示</view>
-            </el-divider>
-            <view class="" style="height: 20px;"></view>
-            <view class="server-card2">
-                <view class="item b1">
-                    <image src="http://jyx.gxwebsoft.com/public/index/images/icon9.png" mode="widthFix"
-                           style="width: 40px;"></image>
-                    <!-- <i class="el-icon-lock"></i> -->
-                    <view class="text">交易安全</view>
-                    <view class="p4">
-                        <el-button plain round size="mini">交易安全</el-button>
-                    </view>
-                </view>
-                <view class="item b2">
-                    <image src="http://jyx.gxwebsoft.com/public/index/images/icon10.png" mode="widthFix"
-                           style="width: 40px;"></image>
-                    <!-- <i class="el-icon-lock"></i> -->
-                    <view class="text">代检代查</view>
-                    <view class="p4">
-                        <el-button plain round size="mini">代检代查</el-button>
-                    </view>
-                </view>
-                <view class="item b3">
-                    <image src="http://jyx.gxwebsoft.com/public/index/images/icon11.png" mode="widthFix"
-                           style="width: 40px;"></image>
-                    <!-- <i class="el-icon-lock"></i> -->
-                    <view class="text">优势资源匹配</view>
-                    <view class="p4">
-                        <el-button plain round size="mini">优势资源匹配</el-button>
-                    </view>
-                </view>
-                <view class="item b4">
-                    <image src="http://jyx.gxwebsoft.com/public/index/images/icon12.png" mode="widthFix"
-                           style="width: 40px;"></image>
-                    <!-- <i class="el-icon-lock"></i> -->
-                    <view class="text">交易模式多元化</view>
-                    <view class="p4">
-                        <el-button plain round size="mini">交易模式多元化</el-button>
-                    </view>
-                </view>
-                <view class="item b5">
-                    <image src="http://jyx.gxwebsoft.com/public/index/images/icon13.png" mode="widthFix"
-                           style="width: 40px;"></image>
-                    <!-- <i class="el-icon-lock"></i> -->
-                    <view class="text">电子合同</view>
-                    <view class="p4">
-                        <el-button plain round size="mini">电子合同</el-button>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-
-        <!-- 合作商家 end -->
-
-        <!-- 交易模式 start -->
-        <view class="w1200">
-            <view class="" style="height: 20px;"></view>
-            <el-divider>
-                <view class="divider-text">交易模式</view>
-            </el-divider>
-            <view class="" style="height: 20px;"></view>
-            <el-row :gutter="10" class="wrap" justify="space-between">
-                <el-col :span="6">
-                    <el-card shadow="hover" class="transaction-card">
-                        <view class="item">
-                            <view class="p1">
-                                <i class="el-icon-lock"></i>
-                                自主交易
-                            </view>
-                            <view class="p2">
-                                <view class="line"></view>
-                            </view>
-                            <view class="p3">
-                                <text>货款直付销售商</text>
-                                <text>双方平台保证金</text>
-                            </view>
-                            <view class="p4">
-                                <el-button plain round size="mini">交易流程</el-button>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-                <el-col :span="6">
-                    <el-card shadow="hover" class="transaction-card">
-                        <view class="item">
-                            <view class="p1">
-                                <i class="el-icon-key"></i>
-                                金久信公正
-                            </view>
-                            <view class="p2">
-                                <view class="line"></view>
-                            </view>
-                            <view class="p3">
-                                <text>货款直付平台</text>
-                                <text>交易成功后支付至销售商</text>
-                            </view>
-                            <view class="p4">
-                                <el-button plain round size="mini">交易流程</el-button>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-                <el-col :span="6">
-                    <el-card shadow="hover" class="transaction-card">
-                        <view class="item">
-                            <view class="p1">
-                                <i class="el-icon-postcard"></i>
-                                信誉采购
-                            </view>
-                            <view class="p2">
-                                <view class="line"></view>
-                            </view>
-                            <view class="p3">
-                                <text>平台接受信誉采购的销售商</text>
-                                <text>进行交易、到期后结算</text>
-                            </view>
-                            <view class="p4">
-                                <el-button plain round size="mini">交易流程</el-button>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-                <el-col :span="6">
-                    <el-card shadow="hover" class="transaction-card">
-                        <view class="item">
-                            <view class="p1">
-                                <i class="el-icon-medal"></i>
-                                金久信自营
-                            </view>
-                            <view class="p2">
-                                <view class="line"></view>
-                            </view>
-                            <view class="p3">
-                                <text>货款直付平台</text>
-                                <text>交易成功后支付至销售商</text>
-                            </view>
-                            <view class="p4">
-                                <el-button plain round size="mini">交易流程</el-button>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </view>
-        <!-- 交易模式 end -->
-
-
-        <!-- 新闻资讯 start -->
-        <view class="w1200">
-            <el-row :gutter="10" class="wrap" justify="space-between">
-                <el-col :span="18">
-                    <el-card shadow="hover" class="news-card">
-                        <div slot="header" class="clearfix">
-                            <span class="card-title">金久信·金融服务</span>
-                            <el-button style="float: right; color: #BD3124;" size="mini">马上开通</el-button>
-                        </div>
-                        <div class="jrfw-img">
-                            <el-row :gutter="20" justify="space-between" class="jrfw-row">
-                                <el-col :span="12">
-                                    <el-card shadow="hover">
-                                        <div class="jrfw-img-item">
-                                            <div class="info">
-                                                <div class="title">·买家采购更放心</div>
-                                                <div class="desc">先收货后付款，账期最长
-                                                    <text>60</text>
-                                                    天
-                                                </div>
-                                                <gap height="20"></gap>
-                                                <div class="title">·卖家销售无压力</div>
-                                                <div class="desc">账期交易未到期，资金提前放。</div>
-                                            </div>
-                                            <div class="pic">
-                                                <image src="http://jyx.gxwebsoft.com/public/index/images/gg1.png"
-                                                       mode="aspectFit"></image>
-                                            </div>
-                                        </div>
-                                    </el-card>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-card shadow="hover">
-                                        <div class="jrfw-img-item">
-                                            <div class="info">
-                                                <div class="title">利率低至年化4.35%</div>
-                                                <div class="desc">赊销卖钢材，回款不担心</div>
-                                            </div>
-                                            <div class="pic">
-                                                <image src="http://jyx.gxwebsoft.com/public/index/images/gg2.png"
-                                                       mode="aspectFit"></image>
-                                            </div>
-                                        </div>
-                                    </el-card>
-                                </el-col>
-                            </el-row>
-
-
-                            <!-- <image src="https://oss.wsdns.cn/20231207/a3ea8ffd7242453eb2242ffaaa89116d.png"
-                                mode="widthFix"></image> -->
-                        </div>
-                    </el-card>
-                </el-col>
-                <el-col :span="6">
-                    <el-card shadow="hover" class="news-card">
-                        <div slot="header" class="clearfix">
-                            <span class="card-title">最新入驻</span>
-                        </div>
-                        <div class="news-list">
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                            <el-link :underline="false">广西聚钱财实业有限公司</el-link>
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </view>
-        <!-- 新闻资讯 end -->
-
-        <!-- 买家入门 卖家入门 start -->
-        <view class="w1200">
-            <el-row :gutter="10" class="wrap" justify="space-between">
-                <el-col :span="12">
-                    <el-card shadow="hover" class="news-card">
-                        <div slot="header" class="clearfix">
-                            <span class="card-title">买家入门</span>
-                            <el-button style="float: right; padding: 3px 0; color: #999999;" type="text"
-                                       @click="navTo(`/pages/otherArticle/list?id=6573d7c3e0ec19b5047ffa8c`)">更多>
-                            </el-button>
-                        </div>
-                        <div class="content">
-                            <div class="news-img">
-                                <image src="http://jyx.gxwebsoft.com/public/index/images/xw1.jpg" mode="widthFix">
-                                </image>
-                            </div>
-                            <div class="tabs">
-                                <div class="news-list">
-                                    <el-link v-for="(item, index) in buyerArticleList" :key="index"
-                                             @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)">{{
-                                            item.name
-                                        }}
-                                    </el-link>
-                                </div>
-                            </div>
-                        </div>
-                    </el-card>
-                </el-col>
-                <el-col :span="12" class="wrap" justify="space-between">
-                    <el-card shadow="hover" class="news-card">
-                        <div slot="header" class="clearfix">
-                            <span class="card-title">卖家入门</span>
-                            <el-button style="float: right; padding: 3px 0; color: #999999;" type="text"
-                                       @click="navTo(`/pages/otherArticle/list?id=6573d7bde0ec19b5047ff941`)">更多>
-                            </el-button>
-                        </div>
-                        <div class="content">
-                            <div class="news-img">
-                                <image src="http://jyx.gxwebsoft.com/public/index/images/xw2.jpg" mode="widthFix">
-                                </image>
-                            </div>
-                            <div class="tabs">
-                                <div class="tabs">
-                                    <div class="news-list">
-                                        <el-link @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)"
-                                                 v-for="(item, index) in sellerArticleList" :key="index">{{
-                                                item.name
-                                            }}
-                                        </el-link>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </view>
-        <!-- 买家入门 卖家入门 end -->
-
-        <!-- 资讯中心 start -->
-        <view class="w1200">
-            <view class="" style="height: 20px;"></view>
-            <el-divider>
-                <view class="divider-text">资讯中心</view>
-            </el-divider>
-            <view class="" style="height: 20px;"></view>
-            <el-row :gutter="10" class="wrap" justify="space-between">
-                <el-col :span="6" v-for="(item, index) in articleList" :key="index">
-                    <el-card shadow="hover">
-                        <div slot="header" class="clearfix">
-                            <span>{{ item.title }}</span>
-                        </div>
-                        <div class="news-list">
-                            <el-link @click="navTo(`/pages/otherArticle/detail?id=${article._id}`)"
-                                     v-for="(article, articleIndex) in item.list" :key="articleIndex"
-                                     :underline="false">
-                                {{ article.name }}
-                            </el-link>
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </view>
-        <!-- 资讯中心 end -->
-
-
-        <view class="ad-bottom">
-            <el-row :gutter="10" class="wrap" justify="space-between">
-                <el-col :span="12">
-                    <view class="item">
-                        <image src="http://jyx.gxwebsoft.com/uploads/20210506/8a6b689d22ffcb382dad758e15e933f9.jpg"
-                               mode="widthFix"/>
-                    </view>
-                </el-col>
-                <el-col :span="12">
-                    <view class="item">
-                        <image src="http://jyx.gxwebsoft.com/uploads/20210506/13a1ee4c52fda80a7e03080198944671.jpg"
-                               mode="widthFix"/>
-                    </view>
-                </el-col>
-                <el-col :span="12">
-                    <view class="item">
-                        <image src="http://jyx.gxwebsoft.com/uploads/20210521/41e761a2f98cdf5a7e873ead16fb47eb.jpg"
-                               mode="widthFix"/>
-                    </view>
-                </el-col>
-                <el-col :span="12">
-                    <view class="item">
-                        <image src="http://jyx.gxwebsoft.com/uploads/20210506/8e24bf5d6b29858a8c5b1256b29ffadc.jpg"
-                               mode="widthFix"/>
-                    </view>
-                </el-col>
-            </el-row>
-        </view>
-
-        <!-- 		<el-card class="register-count">
-            金久信已帮助6,157,952位企业解决产品供需难题
-            在线提交您的需求，即享专业服务
-        </el-card> -->
-
-
-        <gap height="50"/>
-        <common-footer></common-footer>
-        <right-bar></right-bar>
+    <!-- banner -->
+    <view class="banner-outer">
+      <common-swiper height="365" width="760px"/>
     </view>
+    <!-- banner下 -->
+    <div class="group-inner3">
+      <div class="flex justify-center items-center">
+        <div class="w-33p pointer" @click="navTo('/pages/index/self-support/self-support')">
+          <img src="/static/images/home1.jpg" alt="" style="width: 240px; height: 124px">
+        </div>
+        <div class="w-33p pointer" @click="navTo('/pages/spot/goods/goods')">
+          <img src="/static/images/home2.jpg" alt="" style="width: 240px; height: 124px">
+        </div>
+        <div class="w-33p pointer" @click="navTo('/pages/enquiry/list')">
+          <img src="/static/images/home3.jpg" alt="" style="width: 240px; height: 124px">
+        </div>
+      </div>
+      <!--            <div class="group-inner3-list">-->
+      <!--                <a href="javascript:;" rel="nofollow" @click="navTo('/pages/index/self-support/self-support')">-->
+      <!--                    <div class="group-inner3-listleft">-->
+      <!--                        <h2>厂家直营</h2>-->
+      <!--                        <p>产地货源 正规优价</p>-->
+      <!--                    </div>-->
+      <!--                    <div class="group-inner3-listright">-->
+      <!--                        <img src="/static/images/home1.jpg">-->
+      <!--                    </div>-->
+      <!--                </a>-->
+
+      <!--            </div>-->
+
+      <!--            <div class="group-inner3-list">-->
+      <!--                <a href="javascript:;" @click="navTo('/pages/spot/goods/goods')" rel="nofollow">-->
+      <!--                    <div class="group-inner3-listleft">-->
+      <!--                        <h2>采购·找现货</h2>-->
+      <!--                        <p>专属采购助手<br>-->
+      <!--                            为您匹配优质供应商</p>-->
+      <!--                    </div>-->
+      <!--                    <div class="group-inner3-listright">-->
+      <!--                        <img src="/static/images/home2.jpg">-->
+      <!--                    </div>-->
+      <!--                </a>-->
+      <!--            </div>-->
+
+      <!--            <div class="group-inner3-list">-->
+      <!--                <a href="javascript:;" @click="navTo('/pages/enquiry/list')" rel="nofollow">-->
+      <!--                    <div class="group-inner3-listleft">-->
+      <!--                        <h2>供应·找买家 </h2>-->
+      <!--                        <p>快速发布您的产品<br>-->
+      <!--                            让网上生意变的如此简单</p>-->
+      <!--                    </div>-->
+      <!--                    <div class="group-inner3-listright">-->
+      <!--                        <img src="/static/images/home3.jpg">-->
+      <!--                    </div>-->
+      <!--                </a>-->
+      <!--            </div>-->
+    </div>
+
+    <view class="register pointer" @click.native="navTo('/pages/auth/login/login')">
+      <view class="left">
+        <view class="text">
+          <text>免费注册！！</text>
+          <el-divider class="divider" direction="vertical"/>
+          <view class="ad-text2">
+            <text class="yellow">成为平台会员 免费询价</text>
+            <text class="white">企业专享价 续重免运费 增值权益 免息账期 采购管家</text>
+          </view>
+        </view>
+
+      </view>
+      <view class="right">
+        <el-button type="warning" round>
+          立即注册
+          <i class="el-icon-arrow-right"></i>
+        </el-button>
+      </view>
+
+    </view>
+
+
+    <!--        <gap height="100" />-->
+
+    <div style="clear:both;width: 100%;"></div>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad3.length">
+        <el-carousel :height="`100px`" :style="{width: ad4.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad3" :key="index" :style="{width: '100%', height: '100px'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="carousel-img pointer" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%', height: '100px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad4.length">
+        <el-carousel :height="`100px`" :style="{width: ad3.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad4" :key="index" :style="{width: '100%', height: '100px'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="carousel-img pointer" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%', height: '100px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 询价列表 start -->
+    <view class="enquiry-outer">
+      <view class="" style="height: 20px;"></view>
+      <el-divider>
+        <view class="divider-text">最新询价信息</view>
+      </el-divider>
+      <view class="" style="height: 20px;"></view>
+      <div class="mod-inner2Listcenter clearfix sliper" style="margin-top: 0">
+        <ul class="clearfix flex justify-start items-start flex-wrap">
+          <li v-for="(item, index) in enquirySheetData" class="inli-mask" :key="index"
+              style="height: 130px"
+              @click="vk.navigateTo('/pages/enquiry/detail?id=' + item._id);">
+            <a href="javascript:void(0)" style="display: block;" rel="nofollow">
+              <div class="detail">
+                <div class="detail-kind clearfix">
+                  <div class="tag">报价中</div>
+                  <div class="kind"><span>{{ item.quoteNum || 0 }}</span>家已报价</div>
+                </div>
+<!--                <div class="text-30 py-10 text-black line-1">-->
+<!--                  <span>{{ item.title.split('-')[0] }}</span>-->
+<!--                </div>-->
+<!--                <div class="text-30 py-10 text-black line-1">-->
+<!--                  <span>{{ item.title.split('-')[1] }}</span>-->
+<!--                </div>-->
+<!--                <div class="text-30 py-10 text-black line-1">-->
+<!--                                    <span>{{-->
+<!--                                        item.productList.map(product => (product.procureNumber ? product.procureNumber : '') + (product.procureUnit ? product.procureUnit : ''))[0]-->
+<!--                                      }}</span>-->
+<!--                </div>-->
+                <div class="text-25 mt-25">
+                  <span>{{ item.fullAddress }}</span>
+                </div>
+                <div class="detail-num flex flex-col justify-start items-start">
+                  <template v-if="item.user">
+									    <span v-if="item.user.accountType === 1"
+                            class="company line-1">{{
+                          item.user.person.personName.replace(/^(.).*$/, "$1**")
+                        }}</span>
+                    <span v-if="item.user.accountType === 2"
+                          class="company line-1">{{
+                        item.user.company.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6")
+                      }}</span>
+                    <span class="time">{{ item._add_time_str }}</span>
+                  </template>
+                </div>
+              </div>
+            </a>
+          </li>
+        </ul>
+        <div class="show-more" @click="navTo('/pages/enquiry/list')"><i class="el-icon-view"></i>查看更多
+        </div>
+      </div>
+    </view>
+    <!-- 询价列表 end -->
+    <view class="" style="height: 20px;"></view>
+    <el-divider>
+      <view class="divider-text">现货市场</view>
+    </el-divider>
+    <view class="" style="height: 20px;"></view>
+    <!-- 现货市场 start -->
+    <view class="spot-outer">
+
+      <view class="" style="height: 20px;"></view>
+      <view class="goods-list">
+        <view v-for="(item, index) in spotGoodsData" :key="index" class="goods"
+              :style="{marginRight:( (index + 1) % 5 === 0 && index > 0) ? 0 : '10px'}">
+          <view class="top" v-if="item.isTop">特别推荐</view>
+          <view class="top" v-if="!item.isTop && index < 10">最新</view>
+          <view class="goods-title line-2">{{ item.name }}</view>
+          <view class="goods-stock">库存：{{ item.stock }}吨</view>
+          <view class="goods-address">{{ item.addressStr }}</view>
+          <!--                    <view class="goods-image">-->
+          <!--                        <image :src="item.user.businessCard.logo" mode="aspectFit"></image>-->
+          <!--                    </view>-->
+          <view style="height: 45px">
+            <template v-if="item.user">
+              <view v-if="item.user.accountType === 1" class="goods-company">
+                {{ item.user.person.personName }}
+              </view>
+              <view v-if="item.user.accountType === 2" class="goods-company">{{
+                  item.user.company.companyName
+                }}
+              </view>
+            </template>
+          </view>
+          <el-button class="empty-bg-plain-btn"
+                     @click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary" plain
+                     size="small">立即查看
+          </el-button>
+        </view>
+      </view>
+      <div class="show-more" @click="navTo('/pages/spot/goods/goods')"><i class="el-icon-view"></i>查看更多</div>
+    </view>
+    <!-- 现货市场 end -->
+    <!--    <gap height="50"/>-->
+
+    <!-- 合作商家 start -->
+    <view class="spot-outer hzsj-bg">
+      <el-divider>
+        <view class="divider-text">合作商家</view>
+      </el-divider>
+      <view class="hzsj-list">
+        <view class="w-25p pointer" v-for="(item, index) in companyList" :key="index"
+              @click="navTo(`/pages/yellowPage/info?id=${item.uid}`)">
+          <view class="border bg-white flex flex-col justify-start items-start p-20" style="height: 250rpx">
+            <view class="flex justify-start items-center mb-25">
+              <image v-if="item.businessCard" :src="item.businessCard.logo" class="logo"/>
+              <image v-else src="/static/images/no-logo.jpg" class="logo" mode="aspectFill"/>
+              <span class="text-28 font-bold ml-15">{{ item.company.companyName }}</span>
+            </view>
+            <div class="flex justify-start items-start ml-20 w-100p">
+              <span class="mt-20 line-2 w-100p">
+                                    主营: {{
+                  (item.mainSpotCategory && item.mainSpotCategory.length > 0) ? item.mainSpotCategory.join() : ''
+                }}
+                                </span>
+            </div>
+          </view>
+        </view>
+      </view>
+      <div class="show-more" @click="navTo(`/pages/yellowPage/list`)"><i class="el-icon-view"></i>查看更多</div>
+    </view>
+    <!-- 合作商家 end -->
+
+
+    <!-- 金久信服务商展示 start -->
+    <view class="w1200">
+      <el-divider>
+        <view class="divider-text">金久信特色展示</view>
+      </el-divider>
+      <view class="" style="height: 20px;"></view>
+      <view class="server-card2">
+        <!--                <view class="item b1" @click="navTo('/pages/otherArticle/detail?id=65791ccbe0ec19b504538e31')">-->
+        <!--                    <image src="/static/images/index/icon9.png" mode="widthFix"-->
+        <!--                           style="width: 40px;"></image>-->
+        <!--                    &lt;!&ndash; <i class="el-icon-lock"></i> &ndash;&gt;-->
+        <!--                    <view class="text">交易安全</view>-->
+        <!--                    <view class="p4">-->
+        <!--                        <el-button plain round size="mini">交易安全</el-button>-->
+        <!--                    </view>-->
+        <!--                </view>-->
+        <view class="item b2" @click="navTo('/pages/otherArticle/detail?id=65791dab21821b5c0f8741c8')">
+          <image src="/static/images/index/icon10.png" mode="widthFix"
+                 style="width: 40px;"></image>
+          <!-- <i class="el-icon-lock"></i> -->
+          <view class="text">代检代查</view>
+          <view class="p4">
+            <el-button plain round size="mini">
+              <span style="font-size: 18px">代检代查</span>
+            </el-button>
+          </view>
+        </view>
+        <view class="item b3" @click="navTo('/pages/otherArticle/detail?id=65791dc98b0da41d316435b7')">
+          <image src="/static/images/index/icon11.png" mode="widthFix"
+                 style="width: 40px;"></image>
+          <!-- <i class="el-icon-lock"></i> -->
+          <view class="text">优势资源匹配</view>
+          <view class="p4">
+            <el-button plain round size="mini">
+              <span style="font-size: 18px">优势资源匹配</span>
+            </el-button>
+          </view>
+        </view>
+        <view class="item b4" @click="navTo('/pages/otherArticle/detail?id=65791dd0f082105ea491286f')">
+          <image src="/static/images/index/icon12.png" mode="widthFix"
+                 style="width: 40px;"></image>
+          <!-- <i class="el-icon-lock"></i> -->
+          <view class="text">交易模式多元化</view>
+          <view class="p4">
+            <el-button plain round size="mini">
+              <span style="font-size: 18px">交易模式多元化</span>
+            </el-button>
+          </view>
+        </view>
+        <!--                <view class="item b5" @click="navTo('/pages/otherArticle/detail?id=65791dd5bd02205a5327a559')">-->
+        <!--                    <image src="/static/images/index/icon13.png" mode="widthFix"-->
+        <!--                           style="width: 40px;"></image>-->
+        <!--                    &lt;!&ndash; <i class="el-icon-lock"></i> &ndash;&gt;-->
+        <!--                    <view class="text">电子合同</view>-->
+        <!--                    <view class="p4">-->
+        <!--                        <el-button plain round size="mini">电子合同</el-button>-->
+        <!--                    </view>-->
+        <!--                </view>-->
+      </view>
+    </view>
+
+
+    <!-- 合作商家 end -->
+
+    <!-- 交易模式 start -->
+    <view class="w1200">
+      <view class="" style="height: 1px;"></view>
+      <el-divider>
+        <view class="divider-text">交易模式多样化</view>
+      </el-divider>
+      <view class="" style="height: 20px;"></view>
+      <el-row :gutter="10" class="wrap" justify="space-between">
+        <el-col :span="6">
+          <el-card shadow="hover" class="transaction-card"
+                   @click.native="navTo('/pages/otherArticle/detail?id=6583beb165234188b3be6732')">
+            <view class="item">
+              <view class="p1">
+                <i class="el-icon-lock"></i>
+                自主交易
+              </view>
+              <view class="p2">
+                <view class="line"></view>
+              </view>
+              <view class="p3">
+                <text>平台提供供需信息</text>
+                <text>用户在相互信任基础之上可进行自主交易</text>
+              </view>
+              <view class="p4">
+                <el-button plain round size="mini">交易流程</el-button>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="hover" class="transaction-card"
+                   @click.native="navTo('/pages/otherArticle/detail?id=6583bec8189f86d49ba8a58a')">
+            <view class="item">
+              <view class="p1">
+                <i class="el-icon-key"></i>
+                金久信公正
+              </view>
+              <view class="p2">
+                <view class="line"></view>
+              </view>
+              <view class="p3">
+                <text>平台作为中间方</text>
+                <text>采购货款支付至平台，双方确认交易完成后支付至供货商</text>
+              </view>
+              <view class="p4">
+                <el-button plain round size="mini">交易流程</el-button>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="hover" class="transaction-card"
+                   @click.native="navTo('/pages/otherArticle/detail?id=6583bee1fe975f47a5931867')">
+            <view class="item">
+              <view class="p1">
+                <i class="el-icon-postcard"></i>
+                信誉采购
+              </view>
+              <view class="p2">
+                <view class="line"></view>
+              </view>
+              <view class="p3">
+                <text>信誉良好用户可与平台或接受账期交易内供应商进行交易</text>
+                <!--                <text></text>-->
+              </view>
+              <view class="p4">
+                <el-button plain round size="mini">交易流程</el-button>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="hover" class="transaction-card"
+                   @click.native="navTo('/pages/otherArticle/detail?id=6583bef3f08210d4b8a10e8a')">
+            <view class="item">
+              <view class="p1">
+                <i class="el-icon-medal"></i>
+                金久信自营
+              </view>
+              <view class="p2">
+                <view class="line"></view>
+              </view>
+              <view class="p3">
+                <text>对产品质量和服务有高标准高要求的用户与平台交易:享受专业 、高效的 服务过程</text>
+                <!--                <text>交易成功后支付至销售商</text>-->
+              </view>
+              <view class="p4">
+                <el-button plain round size="mini">交易流程</el-button>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+      </el-row>
+    </view>
+    <!-- 交易模式 end -->
+
+
+    <!-- 新闻资讯 start -->
+    <view class="w1200">
+      <el-row :gutter="10" class="wrap" justify="space-between">
+        <el-col :span="18">
+          <el-card shadow="hover" class="news-card">
+            <div slot="header" class="clearfix">
+              <span class="card-title">金久信·金融服务</span>
+              <el-button style="float: right; color: #BD3124;" size="mini" @click.native="openClose">
+                马上开通
+              </el-button>
+            </div>
+            <div class="jrfw-img">
+              <el-row :gutter="20" justify="space-between" class="jrfw-row">
+                <el-col :span="12">
+                  <el-card shadow="hover">
+                    <div class="jrfw-img-item">
+                      <div class="info">
+                        <div class="title">·买家采购更放心</div>
+                        <div class="desc">先收货后付款，账期最长
+                          <text>60</text>
+                          天
+                        </div>
+                        <gap height="20"></gap>
+                        <div class="title">·卖家销售无压力</div>
+                        <div class="desc">账期交易未到期，资金提前放。</div>
+                      </div>
+                      <div class="pic">
+                        <image src="/static/images/index/gg1.png"
+                               mode="aspectFit"></image>
+                      </div>
+                    </div>
+                  </el-card>
+                </el-col>
+                <el-col :span="12">
+                  <el-card shadow="hover">
+                    <div class="jrfw-img-item">
+                      <div class="info">
+                        <div class="title">利率低至年化4.35%</div>
+                        <div class="desc">赊销卖钢材，回款不担心</div>
+                      </div>
+                      <div class="pic">
+                        <image src="/static/images/index/gg2.png"
+                               mode="aspectFit"></image>
+                      </div>
+                    </div>
+                  </el-card>
+                </el-col>
+              </el-row>
+
+
+              <!-- <image src="https://oss.wsdns.cn/20231207/a3ea8ffd7242453eb2242ffaaa89116d.png"
+                  mode="widthFix"></image> -->
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="hover" class="news-card">
+            <div slot="header" class="clearfix">
+              <span class="card-title">最新入驻</span>
+            </div>
+            <div class="news-list">
+              <el-link @click.native="navTo(`/pages/yellowPage/info?id=${item._id}`)" :underline="false"
+                       v-for="(item, index) in latestCompanyList" :key="index">
+                {{ item.company.companyName }}
+              </el-link>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </view>
+    <!-- 新闻资讯 end -->
+
+    <!-- 买家入门 卖家入门 start -->
+    <view class="w1200">
+      <el-row :gutter="10" class="wrap" justify="space-between">
+        <el-col :span="12">
+          <el-card shadow="hover" class="news-card">
+            <div slot="header" class="clearfix">
+              <span class="card-title">买家入门</span>
+              <el-button style="float: right; padding: 3px 0; color: #999999;" type="text"
+                         @click="navTo(`/pages/otherArticle/list?id=6573d7c3e0ec19b5047ffa8c`)">更多>
+              </el-button>
+            </div>
+            <div class="content">
+              <div class="news-img">
+                <image src="/static/images/index/xw1.jpg" mode="widthFix">
+                </image>
+              </div>
+              <div class="tabs">
+                <div class="news-list">
+                  <el-link v-for="(item, index) in buyerArticleList" :key="index"
+                           @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)">{{
+                      item.name
+                    }}
+                  </el-link>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12" class="wrap" justify="space-between">
+          <el-card shadow="hover" class="news-card">
+            <div slot="header" class="clearfix">
+              <span class="card-title">卖家入门</span>
+              <el-button style="float: right; padding: 3px 0; color: #999999;" type="text"
+                         @click="navTo(`/pages/otherArticle/list?id=6573d7bde0ec19b5047ff941`)">更多>
+              </el-button>
+            </div>
+            <div class="content">
+              <div class="news-img">
+                <image src="/static/images/index/xw2.jpg" mode="widthFix">
+                </image>
+              </div>
+              <div class="tabs">
+                <div class="tabs">
+                  <div class="news-list">
+                    <el-link @click="navTo(`/pages/otherArticle/detail?id=${item._id}`)"
+                             v-for="(item, index) in sellerArticleList" :key="index">{{
+                        item.name
+                      }}
+                    </el-link>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </view>
+    <!-- 买家入门 卖家入门 end -->
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad5.length">
+        <el-carousel :height="`100px`" :style="{width: '1200px'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad5" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="widthFix"
+                   :style="{width: '100%', height: '100px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad6.length">
+        <el-carousel :height="`100px`" :style="{width: '1200px'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad6" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="widthFix"
+                   :style="{width: '100%', height: '100px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad7.length">
+        <el-carousel :height="`100px`" :style="{width: '1200px'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad7" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="widthFix"
+                   :style="{width: '100%', height: '100px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad8.length">
+        <el-carousel :height="`100px`" :style="{width: '1200px'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad8" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="widthFix"
+                   :style="{width: '100%', height: '100px'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 资讯中心 start -->
+    <view class="w1200">
+      <view class="" style="height: 1px;"></view>
+      <el-divider>
+        <view class="divider-text">资讯中心</view>
+      </el-divider>
+      <view class="" style="height: 20px;"></view>
+      <el-row :gutter="10" class="wrap" justify="space-between">
+        <el-col :span="6" v-for="(item, index) in articleList" :key="index">
+          <el-card shadow="hover">
+            <div slot="header" class="clearfix pointer">
+              <span @click="navTo(`/pages/otherArticle/list?id=${item.id}`)">{{ item.title }}</span>
+            </div>
+            <div class="news-list" style="height: 140px">
+              <el-link @click="navTo(`/pages/otherArticle/detail?id=${article._id}`)"
+                       v-for="(article, articleIndex) in item.list" :key="articleIndex"
+                       :underline="false">
+                {{ article.name }}
+              </el-link>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </view>
+    <!-- 资讯中心 end -->
+
+
+    <!--    <view class="ad-bottom">-->
+    <!--      <el-row :gutter="10" class="wrap" justify="space-between">-->
+    <!--        <el-col :span="12">-->
+    <!--          <view class="item">-->
+    <!--            <image src="http://jyx.gxwebsoft.com/uploads/20210506/8a6b689d22ffcb382dad758e15e933f9.jpg"-->
+    <!--                   mode="widthFix"/>-->
+    <!--          </view>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="12">-->
+    <!--          <view class="item">-->
+    <!--            <image src="http://jyx.gxwebsoft.com/uploads/20210506/13a1ee4c52fda80a7e03080198944671.jpg"-->
+    <!--                   mode="widthFix"/>-->
+    <!--          </view>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="12">-->
+    <!--          <view class="item">-->
+    <!--            <image src="http://jyx.gxwebsoft.com/uploads/20210521/41e761a2f98cdf5a7e873ead16fb47eb.jpg"-->
+    <!--                   mode="widthFix"/>-->
+    <!--          </view>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="12">-->
+    <!--          <view class="item">-->
+    <!--            <image src="http://jyx.gxwebsoft.com/uploads/20210506/8e24bf5d6b29858a8c5b1256b29ffadc.jpg"-->
+    <!--                   mode="widthFix"/>-->
+    <!--          </view>-->
+    <!--        </el-col>-->
+    <!--      </el-row>-->
+    <!--    </view>-->
+
+    <!-- 		<el-card class="register-count">
+        金久信已帮助6,157,952位企业解决产品供需难题
+        在线提交您的需求，即享专业服务
+    </el-card> -->
+
+
+    <gap height="50"/>
+    <common-footer></common-footer>
+    <right-bar></right-bar>
+  </view>
 </template>
 
 
 <script>
-import Gap from "../../components/gap/gap.vue";
 
 var vk = uni.vk;
 export default {
-    components: {
-        Gap
-    },
-    data() {
-        // 页面数据变量
-        return {
-            // init请求返回的数据
-            spotGoodsData: [],
-            enquirySheetData: [],
-            data: {},
-            // 表单请求数据
-            form1: {},
-            scrollTop: 0,
-            buyerTabs: 'first',
-            sellerTabs: 'first',
-            sellerArticleList: [],
-            buyerArticleList: [],
-            articleList: [
-                {
-                    id: '657451bb6e5d2d335ab78b3a',
-                    title: '市场信息',
-                    list: []
-                },
-                {
-                    id: '65745200337a9f07565fb08d',
-                    title: '期货信息',
-                    list: []
-                },
-                {
-                    id: '6574520a7ad52d34471a9582',
-                    title: '行情分析',
-                    list: []
-                },
-                {
-                    id: '6574521499c62431df5b562c',
-                    title: '行业动态',
-                    list: []
-                },
-            ]
+  data() {
+    // 页面数据变量
+    return {
+      // init请求返回的数据
+      spotGoodsData: [],
+      enquirySheetData: [],
+      data: {},
+      // 表单请求数据
+      form1: {},
+      scrollTop: 0,
+      buyerTabs: 'first',
+      sellerTabs: 'first',
+      sellerArticleList: [],
+      buyerArticleList: [],
+      articleList: [
+        {
+          id: '657451bb6e5d2d335ab78b3a',
+          title: '市场信息',
+          list: []
+        },
+        {
+          id: '65745200337a9f07565fb08d',
+          title: '期货信息',
+          list: []
+        },
+        {
+          id: '6574520a7ad52d34471a9582',
+          title: '行情分析',
+          list: []
+        },
+        {
+          id: '6574521499c62431df5b562c',
+          title: '行业动态',
+          list: []
+        },
+      ],
+      companyList: [],
+      latestCompanyList: [],
+      ad3: [],
+      ad4: [],
+      ad5: [],
+      ad6: [],
+      ad7: [],
+      ad8: [],
+      allChildCate: [],
+    }
+  },
+  onPageScroll(e) {
+    this.scrollTop = e.scrollTop;
+  },
+  // 监听 - 页面每次【加载时】执行(如：前进)
+  onLoad(options = {}) {
+    console.log(options)
+    vk = uni.vk;
+    this.options = options;
+    this.init(options);
+  },
+  // 函数
+  methods: {
+    getSpotGoods() {
+      vk.callFunction({
+        url: 'client/spot/goods/pub/getList',
+        loading: false,
+        data: {
+          pageIndex: 1,
+          pageSize: 10,
+        },
+        success: (data) => {
+          console.log('data: ', data);
+          data.rows.forEach(item => {
+            try {
+              item.addressStr = item.address.province.name + "-" + item.address.city
+                .name + "-" + item.address.area.name
+            } catch (err) {
+              item.addressStr = ""
+            }
+          })
+          this.spotGoodsData = data.rows
         }
+      });
     },
-    onPageScroll(e) {
-        this.scrollTop = e.scrollTop;
+    getEnquirySheetList() {
+      vk.callFunction({
+        url: 'client/enquiry/sheet/pub/getList',
+        loading: false,
+        data: {
+          pageIndex: 1,
+          pageSize: 15,
+          latest: true
+        },
+        success: (data) => {
+          this.enquirySheetData = data.rows.map(item => {
+            item.fullAddress = ''
+            item.fullAddress = (item.addressRegion && item.addressRegion.province) ? `${item.addressRegion.province.name}${item.addressRegion.city.name}${item.addressRegion.area.name}` : ''
+            // if (item.addressDetail) item.fullAddress += item.addressDetail
+            return item
+          })
+        }
+      });
     },
-    // 监听 - 页面每次【加载时】执行(如：前进)
-    onLoad(options = {}) {
-        console.log(options)
-        vk = uni.vk;
-        this.options = options;
-        this.init(options);
+    getUserInfo() {
+      vk.userCenter.getCurrentUserInfo({
+        success: (data) => {
+          uni.reLaunch({
+            url: '/pages/contract/index?tab=sign'
+          })
+        }
+      });
     },
-    // 函数
-    methods: {
-        getSpotGoods() {
-            vk.callFunction({
-                url: 'client/spot/goods/pub/getList',
-                loading: false,
-                data: {
-                    pageIndex: 1,
-                    pageSize: 10,
-                },
-                success: (data) => {
-                    console.log('data: ', data);
-                    data.rows.forEach(item => {
-                        try {
-                            item.addressStr = item.address.province.name + "-" + item.address.city
-                                .name + "-" + item.address.area.name
-                        } catch (err) {
-                            item.addressStr = ""
-                        }
-                    })
-                    this.spotGoodsData = data.rows
-                }
-            });
+    // 页面数据初始化函数
+    init(options) {
+      // this.getSpotGoods()
+      // this.getEnquirySheetList()
+      // // this.getBuyerArticle()
+      // // this.getArticle()
+      // // this.geSellerArticle()
+      // this.getCategoryTreeData()
+      // this.getArticleList()
+      // this.getLatestCompanyList()
+      // this.getAd3()
+      // this.getAd4()
+      // this.getAd5()
+      // this.getAd6()
+      // this.getAd7()
+      // this.getAd8()
+      this.getUserInfo()
+    },
+    navTo(path) {
+      vk.navigateTo(path);
+    },
+    getArticleList() {
+      const otherArticleIdList = []
+      this.articleList.forEach((item, index) => {
+        otherArticleIdList.push(item.id)
+      })
+      otherArticleIdList.push('6573d7bde0ec19b5047ff941')
+      otherArticleIdList.push('6573d7c3e0ec19b5047ffa8c')
+      this.sellerArticleList = []
+      this.buyerArticleList = []
+      this.articleList.forEach((item, index) => {
+        this.articleList[index].list = []
+      })
+      vk.callFunction({
+        url: 'client/otherArticle/list/pub/getList',
+        data: {
+          pageIndex: 1,
+          pageSize: 200,
+          parentId: otherArticleIdList
         },
-        getEnquirySheetList() {
-            vk.callFunction({
-                url: 'client/enquiry/sheet/pub/getList',
-                loading: false,
-                data: {
-                    pageIndex: 1,
-                    pageSize: 10,
-                },
-                success: (data) => {
-
-                    this.enquirySheetData = data.rows
-                }
-            });
-        },
-        // 页面数据初始化函数
-        init(options) {
-            this.getSpotGoods()
-            this.getEnquirySheetList()
-            this.getBuyerArticle()
-            this.getArticle()
-            this.geSellerArticle()
-        },
-        navTo(path) {
-            vk.navigateTo(path);
-        },
-        getBuyerArticle() {
-            vk.callFunction({
-                url: 'client/otherArticle/list/pub/getList',
-                data: {
-                    pageIndex: 1,
-                    pageSize: 5,
-                    parentId: '6573d7c3e0ec19b5047ffa8c',
-                },
-                success: (data) => {
-                    this.buyerArticleList = data.rows
-                }
-            });
-        },
-        geSellerArticle() {
-            vk.callFunction({
-                url: 'client/otherArticle/list/pub/getList',
-                data: {
-                    pageIndex: 1,
-                    pageSize: 5,
-                    parentId: '6573d7bde0ec19b5047ff941',
-                },
-                success: (data) => {
-                    this.sellerArticleList = data.rows
-                }
-            });
-        },
-        getArticle() {
-            this.articleList.forEach((item, index) => {
-                vk.callFunction({
-                    url: 'client/otherArticle/list/pub/getList',
-                    data: {
-                        pageIndex: 1,
-                        pageSize: 5,
-                        parentId: item.id,
-                    },
-                    success: (data) => {
-                        this.articleList[index].list = data.rows
-                    }
-                });
+        success: (data) => {
+          data.rows.forEach(item => {
+            console.log(item.parentId)
+            if (item.parentId === '6573d7bde0ec19b5047ff941') this.sellerArticleList.push(item)
+            else if (item.parentId === '6573d7c3e0ec19b5047ffa8c') this.buyerArticleList.push(item)
+            this.articleList.forEach((article, articleIndex) => {
+              if (article.id === item.parentId) {
+                this.articleList[articleIndex].list.push(item)
+              }
             })
-        },
+          })
+        }
+      });
     },
+    // getArticle() {
+    //     this.articleList.forEach((item, index) => {
+    //         vk.callFunction({
+    //             url: 'client/otherArticle/list/pub/getList',
+    //             data: {
+    //                 pageIndex: 1,
+    //                 pageSize: 5,
+    //                 parentId: item.id,
+    //             },
+    //             success: (data) => {
+    //                 this.articleList[index].list = data.rows
+    //             }
+    //         });
+    //     })
+    // },
+    getCategoryTreeData() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.allChildCate = []
+          data.rows.forEach(item => {
+            item.children.forEach(child => {
+              this.allChildCate.push(child)
+            })
+          })
+          this.getCompanyList()
+        }
+      });
+    },
+    async getCompanyList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        data: {
+          pageIndex: 1,
+          pageSize: 10,
+          isCoop: 1,
+        }
+      })
+      this.companyList = rows.map(item => {
+        item.mainSpotCategory = []
+        if (item.company && item.company.mainSpotCategoryIds) {
+          this.allChildCate.forEach(child => {
+            if (item.company.mainSpotCategoryIds.includes(child._id)) {
+              item.mainSpotCategory.push(child.name)
+            }
+          })
+        }
+        return item
+      })
+
+    },
+    async getLatestCompanyList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        data: {
+          pageIndex: 1,
+          pageSize: 8,
+          authStatus: 1
+        }
+      })
+      this.latestCompanyList = rows
+    },
+    openClose() {
+      this.$confirm(`该功能暂未开放`, '', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false
+      })
+    },
+    async getAd3() {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 3
+        }
+      })
+      if (res.data) this.ad3 = res.data
+    },
+    async getAd4() {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 4
+        }
+      })
+      if (res.data) this.ad4 = res.data
+    },
+    async getAd5() {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 5
+        }
+      })
+      if (res.data) this.ad5 = res.data
+    },
+    async getAd6() {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 6
+        }
+      })
+      if (res.data) this.ad6 = res.data
+    },
+    async getAd7() {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 7
+        }
+      })
+      if (res.data) this.ad7 = res.data
+    },
+    async getAd8() {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 8
+        }
+      })
+      if (res.data) this.ad8 = res.data
+    },
+
+  },
 }
 </script>
 <style lang="scss" scoped>
 .w1200 {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .register {
-    background-color: #3d5fda;
-    width: 1200px;
-    height: 88px;
-    margin: 20px auto;
+  background-color: #3d5fda;
+  width: 1200px;
+  height: 88px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .left {
     display: flex;
-    justify-content: space-between;
     align-items: center;
 
-    .left {
+    .text {
+      display: flex;
+      align-items: center;
+      font-size: 30px;
+      color: #ffffff;
+      padding-left: 50px;
+
+      .divider {
+        margin: 0 30px;
+        transform: translateX(-10%);
+      }
+
+      .ad-text2 {
         display: flex;
-        align-items: center;
+        flex-direction: column;
+        font-size: 18px;
 
-        .text {
-            display: flex;
-            align-items: center;
-            font-size: 30px;
-            color: #ffffff;
-            padding-left: 50px;
-
-            .divider {
-                margin: 0 30px;
-                transform: translateX(-10%);
-            }
-
-            .ad-text2 {
-                display: flex;
-                flex-direction: column;
-                font-size: 18px;
-
-                // transform: rotate(0.1turn);
-                .yellow {
-                    color: #fcb800;
-                    font-size: 25px;
-                }
-
-                .white {
-                    color: #ffffff;
-                }
-            }
+        // transform: rotate(0.1turn);
+        .yellow {
+          color: #fcb800;
+          font-size: 25px;
         }
-    }
 
-    .right {
-        padding-right: 50px;
-        display: flex;
+        .white {
+          color: #ffffff;
+        }
+      }
     }
+  }
+
+  .right {
+    padding-right: 50px;
+    display: flex;
+  }
 }
 
 .banner-outer {
 }
 
 .carousel-img {
-    width: 760px;
-    height: 365px;
-    margin: 0 auto;
+  width: 760px;
+  height: 365px;
+  margin: 0 auto;
 }
 
 .el-divider__text {
-    background-color: initial;
+  background-color: initial;
 }
 
 .el-carousel__item {
-    text-align: center;
+  text-align: center;
 }
 
 .divider-text {
-    color: #393735;
-    font-size: 28px;
-    padding: 0 20px;
-    background-color: #f4f4f4;
-    font-weight: bold;
+  color: #393735;
+  font-size: 28px;
+  padding: 0 20px;
+  background-color: #f4f4f4;
+  font-weight: bold;
 }
 
 .spot-divider-text {
-    color: #393735;
-    font-size: 28px;
-    font-weight: bold;
-    padding: 0 20px;
-    background-color: white;
+  color: #393735;
+  font-size: 28px;
+  font-weight: bold;
+  padding: 0 20px;
+  background-color: white;
 }
 
 .enquiry-outer {
-    width: 1200px;
-    margin: 0px auto;
+  width: 1200px;
+  margin: 0 auto;
 
-    .inli-mask {
-        padding: 20px;
-        min-height: 120px;
-    }
+  .inli-mask {
+    padding: 10px;
+    height: 400rpx;
+    flex: 0 0 232px
+  }
 }
 
 .show-more {
-    clear: both;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: #ffffff;
-    background-color: #BD3124;
-    text-align: center;
-    width: 150px;
-    margin: 0 auto;
-    height: 40px;
-    cursor: pointer;
+  clear: both;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #ffffff;
+  background-color: #BD3124;
+  text-align: center;
+  width: 150px;
+  margin: 0 auto;
+  height: 40px;
+  cursor: pointer;
 
-    .el-icon-view {
-        font-size: 18px;
-        padding-right: 5px;
-    }
-}
-
-.enquiry-outer .mod-inner2Listcenter {
-
-    padding: 20px 0;
+  .el-icon-view {
+    font-size: 18px;
+    padding-right: 5px;
+  }
 }
 
 .spot-outer {
-    width: 1200px;
-    margin: 0px auto;
-    background-color: white;
-    padding: 50px;
+  width: 1200px;
+  margin: 0 auto;
+  background-color: white;
+  padding: 20px 0;
+}
+
+.hzsj-list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  padding: 20px 0;
+
+  .item {
+    display: flex;
+    flex-direction: column;
+    width: 265px;
+    height: 120px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    cursor: pointer;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+      padding-bottom: 15px;
+      border-bottom: 1px solid #f3f3f3;
+
+      .logo {
+        //padding: 8px;
+        background-color: #fff;
+        width: 60px;
+        height: 60px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: #ffffff;
+        border-radius: 8px;
+        margin-right: 8px;
+      }
+
+      .company {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+
+        .compnay-name {
+          color: #333333;
+          font-size: 1rem;
+        }
+
+        .company-desc {
+          color: #808080;
+          font-size: 12px;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          word-break: break-all;
+          white-space: nowrap;
+          max-width: 120px;
+          text-align: right;
+        }
+      }
+    }
+
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 10px;
+
+      .num {
+        text {
+          color: #BD3124;
+        }
+      }
+    }
+  }
+
+  .item:hover {
+    border: 1px solid #808080;
+  }
 }
 
 .goods-list {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 10px;
 }
 
 .goods {
-    width: 200px;
-    //height: 280px;
-    background-color: #FFFFFF;
-    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);
+  width: 228px;
+  //height: 280px;
+  background-color: #FFFFFF;
+  box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.05);
+  text-align: center;
+  //margin-right: 25px;
+  margin-bottom: 25px;
+  padding: 10px 20px;
+  position: relative;
+
+  .top {
+    position: absolute;
+    right: 0;
+    top: 0;
+    background-color: rgba(169, 41, 36, 1);
+    padding: 2px 5px;
+    border-radius: 0 0 0 5px;
+    color: #FFFFFF;
+  }
+
+  &-title {
+    font-size: 15px;
+    color: #101010;
+    height: 62px;
+    padding-top: 20px;
+    font-weight: bold;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+  }
+
+  &-stock {
+    font-size: 12px;
+    color: #BD3124;
+  }
+
+  &-address {
+    font-size: 12px;
+    margin: 10px 0;
+  }
+
+  &-image {
+    width: 100%;
+    height: 70px;
+    margin: 0 auto;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &-company {
+    color: #4F4F4F;
+    font-size: 14px;
+    margin: 10px 0;
+  }
+
+  &-buy {
+    width: 108px;
+    height: 30px;
+    line-height: 30px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(169, 41, 36, 1);
+    font-size: 13px;
     text-align: center;
-    //margin-right: 25px;
-    margin-bottom: 25px;
-    padding: 10px 20px;
-
-    &-title {
-        font-size: 15px;
-        color: #101010;
-        height: 62px;
-        padding-top: 20px;
-        font-weight: bold;
-        text-overflow: ellipsis;
-        -o-text-overflow: ellipsis;
-        -webkit-line-clamp: 2;
-    }
-
-    &-stock {
-        font-size: 12px;
-        color: #BD3124;
-    }
-
-    &-address {
-        font-size: 12px;
-        margin: 10px 0;
-    }
-
-    &-image {
-        width: 100%;
-        height: 70px;
-        margin: 0 auto;
-
-        image {
-            width: 100%;
-            height: 100%;
-        }
-    }
-
-    &-company {
-        color: #4F4F4F;
-        font-size: 14px;
-        margin: 10px 0;
-    }
-
-    &-buy {
-        width: 108px;
-        height: 30px;
-        line-height: 30px;
-        background-color: rgba(255, 255, 255, 1);
-        color: rgba(169, 41, 36, 1);
-        font-size: 13px;
-        text-align: center;
-        font-family: Roboto;
-        border: 1px solid rgba(169, 41, 36, 1);
-        margin: 0 auto;
-        cursor: pointer;
-    }
+    font-family: Roboto;
+    border: 1px solid rgba(169, 41, 36, 1);
+    margin: 0 auto;
+    cursor: pointer;
+  }
 
 
-    .goods-address {
-        color: gray;
-    }
+  .goods-address {
+    color: gray;
+    height: 35px;
+  }
 
 }
 
 .detail-num .company {
-    font-size: 15px !important;
-    line-height: 2em;
+  font-size: 15px !important;
+  line-height: 2em;
+  width: 100%;
 }
 
 .ad-bottom {
-    width: 1200px;
-    margin: 40px auto;
+  width: 1200px;
+  margin: 40px auto;
 
-    .item {
-        margin: 3px 0;
+  .item {
+    margin: 3px 0;
 
-        image {
-            width: 100%;
-            height: 100%;
-        }
+    image {
+      width: 100%;
+      height: 100%;
     }
+  }
 
-    .wrap {
-        flex-wrap: wrap;
-    }
+  .wrap {
+    flex-wrap: wrap;
+  }
 }
 
 .register-count {
-    width: 1200px;
-    margin: auto;
+  width: 1200px;
+  margin: auto;
 }
 
 .card-title {
-    color: #BD3124;
+  color: #BD3124;
 }
 
 .clearfix {
-    font-size: 16px;
-    font-weight: 500;
+  font-size: 16px;
+  font-weight: 500;
 }
 
 .news-list {
-    width: 330px;
-    display: flex;
-    flex-direction: column;
-    align-items: self-start;
-    line-height: 1.8em;
+  //width: 330px;
+  display: flex;
+  flex-direction: column;
+  align-items: self-start;
+  line-height: 1.8em;
 }
 
 .news-card {
-    .news-img {
-        image {
-            width: 200px;
-        }
+  .news-img {
+    image {
+      width: 200px;
+    }
+  }
+
+  .content {
+    display: flex;
+
+    .tabs {
+      padding: 0 20px;
     }
 
-    .content {
-        display: flex;
-
-        .tabs {
-            padding: 0 20px;
-        }
-
-        .news-list {
-            width: 330px;
-            display: flex;
-            flex-direction: column;
-            align-items: self-start;
-            line-height: 1.8em;
-            // .ellipsis {
-            // 	width: 320px;
-            // 	display: flex;
-            // 	flex-direction: column;
-            // 	align-items: self-start;
-            // 	overflow: hidden;
-            // 	white-space: nowrap;
-            // 	text-overflow: ellipsis;
-            // }
-        }
+    .news-list {
+      width: 330px;
+      display: flex;
+      flex-direction: column;
+      align-items: self-start;
+      line-height: 1.8em;
+      // .ellipsis {
+      // 	width: 320px;
+      // 	display: flex;
+      // 	flex-direction: column;
+      // 	align-items: self-start;
+      // 	overflow: hidden;
+      // 	white-space: nowrap;
+      // 	text-overflow: ellipsis;
+      // }
     }
+  }
 }
 
 .jrfw-img {
-    display: flex;
-    justify-content: space-between;
-    flex: 1;
+  display: flex;
+  justify-content: space-between;
+  flex: 1;
 
-    .jrfw-row {
-        width: 100%;
+  .jrfw-row {
+    width: 100%;
 
-    }
+  }
 
-    height: 184px;
+  height: 184px;
 
-    image {
-        width: 100%;
-    }
+  image {
+    width: 100%;
+  }
 }
 
 .jrfw-img-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex: 1;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex: 1;
 
-    .info {
-        .title {
-            font-weight: 400;
-            font-size: 17px;
-        }
-
-        .desc {
-            color: #666666;
-
-            text {
-                font-size: 20px;
-                color: #BD3124;
-            }
-        }
+  .info {
+    .title {
+      font-weight: 400;
+      font-size: 17px;
     }
 
-    .pic {
-        width: 156px;
+    .desc {
+      color: #666666;
 
-        image {
-            width: 156px;
-            height: 136px;
-        }
+      text {
+        font-size: 20px;
+        color: #BD3124;
+      }
     }
+  }
+
+  .pic {
+    width: 156px;
+
+    image {
+      width: 156px;
+      height: 136px;
+    }
+  }
 }
 
 .transaction-card {
-    .item {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-around;
-        align-items: center;
-        height: 150px;
-
-        .p1 {
-            font-size: 20px;
-            font-weight: 500;
-
-            i {
-                font-size: 20px;
-                padding: 0 4px;
-            }
-        }
-
-        .p2 {
-            .line {
-                width: 40px;
-                height: 3px;
-                border-radius: 100px;
-                background-color: #BD3124;
-            }
-        }
-
-        .p3 {
-            display: flex;
-            flex-direction: column;
-            text-align: center;
-            font-size: 15px;
-            color: #666;
-        }
-    }
-}
-
-.transaction-card:hover {
-    background-color: #BD3124;
+  .item {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    align-items: center;
+    height: 150px;
 
     .p1 {
-        color: #ffffff;
+      font-size: 20px;
+      font-weight: 500;
+
+      i {
+        font-size: 20px;
+        padding: 0 4px;
+      }
     }
 
     .p2 {
-        .line {
-            width: 40px;
-            height: 3px;
-            border-radius: 100px;
-            background-color: #ffffff;
-        }
+      .line {
+        width: 40px;
+        height: 3px;
+        border-radius: 100px;
+        background-color: #BD3124;
+      }
     }
 
     .p3 {
-        color: #ffffff;
+      display: flex;
+      flex-direction: column;
+      text-align: center;
+      font-size: 15px;
+      color: #666;
     }
+  }
+}
+
+.transaction-card:hover {
+  background-color: #BD3124;
+
+  .p1 {
+    color: #ffffff;
+  }
+
+  .p2 {
+    .line {
+      width: 40px;
+      height: 3px;
+      border-radius: 100px;
+      background-color: #ffffff;
+    }
+  }
+
+  .p3 {
+    color: #ffffff;
+  }
 }
 
 .server-card2 {
+  display: flex;
+  justify-content: space-between;
+
+  .item {
+    width: 400px;
+    height: 420px;
     display: flex;
-    justify-content: space-between;
-
-    .item {
-        width: 240px;
-        height: 270px;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-
-        i {
-            color: #ffffff;
-            font-size: 24px;
-        }
-
-        .p4 {
-            margin-top: 20px;
-        }
-
-        .text {
-            display: none;
-        }
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
 
+    i {
+      color: #ffffff;
+      font-size: 24px;
     }
 
-    .b1 {
-        background: url('http://jyx.gxwebsoft.com/public/index/images/god1hover.jpg');
-        background-position: center;
-        background-size: 150%;
+    .p4 {
+      margin-top: 20px;
     }
 
-    .b1:hover {
-        width: 380px;
-        /* 添加过渡属性效果 */
-        transition: width .1s linear;
-
-        .text {
-            display: block;
-            color: #ffffff;
-            font-size: 24px;
-            padding-top: 10px;
-        }
+    .text {
+      display: none;
     }
 
-    .b2 {
-        background: url('http://jyx.gxwebsoft.com/public/index/images/god2hover.jpg');
-        background-position: center;
-        background-size: 150%;
+  }
+
+  .b1 {
+    background: url('/static/images/index/god1hover.jpg');
+    background-position: center;
+    background-size: 150%;
+  }
+
+  .b1:hover {
+    width: 380px;
+    /* 添加过渡属性效果 */
+    transition: width .1s linear;
+
+    .text {
+      display: block;
+      color: #ffffff;
+      font-size: 24px;
+      padding-top: 10px;
     }
+  }
 
-    .b2:hover {
-        width: 380px;
-        /* 添加过渡属性效果 */
-        transition: width .1s linear;
+  .b2 {
+    background: url('/static/images/god4hover.jpg');
+    background-position: center;
+    background-size: 150%;
+  }
 
-        .text {
-            display: block;
-            color: #ffffff;
-            font-size: 24px;
-            padding-top: 10px;
-        }
+  .b2:hover {
+    width: 380px;
+    /* 添加过渡属性效果 */
+    transition: width .1s linear;
+
+    .text {
+      display: block;
+      color: #ffffff;
+      font-size: 24px;
+      padding-top: 10px;
     }
+  }
 
-    .b3 {
-        background: url('http://jyx.gxwebsoft.com/public/index/images/god3hover.jpg');
-        background-position: center;
-        background-size: 150%;
+  .b3 {
+    background: url('/static/images/index/feture-1.jpg');
+    background-position: center;
+    background-size: 100%;
+  }
+
+  .b3:hover {
+    width: 380px;
+    /* 添加过渡属性效果 */
+    transition: width .1s linear;
+
+    .text {
+      display: block;
+      color: #ffffff;
+      font-size: 24px;
+      padding-top: 10px;
     }
+  }
 
-    .b3:hover {
-        width: 380px;
-        /* 添加过渡属性效果 */
-        transition: width .1s linear;
+  .b4 {
+    background: url('/static/images/god3hover.jpg');
+    background-position: center;
+    background-size: 150%;
+  }
 
-        .text {
-            display: block;
-            color: #ffffff;
-            font-size: 24px;
-            padding-top: 10px;
-        }
+  f
+  .b4:hover {
+    width: 380px;
+    /* 添加过渡属性效果 */
+    transition: width .1s linear;
+
+    .text {
+      display: block;
+      color: #ffffff;
+      font-size: 24px;
+      padding-top: 10px;
     }
+  }
 
-    .b4 {
-        background: url('http://jyx.gxwebsoft.com/public/index/images/god4hover.jpg');
-        background-position: center;
-        background-size: 150%;
+  .b5 {
+    background: url('/static/images/index/god5hover.jpg');
+    background-position: center;
+    background-size: 150%;
+  }
+
+  .b5:hover {
+    width: 380px;
+    /* 添加过渡属性效果 */
+    transition: width .1s linear;
+
+    .text {
+      display: block;
+      color: #ffffff;
+      font-size: 24px;
+      padding-top: 10px;
     }
+  }
+}
 
-    .b4:hover {
-        width: 380px;
-        /* 添加过渡属性效果 */
-        transition: width .1s linear;
+.hzsj-bg {
+  background: url('https://mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.cdn.bspapp.com/2023/12/10/97087803-46388785-1.jpg');
+  background-position: center;
+  background-size: 150%;
+}
 
-        .text {
-            display: block;
-            color: #ffffff;
-            font-size: 24px;
-            padding-top: 10px;
-        }
-    }
-
-    .b5 {
-        background: url('http://jyx.gxwebsoft.com/public/index/images/god5hover.jpg');
-        background-position: center;
-        background-size: 150%;
-    }
-
-    .b5:hover {
-        width: 380px;
-        /* 添加过渡属性效果 */
-        transition: width .1s linear;
-
-        .text {
-            display: block;
-            color: #ffffff;
-            font-size: 24px;
-            padding-top: 10px;
-        }
-    }
+.logo {
+  width: 40px;
+  height: 40px;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/old/detail.vue b/pages/index/old/detail.vue
index 7767352..89c7d0c 100644
--- a/pages/index/old/detail.vue
+++ b/pages/index/old/detail.vue
@@ -1,352 +1,551 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item>
-                    <navigator style="display: inline-block;" url="/pages/old">旧货交易</navigator>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>旧货详情</el-breadcrumb-item>
-            </el-breadcrumb>
-        </view>
-
-        <view class="page-main" v-if="sheet">
-            <view class="flex justify-between items-center">
-                <text class="text-gray">发布时间:{{ sheet._add_time_str }}</text>
-            </view>
-            <view class="my-25 flex justify-between items-center">
-<!--                <view class="flex justify-start items-center">-->
-<!--                    <text class="text-40 font-bold">{{ sheet.title }}</text>-->
-<!--                    <view class="ml-20 flex justify-start items-center">-->
-<!--                        <building-one theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>-->
-<!--                        <view class="text-main ">-->
-<!--                            <text class="mx-20">{{-->
-<!--                                    (sheet.quoteList && sheet.quoteList.length > 0) ? sheet.quoteList.length : 0-->
-<!--                                }}-->
-<!--                            </text>-->
-<!--                            <text>家已报价</text>-->
-<!--                        </view>-->
-<!--                    </view>-->
-<!--                </view>-->
-                <view class="flex justify-end items-end"
-                      v-if="sheet.expiredTime && dayjs().diff(dayjs(sheet.expiredTime), 'second') > 0">
-                    <text>距离报价结束还有：</text>
-                    <view class="border-main countdown text-main">{{
-                            dayjs().diff(dayjs(sheet.expiredTime), 'day')
-                        }}
-                    </view>
-                    <text>天</text>
-                    <view class="border-main countdown text-main">
-                        {{ (dayjs().diff(dayjs(sheet.expiredTime), 'hour')) % 24 }}
-                    </view>
-                    <text>时</text>
-                </view>
-            </view>
-            <view class="my-25 flex justify-between items-center pb-20 border-bottom">
-                <view class="flex justify-start items-center">
-                    <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
-                    <text class="ml-15 text-gray">
-                        {{
-                            sheet.supplier.companyName
-                        }}
-                    </text>
-                </view>
-<!--                <el-button type="primary" @click.native="toQuote"-->
-<!--                           v-if="vk.getVuex('$user.userInfo._id') !== sheet.userId && sheet.status === 0">我要报价-->
-<!--                </el-button>-->
-<!--                <el-button type="primary" @click.native="showDialog = true"-->
-<!--                           v-else-if="vk.getVuex('$user.userInfo._id') === sheet.userId">查看收到的申请报价-->
-<!--                </el-button>-->
-            </view>
-            <view class="item-wrap" v-if="sheet.files && sheet.files.length > 0">
-                <view class="form-title-wrap">
-                    <view class="goods-sheet-title">
-                        <view class="form-title">
-                            实物
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15 mr-15" v-for="(item, index) in sheet.files" :key="index">
-                    <el-image :src="item" style="width: 100px; height: 100px" fit="cover"
-                              :preview-src-list="sheet.files"/>
-                </view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-sheet-title">
-                        <view class="form-title">
-                            详情
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">{{ sheet.desc }}</view>
-            </view>
-
-<!--            <view class="item-wrap">-->
-<!--                <view class="form-title-wrap">-->
-<!--                    <view class="goods-sheet-title">-->
-<!--                        <view class="form-title">-->
-<!--                            纳税和税票-->
-<!--                        </view>-->
-<!--                    </view>-->
-<!--                </view>-->
-<!--                <view class="mt-15">是否含税：{{ sheet.invoice ? '含税' : '不含税' }}</view>-->
-<!--                <view class="mt-15">开票时间：{{ WRITE_INVOICE_TIME[sheet.writeInvoiceTime] }}</view>-->
-<!--                <view class="mt-15">发票种类：{{ INVOICE_TYPE[sheet.invoiceType] }}</view>-->
-<!--                <view class="mt-15">其他要求：{{ sheet.invoiceOther }}</view>-->
-<!--            </view>-->
-
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-sheet-title">
-                        <view class="form-title">
-                            交易说明
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">付款方式：{{ sheet.payMethod }}</view>
-<!--                <view class="mt-15">报价形式：{{ sheet.offerType === 0 ? '整单报价' : '可分项报价' }}</view>-->
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-sheet-title">
-                        <view class="form-title">
-                            简易合同备注和其他补充条款
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">违约责任：</view>
-                <view class="mt-15">
-                    1.乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                </view>
-                <view class="mt-15">解决纠纷的方法：</view>
-                <view class="mt-15">
-                    1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工費和获取证据产生费用等其他相关费用。2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                </view>
-                <view class="mt-15">不可抗力：</view>
-                <view class="mt-15">
-                    甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                </view>
-                <view class="mt-15">其他：</view>
-                <view class="mt-15">
-                    本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                </view>
-                <view class="mt-15">采购方补充条款： 供货方逾期供货承担采购方一切损失</view>
-                <view class="mt-15"> 供应方补充条款：</view>
-            </view>
-
-<!--            <view class="item-wrap">-->
-<!--                <view class="form-title-wrap">-->
-<!--                    <view class="goods-info-title">-->
-<!--                        <view class="form-title">-->
-<!--                            已收到的加工申请-->
-<!--                        </view>-->
-<!--                    </view>-->
-<!--                </view>-->
-<!--                &lt;!&ndash; 报价列表 &ndash;&gt;-->
-<!--                <vk-data-table :data="sheet.quoteList" :columns="table1.columns" title="adasda "-->
-<!--                               :customRightBtns="table1.customRightBtns"></vk-data-table>-->
-<!--            </view>-->
-        </view>
-
-        <common-footer></common-footer>
-
-<!--        <el-dialog :visible.sync="showDialog" width="70%" :show-close="false">-->
-<!--            <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">-->
-<!--                <text>收到的报价</text>-->
-<!--                <el-button type="primary" @click.native="showDialog = false">关闭</el-button>-->
-<!--            </view>-->
-<!--            <view class="mt-15">-->
-<!--                <view class="request-header">-->
-<!--                    <text class="flex-1">供应商</text>-->
-<!--                    <text class="flex-1">报价时间</text>-->
-<!--                    <text class="flex-1">联系方式</text>-->
-<!--                    <text class="flex-1">报价</text>-->
-<!--                    <text class="flex-1">操作</text>-->
-<!--                </view>-->
-<!--                <view class="quote" v-for="(item, index) in sheet.quoteList" :key="index">-->
-<!--                    <text class="flex-1">{{ item.subjectName }}</text>-->
-<!--                    <text class="flex-1">{{ item._add_time_str }}</text>-->
-<!--                    <text class="flex-1">{{ item.subjectMobile }}</text>-->
-<!--                    <text class="flex-1">{{ item.totalPrice }}元</text>-->
-<!--                    <text class="flex-1">-->
-<!--                        <el-button type="primary" v-if="sheet.status === 0">选择</el-button>-->
-<!--                    </text>-->
-<!--                </view>-->
-<!--            </view>-->
-<!--        </el-dialog>-->
+    <view class="page-nav">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/index/old/old">旧货交易</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>{{ oldType[sheet.type] }}</el-breadcrumb-item>
+      </el-breadcrumb>
     </view>
+
+    <view class="page-main" v-if="sheet">
+      <view class="flex justify-between items-center">
+        <text class="text-gray">发布时间:{{ sheet._add_time_str }}</text>
+      </view>
+      <view class="my-25 flex justify-between items-center">
+        <view class="flex justify-start items-center">
+          <text class="text-main" v-if="sheet.isUrgent">[加急]</text>
+          <text class="text-40 font-bold">{{ sheet.title }}</text>
+          <view class="ml-20 flex justify-start items-center" v-if="sheet.type < 3">
+            <building-one theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
+            <view class="text-main ">
+              <text class="mx-20">{{
+                  (sheet.quoteList && sheet.quoteList.length > 0) ? sheet.quoteList.length : 0
+                }}
+              </text>
+              <text>家已报价</text>
+            </view>
+          </view>
+        </view>
+
+      </view>
+      <view class="my-25 flex justify-between items-center pb-20 border-bottom">
+        <view class="flex justify-start items-center">
+          <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
+          <text class="ml-15 text-gray" :class="[sheet.user.showInYellow ? 'pointer hover' : '']" @click="toCompany">
+            {{
+              (sheet.supplier && sheet.supplier.companyName) ? sheet.supplier.companyName : sheet.buyer.companyName
+            }}
+          </text>
+        </view>
+        <template v-if="sheet.type < 3">
+          <el-button type="primary" @click.native="toQuote"
+                     v-if="vk.getVuex('$user.userInfo._id') !== sheet.uid && sheet.status === 0">
+            {{ (sheet.type === 3 || (sheet.type === 2 && sheet.rentType === 1)) ? '我要询价' : '我要报价' }}
+          </el-button>
+          <el-button type="primary" @click.native="showDialog = true"
+                     v-else-if="vk.getVuex('$user.userInfo._id') === sheet.uid">查看收到的申请报价
+          </el-button>
+        </template>
+      </view>
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              物资信息
+            </view>
+          </view>
+        </view>
+        <view class="mt-15 mr-15" v-for="(item, index) in sheet.files" :key="index">
+          <el-image :src="item" style="width: 100px; height: 100px" fit="cover"
+                    :preview-src-list="sheet.files"/>
+        </view>
+        <view class="mt-15">物资分类：{{ sheet.category[1] }}</view>
+        <view class="mt-15" v-if="sheet.addressRegion && sheet.addressRegion.city">
+          物资所在地：{{ sheet.addressRegion.province.name }}{{
+            sheet.addressRegion.city.name
+          }}{{ sheet.addressRegion.area.name }}{{ sheet.addressDetail }}
+        </view>
+        <view class="mt-15" v-if="[2].includes(sheet.type) && sheet.deliverAddressRegion.city">
+          {{
+            sheet.type === 2 ? (sheet.rentType === 0 ? '物资交货地' : '物资装货地') : '物资交货地'
+          }}：{{ sheet.deliverAddressRegion.province.name }}{{
+            sheet.deliverAddressRegion.city.name
+          }}{{ sheet.deliverAddressRegion.area.name }}{{ sheet.deliverAddressDetail }}
+        </view>
+        <view class="mt-15">详情：{{ sheet.desc ? sheet.desc : '无' }}</view>
+        <template v-if="sheet.type === 0">
+          <view class="mt-15">起拍计价单位：
+            <!--            <text>{{-->
+            <!--                sheet.startNum ? sheet.startNum : '无'-->
+            <!--              }}-->
+            <!--            </text>-->
+            <text v-if="sheet.unit">{{ sheet.unit ? sheet.unit : '无' }}</text>
+          </view>
+          <view class="mt-15">起拍人民币单价：{{ sheet.startAmount ? `${sheet.startAmount}元` : '无' }}</view>
+          <view class="mt-15">拍卖信息失效时间：{{ sheet.expiredTime ? sheet.expiredTime : '无' }}</view>
+        </template>
+      </view>
+
+      <view class="item-wrap" v-if="[1, 2].includes(sheet.type)">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              纳税和税票
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">是否含税：{{ sheet.invoice ? '含税' : '不含税' }}</view>
+        <view class="mt-15">
+          开票时间：{{ sheet.writeInvoiceTime ? WRITE_INVOICE_TIME[sheet.writeInvoiceTime] : '无' }}
+        </view>
+        <template v-if="sheet.type === 1">
+          <view class="mt-15" v-if="sheet.invoiceOther">税票要求：{{ sheet.invoiceOther }}</view>
+          <template v-else>
+            <view class="mt-15">纳税人身份：{{ sheet.taxType ? sheet.taxType : '无' }}</view>
+            <view class="mt-15">发票种类：{{ sheet.invoiceType ? sheet.invoiceType : '无' }}</view>
+            <view class="mt-15">税率：{{ sheet.taxRate ? sheet.taxRate : '无' }}</view>
+          </template>
+        </template>
+        <template v-else>
+          <view class="mt-15">发票种类：{{ sheet.invoiceType ? INVOICE_TYPE[sheet.invoiceType] : '无' }}</view>
+          <view class="mt-15" v-if="sheet.type === 2">报价明细：{{
+              sheet.invoiceDetail ? sheet.invoiceDetail : '无'
+            }}
+          </view>
+          <view class="mt-15" v-if="sheet.invoiceOther">其他要求：{{
+              sheet.invoiceOther ? sheet.invoiceOther : '无'
+            }}
+          </view>
+        </template>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              交易说明
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">报价区域：{{
+            sheet.offerAddressNoLimit ? '不限区域' :
+              (sheet.offerAddressRegion && sheet.offerAddressRegion.province) ? `${sheet.offerAddressRegion.province.name} ${sheet.offerAddressRegion.city ? sheet.offerAddressRegion.city.name : '无'} ${sheet.offerAddressRegion.area ? sheet.offerAddressRegion.area.name : '无'}` : '无'
+          }}
+        </view>
+        <view class="mt-15" v-if="sheet.payMethod !== '其他付款方式描述'">
+          付款方式：{{ sheet.payMethod ? sheet.payMethod : '无' }} {{ sheet.prePayRate ? `${sheet.prePayRate}%` : '' }}
+        </view>
+        <view class="mt-15" v-else>付款方式：{{
+            sheet.otherPayMethodDesc ? sheet.otherPayMethodDesc : '无'
+          }}
+        </view>
+        <!--                <view class="mt-15">报价形式：{{ sheet.offerType === 0 ? '整单报价' : '可分项报价' }}</view>-->
+      </view>
+
+      <template v-if="sheet.type === 1">
+        <view class="item-wrap">
+          <view class="form-title-wrap">
+            <view class="goods-sheet-title">
+              <view class="form-title">
+                采购商信息
+              </view>
+            </view>
+          </view>
+          <template v-if="sheet.isMine || sheet.hasQuote || userInfo.userLevel > 0">
+            <view class="mt-15" v-if="sheet.buyer.companyName">公司信息：{{
+                sheet.buyer.companyName ? sheet.buyer.companyName : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.contract">公司联系方式：{{
+                sheet.buyer.contract ? sheet.buyer.contract : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.personalName">个人信息：{{
+                sheet.buyer.personalName ? sheet.buyer.personalName : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.personalContract">个人联系方式：{{
+                sheet.buyer.personalContract ? sheet.buyer.personalContract : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.managerName">授权人姓名：{{
+                sheet.buyer.managerName ? sheet.buyer.managerName : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.managerContract">授权联系方式：{{
+                sheet.buyer.managerContract ? sheet.buyer.managerContract : ''
+              }}
+            </view>
+          </template>
+          <template v-else>
+            <view class="mt-15" v-if="sheet.buyer.companyName">公司信息：{{
+                sheet.buyer.companyName ? sheet.buyer.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.contract">公司联系方式：{{
+                sheet.buyer.contract ? (sheet.buyer.contract.slice(0, 3) + '*'.repeat(sheet.buyer.contract.length - 7) + sheet.buyer.contract.slice(-4)) : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.personalName">个人信息：{{
+                sheet.buyer.personalName ? sheet.buyer.personalName.replace(/^(.).*(.)$/, "$1***$2") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.personalContract">个人联系方式：{{
+                sheet.buyer.personalContract ? sheet.buyer.personalContract.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.managerName">授权人姓名：{{
+                sheet.buyer.managerName ? sheet.buyer.managerName.replace(/^(.).*(.)$/, "$1***$2") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.buyer.managerContract">授权联系方式：{{
+                sheet.buyer.managerContract ? sheet.buyer.managerContract.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+              }}
+            </view>
+          </template>
+        </view>
+      </template>
+      <template v-else>
+        <view class="item-wrap">
+          <view class="form-title-wrap">
+            <view class="goods-sheet-title">
+              <view class="form-title">
+                {{ sheet.type === 3 ? '回收单位信息' : '供货商信息' }}
+              </view>
+            </view>
+          </view>
+          <template v-if="sheet.isMine || sheet.hasQuote || userInfo.userLevel > 0">
+            <view class="mt-15" v-if="sheet.supplier.companyName">公司信息：{{
+                sheet.supplier.companyName ? sheet.supplier.companyName : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.contract">公司联系方式：{{
+                sheet.supplier.contract ? sheet.supplier.contract : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.personalName">个人信息：{{
+                sheet.supplier.personalName ? sheet.supplier.personalName : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.personalContract">
+              个人联系方式：{{
+                sheet.supplier.personalContract ? sheet.supplier.personalContract : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.managerName">授权人姓名：{{
+                sheet.supplier.managerName ? sheet.supplier.managerName : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.managerContract">授权联系方式：{{
+                sheet.supplier.managerContract ? sheet.supplier.managerContract : ''
+              }}
+            </view>
+          </template>
+          <template v-else>
+            <view class="mt-15" v-if="sheet.supplier.companyName">公司信息：{{
+                sheet.supplier.companyName ? sheet.supplier.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.contract">公司联系方式：{{
+                sheet.supplier.contract ? (sheet.supplier.contract.slice(0, 3) + '*'.repeat(sheet.supplier.contract.length - 7) + sheet.supplier.contract.slice(-4)) : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.personalName">个人信息：{{
+                sheet.supplier.personalName ? sheet.supplier.personalName.replace(/^(.).*(.)$/, "$1***$2") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.personalContract">
+              个人联系方式：{{
+                sheet.supplier.personalContract ? sheet.supplier.personalContract.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.managerName">授权人姓名：{{
+                sheet.supplier.managerName ? sheet.supplier.managerName.replace(/^(.).*(.)$/, "$1***$2") : ''
+              }}
+            </view>
+            <view class="mt-15" v-if="sheet.supplier.managerContract">授权联系方式：{{
+                sheet.supplier.managerContract ? sheet.supplier.managerContract.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+              }}
+            </view>
+          </template>
+        </view>
+      </template>
+      <view class="item-wrap" v-if="sheet.signMethod === 0">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              简易合同备注和其他补充条款
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">违约责任：</view>
+        <view class="mt-15">
+          1.乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+        </view>
+        <view class="mt-15">解决纠纷的方法：</view>
+        <view class="mt-15">
+          1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工費和获取证据产生费用等其他相关费用。2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+        </view>
+        <view class="mt-15">不可抗力：</view>
+        <view class="mt-15">
+          甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+        </view>
+        <view class="mt-15">其他：</view>
+        <view class="mt-15">
+          本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+        </view>
+        <view class="mt-15">采购方补充条款： {{ sheet.supplementary }}</view>
+      </view>
+
+      <template v-else-if="sheet.signMethod === 2">
+        <view class="item-wrap">
+          <view class="form-title-wrap">
+            <view class="goods-sheet-title">
+              <view class="form-title">
+                合同附件
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-for="(item, index) in sheet.contractAttachment" :key="index" class="mr-25 my-25">
+          <file-type :item="item" @click.native="openDownload(item)"/>
+        </view>
+      </template>
+    </view>
+
+    <common-footer></common-footer>
+
+    <el-dialog :visible.sync="showDialog" width="70%" :show-close="false">
+      <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
+        <text>收到的报价</text>
+        <el-button type="primary" @click.native="showDialog = false">关闭</el-button>
+      </view>
+      <view class="mt-15">
+        <view class="request-header">
+          <text class="flex-1">报价方</text>
+          <text class="flex-1">报价时间</text>
+          <text class="flex-1">联系方式</text>
+          <text class="flex-1">报价</text>
+          <text class="flex-1">详情</text>
+          <text class="flex-1">补充协议</text>
+          <text class="flex-1">附件</text>
+          <text class="flex-1">操作</text>
+        </view>
+        <view class="quote" v-for="(item, index) in sheet.quoteList" :key="index">
+          <text class="flex-1">{{ item.subjectName }}</text>
+          <text class="flex-1">{{ item._add_time_str }}</text>
+          <text class="flex-1" v-if="item.user">{{ item.user.mobile }}</text>
+          <text class="flex-1">{{ item.totalPrice }}元</text>
+          <text class="flex-1">{{ item.remark }}</text>
+          <text class="flex-1">{{ item.supplierExt ? item.supplierExt : '无' }}</text>
+          <view class="flex-1">
+            <view class="flex-1">
+              <view class="mt-15 mr-15" v-for="(file, fileIndex) in item.files" :key="fileIndex">
+                <file-type :item="file" @click.native="openDownload(file)"/>
+              </view>
+            </view>
+          </view>
+          <text class="flex-1">
+            <el-button type="primary" v-if="sheet.status === 0 && sheet.type !== 3"
+                       @click.native="confirmQuote(item._id)">
+              选择
+            </el-button>
+            <el-button type="primary" v-if="sheet.status === 1 && sheet.type !== 3"
+                       @click.native="toSign(item._id)">
+              去签约
+            </el-button>
+          </text>
+        </view>
+      </view>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
-import {BuildingOne, IdCard} from "@icon-park/vue";
+import {BuildingOne, FileExcel, FilePdfOne, FileWord, IdCard} from "@icon-park/vue";
 import dayjs from "dayjs";
 import {WRITE_INVOICE_TIME, INVOICE_TYPE, PROCESS_PAY_METHOD} from '@/util'
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    components: {BuildingOne, IdCard},
-    data() {
-        return {
-            WRITE_INVOICE_TIME,
-            INVOICE_TYPE,
-            PROCESS_PAY_METHOD,
-            id: undefined,
-            showDialog: false,
-            productList: [],
-            sheetTitle: '',
-            sheet: {
-                user: {},
-                productList: [],
-                transportDocuments: []
-            },
-            table1: {
-                // 表格数据
-                data: [],
-                // 表格字段显示规则
-                columns: [{
-                    key: "subjectName",
-                    title: "供应商",
-                    type: "text",
-                    width: 300,
-                    formatter: (val, row, column, index) => {
-                        if (vk.getVuex('$user.userInfo._id') == this.sheet.userId) {
-                            return val
-                        }
-                        if (row.accountType == 1) {
-                            return vk.pubfn.hidden(val, 1, 1);
-                        } else {
-                            return vk.pubfn.hidden(val, 2, 4);
-                        }
-                    }
-
-                },
-                    {
-                        key: "_add_time_str",
-                        title: "报价时间",
-                        type: "text",
-                        width: 200
-                    },
-                    {
-                        key: "subjectMobile",
-                        title: "联系方式",
-                        type: "text",
-                        width: 120,
-                        formatter: (val, row, column, index) => {
-                            let str = val
-                            if (row.managerMobile) {
-                                str = row.managerMobile
-                            }
-                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId) {
-                                return str
-                            }
-                            return vk.pubfn.hidden(str, 3, 4);
-                        }
-                    },
-                    {
-                        key: "totalPrice",
-                        title: "报价",
-                        type: "textarea",
-                        width: 130,
-                        formatter: (val, row, column, index) => {
-                            let str = val
-                            if (row.managerMobile) {
-                                str = row.managerMobile
-                            }
-                            if (vk.getVuex('$user.userInfo._id') == this.sheet.userId) {
-                                return val
-                            }
-                            return "******";
-                        }
-                    },
-
-
-                ],
-                customRightBtns: [
-                    {
-                        title: '合同',
-                        type: 'primary',
-                        icon: 'el-icon-search',
-                        show: (row) => {
-                            return vk.getVuex('$user.userInfo._id') == this.sheet.userId && row.status == 1
-                        },
-                        onClick: (item) => {
-                            vk.navigateTo('/pages/contract/index');
-                        },
-                    },
-
-                    {
-                        title: '选择',
-                        type: 'primary',
-                        icon: 'el-icon-search',
-                        show: (row) => {
-                            return vk.getVuex('$user.userInfo._id') == this.sheet.userId && row.status == 0
-                        },
-                        onClick: (item) => {
-                            vk.callFunction({
-                                url: 'client/enquiry/quote/kh/confirmQuote',
-                                title: '请求中...',
-                                data: {
-                                    quoteId: item._id,
-                                },
-                                success: (data) => {
-                                    vk.navigateTo('/pages/contract/index');
-                                }
-                            });
-                        },
-                    },
-                    {
-                        title: '查看报价详情',
-                        type: 'primary',
-                        icon: 'el-icon-search',
-                        disabled: (item) => {
-                            return vk.getVuex('$user.userInfo._id') != this.sheet.userId
-                        },
-                        onClick: (item) => {
-                            this.showDialog = true
-                        }
-                    },
-                ]
-            },
-        };
-    },
-    onLoad(options = {}) {
-        const {
-            id
-        } = options
-        if (!id) {
-            vk.navigateTo('/pages/enquiry/list');
-            return
-        }
-
-        this.id = id
-
-        this.getDetail()
-    },
-    methods: {
-        dayjs,
-        /**
-         * 获取询价单详情
-         */
-        getDetail() {
-            vk.callFunction({
-                url: 'client/old/pub/getDetail',
-                title: '请求中...',
-                data: {
-                    id: this.id
-                },
-                success: (res) => {
-                    this.sheet = res
-                }
-            });
-        }
+  components: {FileExcel, FilePdfOne, FileWord, BuildingOne, IdCard},
+  data() {
+    return {
+      oldType: [
+        '拍卖信息',
+        '采购信息',
+        '承租信息',
+        '物资回收信息',
+      ],
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      WRITE_INVOICE_TIME,
+      INVOICE_TYPE,
+      PROCESS_PAY_METHOD,
+      id: undefined,
+      showDialog: false,
+      productList: [],
+      sheetTitle: '',
+      sheet: {
+        user: {},
+        productList: [],
+        transportDocuments: []
+      },
+      userInfo: {
+        userLevel: -1
+      }
+    };
+  },
+  async onLoad(options = {}) {
+    const {
+      id
+    } = options
+    if (!id) {
+      vk.navigateBack()
+      return
     }
+
+    this.id = id
+
+    const {userInfo} = await vk.callFunction({
+      url: 'user/kh/getMyUserInfo'
+    })
+    this.userInfo = userInfo
+
+    this.getDetail()
+  },
+  methods: {
+    dayjs,
+    /**
+     * 获取询价单详情
+     */
+    getDetail() {
+      vk.callFunction({
+        url: 'client/old/pub/getDetail',
+        title: '请求中...',
+        data: {
+          id: this.id
+        },
+        success: (res) => {
+          this.sheet = res
+          this.sheet.address = ''
+          this.sheet.deliverAddress = ''
+          this.sheet.offerAddress = ''
+          if (this.sheet.addressRegion && this.sheet.addressRegion.length > 0)
+            this.sheet.address = this.sheet?.addressRegion[0]?.name + this.sheet?.addressRegion[1]?.name + this.sheet?.addressRegion[2]?.name + this.sheet.addressDetail
+          if (this.sheet.deliverAddress && this.sheet.deliverAddress.length > 0)
+            this.sheet.deliverAddress = this.sheet?.deliverAddressRegion[0]?.name + this.sheet?.deliverAddressRegion[1]?.name + this.sheet?.deliverAddressRegion[2]?.name + this.sheet.addressDetail
+          if (this.sheet.offerAddress && this.sheet.offerAddress.length > 0)
+            this.sheet.offerAddress = !this.sheet.offerAddressNoLimit ? (this.sheet?.offerAddressRegion[0]?.name + this.sheet?.offerAddressRegion[1]?.name + this.sheet?.offerAddressRegion[2]?.name) : '无限制'
+          this.sheet.expiredTime = dayjs(this.sheet.expiredTime).format('YYYY-MM-DD')
+        }
+      });
+    },
+    async toQuote() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: `/pages/index/old/quote?id=${this.id}`
+        })
+      }
+    },
+    async confirmQuote(quoteId) {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (userInfo.qybNum <= 0) {
+        this.showDialog = false
+        this.$confirm('您的金久信签约宝次数不足，请先购买', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/contract/index?tab=sign'});
+        })
+        return
+      }
+      await vk.callFunction({
+        url: 'client/old/kh/confirmQuote',
+        title: '请求中...',
+        data: {
+          quoteId,
+        }
+      });
+      this.showDialog = false
+      this.$message({
+        message: "选择成功",
+        type: 'success'
+      })
+      if (this.sheet.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+      else {
+        if (this.sheet.signMethod === 1) vk.navigateTo('/pages/store/store?menuIndex=2')
+        else vk.navigateTo('/pages/contract/index?tab=0&tradeMethod=0')
+      }
+    },
+    toSign() {
+      this.showDialog = false
+      if (this.sheet.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+      else {
+        if (this.sheet.signMethod === 1) vk.navigateTo('/pages/store/store?menuIndex=2')
+        else vk.navigateTo('/pages/contract/index?tab=0&tradeMethod=0')
+      }
+    },
+    openDownload(url) {
+      window.open(url)
+    },
+    toCompany() {
+      if (this.sheet.user.showInYellow && this.sheet.user.showInYellow === 1) {
+        vk.navigateTo({
+          url: `/pages/yellowPage/info?id=${this.sheet.user._id}`
+        })
+      }
+    }
+  }
 }
 </script>
 
@@ -354,68 +553,72 @@ export default {
 @import "@/common/css/app.scss";
 
 .page-main {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
-    border-radius: 5px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
+  border-radius: 5px;
 }
 
 .countdown {
-    padding: 2px 5px;
-    margin: 0 5px;
+  padding: 2px 5px;
+  margin: 0 5px;
 }
 
 .item-wrap {
-    margin: 24px 0;
+  margin: 24px 0;
 
-    .form-title-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .goods-info-title {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-        }
-
-        .form-title {
-            padding-left: 10px;
-            color: $--color-primary;
-            font-size: 18px;
-            line-height: 18px;
-            border-left: 4px solid $--color-primary;
-        }
+  .form-title-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
+    .goods-info-title {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
     }
+
+    .form-title {
+      padding-left: 10px;
+      color: $--color-primary;
+      font-size: 18px;
+      line-height: 18px;
+      border-left: 4px solid $--color-primary;
+    }
+
+  }
 }
 
 .request-header {
-    border: 1px solid #EDEDED;
-    background-color: #FFF8F1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 15px;
-    margin-top: 30px;
+  border: 1px solid #EDEDED;
+  background-color: #FFF8F1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+  margin-top: 30px;
 
-    text {
-        text-align: center;
-    }
+  text {
+    text-align: center;
+  }
 }
 
 .quote {
-    border-left: 1px solid #EDEDED;
-    border-right: 1px solid #EDEDED;
-    border-bottom: 1px solid #EDEDED;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 15px;
+  border-left: 1px solid #EDEDED;
+  border-right: 1px solid #EDEDED;
+  border-bottom: 1px solid #EDEDED;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
 
-    text {
-        text-align: center;
-    }
+  text {
+    text-align: center;
+  }
+}
+
+.hover:hover {
+  color: #a92924;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/old/list/list.vue b/pages/index/old/list/list.vue
index 3e76fce..17e674a 100644
--- a/pages/index/old/list/list.vue
+++ b/pages/index/old/list/list.vue
@@ -1,140 +1,256 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <view class="page-nav">
-            <el-breadcrumb separator=">">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item>
-                    <navigator style="display: inline-block;" url="/pages/index/old/list/list">旧货交易</navigator>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item class="text-main">采购信息</el-breadcrumb-item>
-            </el-breadcrumb>
-            <el-row class="">
-                <el-button @click="toRelease" type="primary" round>发布旧货交易</el-button>
-                <el-button @click="toMy" type="primary" round plain class="empty-bg-plain-btn">我发布的信息
-                </el-button>
-            </el-row>
-        </view>
-
-
-        <!-- 筛选表单 -->
-        <view class="filter-outer">
-            <el-form @submit.native.prevent label-width="80px">
-                <el-form-item label="关键词" class="border-bottom pb-30">
-                    <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
-                        <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                        <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
-                        </el-button>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="物资分类" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="clickedCateIndex = -1" class="pointer mr-25"
-                              :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in categoryTreeData" :key="index">
-                            <text @click="clickedCateIndex = index" class="pointer mr-25"
-                                  :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                    </view>
-                    <view class="child-cate flex justify-start items-center flex-wrap">
-                        <template v-if="clickedCateIndex === -1">
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
-                            </text>
-                        </template>
-                        <template v-else>
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
-                                {{ item.name }}
-                            </text>
-                        </template>
-                    </view>
-                </el-form-item>
-                <el-form-item label="筛选区域" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
-                              :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
-                        </text>
-                        <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
-                            <text @click="selectProvince(item.code)"
-                                  :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']"
-                                  v-if="index < 10 || showAllProvince">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多
-                        </text>
-                    </view>
-                </el-form-item>
-                <el-form-item label="已选">
-                    <view class="tags">
-                        <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
-                    </view>
-                </el-form-item>
-
-            </el-form>
-        </view>
-
-        <!-- 商品列表 -->
-        <view class="goods-list">
-            <view v-for="(item, index) in goodsData.rows" :key="index" class="goods">
-                <view class="goods-info">
-                    <!--                    <el-image src="https://oss.wsdns.cn/20231204/d35332fa6a3b4596b522edf9527ac612.png"-->
-                    <!--                              class="goods-img"/>-->
-                    <view class="info">
-                        <view class="goods-name pointer" @click="navTo(`/pages/index/old/detail?id=${item._id}`)">{{ item.title }}</view>
-                        <view class="field">
-                            <view class="desc">
-                                <view class="text">企 业</view>
-                                <view>{{ item.buyer.companyName }}</view>
-                            </view>
-                            <view class="desc"></view>
-                            <view class="desc">
-                                <view class="text">所属分类</view>
-                                <view>{{ item.category }}</view>
-                            </view>
-                            <view class="desc">
-                                <view class="text">发布时间</view>
-                                <view>{{ item._add_time_str }}</view>
-                            </view>
-                            <view class="desc">
-                                <view class="text">所在地区</view>
-                                <view>{{ item.addressStr }}</view>
-                            </view>
-                            <view class="desc">
-                                <view class="text">有效日期</view>
-                                <view>{{ item.expiredTime }}</view>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-                <view class="buttons">
-                    <button type="default" class="btn" plain @click="showCntract(item)">查看电话
-                    </button>
-                    <button type="default" class="btn green" plain>添加微信
-                    </button>
-                    <button type="default" class="btn" plain>向此卖家询价
-                    </button>
-                </view>
-            </view>
-
-            <view class="paginatio">
-                <el-pagination @current-change="search" background layout="prev, pager, next" :total="goodsData.total"
-                               :page-size="pageSize">
-                </el-pagination>
-            </view>
-        </view>
-        <common-footer></common-footer>
+    <view class="page-nav">
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/index/old/old">旧货交易</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item class="text-main">{{ oldType[type] }}</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-row class="">
+        <el-button @click="toRelease" type="primary" round>发布旧货交易</el-button>
+        <el-button @click="toMy" type="primary" round plain class="empty-bg-plain-btn">我发布的信息
+        </el-button>
+      </el-row>
     </view>
+
+    <!-- 筛选表单 -->
+    <view class="filter-outer">
+      <el-form @submit.native.prevent label-width="80px">
+        <el-form-item label="关键词" class="border-bottom pb-30">
+          <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
+            </el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="物资分类" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="clickedCateIndex = -1" class="pointer mr-25"
+                  :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in categoryTreeData" :key="index">
+              <text @click="clickedCateIndex = index" class="pointer mr-25"
+                    :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
+                    v-if="index < 10">
+                {{ item.name }}
+              </text>
+            </view>
+            <text @click="selectCate(-2)" class="pointer mr-25"
+                  :class="[clickedCateIndex === -2 ? 'text-main selected-cate' : '']">
+              其他
+            </text>
+          </view>
+          <view class="child-cate flex justify-start items-center flex-wrap" v-if="clickedCateIndex !== -2">
+            <template v-if="clickedCateIndex === -1">
+              <text class="pointer mr-25" @click="selectCate(item._id)"
+                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
+                    v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
+              </text>
+            </template>
+            <template v-else>
+              <text class="pointer mr-25" @click="selectCate(item._id)"
+                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
+                    v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
+                {{ item.name }}
+              </text>
+            </template>
+          </view>
+        </el-form-item>
+        <el-form-item label="筛选区域" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
+                  :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
+            </text>
+            <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
+              <text @click="selectProvince(item.code)"
+                    :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']"
+                    v-if="index < 10 || showAllProvince">
+                {{ item.name }}
+              </text>
+            </view>
+            <!--                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多-->
+            <!--                        </text>-->
+          </view>
+        </el-form-item>
+        <el-form-item label="已选">
+          <view class="tags">
+            <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
+          </view>
+        </el-form-item>
+
+      </el-form>
+    </view>
+    <div class="flex justify-between items-center w-1200 m-a" v-if="type === 0">
+      <template v-if="ad15.length">
+        <el-carousel :height="`100px`" :style="{width: ad16.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad15" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad16.length">
+        <el-carousel :height="`100px`" :style="{width: ad15.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad16" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <div class="flex justify-between items-center w-1200 m-a" v-if="type === 1">
+      <template v-if="ad17.length">
+        <el-carousel :height="`100px`" :style="{width: ad18.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad17" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad18.length">
+        <el-carousel :height="`100px`" :style="{width: ad17.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad18" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <div class="flex justify-between items-center w-1200 m-a" v-if="type === 2">
+      <template v-if="ad19.length">
+        <el-carousel :height="`100px`" :style="{width: ad20.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad19" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad20.length">
+        <el-carousel :height="`100px`" :style="{width: ad19.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad20" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <div class="flex justify-between items-center w-1200 m-a" v-if="type === 3">
+      <template v-if="ad21.length">
+        <el-carousel :height="`100px`" :style="{width: ad22.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad21" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad22.length">
+        <el-carousel :height="`100px`" :style="{width: ad21.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad22" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 商品列表 -->
+    <view class="goods-list">
+      <view class="flex justify-start items-center my-20" v-if="parseInt(type) === 2">
+        <el-button @click="changeType(0)" type="primary" :plain="rentType === 1" round>承租信息</el-button>
+        <el-button @click="changeType(1)" type="primary" :plain="rentType === 0" round>出租信息
+        </el-button>
+      </view>
+      <view v-for="(item, index) in goodsData.rows" :key="index" class="goods">
+        <view class="goods-info">
+          <!--                    <el-image src="https://oss.wsdns.cn/20231204/d35332fa6a3b4596b522edf9527ac612.png"-->
+          <!--                              class="goods-img"/>-->
+          <view class="info">
+            <view class="goods-name pointer" @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+              <span>{{ item.title }}</span>
+              <span v-if="item.isUrgent" class="text-main font-bold">[加急]</span>
+            </view>
+            <view class="field">
+              <view class="desc">
+                <view class="text">企 业</view>
+                <view v-if="![0, 2, 3].includes(item.type) ">
+                  {{ item.buyer.companyName ? item.buyer.companyName : '无' }}
+                </view>
+                <view v-else>{{ item.supplier.companyName ? item.supplier.companyName : '无' }}</view>
+              </view>
+              <view class="desc"></view>
+              <view class="desc">
+                <view class="text">所属分类</view>
+                <view>{{ item.category[1] }}</view>
+              </view>
+              <view class="desc">
+                <view class="text">发布时间</view>
+                <view>{{ item._add_time_str }}</view>
+              </view>
+              <view class="desc">
+                <view class="text">所在地区</view>
+                <view>{{ item.addressStr }}</view>
+              </view>
+              <view class="desc">
+                <view class="text">有效日期</view>
+                <view>{{ item.expiredTime }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="buttons">
+          <button type="default" class="btn" plain @click="doShowContract(index)">查看电话
+          </button>
+          <button type="default" class="btn green" plain @click="doShowWechat(index)">添加微信
+          </button>
+          <template v-if="item.type !== 3">
+            <button type="default" class="btn" plain v-if="item.type !== 2"
+                    @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+              {{ item.uid === vk.getVuex('$user.userInfo._id') ? '查看报价' : '我要报价' }}
+            </button>
+            <button type="default" class="btn" plain v-else-if="item.type === 2 && item.rentType === 0"
+                    @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+              {{ item.uid === vk.getVuex('$user.userInfo._id') ? '查看报价' : '我要报价' }}
+            </button>
+          </template>
+          <view class="wechat"
+                v-if="item.user && parseInt(item.user.accountType) === 2 && item.user.businessCard && item.user.businessCard.companyWechat && item.showWechat">
+            <el-image :src="item.user.businessCard.companyWechat" style="width: 100%; height: 100%"/>
+          </view>
+          <view class="wechat"
+                v-if="item.user && parseInt(item.user.accountType) === 1 && item.user.businessCard && item.user.businessCard.personalWechat && item.showWechat">
+            <el-image :src="item.user.businessCard.personalWechat" style="width: 100%; height: 100%"/>
+          </view>
+          <view class="mobile" v-if="item.user && item.showContract && item.user.businessCard">
+            <i class="el-icon-phone"></i>
+            <text class="ml-20">{{
+                (item.user.businessCard && item.user.businessCard.companyMobile) ? item.user.businessCard.companyMobile : '暂无电话'
+              }}
+            </text>
+          </view>
+        </view>
+      </view>
+
+      <view class="paginatio">
+        <el-pagination @current-change="search" background layout="prev, pager, next" :total="goodsData.total"
+                       :page-size="pageSize">
+        </el-pagination>
+      </view>
+    </view>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -142,360 +258,705 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import dayjs from "dayjs";
 
 export default {
-    data() {
-        return {
-            categoryTreeData: [],
-            allChildCate: [],
-            checkCategoryList: [],
-            clickedCateIndex: -1,
-            provinceData: provinces,
-            checkProvinceList: [],
-            keyword: '',
-            goodsData: {
-                total: 0,
-                rows: []
-            },
-            showAllProvince: false,
-            type: 0,
-            pageSize: 20,
-        };
+  data() {
+    return {
+      oldType: [
+        '拍卖信息',
+        '采购信息',
+        '承租信息',
+        '物资回收信息',
+      ],
+      categoryTreeData: [],
+      allChildCate: [],
+      checkCategoryList: [],
+      clickedCateIndex: -1,
+      provinceData: provinces,
+      checkProvinceList: [],
+      keyword: '',
+      goodsData: {
+        total: 0,
+        rows: []
+      },
+      showAllProvince: true,
+      type: 0,
+      pageSize: 20,
+      rentType: 0,
+      ad15: [],
+      ad16: [],
+      ad17: [],
+      ad18: [],
+      ad19: [],
+      ad20: [],
+      ad21: [],
+      ad22: [],
+    };
+  },
+  onLoad(option) {
+    if (option.type) this.type = parseInt(option.type)
+  },
+  onShow() {
+    this.search(1)
+    vk.callFunction({
+      url: 'client/old/pub/getTree',
+      title: '请求中...',
+      data: {type: parseInt(this.type)},
+      success: (data) => {
+        this.categoryTreeData = data.rows
+        this.allChildCate = []
+        this.categoryTreeData.forEach(item => {
+          item.children.forEach(child => {
+            this.allChildCate.push(child)
+          })
+        })
+      }
+    });
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
     },
-    onLoad(option) {
-        if (option.type) this.type = option.type
-    },
-    onShow() {
+    selectCate(id) {
+      if (id === -2) {
+        this.clickedCateIndex = -2
+        this.checkCategoryList = [-2]
         this.search(1)
-        vk.callFunction({
-            url: 'client/spot/category/pub/getTree',
-            title: '请求中...',
-            data: {},
-            success: (data) => {
-                this.categoryTreeData = data.rows
-                this.allChildCate = []
-                this.categoryTreeData.forEach(item => {
-                    item.children.forEach(child => {
-                        this.allChildCate.push(child)
-                    })
-                })
-            }
-        });
+      } else {
+        const index = this.checkCategoryList.indexOf(id)
+        if (index === -1) this.checkCategoryList.push(id)
+        else this.checkCategoryList.splice(index, 1)
+        this.search(1)
+      }
     },
-    methods: {
-        navTo(url) {
-            vk.navigateTo({
-                url
-            })
-        },
-        selectCate(id) {
-            const index = this.checkCategoryList.indexOf(id)
-            if (index === -1) this.checkCategoryList.push(id)
-            else this.checkCategoryList.splice(index, 1)
-            this.search(1)
-        },
-        selectProvince(code) {
-            if (code === -1) this.checkProvinceList = []
-            else {
-                const index = this.checkProvinceList.indexOf(code)
-                if (index === -1) this.checkProvinceList.push(code)
-                else this.checkProvinceList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        async toRelease() {
-            const {
-                userInfo
-            } = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({
-                        url: '/pages/user/user?menu=fadada'
-                    });
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({
-                        url: '/pages/user/user?menu=business-card'
-                    });
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/index/old/release'
-                })
-            }
-        },
-        async toMy() {
-            const {
-                userInfo
-            } = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.getCertUrl()
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo('/pages/user/user?menu=business-card');
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/index/old/my'
-                })
-            }
-        },
-
-        search(pageIndex) {
-            vk.callFunction({
-                url: 'client/old/pub/getList',
-                data: {
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    keyword: this.keyword,
-                    type: this.type,
-                    categoryIds: this.checkCategoryList,
-                    provinceCodes: this.checkProvinceList
-                },
-                success: (data) => {
-                    console.log('data: ', data);
-                    data.rows.map(item => {
-                        item.addressStr = item.addressRegion[0].name + "-" + item.addressRegion[1].name
-                        item.expiredTime = dayjs(item.expiredTime).format('YYYY-MM-DD')
-                        return item
-                    })
-                    this.goodsData = data
-                }
-            });
-        },
-        getCertUrl() {
-            vk.callFunction({
-                url: 'client/fadada.getVerifyUrl',
-                success: (res) => {
-                    location.href = res.data.url
-                }
-            });
-        },
+    selectProvince(code) {
+      if (code === -1) this.checkProvinceList = []
+      else {
+        // const index = this.checkProvinceList.indexOf(code)
+        // if (index === -1) this.checkProvinceList.push(code)
+        // else this.checkProvinceList.splice(index, 1)
+        this.checkProvinceList = [code]
+      }
+      this.search(1)
     },
-    computed: {
-        checkCategoryArr() {
-            const arr = []
-            this.allChildCate.forEach(item => {
-                if (this.checkCategoryList.includes(item._id)) arr.push(item)
-            })
-            this.provinceData.forEach(item => {
-                if (this.checkProvinceList.includes(item.code)) {
-                    arr.push(item)
-                }
-            })
-            return arr
+    async toRelease() {
+      const {
+        userInfo
+      } = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({
+            url: '/pages/user/user?menu=fadada'
+          });
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({
+            url: '/pages/user/user?menu=fadada'
+          });
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
         }
+        vk.navigateTo({
+          url: '/pages/index/old/release'
+        })
+      }
+    },
+    async toMy() {
+      const {
+        userInfo
+      } = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo('/pages/user/user?menu=fadada');
+        })
+      } else {
+        vk.navigateTo({
+          url: '/pages/index/old/my'
+        })
+      }
+    },
 
+    search(pageIndex) {
+      let categoryIds = []
+      if (this.checkCategoryList.length === 1 && this.checkCategoryList[0] === -2) categoryIds.push(0)
+      else {
+        categoryIds = this.checkCategoryList
+        this.allChildCate.map(item => {
+          if (this.checkCategoryList.indexOf(item._id) > -1) categoryIds.push(item.name)
+        })
+      }
+      vk.callFunction({
+        url: 'client/old/pub/getList',
+        title: '加载中...',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          keyword: this.keyword,
+          type: this.type,
+          categoryIds,
+          provinceCodes: this.checkProvinceList,
+          rentType: this.rentType
+        },
+        success: (data) => {
+          data.rows.map(item => {
+            if (item.type === 1) item.addressStr = (item.deliverAddressRegion && item.deliverAddressRegion.city) ? (item.deliverAddressRegion.province.name + "-" + item.deliverAddressRegion.city.name) : ''
+            else item.addressStr = (item.addressRegion && item.addressRegion.city) ? (item.addressRegion.province.name + "-" + item.addressRegion.city.name) : ''
+            item.expiredTime = item.expiredTime ? dayjs(item.expiredTime).format('YYYY-MM-DD') : ''
+            item.showWechat = false
+            item.showContract = false
+            return item
+          })
+          this.goodsData = data
+          if (this.type === 0) {
+            this.getAd15()
+            this.getAd16()
+          } else if (this.type === 1) {
+            this.getAd17()
+            this.getAd18()
+          } else if (this.type === 2) {
+            this.getAd19()
+            this.getAd20()
+          } else if (this.type === 3) {
+            this.getAd21()
+            this.getAd22()
+          }
+        }
+      });
+    },
+    getCertUrl() {
+      vk.callFunction({
+        url: 'client/fadada.getVerifyUrl',
+        success: (res) => {
+          location.href = res.data.url
+        }
+      });
+    },
+    doShowWechat(index) {
+      if (parseInt(this.goodsData.rows[index].user.accountType) === 2 && !this.goodsData.rows[index].user.businessCard.companyWechat)
+        return vk.toast('用户暂未上传')
+      else if (parseInt(this.goodsData.rows[index].user.accountType) === 1 && !this.goodsData.rows[index].user.businessCard.personalWechat)
+        return vk.toast('用户暂未上传')
+      this.goodsData.rows[index].showContract = false
+      this.goodsData.rows[index].showWechat = !this.goodsData.rows[index].showWechat
+    },
+    doShowContract(index) {
+      this.goodsData.rows[index].showWechat = false
+      this.goodsData.rows[index].showContract = !this.goodsData.rows[index].showContract
+    },
+    changeType(type) {
+      this.rentType = type
+      this.search(1)
+    },
+    async getAd15() {
+      this.ad15 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 15,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad15 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 1,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad15.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd16() {
+      this.ad16 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 16,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad16 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 2,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad16.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd17() {
+      this.ad17 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 17,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad17 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 1,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad17.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd18() {
+      this.ad18 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 18,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad18 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 2,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad18.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd19() {
+      this.ad19 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 19,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad19 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 1,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad19.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd20() {
+      this.ad20 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 20,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad20 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 2,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad20.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd21() {
+      this.ad21 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 21,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad21 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 1,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad21.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd22() {
+      this.ad22 = []
+      // if (this.checkProvinceList.length === 0) {
+        const res = await vk.callFunction({
+          url: 'client/ad/pub/getList',
+          data: {
+            adKey: 22,
+            region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+          }
+        })
+        if (res.data) this.ad22 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 2,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad22.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+  },
+  computed: {
+    checkCategoryArr() {
+      const arr = []
+      this.allChildCate.forEach(item => {
+        if (this.checkCategoryList.includes(item._id)) arr.push(item)
+      })
+      this.provinceData.forEach(item => {
+        if (this.checkProvinceList.includes(item.code)) {
+          arr.push(item)
+        }
+      })
+      return arr
     }
+
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .page-nav {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 
 .goods-list {
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    flex-wrap: wrap;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  flex-wrap: wrap;
 }
 
 .goods {
-    background-color: #FFFFFF;
-    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);
-    text-align: center;
-    width: 1200px;
-    margin: 10px auto;
-    padding: 20px;
+  background-color: #FFFFFF;
+  box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);
+  text-align: center;
+  width: 1200px;
+  margin: 10px auto;
+  padding: 20px;
+  display: flex;
+  justify-content: space-between;
+
+  .goods-info {
     display: flex;
-    justify-content: space-between;
 
-    .goods-info {
+    .goods-img {
+      width: 200px;
+      height: 150px;
+    }
+
+    .info {
+      width: 700px;
+      text-align: left;
+      margin-left: 20px;
+
+      .goods-name {
+        font-size: 20px;
+        font-weight: 500;
+        line-height: 2.5em;
+      }
+
+      .field {
         display: flex;
+        flex-wrap: wrap;
 
-        .goods-img {
-            width: 200px;
-            height: 150px;
+        .desc {
+          display: flex;
+          width: 300px;
+          line-height: 2.5em;
+
+          .text {
+            width: 80px;
+            color: #999999;
+          }
         }
+      }
 
-        .info {
-            width: 700px;
-            text-align: left;
-            margin-left: 20px;
+    }
+  }
 
-            .goods-name {
-                font-size: 20px;
-                font-weight: 500;
-                line-height: 2.5em;
-            }
+  .buttons {
+    padding: 0 20px;
+    width: 200px;
+    border-left: 1px solid #f3f3f3;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    position: relative;
 
-            .field {
-                display: flex;
-                flex-wrap: wrap;
-
-                .desc {
-                    display: flex;
-                    width: 300px;
-                    line-height: 2.5em;
-
-                    .text {
-                        width: 80px;
-                        color: #999999;
-                    }
-                }
-            }
-
-        }
+    .btn {
+      width: 120px;
     }
 
-    .buttons {
-        padding: 0 20px;
-        width: 200px;
-        border-left: 1px solid #f3f3f3;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-around;
-
-        .btn {
-            width: 120px;
-        }
-
-        .green {
-            background-color: #7ec050 !important;
-            color: #ffffff;
-        }
+    .green {
+      background-color: #7ec050 !important;
+      color: #ffffff;
     }
 
-    &-title {
-        font-size: 15px;
-        color: #101010;
-        height: 62px;
-        padding-top: 20px;
-        font-weight: bold;
+    .wechat {
+      position: absolute;
+      left: -140px;
+      top: 0;
+      width: 150px;
+      height: 150px;
+      background-color: white;
+      border-radius: 10px;
+      padding: 5px;
+      box-shadow: 0 1px 10px 0 #eee
     }
 
-    &-stock {
-        font-size: 12px;
-        color: #BD3124;
+    .mobile {
+      position: absolute;
+      left: -110px;
+      top: 10px;
+      background-color: white;
+      border-radius: 10px;
+      padding: 5px;
+      box-shadow: 0 1px 10px 0 #eee;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
+  }
 
-    &-address {
-        font-size: 12px;
-        margin: 10px 0;
+  &-title {
+    font-size: 15px;
+    color: #101010;
+    height: 62px;
+    padding-top: 20px;
+    font-weight: bold;
+  }
+
+  &-stock {
+    font-size: 12px;
+    color: #BD3124;
+  }
+
+  &-address {
+    font-size: 12px;
+    margin: 10px 0;
+  }
+
+  &-image {
+    width: 200px;
+    height: 70px;
+    margin: 0 auto;
+
+    image {
+      width: 100%;
+      height: 100%;
     }
+  }
 
-    &-image {
-        width: 200px;
-        height: 70px;
-        margin: 0 auto;
+  &-company {
+    color: #4F4F4F;
+    font-size: 14px;
+    margin: 10px 0;
+  }
 
-        image {
-            width: 100%;
-            height: 100%;
-        }
-    }
+  &-buy {
+    width: 108px;
+    height: 30px;
+    line-height: 30px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(169, 41, 36, 1);
+    font-size: 13px;
+    text-align: center;
+    font-family: Roboto;
+    border: 1px solid rgba(169, 41, 36, 1);
+    margin: 0 auto;
+    cursor: pointer;
+  }
 
-    &-company {
-        color: #4F4F4F;
-        font-size: 14px;
-        margin: 10px 0;
-    }
-
-    &-buy {
-        width: 108px;
-        height: 30px;
-        line-height: 30px;
-        background-color: rgba(255, 255, 255, 1);
-        color: rgba(169, 41, 36, 1);
-        font-size: 13px;
-        text-align: center;
-        font-family: Roboto;
-        border: 1px solid rgba(169, 41, 36, 1);
-        margin: 0 auto;
-        cursor: pointer;
-    }
-
-    .goods-image {
-        width: 100%;
-    }
+  .goods-image {
+    width: 100%;
+  }
 }
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 .selected-cate {
-    border-bottom: 2px solid #BD3124;
-    line-height: 40rpx;
+  border-bottom: 2px solid #BD3124;
+  line-height: 40rpx;
 }
 
 .child-cate {
-    background-color: #DB8382;
-    color: white;
-    margin-top: 10rpx;
-    border-radius: 15rpx;
-    padding: 0 20rpx;
+  background-color: #DB8382;
+  color: white;
+  margin-top: 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
 }
 </style>
diff --git a/pages/index/old/my.vue b/pages/index/old/my.vue
index 6cfb4db..76dda83 100644
--- a/pages/index/old/my.vue
+++ b/pages/index/old/my.vue
@@ -1,236 +1,290 @@
 <template>
-	<view>
-		<top-bar></top-bar>
-		<common-header></common-header>
-		<category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-		<!-- <view class="page-nav">
-			<el-breadcrumb separator="/">
-				<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-				<el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-			</el-breadcrumb>
-		</view> -->
+    <!-- <view class="page-nav">
+        <el-breadcrumb separator="/">
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+        </el-breadcrumb>
+    </view> -->
 
-		<view class="carousel">
-			<el-carousel height="170px">
-				<el-carousel-item v-for="item in 4" :key="item">
-					<image class="carousel-img"
-						src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-						mode="aspectFill"></image>
-				</el-carousel-item>
-			</el-carousel>
-			<view class="goods-options">
-				<el-row class="">
-					<el-button @click="toRelease" type="primary" round>发布旧货交易</el-button>
-					<!-- <el-button type="primary" round plain>我发布的询价单</el-button> -->
-				</el-row>
-			</view>
-		</view>
+    <view class="carousel">
+      <!--            <el-carousel height="170px">-->
+      <!--                <el-carousel-item v-for="item in 4" :key="item">-->
+      <!--                    <image class="carousel-img"-->
+      <!--                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"-->
+      <!--                           mode="aspectFill"></image>-->
+      <!--                </el-carousel-item>-->
+      <!--            </el-carousel>-->
+      <common-swiper page="old-mine" :height="200"/>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布旧货交易</el-button>
+          <!-- <el-button type="primary" round plain>我发布的询价单</el-button> -->
+        </el-row>
+      </view>
+    </view>
 
-		<!-- 商品列表 -->
-		<view class="sheet-list">
-			<vk-data-table ref="table1" :action="table1.action" :columns="table1.columns" :customRightBtns="table1.customRightBtns"
-				:pagination="true" :query-form-param="queryForm1"></vk-data-table>
-		</view>
+    <!-- 商品列表 -->
+    <view class="sheet-list">
+      <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
+                     :customRightBtns="table1.customRightBtns"
+                     :pagination="true" :query-form-param="queryForm1"></vk-data-table>
+    </view>
 
 
-		<common-footer></common-footer>
-	</view>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				keyword: '',
-				// 表格相关开始 -----------------------------------------------------------
-				queryForm1: {
-					formData: {
-						userId: vk.getVuex('$user.userInfo._id')
-					},
-					columns: [
-						{ key:"userId", title:"发布人ID", type:"text", width:160, mode:"=" },
-					]
-				},
-				table1: {
-					// 表格数据请求地址
-					action: "client/old/kh/getList",
-					customRightBtns: [
-						{
-							title: '详情',
-							icon: 'el-icon-search',
-							type: 'primary',
-							onClick: (item) => {
-								vk.navigateTo('/pages/index/old/detail?id=' + item._id);
-							}
-						}, 
-						{
-							title: '删除',
-							icon: 'el-icon-delete',
-							type: 'primary',
-							onClick: (item) => {
-								this.$confirm('').then(()=> {
-									
-								}).then(() => {
-									vk.callFunction({
-										url: 'client/old/kh/delete',
-										title: '请求中...',
-										data: {
-											id: item._id
-										},
-									}).then(res => {
-										this.$refs.table1.refresh()
-									})
-								})
-							}
-						}, 
-					],
-					// 表格字段显示规则
-					columns: [
-						{
-							key: "标题",
-							title: "title",
-							type: "text",
-							width: 280
-						},
-						{
-							key: "productList",
-							title: "所在地",
-							type: "text",
-							minWidth: 200,
-							formatter: (val, row, column, index) => {
-								let str = ""
-								try {
-									str = val.map(item=>{
-                                        return item.addressRegion[0].name + "-" + item.addressRegion[1].name
-									}).join("/")
-								} catch(err){
-									str = ""
-								}
-								
-								return str
-							}
-						},
-						{
-							key: "supplier.companyName",
-							title: "供应商",
-							type: "text",
-						},
-						{
-							key: "_add_time_srt",
-							title: "添加时间",
-							type: "time",
-							width: 160
-						},
-						
-					],
-					// 多选框选中的值
-					multipleSelection: [],
-					// 当前高亮的记录
-					selectItem: "",
+export default {
+  data() {
+    return {
+      keyword: '',
+      // 表格相关开始 -----------------------------------------------------------
+      queryForm1: {
+        formData: {
+          userId: vk.getVuex('$user.userInfo._id')
+        },
+        columns: [
+          {key: "userId", title: "发布人ID", type: "text", width: 160, mode: "="},
+        ]
+      },
+      table1: {
+        // 表格数据请求地址
+        action: "client/old/kh/getList",
+        customRightBtns: [
+          {
+            title: '详情',
+            icon: 'el-icon-search',
+            type: 'primary',
+            onClick: (item) => {
+              vk.navigateTo('/pages/index/old/detail?id=' + item._id);
+            }
+          },
+          {
+            title: '删除',
+            icon: 'el-icon-delete',
+            type: 'primary',
+            onClick: (item) => {
+              this.$confirm('如果你要删除此条信息，之前其他客户填写的留言将无法查看', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                vk.callFunction({
+                  url: 'client/old/kh/delete',
+                  title: '请求中...',
+                  data: {
+                    id: item._id
+                  },
+                }).then(res => {
+                  this.$refs.table1.refresh()
+                })
+              })
+            },
+            show: (item) => {
+              console.log(item.status)
+              return item.status === 0
+            }
+          },
+        ],
+        // 表格字段显示规则
+        columns: [
+          {
+            key: "title",
+            title: "标题",
+            type: "text",
+            width: 280
+          },
+          {
+            key: "addressRegion",
+            title: "所在地",
+            type: "text",
+            minWidth: 200,
+            formatter: (val, row, column, index) => {
+              let str = ""
+              try {
+                if (row.type === 1) str = (row.deliverAddressRegion && row.deliverAddressRegion.city) ? (row.deliverAddressRegion.province.name + "-" + row.deliverAddressRegion.city.name) : ''
+                else str = (row.addressRegion && row.addressRegion.city) ? (row.addressRegion.province.name + "-" + row.addressRegion.city.name) : ''
 
-				},
-				// 表格相关结束 -----------------------------------------------------------
-			};
-		},
-		onLoad() {
+                // if (row.type === 2) {
+                //     str = row.offerAddressRegion.province.name + row.offerAddressRegion.city.name + row.offerAddressRegion.area.name
+                // } else if (row.type === 1) {
+                //     str = row.deliverAddressRegion.province.name + row.deliverAddressRegion.city.name + row.deliverAddressRegion.area.name
+                // } else {
+                //     str = val.province.name + val.city.name + val.area.name
+                // }
+              } catch (err) {
+                str = ""
+              }
 
-		},
-		methods: {
-			toRelease() {
+              return str
+            }
+          },
+          {
+            key: "quoteNum",
+            title: "报价数",
+            type: "text",
+            formatter: (val, row, column, index) => {
+              return `${val}家已报价`
+            }
+          },
+          {
+            key: "type",
+            title: "类型",
+            type: "select",
+            data: [
+              {value: 0, label: '拍卖'},
+              {value: 1, label: '采购'},
+              {value: 2, label: '租赁'},
+              {value: 3, label: '物资回收'},
+            ]
+          },
+          // {
+          //     key: "supplier",
+          //     title: "供应商",
+          //     type: "text",
+          //     formatter: (val, row, column, index) => {
+          //         console.log(val.companyName, val.companyName === '')
+          //         if (val.companyName && val.companyName !== '') return val.companyName
+          //         else return val.personName
+          //         // console.log((val.companyName && val.companyName !== ''), val.companyName)
+          //         // return ((val.companyName && val.companyName !== '') ? val.companyName : val.personName)
+          //     }
+          // },
+          {
+            key: "_add_time_str",
+            title: "添加时间",
+            type: "time",
+            width: 160
+          },
 
-				if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
-					this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning'
-					}).then(() => {
-						this.getCertUrl()
-					})
-				} else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
-					this.$confirm('请完善名片信息', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning'
-					}).then(() => {
-						vk.navigateTo('/pages/user/user?menu=business-card');
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/index/old/release'
-					})
-				}
+        ],
+        // 多选框选中的值
+        multipleSelection: [],
+        // 当前高亮的记录
+        selectItem: "",
 
+      },
+      // 表格相关结束 -----------------------------------------------------------
+    };
+  },
+  onLoad() {
 
+  },
+  methods: {
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/index/old/release'
+        })
+      }
+    },
+  },
+  computed: {
+    checkCategoryArr() {
+      let arr = []
+      this.checkCategoryList.forEach(item => {
+        arr.push(...item)
+      })
 
+      this.checkProvinceList.forEach(item => {
+        arr.push({
+          ...item
+        })
+      })
+      return arr
+    }
 
-			},
-		},
-		computed: {
-			checkCategoryArr() {
-				let arr = []
-				this.checkCategoryList.forEach(item => {
-					arr.push(...item)
-				})
-
-				this.checkProvinceList.forEach(item => {
-					arr.push({
-						...item
-					})
-				})
-				return arr
-			}
-
-		}
-	}
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.carousel {
-		width: 1200px;
-		margin: 20px auto;
-	}
+.carousel {
+  width: 1200px;
+  margin: 20px auto;
+}
 
-	.carousel-img {
-		width: 100%;
-		height: 100%;
-	}
+.carousel-img {
+  width: 100%;
+  height: 100%;
+}
 
-	.goods-options {
-		background-color: #FFFFFF;
-		padding: 20px;
-	}
+.goods-options {
+  background-color: #FFFFFF;
+  padding: 20px;
+}
 
-	.filter-outer {
-		width: 1200px;
-		margin: 20px auto;
-		background-color: #FFFFFF;
-		padding: 20px;
-	}
+.filter-outer {
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
+}
 
-	.tags {
-		display: flex;
+.tags {
+  display: flex;
 
-		.el-tag {
-			margin-right: 10px;
-		}
-	}
+  .el-tag {
+    margin-right: 10px;
+  }
+}
 
 
-	.sheet-list {
-		width: 1200px;
-		margin: 20px auto;
-		// display: flex;
+.sheet-list {
+  width: 1200px;
+  margin: 20px auto;
+  // display: flex;
 
-	}
+}
 
 
-
-	.paginatio {
-		float: none;
-		width: 1200px;
-		margin: 20px auto;
-		display: flex;
-		justify-content: center;
-	}
+.paginatio {
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
+}
 </style>
\ No newline at end of file
diff --git a/pages/index/old/old.vue b/pages/index/old/old.vue
index b8b1692..61d0d69 100644
--- a/pages/index/old/old.vue
+++ b/pages/index/old/old.vue
@@ -1,216 +1,255 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img" src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-            <view class="goods-options">
-                <el-row class="">
-                    <el-button @click="navTo('/pages/index/old/release')" type="primary" round>发布旧货交易</el-button>
-                    <el-button @click="navTo('/pages/index/old/my')" type="primary" round plain
-                               class="empty-bg-plain-btn">我发布的信息
-                    </el-button>
-                </el-row>
-            </view>
-        </view>
-
-        <view class="nav-tool">
-            <view class="btn pointer" @click="navTo('/pages/index/old/list/list')">
-                <image src="https://oss.wsdns.cn/20231204/bbd54039c69e4d0292c6889bce0ac088.png" mode="widthFix"/>
-                <text>拍卖信息</text>
-            </view>
-            <view class="btn pointer" @click="navTo('/pages/index/old/list/list?type=1')">
-                <image src="https://oss.wsdns.cn/20231204/bbd54039c69e4d0292c6889bce0ac088.png" mode="widthFix"/>
-                <text>采购信息</text>
-            </view>
-            <view class="btn pointer" @click="navTo('/pages/index/old/list/list?type=2')">
-                <image src="https://oss.wsdns.cn/20231204/bbd54039c69e4d0292c6889bce0ac088.png" mode="widthFix"/>
-                <text>租赁信息</text>
-            </view>
-            <view class="btn pointer" @click="navTo('/pages/index/old/list/list?type=3')">
-                <image src="https://oss.wsdns.cn/20231204/bbd54039c69e4d0292c6889bce0ac088.png" mode="widthFix"/>
-                <text>物资回收信息</text>
-            </view>
-        </view>
-
-
-        <view class="carousel news-list-1">
-            <view class="title">
-                成交动态
-            </view>
-            <view class="news-list">
-                <el-row class="wrap" type="flex" :gutter="10" justify="space-between">
-                    <el-col :span="7" v-for="(item, index) in list" :key="index">
-                        <view class="item">
-                            <view class="text">[南宁]{{ item.title }}</view>
-                            <view class="date-time">11-15</view>
-                        </view>
-                    </el-col>
-                </el-row>
-            </view>
-        </view>
-
-        <view class="carousel ad">
-            <el-row class="wrap" type="flex" :gutter="10" justify="space-between">
-                <el-col :span="12">
-                    <div class="ad-img">
-                        <el-image
-                            src="http://jyx.gxwebsoft.com/uploads/20210817/57f8333bed0d3a4e2aac3fd251e19007.jpg"/>
-                    </div>
-                </el-col>
-                <el-col :span="12">
-                    <div class="ad-img">
-                        <el-image
-                            src="http://jyx.gxwebsoft.com/uploads/20210506/f3afbd29ce99dc6e2fdf4c8f3ec16221.jpg"/>
-                    </div>
-                </el-col>
-            </el-row>
-        </view>
-
-
-        <view class="carousel news-list-1">
-            <view class="title">
-                加急公告
-            </view>
-            <view class="news-gg">
-                <el-row class="wrap" type="flex" :gutter="0" justify="space-between">
-                    <el-col :span="12" v-for="(item, index) in Math.ceil(noticeList.length / 3)" :key="index">
-                        <view class="item">
-                            <view class="new-avatar">
-                                <el-image class="image" fit="cover"
-                                          :src="noticeList[index].cover[0]"/>
-                            </view>
-                            <view class="list3">
-                                <view v-for="(noticeItem, noticeIndex) in 3" :key="noticeIndex"
-                                      @click="navTo(`/pages/otherArticle/noticeDetail?id=${noticeList[index * 3 + noticeIndex]._id}`)">
-                                    <view class="text pointer" v-if="index * 3 + noticeIndex < noticeList.length">
-                                        <span>[{{ noticeList[index * 3 + noticeIndex].address.city.name }}]</span>
-                                        <text>{{ noticeList[index * 3 + noticeIndex].name }}</text>
-                                        <span class="ml-20">{{ noticeList[index * 3 + noticeIndex].addTime }}</span>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </el-col>
-                </el-row>
-            </view>
-        </view>
-
-        <view class="carousel">
-            <el-row class="wrap" type="flex" :gutter="20" justify="space-between">
-                <el-col :span="12">
-                    <el-card class="new-box">
-                        <div slot="header" class="clearfix">
-                            <span class="title">最新拍卖信息</span>
-                            <el-button style="float: right; padding: 3px 0" type="text"
-                                       @click="navTo('/pages/index/old/list/list')">查看更多
-                            </el-button>
-                        </div>
-                        <view class="list8">
-                            <view class="article pointer" v-for="(item, index) in dataList[0]" :key="index"
-                                  @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
-                                <view class="title2" v-if="index < 3">
-                                    <span>[{{ item.addressRegion[1].name }}]</span>
-                                    <text class="line-1 ">{{ item.title }}</text>
-                                </view>
-                                <view class="date-time">{{ item.addDate }}</view>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-                <el-col :span="12">
-                    <el-card class="new-box">
-                        <div slot="header" class="clearfix">
-                            <span class="title">最新采购信息</span>
-                            <el-button style="float: right; padding: 3px 0" type="text"
-                                       @click="navTo('/pages/index/old/list/list?type=1')">查看更多
-                            </el-button>
-                        </div>
-                        <view class="list8">
-                            <view class="article pointer" v-for="(item, index) in dataList[1]" :key="index"
-                                  @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
-                                <view class="title2" v-if="index < 3">
-                                    <span>[{{ item.addressRegion[1].name }}]</span>
-                                    <text class="line-1 ">{{ item.title }}</text>
-                                </view>
-                                <view class="date-time">{{ item.addDate }}</view>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-                <el-col :span="12">
-                    <el-card class="new-box">
-                        <div slot="header" class="clearfix">
-                            <span class="title">最新租赁信息</span>
-                            <el-button style="float: right; padding: 3px 0" type="text"
-                                       @click="navTo('/pages/index/old/list/list?type=2')">查看更多
-                            </el-button>
-                        </div>
-                        <view class="list8">
-                            <view class="article pointer" v-for="(item, index) in dataList[2]" :key="index"
-                                  @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
-                                <view class="title2" v-if="index < 3">
-                                    <span>[{{ item.addressRegion[1].name }}]</span>
-                                    <text class="line-1">{{ item.title }}</text>
-                                </view>
-                                <view class="date-time">{{ item.addDate }}</view>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-                <el-col :span="12">
-                    <el-card class="new-box">
-                        <div slot="header" class="clearfix">
-                            <span class="title">最新物资回收信息</span>
-                            <el-button style="float: right; padding: 3px 0" type="text"
-                                       @click="navTo('/pages/index/old/list/list?type=3')">查看更多
-                            </el-button>
-                        </div>
-                        <view class="list8">
-                            <view class="article pointer" v-for="(item, index) in dataList[3]" :key="index"
-                                  @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
-                                <view class="title2" v-if="index < 3">
-                                    <span>[{{ item.addressRegion[1].name }}]</span>
-                                    <text class="line-1">{{ item.title }}</text>
-                                </view>
-                                <view class="date-time">{{ item.addDate }}</view>
-                            </view>
-                        </view>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </view>
-
-        <!-- 合作单位/联营单位-->
-        <view class="cooperate">
-            <view class="title">
-                <el-image src="https://oss.wsdns.cn/20231204/860581fbcb9741658de15470f053e42e.png"
-                          style="width: 180px"/>
-            </view>
-            <u-gap height="1" bg-color="#f3f3f3"/>
-            <view class="flex justify-start items-start flex-wrap">
-                <view class="w-25p pointer" v-for="(item, index) in companyList" :key="index">
-                    <view class="border bg-white flex flex-col justify-center items-center p-20">
-                        <image :src="item.businessCard.logo" class="logo"/>
-                        <span class="mt-20 line-1 w-100p text-center">
-                                主营: {{ item.businessCard.mainBusiness }}
-                            </span>
-                    </view>
-                </view>
-            </view>
-            <u-gap height="5" bg-color="#f3f3f3"/>
-        </view>
-
-        <!-- 现货市场 end -->
-        <gap height="50"/>
-        <common-footer></common-footer>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="carousel">
+      <el-carousel height="500px">
+        <common-swiper page="old"/>
+      </el-carousel>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布旧货交易</el-button>
+          <el-button @click="navTo('/pages/index/old/my')" type="primary" round plain
+                     class="empty-bg-plain-btn">我发布的信息
+          </el-button>
+          <el-button @click="navTo('/pages/index/old/quote/my')" type="primary" round plain
+                     class="empty-bg-plain-btn">我的报价
+          </el-button>
+        </el-row>
+      </view>
     </view>
+
+    <view class="nav-tool">
+      <view class="btn pointer" @click="navTo('/pages/index/old/list/list')">
+        <image src="/static/images/old/btn01.png" mode="widthFix"/>
+        <text>拍卖信息</text>
+      </view>
+      <view class="btn pointer" @click="navTo('/pages/index/old/list/list?type=1')">
+        <image src="/static/images/old/btn02.png" mode="widthFix"/>
+        <text>采购信息</text>
+      </view>
+      <view class="btn pointer" @click="navTo('/pages/index/old/list/list?type=2')">
+        <image src="/static/images/old/btn03.png" mode="widthFix"/>
+        <text>租赁信息</text>
+      </view>
+      <view class="btn pointer" @click="navTo('/pages/index/old/list/list?type=3')">
+        <image src="/static/images/old/btn04.png" mode="widthFix"/>
+        <text>物资回收信息</text>
+      </view>
+    </view>
+
+
+    <!--        <view class="carousel news-list-1">-->
+    <!--            <view class="title">-->
+    <!--                成交动态-->
+    <!--            </view>-->
+    <!--            <view class="news-list">-->
+    <!--                <el-row class="wrap" type="flex" :gutter="10" justify="space-between">-->
+    <!--                    <el-col :span="7" v-for="(item, index) in list" :key="index">-->
+    <!--                        <view class="item">-->
+    <!--                            <view class="text">[南宁]{{ item.title }}</view>-->
+    <!--                            <view class="date-time">11-15</view>-->
+    <!--                        </view>-->
+    <!--                    </el-col>-->
+    <!--                </el-row>-->
+    <!--            </view>-->
+    <!--        </view>-->
+
+    <!--        <view class="carousel ad">-->
+    <!--            <el-row class="wrap" type="flex" :gutter="10" justify="space-between">-->
+    <!--                <el-col :span="12">-->
+    <!--                    <div class="ad-img">-->
+    <!--                        <el-image-->
+    <!--                            src="http://jyx.gxwebsoft.com/uploads/20210817/57f8333bed0d3a4e2aac3fd251e19007.jpg"/>-->
+    <!--                    </div>-->
+    <!--                </el-col>-->
+    <!--                <el-col :span="12">-->
+    <!--                    <div class="ad-img">-->
+    <!--                        <el-image-->
+    <!--                            src="http://jyx.gxwebsoft.com/uploads/20210506/f3afbd29ce99dc6e2fdf4c8f3ec16221.jpg"/>-->
+    <!--                    </div>-->
+    <!--                </el-col>-->
+    <!--            </el-row>-->
+    <!--        </view>-->
+
+
+    <view class="carousel news-list-1">
+      <view class="title">
+        加急公告
+      </view>
+      <view class="news-gg">
+        <el-carousel height="50px" direction="vertical" autoplay class="w-100p">
+          <el-carousel-item v-for="i in Math.ceil(urgentList.length / 4)" :key="i">
+            <view class="flex justify-start items-start flex-wrap">
+              <view class="item w-50p mb-10" v-for="index in 4" :key="index">
+                <template v-if="urgentList[(i - 1) * 4 + (index - 1)]">
+                  <view
+                    @click="navTo(`/pages/index/old/detail?id=${urgentList[(i - 1) * 4 + (index - 1)]._id}`)">
+                    <view class="text pointer">
+                                        <span class="text-gray"
+                                              v-if="urgentList[(i - 1) * 4 + (index - 1)].addressRegion && urgentList[(i - 1) * 4 + (index - 1)].addressRegion.city">[{{
+                                            urgentList[(i - 1) * 4 + (index - 1)].addressRegion.city.name
+                                          }}]</span>
+                      <span class="urgent">[加急]</span>
+                      <text>{{ urgentList[(i - 1) * 4 + (index - 1)].title }}</text>
+                      <span class="ml-20">{{
+                          urgentList[(i - 1) * 4 + (index - 1)].addTime
+                        }}</span>
+                    </view>
+                  </view>
+                </template>
+              </view>
+            </view>
+          </el-carousel-item>
+        </el-carousel>
+      </view>
+    </view>
+
+    <view class="carousel">
+      <el-row class="wrap" type="flex" :gutter="20" justify="space-between">
+        <el-col :span="12">
+          <el-card class="new-box">
+            <div slot="header" class="clearfix">
+              <span class="title">最新拍卖信息</span>
+              <el-button style="float: right; padding: 3px 0" type="text"
+                         @click="navTo('/pages/index/old/list/list')">查看更多
+              </el-button>
+            </div>
+            <view class="list8">
+              <view class="article pointer" v-for="(item, index) in dataList[0]" :key="index"
+                    @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+                <view class="title2 " v-if="index < 8">
+                  <view class="flex justify-start">
+                                        <span v-if="item.addressRegion && item.addressRegion.city ">[{{
+                                            item.addressRegion.city.name
+                                          }}]</span>
+                    <span v-else>[区域不限]</span>
+                    <span class="urgent" v-if="item.isUrgent">[加急]</span>
+                    <text class="line-1 ">{{ item.title }}</text>
+                  </view>
+                  <view class="date-time">{{ item.addDate }}</view>
+                </view>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card class="new-box">
+            <div slot="header" class="clearfix">
+              <span class="title">最新采购信息</span>
+              <el-button style="float: right; padding: 3px 0" type="text"
+                         @click="navTo('/pages/index/old/list/list?type=1')">查看更多
+              </el-button>
+            </div>
+            <view class="list8">
+              <view class="article pointer" v-for="(item, index) in dataList[1]" :key="index"
+                    @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+                <view class="title2" v-if="index < 8">
+                  <view class="flex justify-start">
+                    <span v-if="item.addressRegion && item.addressRegion.city">[{{
+                        item.addressRegion.city.name
+                      }}]</span>
+                    <template v-else>
+                      <span v-if="item.deliverAddressRegion && item.deliverAddressRegion.city">[{{
+                          item.deliverAddressRegion.city.name
+                        }}]</span>
+                    </template>
+                    <span class="urgent" v-if="item.isUrgent">[加急]</span>
+                    <text class="line-1 ">{{ item.title }}</text>
+                  </view>
+                  <view class="date-time">{{ item.addDate }}</view>
+                </view>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card class="new-box">
+            <div slot="header" class="clearfix">
+              <span class="title">最新租赁信息</span>
+              <el-button style="float: right; padding: 3px 0" type="text"
+                         @click="navTo('/pages/index/old/list/list?type=2')">查看更多
+              </el-button>
+            </div>
+            <view class="list8">
+              <view class="article pointer" v-for="(item, index) in dataList[2]" :key="index"
+                    @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+                <view class="title2" v-if="index < 8">
+                  <view class="flex justify-start">
+                    <span v-if="item.offerAddressRegion && item.offerAddressRegion.city">[{{
+                        item.offerAddressRegion.city.name
+                      }}]</span>
+                    <span v-else>[区域不限]</span>
+                    <span class="urgent" v-if="item.isUrgent">[加急]</span>
+                    <text class="line-1">{{ item.title }}</text>
+                  </view>
+                  <view class="date-time">{{ item.addDate }}</view>
+                </view>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card class="new-box">
+            <div slot="header" class="clearfix">
+              <span class="title">最新物资回收信息</span>
+              <el-button style="float: right; padding: 3px 0" type="text"
+                         @click="navTo('/pages/index/old/list/list?type=3')">查看更多
+              </el-button>
+            </div>
+            <view class="list8">
+              <view class="article pointer" v-for="(item, index) in dataList[3]" :key="index"
+                    @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+                <view class="title2" v-if="index < 8">
+                  <view class="flex justify-start">
+                    <span v-if="item.addressRegion && item.addressRegion.city">[{{
+                        item.addressRegion.city.name
+                      }}]</span>
+                    <span v-else>[区域不限]</span>
+                    <span class="urgent" v-if="item.isUrgent">[加急]</span>
+                    <text class="line-1">{{ item.title }}</text>
+                  </view>
+                  <view class="date-time">{{ item.addDate }}</view>
+                </view>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+      </el-row>
+    </view>
+
+    <!-- 合作单位/联营单位-->
+    <view class="cooperate">
+      <view class="title">
+        <el-image src="https://oss.wsdns.cn/20231204/860581fbcb9741658de15470f053e42e.png"
+                  style="width: 180px"/>
+      </view>
+      <u-gap height="1" bg-color="#f3f3f3"/>
+      <view class="flex justify-start items-center flex-wrap">
+        <view class="w-25p pointer" v-for="(item, index) in companyList" :key="index"
+              @click="navTo(`/pages/yellowPage/info?id=${item.uid}`)">
+          <view class="border bg-white flex justify-start items-start p-20" style="height: 250rpx">
+            <image v-if="item.businessCard" :src="item.businessCard.logo" class="logo"/>
+            <image v-else src="/static/images/no-logo.jpg" class="logo" mode="aspectFill"/>
+            <div class="flex flex-col justify-start items-start ml-20 w-67p">
+              <span class="text-28 font-bold mb-25">{{ item.company.companyName }}</span>
+              <span class="mt-20 line-2 w-100p">
+                                    主营: {{
+                  (item.mainSpotCategory && item.mainSpotCategory.length > 0) ? item.mainSpotCategory.join() : ''
+                }}
+                                </span>
+            </div>
+          </view>
+        </view>
+      </view>
+      <u-gap height="5" bg-color="#f3f3f3"/>
+    </view>
+
+    <!-- 现货市场 end -->
+    <gap height="50"/>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -218,363 +257,415 @@ import UGap from "@/uni_modules/vk-uview-ui/components/u-gap/u-gap.vue";
 import dayjs from "dayjs";
 
 export default {
-    components: {
-        UGap
-    },
-    data() {
-        return {
-            info: {
-                name: ''
-            },
-            companyList: [],
-            list: [
-                {
-                    id: 1,
-                    image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-                    title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-                },
-                {
-                    id: 2,
-                    image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-                    title: '身无彩凤双飞翼，心有灵犀一点通'
-                },
-                {
-                    id: 3,
-                    image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-                    title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-                },
-                {
-                    id: 4,
-                    image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-                    title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-                },
-                {
-                    id: 5,
-                    image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-                    title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-                },
-                {
-                    id: 6,
-                    image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-                    title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-                }
-            ],
-            dataList: [],
-            noticeList: [],
-        };
-    },
-    onLoad(options) {
-        if (options && options.id) {
-            this.getInfo(options.id)
-        }
-        this.getCompanyList()
-        this.getDataList()
-        this.getNoticeList()
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo(url);
-        },
-        async getInfo(id) {
-            this.info = await vk.callFunction({
-                url: 'client/goods/list/pub/getDetail',
-                data: {
-                    id
-                }
-            })
-        },
-        async getNoticeList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/notice/list/pub/getList'
-            })
-            this.noticeList = rows.map(item => {
-                item.addTime = dayjs(item._add_time).format('MM-DD')
-                return item
-            })
-        },
-        async getCompanyList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/user/pub/getCompany',
-                data: {isCoop: 1}
-            })
-            this.companyList = rows
-        },
-        async getDataList() {
-            for (let i = 0; i < 4; i++) {
-                const {rows} = await vk.callFunction({
-                    url: 'client/old/pub/getList',
-                    data: {
-                        type: i
-                    }
-                })
-                this.dataList[i] = rows.map(item => {
-                    item.addDate = dayjs(item._add_time).format('MM-DD')
-                    return item
-                })
-            }
-            console.log(this.dataList)
-        }
+  components: {
+    UGap
+  },
+  data() {
+    return {
+      info: {
+        name: ''
+      },
+      companyList: [],
+      dataList: [],
+      urgentList: [],
+      allChildCate: [],
+    };
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.getInfo(options.id)
     }
+    this.getCategoryTreeData()
+    this.getDataList()
+    this.getUrgentList()
+  },
+  methods: {
+    getCategoryTreeData() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.allChildCate = []
+          data.rows.forEach(item => {
+            item.children.forEach(child => {
+              this.allChildCate.push(child)
+            })
+          })
+          this.getCompanyList()
+        }
+      });
+    },
+    navTo(url) {
+      vk.navigateTo(url);
+    },
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/index/old/release'
+        })
+      }
+    },
+    async getInfo(id) {
+      this.info = await vk.callFunction({
+        url: 'client/goods/list/pub/getDetail',
+        data: {
+          id
+        }
+      })
+    },
+    async getCompanyList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        data: {isCoop: 1}
+      })
+      this.companyList = rows.map(item => {
+        item.name = item.company.companyName
+        item.mainSpotCategory = []
+        if (item.company && item.company.mainSpotCategoryIds) {
+          this.allChildCate.forEach(child => {
+            if (item.company.mainSpotCategoryIds.includes(child._id)) {
+              item.mainSpotCategory.push(child.name)
+            }
+          })
+        }
+        return item
+      })
+    },
+    async getDataList() {
+      for (let i = 0; i < 4; i++) {
+        const {rows} = await vk.callFunction({
+          url: 'client/old/pub/getList',
+          data: {
+            type: i
+          }
+        })
+        this.dataList[i] = rows.map(item => {
+          item.addDate = dayjs(item._add_time).format('MM-DD')
+          return item
+        })
+        this.$forceUpdate()
+      }
+    },
+    async getUrgentList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/old/pub/getList',
+        data: {
+          isUrgent: true
+        }
+      })
+      this.urgentList = rows.map(item => {
+        item.addDate = dayjs(item._add_time).format('MM-DD')
+        return item
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 
-    .wrap {
-        flex-wrap: wrap;
-    }
+  .wrap {
+    flex-wrap: wrap;
+  }
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .nav-tool {
-    background-color: #FFFFFF;
-    width: 1200px;
+  background-color: #FFFFFF;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: space-around;
+
+  .btn {
     margin: 20px auto;
     display: flex;
-    justify-content: space-around;
+    flex-direction: column;
+    align-items: center;
 
-    .btn {
-        margin: 20px auto;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        image {
-            width: 80px;
-        }
-
-        text {
-            font-size: 18px;
-            font-weight: 500;
-        }
+    image {
+      width: 80px;
     }
+
+    text {
+      font-size: 18px;
+      font-weight: 500;
+    }
+  }
 }
 
 .news-list-1 {
-    padding: 20px;
-    background-color: #FFFFFF;
+  padding: 20px;
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .title {
+    color: #bf2b28;
+    font-weight: bold;
+    font-size: 20px;
+    width: 56px;
+    border-right: 1px solid #ccc;
+    margin-right: 10px;
+  }
+
+  .news-list {
+    flex: 1;
     display: flex;
-    justify-content: space-between;
     align-items: center;
+    justify-content: space-around;
 
-    .title {
-        color: #bf2b28;
-        font-weight: bold;
-        font-size: 20px;
-        width: 56px;
-        border-right: 1px solid #ccc;
-        margin-right: 10px;
+    .wrap {
+      flex-wrap: wrap;
     }
 
-    .news-list {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: space-around;
+    .item {
+      line-height: 2em;
+      display: flex;
+      justify-content: space-between;
 
-        .wrap {
-            flex-wrap: wrap;
-        }
+      .text {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
 
-        .item {
-            line-height: 2em;
-            display: flex;
-            justify-content: space-between;
+      .date-time {
+        white-space: nowrap;
+      }
+    }
+  }
 
-            .text {
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
+  .news-gg {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
-            .date-time {
-                white-space: nowrap;
-            }
-        }
+    .wrap {
+      width: 100%;
+      flex-wrap: wrap;
     }
 
-    .news-gg {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+    .item {
+      display: flex;
+      align-items: center;
 
-        .wrap {
-            width: 100%;
-            flex-wrap: wrap;
+      .new-avatar {
+        padding: 10px;
+
+        .image {
+          width: 70px;
+          height: 70px;
         }
+      }
 
-        .item {
-            display: flex;
-            align-items: center;
-
-            .new-avatar {
-                padding: 10px;
-
-                .image {
-                    width: 70px;
-                    height: 70px;
-                }
-            }
-
-            .list3 {
-                display: flex;
-                flex-direction: column;
-                justify-content: space-between;
-
-                span {
-                    padding-right: 10px;
-                    color: #999;
-                }
-
-                .text {
-                    line-height: 1.8em;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                }
-            }
-
-            .date-time {
-                white-space: nowrap;
-            }
-        }
-    }
-}
-
-.new-box {
-    margin-bottom: 20px;
-
-    .title {
-        color: #bf2b28;
-        font-size: 20px;
-        font-weight: 500;
-    }
-
-    .list8 {
+      .list3 {
         display: flex;
         flex-direction: column;
         justify-content: space-between;
 
         span {
-            padding-right: 10px;
-            color: #999;
-        }
-
-        .article {
-            display: flex;
-            justify-content: space-between;
-            line-height: 2em;
-
-            .date-time {
-                color: #999999;
-            }
+          padding-right: 10px;
+          color: #999;
         }
 
         .text {
-            line-height: 1.8em;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
+          line-height: 1.8em;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
+      }
+
+      .date-time {
+        white-space: nowrap;
+      }
     }
+  }
+}
+
+.new-box {
+  margin-bottom: 20px;
+  height: 600rpx;
+
+  .title {
+    color: #bf2b28;
+    font-size: 20px;
+    font-weight: 500;
+  }
+
+  .list8 {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    span {
+      padding-right: 10px;
+      color: #999;
+    }
+
+    .article {
+      .title2 {
+        display: flex;
+        justify-content: space-between;
+        line-height: 2em;
+
+        .date-time {
+          color: #999999;
+        }
+      }
+
+      .title2:hover {
+        color: #a92924;
+      }
+    }
+
+    .text {
+      line-height: 1.8em;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
 }
 
 .cooperate {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #ffffff;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #ffffff;
 
-    .title {
-        text-align: center;
+  .title {
+    text-align: center;
+  }
+
+  .wrap {
+    flex-wrap: wrap;
+  }
+
+  .grid-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 10px;
+    flex-direction: column;
+
+    .comments {
+      line-height: 2em;
     }
+  }
 
-    .wrap {
-        flex-wrap: wrap;
+  .bg-purple {
+    border-top: 1px solid #f3f3f3;
+    border-right: 1px solid #f3f3f3;
+
+    .image {
+      width: 140px;
     }
+  }
 
-    .grid-content {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 10px;
-        flex-direction: column;
-
-        .comments {
-            line-height: 2em;
-        }
-    }
-
-    .bg-purple {
-        border-top: 1px solid #f3f3f3;
-        border-right: 1px solid #f3f3f3;
-
-        .image {
-            width: 140px;
-        }
-    }
-
-    .logo {
-        width: 80px;
-        height: 80px;
-    }
+  .logo {
+    width: 80px;
+    height: 80px;
+  }
 }
 
 .tags {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 //
 .album {
-    width: 500px;
+  width: 500px;
 
-    .album-item {
-        width: 500px;
-        height: 400px;
-    }
+  .album-item {
+    width: 500px;
+    height: 400px;
+  }
 }
 
 .desc {
-    background-color: #F5E2E3;
+  background-color: #F5E2E3;
 }
 
 .add-to-cart-btn {
-    background-color: #FF7300;
+  background-color: #FF7300;
 }
 
 .intro-title {
-    background-color: #EF0021;
-    padding: 10px 20px;
-    color: white;
-    width: 120px;
-    text-align: center;
+  background-color: #EF0021;
+  padding: 10px 20px;
+  color: white;
+  width: 120px;
+  text-align: center;
 }
 
 .intro {
-    border-top: 1px solid #F95F6E;
+  border-top: 1px solid #F95F6E;
+}
+
+.urgent {
+  color: #bf2b28 !important;
 }
 </style>
diff --git a/pages/index/old/quote.vue b/pages/index/old/quote.vue
new file mode 100644
index 0000000..d2c2617
--- /dev/null
+++ b/pages/index/old/quote.vue
@@ -0,0 +1,235 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+
+        <view class="page-nav">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item>
+                    <navigator style="display: inline-block;" url="/pages/index/old/old">旧货交易</navigator>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item>填写报价信息</el-breadcrumb-item>
+            </el-breadcrumb>
+        </view>
+
+        <view class="page-main">
+            <quote-remain-num v-if="reloaded" :amount="sheet.quoteAmount" type="old" :id="id"/>
+            <vk-data-form
+                ref="form1"
+                v-model="form1.data"
+                :action="form1.props.action"
+                :columns="form1.props.columns"
+                :rules="form1.props.rules"
+                :form-type="form1.props.formType"
+                :loading.sync="form1.props.loading"
+                :auto-close="false"
+                label-width="140px"
+                :show-cancel="false"
+                @success="onFormSuccess"
+            >
+                <template v-slot:totalPrice>
+                    <el-input v-if="sheet.type === 2 && sheet.rentType === 1" v-model="form1.data.totalPrice"
+                              placeholder="请输入询价内容"/>
+                    <el-input v-else v-model="form1.data.totalPrice" placeholder="请输入总价"
+                              @change="formatNumber"></el-input>
+                </template>
+            </vk-data-form>
+        </view>
+
+        <common-footer></common-footer>
+    </view>
+</template>
+
+<script>
+import dayjs from "dayjs";
+
+export default {
+    data() {
+        return {
+            id: null,
+            sheet: null,
+            reloaded: false,
+            // 表单相关开始-----------------------------------------------------------
+            form1: {
+                // 表单请求数据，此处可以设置默认值
+                data: {
+                    // radio: 1,
+                    // checkbox : [1,2]
+                    sheetId: null
+                },
+                // 表单属性
+                props: {
+                    // 表单请求地址
+                    action: "client/old/kh/addQuote",
+                    // 表单字段显示规则
+                    columns: [
+                        {
+                            key: "totalPrice", title: "总价(人民币:元)", type: "number", showRule: () => {
+                                return this.sheet.type !== 2 || (this.sheet.type === 2 && this.sheet.rentType === 0)
+                            }
+                        },
+                        {
+                            key: "totalPrice", title: '简述询价内容', type: "number", showRule: () => {
+                                return this.sheet.type === 2 && this.sheet.rentType === 1
+                            }
+                        },
+                        {key: "files", title: "附件", type: "file", accept: '.pdf'},
+                        {
+                            key: "remark", title: "报价单详情", type: "textarea", showRule: () => {
+                                return this.sheet.type !== 2 || (this.sheet.type === 2 && this.sheet.rentType === 0)
+                            }
+                        },
+                        {
+                            key: "remark", title: "询价详情", type: "textarea", showRule: () => {
+                                return this.sheet.type === 2 && this.sheet.rentType === 1
+                            }
+                        },
+                        {
+                            key: "supplierExt", title: "报价补充条款", type: "textarea", showRule: () => {
+                                return this.sheet.type !== 2 || (this.sheet.type === 2 && this.sheet.rentType === 0)
+                            }
+                        },
+                    ],
+                    // 表单验证规则
+                    rules: {
+                        totalPrice: [
+                            {required: true, message: "总价不能为空", trigger: "change,blur"},
+                        ]
+                    },
+                    // add 代表添加 update 代表修改
+                    formType: "",
+                    // 表单是否在请求中
+                    loading: false,
+                    // 是否显示表单1 的弹窗
+                    show: false
+                }
+            },
+            // 表单相关结束-----------------------------------------------------------
+        };
+    },
+    onLoad(options = {}) {
+        console.log(options)
+        const {
+            id
+        } = options
+        if (!id) {
+            vk.navigateTo('/pages/index/old/old');
+            return
+        }
+
+        this.id = id
+        this.form1.data.sheetId = id
+        this.getDetail()
+    },
+    computed: {
+        totalPriceStr() {
+            if (this.totalPrice === 0) {
+                return "零元"
+            }
+            return vk.myfn.convertCurrency(this.totalPrice / 100)
+        }
+    },
+    methods: {
+        getDetail() {
+            this.reloaded = false
+            vk.callFunction({
+                url: 'client/old/pub/getDetail',
+                title: '请求中...',
+                data: {
+                    id: this.id
+                },
+                success: (res) => {
+                    this.sheet = res
+                    this.reloaded = true
+
+                }
+            }).catch(err => {
+                if (err.code === -1) {
+                    setTimeout(() => {
+                        vk.navigateBack()
+                    }, 1500)
+                }
+            })
+        },
+        formatNumber(e) {
+            this.form1.data.totalPrice = parseFloat(this.form1.data.totalPrice).toFixed(2)
+        },
+        onFormSuccess() {
+            vk.redirectTo({url: `/pages/index/old/detail?id=${this.id}`})
+        },
+        // 提交报价单
+        async submit() {
+
+            const data = await vk.userCenter.getCurrentUserInfo();
+            const {userInfo} = data
+            if (userInfo.quoteTimes > 3) {
+
+            }
+
+            // this.$confirm(`今日报价次数${userInfo.quoteTimes || 0}, 是否继续?`, '提示', {
+            // confirmButtonText: '确定',
+            // cancelButtonText: '取消',
+            // type: 'warning',
+            // center: true
+            // }).then(res => {
+            vk.callFunction({
+                url: 'client/enquiry/quote/kh/addQuote',
+                title: '请求中...',
+                // data: {
+                //     sheet: this.sheet,
+                //     totalPrice: this.totalPrice
+                // },
+                success: (data) => {
+                    this.$message({
+                        message: "报价成功",
+                        type: 'success'
+                    })
+
+                }
+            });
+            // })
+        },
+    },
+    onShow() {
+        this.reloaded = false
+        setTimeout(() => {
+            this.reloaded = true
+        }, 500)
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.page-main {
+    width: 1200px;
+    margin: 20px auto;
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.description {
+    margin-bottom: 40px;
+    width: 800px;
+}
+
+.quote {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.quote-form {
+    width: 260px;
+}
+
+.form-footer {
+    height: 40px;
+    line-height: 40px;
+    background: #fff;
+    padding-top: 0;
+    text-align: center;
+    display: block;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/old/quote/my.vue b/pages/index/old/quote/my.vue
new file mode 100644
index 0000000..ca1135b
--- /dev/null
+++ b/pages/index/old/quote/my.vue
@@ -0,0 +1,195 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+
+        <!-- <view class="page-nav">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+            </el-breadcrumb>
+        </view> -->
+
+        <view class="carousel">
+            <el-carousel height="170px">
+                <el-carousel-item v-for="item in 4" :key="item">
+                    <image class="carousel-img"
+                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
+                           mode="aspectFill"></image>
+                </el-carousel-item>
+            </el-carousel>
+            <view class="goods-options">
+                <el-row class="">
+                    <el-button @click="toRelease" type="primary" round>发布旧货交易</el-button>
+                    <!-- <el-button type="primary" round plain>我发布的询价单</el-button> -->
+                </el-row>
+            </view>
+        </view>
+
+        <!-- 商品列表 -->
+        <view class="sheet-list">
+            <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
+                           :customRightBtns="table1.customRightBtns"
+                           :pagination="true"></vk-data-table>
+        </view>
+        <common-footer></common-footer>
+    </view>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            keyword: '',
+            // 表格相关开始 -----------------------------------------------------------
+            table1: {
+                // 表格数据请求地址
+                action: "client/old/kh/getMyQuoteList",
+                customRightBtns: [
+                    {
+                        title: '详情',
+                        icon: 'el-icon-search',
+                        type: 'primary',
+                        onClick: (item) => {
+                            vk.navigateTo('/pages/index/old/detail?id=' + item.sheetId);
+                        }
+                    },
+                ],
+                // 表格字段显示规则
+                columns: [
+                    {
+                        key: "sheet.title",
+                        title: "旧货标题",
+                        type: "text",
+                    },
+                    {
+                        key: "sheet.type",
+                        title: "旧货类型",
+                        type: "select",
+                        data: [
+                            {value: 0, label: '拍卖'},
+                            {value: 1, label: '采购'},
+                            {value: 2, label: '租赁'},
+                            {value: 3, label: '物资回收'},
+                        ]
+                    },
+                    {
+                        key: "totalPrice",
+                        title: "金额",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            return `${val}元`
+                        }
+                    },
+                    {
+                        key: "status",
+                        title: "状态",
+                        type: "select",
+                        data: [
+                            {value: 0, label: '待选商'},
+                            {value: 1, label: '已被选商'},
+                        ]
+                    },
+                    {
+                        key: "remark",
+                        title: "备注",
+                        type: "text",
+                    },
+                    {
+                        key: "_add_time_str",
+                        title: "发布时间",
+                        type: "time",
+                        width: 160
+                    },
+                ],
+                // 多选框选中的值
+                multipleSelection: [],
+                // 当前高亮的记录
+                selectItem: "",
+
+            },
+            // 表格相关结束 -----------------------------------------------------------
+        };
+    },
+    onLoad() {
+
+    },
+    methods: {
+        toRelease() {
+
+            if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
+                this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                  vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
+                this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo('/pages/user/user?menu=fadada');
+                })
+            } else {
+                uni.navigateTo({
+                    url: '/pages/index/old/release'
+                })
+            }
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.carousel {
+    width: 1200px;
+    margin: 20px auto;
+}
+
+.carousel-img {
+    width: 100%;
+    height: 100%;
+}
+
+.goods-options {
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.filter-outer {
+    width: 1200px;
+    margin: 20px auto;
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.tags {
+    display: flex;
+
+    .el-tag {
+        margin-right: 10px;
+    }
+}
+
+
+.sheet-list {
+    width: 1200px;
+    margin: 20px auto;
+    // display: flex;
+
+}
+
+
+.paginatio {
+    float: none;
+    width: 1200px;
+    margin: 20px auto;
+    display: flex;
+    justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/old/release.vue b/pages/index/old/release.vue
index 675e600..f5c7910 100644
--- a/pages/index/old/release.vue
+++ b/pages/index/old/release.vue
@@ -1,30 +1,37 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200 m-a bg-white">
-            <image src="/static/images/old/liucheng2.png" class="w-full" mode="widthFix"/>
-            <view class="p-20">
-                <el-tabs v-model="activeName" stretch>
-                    <el-tab-pane label="拍卖信息发布" name="0">
-                        <type_0/>
-                    </el-tab-pane>
-                    <el-tab-pane label="采购信息发布" name="1">
-                        <type_1/>
-                    </el-tab-pane>
-                    <el-tab-pane label="承租信息发布" name="2">
-                        <type_2/>
-                    </el-tab-pane>
-                    <el-tab-pane label="物资回收信息发布" name="3">
-                        <type_3/>
-                    </el-tab-pane>
-                </el-tabs>
-            </view>
-        </view>
-        <gap height="50"/>
-        <common-footer></common-footer>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200 m-a bg-white">
+      <image src="/static/images/old/liucheng2.png" class="w-full" mode="widthFix"/>
+      <view class="p-20">
+        <el-tabs v-model="activeName" stretch>
+          <el-tab-pane label="拍卖信息发布" name="0">
+            <type_0 v-if="parseInt(activeName) === 0" :urgentAmount="urgentAmount" :remainOldNum="remainOldNum" :unitList="unitList"
+                    :buyOldNumAmount="buyOldNumAmount" :agreement="agreement"
+                    :commonContractUrl="commonContractUrl" :contactList="contactList"/>
+          </el-tab-pane>
+          <el-tab-pane label="采购信息发布" name="1">
+            <type_1 v-if="parseInt(activeName) === 1" :urgentAmount="urgentAmount" :remainOldNum="remainOldNum"
+                    :buyOldNumAmount="buyOldNumAmount" :agreement="agreement"
+                    :commonContractUrl="commonContractUrl" :contactList="contactList"/>
+          </el-tab-pane>
+          <el-tab-pane label="承租、租赁信息发布" name="2">
+            <type_2 v-if="parseInt(activeName) === 2" :urgentAmount="urgentAmount" :remainOldNum="remainOldNum"
+                    :buyOldNumAmount="buyOldNumAmount" :agreement="agreement"
+                    :commonContractUrl="commonContractUrl" :contactList="contactList"/>
+          </el-tab-pane>
+          <el-tab-pane label="物资回收信息发布" name="3">
+            <type_3 v-if="parseInt(activeName) === 3" :urgentAmount="urgentAmount" :remainOldNum="remainOldNum"
+                    :buyOldNumAmount="buyOldNumAmount" :agreement="agreement" :contactList="contactList"/>
+          </el-tab-pane>
+        </el-tabs>
+      </view>
     </view>
+    <gap height="50"/>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -34,13 +41,109 @@ import Type_2 from "./release/type_2.vue";
 import Type_3 from "./release/type_3.vue";
 
 export default {
-    name: "list",
-    components: {Type_3, Type_2, Type_1, Type_0},
-    data() {
-        return {
-            activeName: '0'
-        }
+  name: "list",
+  components: {Type_3, Type_2, Type_1, Type_0},
+  data() {
+    return {
+      activeName: '0',
+      urgentAmount: 1,
+      remainOldNum: vk.getVuex('$user.userInfo.remainOldNum') ? parseInt(vk.getVuex('$user.userInfo.remainOldNum')) : 0,
+      buyOldNumAmount: 5,
+      agreement: '',
+      commonContractUrl: '',
+      contactList: [],
+      unitList: [],
+    }
+  },
+  methods: {
+    async getUrgentAmount() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '6587dd2fe0ec19027452c5b5'
+        },
+      })
+      this.urgentAmount = res.content
     },
-    methods: {}
+    async getBuyOldAmount() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '6587dd54189f86d49b3d5ff5'
+        },
+      })
+      this.buyOldNumAmount = res.content
+    },
+    async getUnitList() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: 'a45325976635f10600341a7f2f472cd1'
+        },
+      })
+      this.unitList = res.content.split(',')
+    },
+    async getAgreement() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '65885d5b862066f18a4e4a36'
+        },
+      })
+      this.agreement = res.content
+    },
+    async getCommonContractUrl() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d36befe975f63af1f24e7'
+        },
+      })
+      this.commonContractUrl = res.content
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+  },
+  onLoad() {
+    this.getUnitList()
+    this.getUrgentAmount()
+    this.getBuyOldAmount()
+    this.getAgreement()
+    this.getCommonContractUrl()
+    this.getContactList()
+  },
+  onShow() {
+    vk.userCenter.getCurrentUserInfo({
+      success: (data) => {
+        this.remainOldNum = data.userInfo.remainOldNum ? parseInt(data.userInfo.remainOldNum) : 0
+        if (this.remainOldNum === 0) {
+          this.$confirm('您的旧货发布次数已用完，是否立即购买？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(async () => {
+            const {data} = await vk.callFunction({
+              url: 'client/old/kh/buyNum',
+            })
+            vk.navigateTo({
+              url: `/pages/index/shop/pay?id=${data}`
+            })
+          }).catch(() => {
+            vk.navigateBack()
+          })
+        }
+      }
+    });
+  }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style>
+/deep/ .el-tabs__item.is-active{
+  font-size: 1.2rem!important;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/old/release/type_0.vue b/pages/index/old/release/type_0.vue
index a973c06..e350c88 100644
--- a/pages/index/old/release/type_0.vue
+++ b/pages/index/old/release/type_0.vue
@@ -1,321 +1,427 @@
 <template>
-    <view class="flex flex-col justify-start items-start">
-        <text class="text-50">发布我的拍卖信息</text>
-        <text class="text-gray">拍卖信息越完整，成功交易越容易</text>
-        <el-form ref="form" :model="form" label-width="140px" class="mt-20">
-            <el-form-item label="物资分类:">
-                <el-radio-group v-model="form.category" size="small">
-                    <el-radio label="机械设备">
-                        <text>机械设备</text>
-                    </el-radio>
-                    <el-radio label="成品钢材">
-                        <text>成品钢材</text>
-                    </el-radio>
-                    <el-radio label="废旧钢材">
-                        <text>废旧钢材</text>
-                    </el-radio>
-                    <el-radio label="旧架子管">
-                        <text>旧架子管</text>
-                    </el-radio>
-                    <el-radio label="旧扣件">
-                        <text>旧扣件</text>
-                    </el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="信息标题:">
-                <el-input v-model="form.title" placeholder="一句话简介物资，如拍卖直缝钢管200吨等"/>
-            </el-form-item>
-            <el-form-item label="采购物资详情:">
-                <el-input v-model="form.desc" placeholder="请详细描述物资信息，描述内容：材料名称、材质......（限300字以内）"
-                          type="textarea" show-word-limit maxlength="300"/>
-            </el-form-item>
-            <el-form-item label="拍卖实物:">
-                <vk-data-upload v-model="form.files"
-                                accept="image/*">
-                </vk-data-upload>
-            </el-form-item>
-            <el-form-item label="物资所在地" class="ml-10">
-                <el-row :gutter="10">
-                    <el-col :span="5">
-                        <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
-                            <template v-if="provinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
-                            <template v-if="provinceIndex !== null && cityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-input v-model="form.addressDetail"
-                                  placeholder="详细地址或几公里范围内"></el-input>
-                    </el-col>
-                </el-row>
-            </el-form-item>
-            <el-row :gutter="10">
-                <el-col :span="8">
-                    <view class="flex justify-start items-center">
-                        <el-form-item label="起拍计价单位:">
-                            <el-input v-model="form.startNum" class="input-with-select">
-                                <el-select v-model="form.unit" slot="append">
-                                    <el-option
-                                        v-for="(item, index) in unitList"
-                                        :key="index"
-                                        :label="item"
-                                        :value="item">
-                                    </el-option>
-                                </el-select>
-                            </el-input>
+  <view class="flex flex-col justify-start items-start">
+    <text class="text-50">发布我的拍卖信息</text>
+    <text class="text-gray">拍卖信息越完整，成功交易越容易</text>
+    <el-form ref="form" :model="form" label-width="140px" class="mt-20">
+      <el-form-item label="物资分类:" required>
+        <div class="flex justify-start items-center">
+          <el-cascader :options="cateData" v-model="form.category" :disabled="form.otherCate"
+                       :props="{'label': 'name', 'value': 'name'}"/>
+          <el-checkbox v-model="form.otherCate" class="mx-20">其他分类</el-checkbox>
+          <el-input v-model="form.otherCateName" :disabled="!form.otherCate"
+                    placeholder="如物资分类选项中不能描述您的信息物资主要内容，请在此用专业或通用术语填写"
+                    class="ml-20"/>
+        </div>
+      </el-form-item>
+      <el-form-item label="信息标题:" required>
+        <el-input v-model="form.title" placeholder="一句话简介物资，如拍卖直缝钢管200吨等"/>
+      </el-form-item>
+      <el-form-item label="采购物资详情:">
+        <el-input v-model="form.desc"
+                  placeholder="请详细描述物资信息，描述内容：材料名称、材质、是否含税等关键信息......（限300字以内）"
+                  type="textarea" show-word-limit maxlength="300"/>
+      </el-form-item>
+      <el-form-item label="拍卖实物:">
+        <vk-data-upload v-model="form.files" list-type="text"
+                        accept="image/*">
+        </vk-data-upload>
+      </el-form-item>
+      <el-form-item label="物资所在地" class="ml-10" required>
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
+              <template v-if="provinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
+              <template v-if="provinceIndex !== null && cityIndex !== null">
+                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
+            <el-input v-model="form.addressDetail"
+                      placeholder="详细地址或几公里范围内"></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <view class="flex justify-start items-center">
+            <el-form-item label="起拍计价单位:">
+              <!--              <el-input v-model="form.startNum" class="input-with-select">-->
+              <el-select v-model="form.unit">
+                <el-option
+                  v-for="(item, index) in unitList"
+                  :key="index"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+              <!--              </el-input>-->
 
-                        </el-form-item>
-                        <text class="flex-1">(电议)</text>
-                    </view>
-                </el-col>
-                <el-col :span="8">
-                    <view class="flex justify-start items-center">
-                        <el-form-item label="起拍人民币单价:">
-                            <el-input v-model="form.startAmount" placeholder="请输入" style="width: 160px"/>
-                        </el-form-item>
-                        <text class="flex-1">(电议)</text>
-                    </view>
-                </el-col>
-                <el-col :span="8">
-                    <view class="flex justify-start items-center">
-                        <el-form-item label="拍卖信息失效时间:">
-                            <el-date-picker
-                                v-model="form.expiredTime"
-                                type="datetime"
-                                placeholder="选择日期时间">
-                            </el-date-picker>
-                        </el-form-item>
-                    </view>
-                </el-col>
-            </el-row>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        交易说明
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-form-item label="报价区域:">
-                    <el-col :span="5">
-                        <el-select v-model="offerProvinceIndex" placeholder="省" @change="selectOfferProvince"
-                                   :disabled="form.offerAddressNoLimit">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="offerCityIndex" placeholder="市" @change="selectOfferCity"
-                                   :disabled="form.offerAddressNoLimit">
-                            <template v-if="offerProvinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[offerProvinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="offerAreaIndex" placeholder="区/县" @change="selectOfferArea"
-                                   :disabled="form.offerAddressNoLimit">
-                            <template v-if="offerProvinceIndex !== null && offerCityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[offerProvinceIndex][offerCityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-checkbox v-model="form.offerAddressNoLimit" @change="changeOfferAddressNoLimit">不限区域
-                        </el-checkbox>
-                    </el-col>
-                </el-form-item>
-            </el-row>
-            <el-form-item label="付款方式:">
-                <view class="flex justify-start items-center">
-                    <view class="flex justify-start items-center mr-35">
-                        <el-radio label="预付" v-model="form.payMethod">
-                            <text>预付</text>
-                        </el-radio>
-                        <el-input v-model="form.prePayRate" style="width: 200px"/>
-                        <text>%货到付全款</text>
-                    </view>
-                    <el-radio label="提货付全款" v-model="form.payMethod">
-                        <text>提货付全款</text>
-                    </el-radio>
-                </view>
-                <view class="flex justify-start items-center mt-40">
-                    <el-radio label="其他付款方式描述" v-model="form.payMethod">
-                        <text>其他付款方式描述</text>
-                    </el-radio>
-                    <el-input v-model="form.otherPayMethodDesc"
-                              type="textarea" show-word-limit maxlength="300"/>
-                </view>
             </el-form-item>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        简易合同备注和其他补充条款
-                    </view>
-                </view>
-            </view>
-            <view class="p-30">
-                <view class="mb-20 flex justify-start items-center">
-                    <el-radio v-model="form.signMethod" :label="0">法大大</el-radio>
-                    <el-radio v-model="form.signMethod" :label="1">线下签约</el-radio>
-                </view>
-                <view v-if="form.signMethod === 0">
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">违约责任:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            1.
-                            乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
-                            2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">解决纠纷的方法:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
-                            2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">不可抗力:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">其他:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">采购方补充条款:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            供货方逾期供货承担采购方一切损失
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        采购商信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.buyer.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.buyer.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.buyer.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.buyer.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.buyer.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.buyer.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        供货商信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.supplier.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.supplier.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.supplier.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.supplier.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.supplier.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.supplier.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <view class="mt-20 flex justify-start items-center">
-            <text class="mr-25">您是否对以上信息进行了详细核实:</text>
-            <el-radio label="是" v-model="checked">
-                <text>是</text>
-            </el-radio>
-            <el-radio label="否" v-model="checked">
-                <text>否</text>
-            </el-radio>
+            <!--                        <text class="flex-1">(电议)</text>-->
+          </view>
+        </el-col>
+        <el-col :span="8">
+          <view class="flex justify-start items-center">
+            <el-form-item label="起拍人民币单价:">
+              <el-input v-model="form.startAmount" placeholder="请输入" style="width: 160px"/>
+            </el-form-item>
+            <!--                        <text class="flex-1">(电议)</text>-->
+          </view>
+        </el-col>
+        <el-col :span="8">
+          <view class="flex justify-start items-center">
+            <el-form-item label="拍卖信息失效时间:" required>
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="form.expiredTime"
+                type="datetime"
+                placeholder="选择日期时间">
+              </el-date-picker>
+            </el-form-item>
+          </view>
+        </el-col>
+      </el-row>
+      <view class="form-title-wrap" style="justify-content: flex-start">
+        <view class="goods-info-title">
+          <view class="form-title">
+            发票详情
+          </view>
         </view>
-        <view class="flex justify-center items-center mt-30 m-a">
-            <el-button type="primary" :disabled="checked === '否'" @click="publish">立即发布</el-button>
+        <el-radio-group v-model="form.invoice">
+          <el-radio :label="true">含税</el-radio>
+          <el-radio :label="false">不含税</el-radio>
+        </el-radio-group>
+      </view>
+      <view class="p-30">
+        <template v-if="form.invoice">
+          <view class="mb-20 flex justify-start items-center">
+            <text>开票时间：</text>
+            <el-radio-group v-model="form.writeInvoiceTime">
+              <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
+              <el-radio :label="1">付款后次月</el-radio>
+              <el-radio :label="2">付款前</el-radio>
+            </el-radio-group>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <view class="flex-1 flex justify-start items-center">
+              <text style="width: 30%">纳税人身份：</text>
+              <el-select v-model="form.taxType" placeholder="纳税人身份" style="width: 100%">
+                <el-option
+                  v-for="item in ['一般纳税人', '小规模公司', '个体工商户']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+            <view class="flex-1 flex justify-start items-center ml-20">
+              <text style="width: 30%">发票种类：</text>
+              <el-select v-model="form.invoiceType" placeholder="发票种类" style="width: 100%">
+                <el-option
+                  v-for="item in ['专用发票', '普通发票']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <view class="flex-1 flex justify-start items-center">
+              <text style="width: 30%">税率：</text>
+              <el-select v-model="form.taxRate" placeholder="税率" style="width: 100%">
+                <el-option
+                  v-for="item in ['13%', '9%', '6%', '4%', '3%', '1%']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+            <view class="ml-20 flex justify-start items-center flex-1 ml-20">
+              <text style="width: 30%">手动填写税票要求：</text>
+              <el-input v-model="form.invoiceOther" placeholder="如：一般纳税人 专用发票 税率13%"
+                        size="small"/>
+            </view>
+          </view>
+        </template>
+      </view>
+      <view class="form-title-wrap mt-25">
+        <view class="goods-info-title">
+          <view class="form-title">
+            交易说明
+          </view>
         </view>
+      </view>
+      <el-row :gutter="10">
+        <el-form-item label="报价区域:">
+          <el-col :span="5">
+            <el-select v-model="offerProvinceIndex" placeholder="省" @change="selectOfferProvince"
+                       :disabled="form.offerAddressNoLimit">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="offerCityIndex" placeholder="市" @change="selectOfferCity"
+                       :disabled="form.offerAddressNoLimit">
+              <template v-if="offerProvinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[offerProvinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="offerAreaIndex" placeholder="区/县" @change="selectOfferArea"
+                       :disabled="form.offerAddressNoLimit">
+              <template v-if="offerProvinceIndex !== null && offerCityIndex !== null">
+                <el-option v-for="(item, index) in areaData[offerProvinceIndex][offerCityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-checkbox v-model="form.offerAddressNoLimit" @change="changeOfferAddressNoLimit">不限区域
+            </el-checkbox>
+          </el-col>
+        </el-form-item>
+      </el-row>
+      <el-form-item label="付款方式:">
+        <view class="flex justify-start items-center">
+          <view class="flex justify-start items-center mr-35">
+            <el-radio label="预付" v-model="form.payMethod" @change="changePayMethod('预付')">
+              <text>预付</text>
+            </el-radio>
+            <el-input v-model="form.prePayRate" style="width: 200px" :disabled="form.payMethod !== '预付'"/>
+            <text>%货到付全款</text>
+          </view>
+          <el-radio label="提货付全款" v-model="form.payMethod" @change="changePayMethod('提货付全款')">
+            <text>提货付全款</text>
+          </el-radio>
+        </view>
+        <view class="flex justify-start items-center mt-40">
+          <el-radio label="其他付款方式描述" v-model="form.payMethod"
+                    @change="changePayMethod('其他付款方式描述')">
+            <text>其他付款方式描述</text>
+          </el-radio>
+          <el-input v-model="form.otherPayMethodDesc"
+                    type="textarea" show-word-limit maxlength="300"/>
+        </view>
+      </el-form-item>
+      <view class="form-title-wrap mt-20">
+        <view class="goods-info-title">
+          <view class="form-title">
+            简易合同备注和其他补充条款
+          </view>
+        </view>
+      </view>
+      <view class="p-30">
+        <view class="mb-20 flex justify-start items-center">
+          <el-radio v-model="form.signMethod" :label="0">线上签约-标准合同</el-radio>
+          <el-radio v-model="form.signMethod" :label="2">线上签约-双方协商合同</el-radio>
+          <el-radio v-model="form.signMethod" :label="1">线下签约</el-radio>
+        </view>
+        <view class="my-25" v-if="form.signMethod === 2">
+          <view class="p-30">
+            <view class="mb-20 flex justify-start items-center">
+              <text style="width: 140px">合同附件：</text>
+              <vk-data-upload v-model="form.contractAttachment"
+                              :on-preview="previewUpload"
+                              accept=".pdf" list-type="text"/>
+            </view>
+          </view>
+        </view>
+        <view v-if="form.signMethod === 0">
+          <view @click="openDownload" class="pointer my-25 text-main">
+            点击查看标准合同
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">违约责任:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              1.
+              乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
+              2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">解决纠纷的方法:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
+              2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">不可抗力:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">其他:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">委托人补充条款:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              <el-input v-model="form.supplementary" placeholder="请输入委托人补充条款"/>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!--            <view class="form-title-wrap">-->
+      <!--                <view class="goods-info-title">-->
+      <!--                    <view class="form-title">-->
+      <!--                        采购商信息-->
+      <!--                    </view>-->
+      <!--                </view>-->
+      <!--            </view>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="公司信息">-->
+      <!--                        <el-input v-model="form.buyer.companyName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="公司联系方式">-->
+      <!--                        <el-input v-model="form.buyer.contract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="个人信息">-->
+      <!--                        <el-input v-model="form.buyer.personalName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="个人联系方式">-->
+      <!--                        <el-input v-model="form.buyer.personalContract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="授权人姓名">-->
+      <!--                        <el-input v-model="form.buyer.managerName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="授权联系方式">-->
+      <!--                        <el-input v-model="form.buyer.managerContract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            供货商信息
+          </view>
+        </view>
+      </view>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 2">
+        <el-col :span="12">
+          <el-form-item label="公司信息">
+            <el-input v-model="form.supplier.companyName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司联系方式">
+            <el-input v-model="form.supplier.contract"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 1">
+        <el-col :span="12">
+          <el-form-item label="个人信息">
+            <el-input v-model="form.supplier.personalName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="个人联系方式">
+            <el-input v-model="form.supplier.personalContract" type="number"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="授权业务咨询人">
+            <el-select v-model="form.supplier.managerName" placeholder="点击选择业务联系人"
+                       class="w-100p" @change="selectContact">
+              <el-option
+                v-for="(item, index) in contactList"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+              <view slot="empty" class="text-gray pointer p-20">
+                <text>无业务联系人,请到</text>
+                <text class="text-main mx-15" @click="navTo">个人中心</text>
+                <text>添加</text>
+              </view>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="业务咨询联系方式">
+            <el-input v-model="form.supplier.managerContract" type="number" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">您是否对以上信息进行了详细核实:</text>
+      <el-radio label="是" v-model="checked">
+        <text>是</text>
+      </el-radio>
+      <el-radio label="否" v-model="checked">
+        <text>否</text>
+      </el-radio>
     </view>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">是否加急({{ urgentAmount }}元/次,将在旧货交易页面加急展示区展示):</text>
+      <el-radio :label="true" v-model="form.isUrgent">
+        <text>是</text>
+      </el-radio>
+      <el-radio :label="false" v-model="form.isUrgent">
+        <text>否</text>
+      </el-radio>
+    </view>
+    <view class="my-25 text-main font-bold">本月剩余旧货发布次数:{{ remainOldNum }}</view>
+    <view class="flex justify-start items-center">
+      <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+      <span class="text-main pointer font-bold" @click="showAgreement">《金久信旧货交易协议》</span>
+    </view>
+    <view class="flex justify-center items-center mt-30 m-a">
+      <el-button type="primary" @click="save" plain>暂存</el-button>
+      <el-button type="primary" :disabled="checked === '否' || !agree" @click="publish">立即发布</el-button>
+    </view>
+    <el-dialog title="金久信旧货交易协议" :visible.sync="dialogVisible" width="70%" close-on-press-escape
+               close-on-click-modal show-close
+    >
+      <div v-html="agreement"></div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
@@ -324,95 +430,280 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    name: "type_0",
-    data() {
-        return {
-            unitList: ['吨', '万吨'],
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            form: {
-                type: 0,
-                category: 0,
-                files: [],
-                title: '',
-                desc: '',
-                addressRegion: [],
-                addressDetail: '',
-                startNum: '',
-                unit: '吨',
-                startAmount: '',
-                expiredTime: '',
-                offerAddressRegion: [],
-                offerAddressNoLimit: false,
-                payMethod: '预付',
-                prePayRate: '',
-                otherPayMethodDesc: '',
-                signMethod: 0,
-                buyer: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-                supplier: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-
-            },
-            provinceIndex: null,
-            cityIndex: null,
-            areaIndex: null,
-            offerProvinceIndex: null,
-            offerCityIndex: null,
-            offerAreaIndex: null,
-            checked: '否'
-        }
+  name: "type_0",
+  props: {
+    urgentAmount: {
+      type: Number,
+      default: 10
     },
-    methods: {
-        selectProvince(index) {
-            this.form.addressRegion[0] = this.provinceData[index]
+    remainOldNum: {
+      type: Number,
+      default: 0
+    },
+    agreement: {
+      type: String,
+      default: ''
+    },
+    commonContractUrl: {
+      type: String,
+      default: ''
+    },
+    contactList: {
+      type: Array,
+      default: ''
+    },
+    unitList: {
+      type: Array,
+      default: ''
+    },
+
+  },
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
         },
-        selectCity(index) {
-            this.form.addressRegion[1] = this.cityData[this.provinceIndex][index]
+      },
+      agree: false,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      allChildCate: [],
+      cateData: [],
+      form: {
+        type: 0,
+        category: 0,
+        files: [],
+        otherCate: false,
+        otherCateName: '',
+        title: '',
+        desc: '',
+        addressRegion: {},
+        addressDetail: '',
+        startNum: '',
+        unit: '吨',
+        startAmount: '',
+        expiredTime: '',
+        offerAddressRegion: {},
+        offerAddressNoLimit: false,
+        payMethod: '预付',
+        prePayRate: '',
+        otherPayMethodDesc: '',
+        signMethod: 0,
+        invoice: false,
+        writeInvoiceTime: '',
+        taxType: '',
+        taxRate: '',
+        invoiceType: '',
+        invoiceOther: '',
+        invoiceDetail: '',
+        buyer: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectArea(index) {
-            this.form.addressRegion[2] = this.areaData[this.provinceIndex][this.cityIndex][index]
+        supplier: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectOfferProvince(index) {
-            this.form.offerAddressRegion[0] = this.provinceData[index]
-        },
-        selectOfferCity(index) {
-            this.form.offerAddressRegion[1] = this.cityData[this.offerProvinceIndex][index]
-        },
-        selectOfferArea(index) {
-            this.form.offerAddressRegion[2] = this.areaData[this.offerProvinceIndex][this.offerCityIndex][index]
-        },
-        changeOfferAddressNoLimit(val) {
-            if (val) {
-                this.form.offerAddressRegion = []
-                this.offerProvinceIndex = this.offerCityIndex = this.offerAreaIndex = null
-            }
-        },
-        async publish() {
-            await vk.callFunction({
-                url: 'client/old/kh/add',
-                data: this.form
-            })
-            this.$message({
-                message: "提交成功",
-                type: 'success'
-            })
-            vk.navigateBack()
-        }
+        contractAttachment: [],
+        isUrgent: false,
+        supplementary: ''
+      },
+      provinceIndex: null,
+      cityIndex: null,
+      areaIndex: null,
+      offerProvinceIndex: null,
+      offerCityIndex: null,
+      offerAreaIndex: null,
+      checked: '否',
+      dialogVisible: false,
+
     }
+  },
+  methods: {
+    selectProvince(index) {
+      this.form.addressRegion.province = this.provinceData[index]
+    },
+    selectCity(index) {
+      this.form.addressRegion.city = this.cityData[this.provinceIndex][index]
+    },
+    selectArea(index) {
+      this.form.addressRegion.area = this.areaData[this.provinceIndex][this.cityIndex][index]
+    },
+    selectOfferProvince(index) {
+      this.form.offerAddressRegion.province = this.provinceData[index]
+    },
+    selectOfferCity(index) {
+      this.form.offerAddressRegion.city = this.cityData[this.offerProvinceIndex][index]
+    },
+    selectOfferArea(index) {
+      this.form.offerAddressRegion.area = this.areaData[this.offerProvinceIndex][this.offerCityIndex][index]
+    },
+    changeOfferAddressNoLimit(val) {
+      if (val) {
+        this.form.offerAddressRegion = {}
+        this.offerProvinceIndex = this.offerCityIndex = this.offerAreaIndex = null
+      }
+    },
+    async publish() {
+      if (this.remainOldNum === 0) {
+        this.$confirm('您的旧货发布次数已用完，是否立即购买？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async ({confirm}) => {
+          if (confirm) {
+            const {data} = await vk.callFunction({
+              url: 'client/old/kh/buyNum',
+            })
+            vk.navigateTo({
+              url: `/pages/index/shop/pay?id=${data}`
+            })
+          }
+        })
+        return
+      }
+      if (this.provinceIndex === null || this.cityIndex === null || this.areaIndex === null) return this.$message({
+        message: "请选择完整的物资所在地",
+        type: 'warning'
+      })
+      if (!this.form.addressDetail) return this.$message({
+        message: "请填写详细物资所在地",
+        type: 'warning'
+      })
+      if (!this.form.title) return this.$message({
+        message: "请填写标题",
+        type: 'warning'
+      })
+      if (!this.form.otherCate) {
+        if (!this.form.category) return this.$message({
+          message: "请选择分类",
+          type: 'warning'
+        })
+      } else {
+        if (!this.form.otherCateName) return this.$message({
+          message: "请输入其他分类",
+          type: 'warning'
+        })
+        this.form.category = ['', this.form.otherCateName]
+      }
+      if (!this.form.expiredTime) return this.$message({
+        message: "请选择失效时间",
+        type: 'warning'
+      })
+      if (this.form.payMethod === '预付' && !this.form.prePayRate) {
+        return this.$message({
+          message: "请填写预付比例",
+          type: 'warning'
+        })
+      }
+
+      const res = await vk.callFunction({
+        url: 'client/old/kh/add',
+        data: this.form
+      })
+      this.$message({
+        message: "您的信息已经提交，等待管理员审核，请您耐心等待！",
+        type: 'success'
+      })
+      localStorage.removeItem("old_0")
+      if (this.form.isUrgent) {
+        vk.navigateTo({
+          url: `/pages/index/shop/pay?id=${res.data}`
+        })
+      } else {
+        vk.redirectTo({url: '/pages/index/old/old'});
+      }
+    },
+    showAgreement() {
+      // this.$confirm(this.agreement, '金久信旧货交易协议', {
+      //     cancelButtonText: '关闭',
+      //     showConfirmButton: false,
+      //     dangerouslyUseHTMLString: true,
+      //     customClass: 'confirm-box'
+      // })
+      this.dialogVisible = true
+    },
+    openDownload() {
+      window.open(this.commonContractUrl)
+    },
+    previewUpload({url}) {
+      window.open(url)
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.form.supplier.managerContract = contact.phone
+    },
+    changePayMethod(payMethod) {
+      if (payMethod !== '预付') {
+        this.form.prePayRate = null
+      }
+    },
+    save() {
+      localStorage.setItem("old_0", JSON.stringify({
+        form: this.form,
+        provinceIndex: this.provinceIndex,
+        cityIndex: this.cityIndex,
+        areaIndex: this.areaIndex,
+        offerProvinceIndex: this.offerProvinceIndex,
+        offerCityIndex: this.offerCityIndex,
+        offerAreaIndex: this.offerAreaIndex
+      }))
+      this.$message({
+        message: "已保存",
+        type: 'success'
+      })
+    }
+  },
+  mounted() {
+    vk.callFunction({
+      url: 'client/old/pub/getTree',
+      title: '请求中...',
+      data: {type: 0},
+      success: (data) => {
+        this.cateData = data.rows.map(item => {
+          item.children.forEach(child => {
+            delete child.children
+          })
+          return item
+        })
+      }
+    });
+    if (vk.getVuex('$user.userInfo.accountType') === 2) {
+      this.form.supplier.companyName = vk.getVuex('$user.userInfo.company.companyName')
+      this.form.supplier.contract = vk.getVuex('$user.userInfo.company.mobile')
+    } else {
+      this.form.supplier.personalName = vk.getVuex('$user.userInfo.person.personName')
+      this.form.supplier.personalContract = vk.getVuex('$user.userInfo.person.mobile')
+    }
+    if (!!localStorage.getItem("old_0")) {
+      this.$confirm('您有一份暂存数据，是否恢复?', '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        const savedData = JSON.parse(localStorage.getItem("old_0"))
+        this.form = savedData.form
+        this.provinceIndex = savedData.provinceIndex
+        this.cityIndex = savedData.cityIndex
+        this.areaIndex = savedData.areaIndex
+        this.offerProvinceIndex = savedData.offerProvinceIndex
+        this.offerCityIndex = savedData.offerCityIndex
+        this.offerAreaIndex = savedData.offerAreaIndex
+      })
+    }
+  }
 }
 </script>
 
@@ -420,38 +711,43 @@ export default {
 @import "@/common/css/app.scss";
 
 .form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+  }
 
-    .goods-info-title {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-    }
-
-    .form-title {
-        padding-left: 10px;
-        color: $--color-primary;
-        font-size: 18px;
-        line-height: 18px;
-        border-left: 4px solid $--color-primary;
-    }
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
 
 }
 
 .sign-method-header {
-    width: 120px;
+  width: 120px;
 }
+
 </style>
 
 <style>
-/deep/ .input-with-select{
-    width: 200px;
+/deep/ .input-with-select {
+  width: 200px;
 }
 
 /deep/ .input-with-select .el-input-group__append {
-    background-color: #fff !important;
-    width: 80px !important;
+  background-color: #fff !important;
+  width: 80px !important;
+}
+
+/deep/ .el-message-box__wrapper .confirm-box {
+  width: 70% !important;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/old/release/type_1.vue b/pages/index/old/release/type_1.vue
index acd248a..961a743 100644
--- a/pages/index/old/release/type_1.vue
+++ b/pages/index/old/release/type_1.vue
@@ -1,366 +1,457 @@
 <template>
-    <view class="flex flex-col justify-start items-start">
-        <text class="text-50">发布我的采购信息</text>
-        <text class="text-gray">采购信息越完整，成功交易越容易</text>
-        <el-form ref="form" :model="form" label-width="140px" class="mt-20">
-            <el-form-item label="信息失效时间:">
-                <el-date-picker
-                    v-model="form.expiredTime"
-                    type="datetime"
-                    placeholder="选择日期时间">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="物资分类:">
-                <el-radio-group v-model="form.category" size="small">
-                    <el-radio label="机械设备">
-                        <text>机械设备</text>
-                    </el-radio>
-                    <el-radio label="成品钢材">
-                        <text>成品钢材</text>
-                    </el-radio>
-                    <el-radio label="废旧钢材">
-                        <text>废旧钢材</text>
-                    </el-radio>
-                    <el-radio label="旧架子管">
-                        <text>旧架子管</text>
-                    </el-radio>
-                    <el-radio label="旧扣件">
-                        <text>旧扣件</text>
-                    </el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="信息标题:">
-                <el-input v-model="form.title" placeholder="一句话简介物资，如拍卖直缝钢管200吨等"/>
-            </el-form-item>
-            <el-form-item label="采购物资详情:">
-                <el-input v-model="form.desc" placeholder="请详细描述物资信息，描述内容：材料名称、材质......（限300字以内）"
-                          type="textarea" show-word-limit maxlength="300"/>
-            </el-form-item>
-            <el-form-item label="物资装货地" class="ml-10">
-                <el-row :gutter="10">
-                    <el-col :span="5">
-                        <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
-                            <template v-if="provinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
-                            <template v-if="provinceIndex !== null && cityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-input v-model="form.addressDetail"
-                                  placeholder="详细地址或几公里范围内"></el-input>
-                    </el-col>
-                </el-row>
-            </el-form-item>
-            <el-form-item label="物资交货地" class="ml-10">
-                <el-row :gutter="10">
-                    <el-col :span="5">
-                        <el-select v-model="deliverProvinceIndex" placeholder="省" @change="selectDeliverProvince">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="deliverCityIndex" placeholder="市" @change="selectDeliverCity">
-                            <template v-if="deliverProvinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[deliverProvinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="deliverAreaIndex" placeholder="区/县" @change="selectDeliverArea">
-                            <template v-if="deliverProvinceIndex !== null && deliverCityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[deliverProvinceIndex][deliverCityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-input v-model="form.deliverAddressDetail"
-                                  placeholder="详细地址或几公里范围内"></el-input>
-                    </el-col>
-                </el-row>
-            </el-form-item>
-            <view class="form-title-wrap" style="justify-content: flex-start">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        纳税和税票要求
-                    </view>
-                </view>
-                <el-radio-group v-model="form.invoice">
-                    <el-radio :label="true">含税</el-radio>
-                    <el-radio :label="false">不含税</el-radio>
-                </el-radio-group>
-            </view>
-            <view class="p-30">
-                <template v-if="form.invoice">
-                    <el-form-item label="开票时间：">
-                        <el-radio-group v-model="form.writeInvoiceTime">
-                            <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
-                            <el-radio :label="1">付款后次月</el-radio>
-                            <el-radio :label="2">付款前</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="发票种类：">
-                        <el-radio-group v-model="form.invoiceType">
-                            <el-radio :label="0">增值税专用发票13%</el-radio>
-                            <el-radio :label="1">增值税普通发票</el-radio>
-                            <el-radio :label="2">普通发票</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="其他要求：">
-                        <el-input v-model="form.invoiceOther" placeholder="请输入" size="small" type="textarea"/>
-                    </el-form-item>
-                    <el-form-item label="报价明细：">
-                        <el-input v-model="form.invoiceDetail" placeholder="请输入" size="small" type="textarea"/>
-                    </el-form-item>
-                </template>
-                <el-form-item label="报价失效时间:">
-                    <el-date-picker
-                        v-model="form.offerExpiredTime"
-                        type="datetime"
-                        placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
-            </view>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        交易说明
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-form-item label="报价区域:">
-                    <el-col :span="5">
-                        <el-select v-model="offerProvinceIndex" placeholder="省" @change="selectOfferProvince"
-                                   :disabled="form.offerAddressNoLimit">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="offerCityIndex" placeholder="市" @change="selectOfferCity"
-                                   :disabled="form.offerAddressNoLimit">
-                            <template v-if="offerProvinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[offerProvinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="offerAreaIndex" placeholder="区/县" @change="selectOfferArea"
-                                   :disabled="form.offerAddressNoLimit">
-                            <template v-if="offerProvinceIndex !== null && offerCityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[offerProvinceIndex][offerCityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-checkbox v-model="form.offerAddressNoLimit" @change="changeOfferAddressNoLimit">不限区域
-                        </el-checkbox>
-                    </el-col>
-                </el-form-item>
-            </el-row>
-            <el-form-item label="付款方式:">
-                <view class="flex justify-start items-center">
-                    <view class="flex justify-start items-center mr-35">
-                        <el-radio label="预付" v-model="form.payMethod">
-                            <text>预付</text>
-                        </el-radio>
-                        <el-input v-model="form.prePayRate" style="width: 200px"/>
-                        <text>%货到付全款</text>
-                    </view>
-                    <el-radio label="提货付全款" v-model="form.payMethod">
-                        <text>提货付全款</text>
-                    </el-radio>
-                </view>
-                <view class="flex justify-start items-center mt-40">
-                    <el-radio label="其他付款方式描述" v-model="form.payMethod">
-                        <text>其他付款方式描述</text>
-                    </el-radio>
-                    <el-input v-model="form.otherPayMethodDesc"
-                              type="textarea" show-word-limit maxlength="300"/>
-                </view>
-            </el-form-item>
-            <el-form-item label="报价形式:">
-                <el-radio label="整单报价" v-model="form.offerType">
-                    <text>整单报价</text>
-                </el-radio>
-                <el-radio label="可分项报价" v-model="form.offerType">
-                    <text>可分项报价</text>
-                </el-radio>
-            </el-form-item>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        简易合同备注和其他补充条款
-                    </view>
-                </view>
-            </view>
-            <view class="p-30">
-                <view class="mb-20 flex justify-start items-center">
-                    <el-radio v-model="form.signMethod" :label="0">法大大</el-radio>
-                    <el-radio v-model="form.signMethod" :label="1">线下签约</el-radio>
-                </view>
-                <view v-if="form.signMethod === 0">
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">违约责任:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            1.
-                            乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
-                            2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">解决纠纷的方法:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
-                            2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">不可抗力:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">其他:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">采购方补充条款:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            供货方逾期供货承担采购方一切损失
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        采购商信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.buyer.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.buyer.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.buyer.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.buyer.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.buyer.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.buyer.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        供货商信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.supplier.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.supplier.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.supplier.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.supplier.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.supplier.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.supplier.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <view class="mt-20 flex justify-start items-center">
-            <text class="mr-25">您是否对以上信息进行了详细核实:</text>
-            <el-radio label="是" v-model="checked">
-                <text>是</text>
-            </el-radio>
-            <el-radio label="否" v-model="checked">
-                <text>否</text>
-            </el-radio>
+  <view class="flex flex-col justify-start items-start">
+    <text class="text-50">发布我的采购信息</text>
+    <text class="text-gray">采购信息越完整，成功交易越容易</text>
+    <el-form ref="form" :model="form" label-width="140px" class="mt-20">
+      <el-form-item label="信息失效时间:">
+        <el-date-picker
+          :picker-options="pickerOptions"
+          v-model="form.expiredTime"
+          type="datetime"
+          placeholder="选择日期时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="物资分类:" required>
+        <div class="flex justify-start items-center">
+          <el-cascader :options="cateData" v-model="form.category" :disabled="form.otherCate"
+                       :props="{'label': 'name', 'value': 'name'}"/>
+          <el-checkbox v-model="form.otherCate" class="mx-20">其他分类</el-checkbox>
+          <el-input v-model="form.otherCateName" :disabled="!form.otherCate"
+                    placeholder="如物资分类选项中不能描述您的信息物资主要内容，请在此用专业或通用术语填写"
+                    class="ml-20"/>
+        </div>
+      </el-form-item>
+      <el-form-item label="信息标题:" required>
+        <el-input v-model="form.title" placeholder="一句话简介物资，如采购直缝钢管200吨等"/>
+      </el-form-item>
+      <el-form-item label="采购物资详情:" required>
+        <el-input v-model="form.desc"
+                  placeholder="请详细描述物资信息，描述内容：材料名称、材质、是否含税等关键信息......（限300字以内）"
+                  type="textarea" show-word-limit maxlength="300"/>
+      </el-form-item>
+      <!--            <el-form-item label="物资装货地" class="ml-10" v>-->
+      <!--                <el-row :gutter="10">-->
+      <!--                    <el-col :span="5">-->
+      <!--                        <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">-->
+      <!--                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"-->
+      <!--                                       :label="item.name"/>-->
+      <!--                        </el-select>-->
+      <!--                    </el-col>-->
+      <!--                    <el-col :span="5">-->
+      <!--                        <el-select v-model="cityIndex" placeholder="市" @change="selectCity">-->
+      <!--                            <template v-if="provinceIndex !== null">-->
+      <!--                                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"-->
+      <!--                                           :value="index"-->
+      <!--                                           :label="item.name"/>-->
+      <!--                            </template>-->
+      <!--                        </el-select>-->
+      <!--                    </el-col>-->
+      <!--                    <el-col :span="5">-->
+      <!--                        <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">-->
+      <!--                            <template v-if="provinceIndex !== null && cityIndex !== null">-->
+      <!--                                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"-->
+      <!--                                           :key="index" :value="index"-->
+      <!--                                           :label="item.name"/>-->
+      <!--                            </template>-->
+      <!--                        </el-select>-->
+      <!--                    </el-col>-->
+      <!--                    <el-col :span="8">-->
+      <!--                        <el-input v-model="form.addressDetail"-->
+      <!--                                  placeholder="详细地址或几公里范围内"></el-input>-->
+      <!--                    </el-col>-->
+      <!--                </el-row>-->
+      <!--            </el-form-item>-->
+      <el-form-item label="物资交货地" class="ml-10" required>
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-select v-model="deliverProvinceIndex" placeholder="省" @change="selectDeliverProvince">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="deliverCityIndex" placeholder="市" @change="selectDeliverCity">
+              <template v-if="deliverProvinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[deliverProvinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="deliverAreaIndex" placeholder="区/县" @change="selectDeliverArea">
+              <template v-if="deliverProvinceIndex !== null && deliverCityIndex !== null">
+                <el-option v-for="(item, index) in areaData[deliverProvinceIndex][deliverCityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
+            <el-input v-model="form.deliverAddressDetail"
+                      placeholder="详细地址或几公里范围内"></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <view class="form-title-wrap" style="justify-content: flex-start">
+        <view class="goods-info-title">
+          <view class="form-title">
+            税票要求
+          </view>
         </view>
-        <view class="flex justify-center items-center mt-30 m-a">
-            <el-button type="primary" :disabled="checked === '否'" @click="publish">立即发布</el-button>
+        <el-radio-group v-model="form.invoice">
+          <el-radio :label="true">含税</el-radio>
+          <el-radio :label="false">不含税</el-radio>
+        </el-radio-group>
+      </view>
+      <view class="p-30">
+        <template v-if="form.invoice">
+          <view class="mb-20 flex justify-start items-center">
+            <text>开票时间：</text>
+            <el-radio-group v-model="form.writeInvoiceTime">
+              <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
+              <el-radio :label="1">付款后次月</el-radio>
+              <el-radio :label="2">付款前</el-radio>
+            </el-radio-group>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <view class="flex-1 flex justify-start items-center">
+              <text style="width: 30%">纳税人身份：</text>
+              <el-select v-model="form.taxType" placeholder="纳税人身份" style="width: 100%">
+                <el-option
+                  v-for="item in ['一般纳税人', '小规模公司', '个体工商户']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+            <view class="flex-1 flex justify-start items-center ml-20">
+              <text style="width: 30%">发票种类：</text>
+              <el-select v-model="form.invoiceType" placeholder="发票种类" style="width: 100%">
+                <el-option
+                  v-for="item in ['专用发票', '普通发票']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <view class="flex-1 flex justify-start items-center">
+              <text style="width: 30%">税率：</text>
+              <el-select v-model="form.taxRate" placeholder="税率" style="width: 100%">
+                <el-option
+                  v-for="item in ['13%', '9%', '6%', '4%', '3%', '1%']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+            <view class="ml-20 flex justify-start items-center flex-1 ml-20">
+              <text style="width: 30%">手动填写税票要求：</text>
+              <el-input v-model="form.invoiceOther" placeholder="如：一般纳税人 专用发票 税率13%"
+                        size="small"/>
+            </view>
+          </view>
+        </template>
+        <!--        <template v-if="form.invoice">-->
+        <!--          <el-form-item label="开票时间：">-->
+        <!--            <el-radio-group v-model="form.writeInvoiceTime">-->
+        <!--              <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>-->
+        <!--              <el-radio :label="1">付款后次月</el-radio>-->
+        <!--              <el-radio :label="2">付款前</el-radio>-->
+        <!--            </el-radio-group>-->
+        <!--          </el-form-item>-->
+        <!--          <el-form-item label="发票种类：">-->
+        <!--            <el-radio-group v-model="form.invoiceType">-->
+        <!--              <el-radio :label="0">增值税专用发票13%</el-radio>-->
+        <!--              <el-radio :label="1">增值税普通发票</el-radio>-->
+        <!--              <el-radio :label="2">普通发票</el-radio>-->
+        <!--            </el-radio-group>-->
+        <!--          </el-form-item>-->
+        <!--          <el-form-item label="其他要求：">-->
+        <!--            <el-input v-model="form.invoiceOther" placeholder="请输入" size="small" type="textarea"/>-->
+        <!--          </el-form-item>-->
+        <!--          <el-form-item label="报价明细：">-->
+        <!--            <el-input v-model="form.invoiceDetail" placeholder="请输入" size="small" type="textarea"/>-->
+        <!--          </el-form-item>-->
+        <!--        </template>-->
+        <el-form-item label="报价失效时间:">
+          <el-date-picker
+            :picker-options="pickerOptions"
+            v-model="form.offerExpiredTime"
+            type="datetime"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+      </view>
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            交易说明
+          </view>
         </view>
+      </view>
+      <el-row :gutter="10">
+        <el-form-item label="报价区域:">
+          <el-col :span="5">
+            <el-select v-model="offerProvinceIndex" placeholder="省" @change="selectOfferProvince"
+                       :disabled="form.offerAddressNoLimit">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="offerCityIndex" placeholder="市" @change="selectOfferCity"
+                       :disabled="form.offerAddressNoLimit">
+              <template v-if="offerProvinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[offerProvinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="offerAreaIndex" placeholder="区/县" @change="selectOfferArea"
+                       :disabled="form.offerAddressNoLimit">
+              <template v-if="offerProvinceIndex !== null && offerCityIndex !== null">
+                <el-option v-for="(item, index) in areaData[offerProvinceIndex][offerCityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-checkbox v-model="form.offerAddressNoLimit" @change="changeOfferAddressNoLimit">不限区域
+            </el-checkbox>
+          </el-col>
+        </el-form-item>
+      </el-row>
+      <el-form-item label="付款方式:">
+        <view class="flex justify-start items-center">
+          <view class="flex justify-start items-center mr-35">
+            <el-radio label="预付" v-model="form.payMethod" @change="changePayMethod('预付')">
+              <text>预付</text>
+            </el-radio>
+            <el-input v-model="form.prePayRate" style="width: 200px" :disabled="form.payMethod !== '预付'"/>
+            <text>%货到付全款</text>
+          </view>
+          <el-radio label="提货付全款" v-model="form.payMethod" @change="changePayMethod('提货付全款')">
+            <text>提货付全款</text>
+          </el-radio>
+        </view>
+        <view class="flex justify-start items-center mt-40">
+          <el-radio label="其他付款方式描述" v-model="form.payMethod" @change="changePayMethod('其他付款方式描述')">
+            <text>其他付款方式描述</text>
+          </el-radio>
+          <el-input v-model="form.otherPayMethodDesc"
+                    type="textarea" show-word-limit maxlength="300"/>
+        </view>
+      </el-form-item>
+      <el-form-item label="报价形式:">
+        <el-radio label="整单报价" v-model="form.offerType">
+          <text>整单报价</text>
+        </el-radio>
+        <el-radio label="可分项报价" v-model="form.offerType">
+          <text>可分项报价</text>
+        </el-radio>
+      </el-form-item>
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            简易合同备注和其他补充条款
+          </view>
+        </view>
+      </view>
+      <view class="p-30">
+        <view class="mb-20 flex justify-start items-center">
+          <el-radio v-model="form.signMethod" :label="0">线上签约-标准合同</el-radio>
+          <el-radio v-model="form.signMethod" :label="2">线上签约-双方协商合同</el-radio>
+          <el-radio v-model="form.signMethod" :label="1">线下签约</el-radio>
+        </view>
+        <view class="my-25" v-if="form.signMethod === 2">
+          <view class="p-30">
+            <view class="mb-20 flex justify-start items-center">
+              <text style="width: 140px">合同附件：</text>
+              <vk-data-upload v-model="form.contractAttachment" accept=".pdf" list-type="text"
+                              :on-preview="previewUpload"/>
+            </view>
+          </view>
+        </view>
+        <view v-if="form.signMethod === 0">
+          <view @click="openDownload" class="pointer my-25 text-main">
+            点击查看标准合同
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">违约责任:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              1.
+              乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
+              2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">解决纠纷的方法:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
+              2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">不可抗力:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">其他:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">采购方补充条款:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              <el-input v-model="form.supplementary" placeholder="请输入采购方补充条款"/>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            采购商信息
+          </view>
+        </view>
+      </view>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 2">
+        <el-col :span="12">
+          <el-form-item label="公司信息">
+            <el-input v-model="form.buyer.companyName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司联系方式">
+            <el-input v-model="form.buyer.contract"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 1">
+        <el-col :span="12">
+          <el-form-item label="个人信息">
+            <el-input v-model="form.buyer.personalName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="个人联系方式">
+            <el-input v-model="form.buyer.personalContract" type="number"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="授权业务咨询人">
+            <el-select v-model="form.buyer.managerName" placeholder="点击选择业务联系人"
+                       class="w-100p" @change="selectContact">
+              <el-option
+                v-for="(item, index) in contactList"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+              <view slot="empty" class="text-gray pointer p-20">
+                <text>无业务联系人,请到</text>
+                <text class="text-main mx-15" @click="navTo">个人中心</text>
+                <text>添加</text>
+              </view>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="业务咨询联系方式">
+            <el-input v-model="form.buyer.managerContract" type="number" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--            <view class="form-title-wrap">-->
+      <!--                <view class="goods-info-title">-->
+      <!--                    <view class="form-title">-->
+      <!--                        供货商信息-->
+      <!--                    </view>-->
+      <!--                </view>-->
+      <!--            </view>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="公司信息">-->
+      <!--                        <el-input v-model="form.supplier.companyName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="公司联系方式">-->
+      <!--                        <el-input v-model="form.supplier.contract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="个人信息">-->
+      <!--                        <el-input v-model="form.supplier.personalName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="个人联系方式">-->
+      <!--                        <el-input v-model="form.supplier.personalContract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="授权人姓名">-->
+      <!--                        <el-input v-model="form.supplier.managerName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="授权联系方式">-->
+      <!--                        <el-input v-model="form.supplier.managerContract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+    </el-form>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">您是否对以上信息进行了详细核实:</text>
+      <el-radio label="是" v-model="checked">
+        <text>是</text>
+      </el-radio>
+      <el-radio label="否" v-model="checked">
+        <text>否</text>
+      </el-radio>
     </view>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">是否加急({{ urgentAmount }}元/次,将在旧货交易页面加急展示区展示):</text>
+      <el-radio :label="true" v-model="form.isUrgent">
+        <text>是</text>
+      </el-radio>
+      <el-radio :label="false" v-model="form.isUrgent">
+        <text>否</text>
+      </el-radio>
+    </view>
+    <view class="my-25 text-main font-bold">本月剩余旧货发布次数:{{ remainOldNum }}</view>
+    <view class="flex justify-start items-center">
+      <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+      <span class="text-main pointer font-bold" @click="showAgreement">《金久信旧货交易协议》</span>
+    </view>
+    <view class="flex justify-center items-center mt-30 m-a">
+      <el-button type="primary" @click="save" plain>暂存</el-button>
+      <el-button type="primary" :disabled="checked === '否' || !agree" @click="publish">立即发布</el-button>
+    </view>
+    <el-dialog title="金久信旧货交易协议" :visible.sync="dialogVisible" width="70%" close-on-press-escape
+               close-on-click-modal show-close>
+      <div v-html="agreement"></div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
@@ -369,112 +460,304 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    name: "type_1",
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            form: {
-                type: 1,
-                category: 0,
-                files: [],
-                title: '',
-                desc: '',
-                addressRegion: [],
-                addressDetail: '',
-                deliverAddressRegion: [],
-                deliverAddressDetail: '',
-                invoice: false,
-                writeInvoiceTime: '',
-                invoiceType: '',
-                invoiceOther: '',
-                invoiceDetail: '',
-                expiredTime: '',
-                offerExpiredTime: '',
-                offerAddressRegion: [],
-                offerAddressNoLimit: false,
-                payMethod: '预付',
-                offerType: '整单报价',
-                prePayRate: '',
-                otherPayMethodDesc: '',
-                signMethod: 0,
-                buyer: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-                supplier: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-
-            },
-            provinceIndex: null,
-            cityIndex: null,
-            areaIndex: null,
-            deliverProvinceIndex: null,
-            deliverCityIndex: null,
-            deliverAreaIndex: null,
-            offerProvinceIndex: null,
-            offerCityIndex: null,
-            offerAreaIndex: null,
-            checked: '否'
-        }
+  name: "type_1",
+  props: {
+    urgentAmount: {
+      type: Number,
+      default: 10
     },
-    methods: {
-        selectProvince(index) {
-            this.form.addressRegion[0] = this.provinceData[index]
+    remainOldNum: {
+      type: Number,
+      default: 0
+    },
+    agreement: {
+      type: String,
+      default: ''
+    },
+    commonContractUrl: {
+      type: String,
+      default: ''
+    },
+    contactList: {
+      type: Array,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
         },
-        selectCity(index) {
-            this.form.addressRegion[1] = this.cityData[this.provinceIndex][index]
+      },
+      agree: false,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      allChildCate: [],
+      cateData: [],
+      form: {
+        otherCate: false,
+        otherCateName: '',
+        type: 1,
+        category: 0,
+        files: [],
+        title: '',
+        desc: '',
+        addressRegion: {},
+        addressDetail: '',
+        deliverAddressRegion: {},
+        deliverAddressDetail: '',
+        invoice: false,
+        writeInvoiceTime: '',
+        taxType: '',
+        taxRate: '',
+        invoiceType: '',
+        invoiceOther: '',
+        invoiceDetail: '',
+        expiredTime: '',
+        offerExpiredTime: '',
+        offerAddressRegion: [],
+        offerAddressNoLimit: false,
+        payMethod: '预付',
+        offerType: '整单报价',
+        prePayRate: '',
+        otherPayMethodDesc: '',
+        signMethod: 0,
+        buyer: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectArea(index) {
-            this.form.addressRegion[2] = this.areaData[this.provinceIndex][this.cityIndex][index]
+        supplier: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectDeliverProvince(index) {
-            this.form.deliverAddressRegion[0] = this.provinceData[index]
-        },
-        selectDeliverCity(index) {
-            this.form.deliverAddressRegion[1] = this.cityData[this.deliverProvinceIndex][index]
-        },
-        selectDeliverArea(index) {
-            this.form.deliverAddressRegion[2] = this.areaData[this.deliverProvinceIndex][this.deliverCityIndex][index]
-        },
-        selectOfferProvince(index) {
-            this.form.offerAddressRegion[0] = this.provinceData[index]
-        },
-        selectOfferCity(index) {
-            this.form.offerAddressRegion[1] = this.cityData[this.offerProvinceIndex][index]
-        },
-        selectOfferArea(index) {
-            this.form.offerAddressRegion[2] = this.areaData[this.offerProvinceIndex][this.offerCityIndex][index]
-        },
-        changeOfferAddressNoLimit(val) {
-            if (val) {
-                this.form.offerAddressRegion = []
-                this.offerProvinceIndex = this.offerCityIndex = this.offerAreaIndex = null
-            }
-        },
-        async publish() {
-            await vk.callFunction({
-                url: 'client/old/kh/add',
-                data: this.form
-            })
-            this.$message({
-                message: "提交成功",
-                type: 'success'
-            })
-            vk.navigateBack()
-        }
+        contractAttachment: [],
+        isUrgent: false,
+        supplementary: ''
+      },
+      provinceIndex: null,
+      cityIndex: null,
+      areaIndex: null,
+      deliverProvinceIndex: null,
+      deliverCityIndex: null,
+      deliverAreaIndex: null,
+      offerProvinceIndex: null,
+      offerCityIndex: null,
+      offerAreaIndex: null,
+      checked: '否',
+      dialogVisible: false
+
     }
+  },
+  methods: {
+    selectProvince(index) {
+      this.form.addressRegion.province = this.provinceData[index]
+    },
+    selectCity(index) {
+      this.form.addressRegion.city = this.cityData[this.provinceIndex][index]
+    },
+    selectArea(index) {
+      this.form.addressRegion.area = this.areaData[this.provinceIndex][this.cityIndex][index]
+    },
+    selectDeliverProvince(index) {
+      this.form.deliverAddressRegion.province = this.provinceData[index]
+    },
+    selectDeliverCity(index) {
+      this.form.deliverAddressRegion.city = this.cityData[this.deliverProvinceIndex][index]
+    },
+    selectDeliverArea(index) {
+      this.form.deliverAddressRegion.area = this.areaData[this.deliverProvinceIndex][this.deliverCityIndex][index]
+    },
+    selectOfferProvince(index) {
+      this.form.offerAddressRegion.province = this.provinceData[index]
+    },
+    selectOfferCity(index) {
+      this.form.offerAddressRegion.city = this.cityData[this.offerProvinceIndex][index]
+    },
+    selectOfferArea(index) {
+      this.form.offerAddressRegion.area = this.areaData[this.offerProvinceIndex][this.offerCityIndex][index]
+    },
+    changeOfferAddressNoLimit(val) {
+      if (val) {
+        this.form.offerAddressRegion = []
+        this.offerProvinceIndex = this.offerCityIndex = this.offerAreaIndex = null
+      }
+    },
+    async publish() {
+      if (this.remainOldNum === 0) {
+        this.$confirm('您的旧货发布次数已用完，是否立即购买？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async ({confirm}) => {
+          if (confirm) {
+            const {data} = await vk.callFunction({
+              url: 'client/old/kh/buyNum',
+            })
+            vk.navigateTo({
+              url: `/pages/index/shop/pay?id=${data}`
+            })
+          }
+        })
+        return
+      }
+      // if (this.provinceIndex === null || this.cityIndex === null || this.areaIndex === null) return this.$message({
+      //     message: "请选择完整的装货地址",
+      //     type: 'warning'
+      // })
+      if (this.deliverProvinceIndex === null || this.deliverCityIndex === null || this.deliverAreaIndex === null) return this.$message({
+        message: "请选择完整的交货地址",
+        type: 'warning'
+      })
+
+      // if (!this.form.addressDetail) return this.$message({
+      //     message: "请填写详细装货地址",
+      //     type: 'warning'
+      // })
+
+      if (!this.form.deliverAddressDetail) return this.$message({
+        message: "请填写交货详细地址",
+        type: 'warning'
+      })
+
+      if (!this.form.title) return this.$message({
+        message: "请填写标题",
+        type: 'warning'
+      })
+      if (!this.form.otherCate) {
+        if (!this.form.category) return this.$message({
+          message: "请选择分类",
+          type: 'warning'
+        })
+      } else {
+        if (!this.form.otherCateName) return this.$message({
+          message: "请输入其他分类",
+          type: 'warning'
+        })
+        this.form.category = ['', this.form.otherCateName]
+      }
+      if (!this.form.expiredTime) return this.$message({
+        message: "请选择失效时间",
+        type: 'warning'
+      })
+      if (!this.form.offerExpiredTime) return this.$message({
+        message: "请选择报价失效时间",
+        type: 'warning'
+      })
+      if (this.form.payMethod === '预付' && !this.form.prePayRate) {
+        return this.$message({
+          message: "请填写预付比例",
+          type: 'warning'
+        })
+      }
+      const res = await vk.callFunction({
+        url: 'client/old/kh/add',
+        data: this.form
+      })
+      localStorage.removeItem("old_1")
+      this.$message({
+        message: "您的信息已经提交，等待管理员审核，请您耐心等待！",
+        type: 'success'
+      })
+      if (this.form.isUrgent) {
+        vk.navigateTo({
+          url: `/pages/index/shop/pay?id=${res.data}`
+        })
+      } else {
+        vk.redirectTo({url: '/pages/index/old/old'});
+      }
+    },
+    showAgreement() {
+      // this.$confirm(this.agreement, '金久信旧货交易协议', {
+      //     cancelButtonText: '关闭',
+      //     showConfirmButton: false,
+      //     dangerouslyUseHTMLString: true,
+      //     customClass: 'confirm-box'
+      // })
+      this.dialogVisible = true
+    },
+    openDownload() {
+      window.open(this.commonContractUrl)
+    },
+    previewUpload({url}) {
+      window.open(url)
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.form.buyer.managerContract = contact.phone
+    },
+    changePayMethod(payMethod) {
+      if (payMethod !== '预付') {
+        this.form.prePayRate = null
+      }
+    },
+    save() {
+      localStorage.setItem("old_1", JSON.stringify({
+        form: this.form,
+        deliverProvinceIndex: this.deliverProvinceIndex,
+        deliverCityIndex: this.deliverCityIndex,
+        deliverAreaIndex: this.deliverAreaIndex,
+        offerProvinceIndex: this.offerProvinceIndex,
+        offerCityIndex: this.offerCityIndex,
+        offerAreaIndex: this.offerAreaIndex
+      }))
+      this.$message({
+        message: "已保存",
+        type: 'success'
+      })
+    }
+
+  },
+  mounted() {
+    vk.callFunction({
+      url: 'client/old/pub/getTree',
+      title: '请求中...',
+      data: {type: 1},
+      success: (data) => {
+        this.cateData = data.rows.map(item => {
+          item.children.forEach(child => {
+            delete child.children
+          })
+          return item
+        })
+      }
+    });
+    if (vk.getVuex('$user.userInfo.accountType') === 2) {
+      this.form.buyer.companyName = vk.getVuex('$user.userInfo.company.companyName')
+      this.form.buyer.contract = vk.getVuex('$user.userInfo.company.mobile')
+    } else {
+      this.form.buyer.personalName = vk.getVuex('$user.userInfo.person.personName')
+      this.form.buyer.personalContract = vk.getVuex('$user.userInfo.person.mobile')
+    }
+    if (!!localStorage.getItem("old_1")) {
+      this.$confirm('您有一份暂存数据，是否恢复?', '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        const savedData = JSON.parse(localStorage.getItem("old_1"))
+        this.form = savedData.form
+        this.deliverProvinceIndex = savedData.deliverProvinceIndex
+        this.deliverCityIndex = savedData.deliverCityIndex
+        this.deliverAreaIndex = savedData.deliverAreaIndex
+        this.offerProvinceIndex = savedData.offerProvinceIndex
+        this.offerCityIndex = savedData.offerCityIndex
+        this.offerAreaIndex = savedData.offerAreaIndex
+      })
+    }
+
+  }
 }
 </script>
 
@@ -482,38 +765,38 @@ export default {
 @import "@/common/css/app.scss";
 
 .form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+  }
 
-    .goods-info-title {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-    }
-
-    .form-title {
-        padding-left: 10px;
-        color: $--color-primary;
-        font-size: 18px;
-        line-height: 18px;
-        border-left: 4px solid $--color-primary;
-    }
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
 
 }
 
 .sign-method-header {
-    width: 120px;
+  width: 120px;
 }
 </style>
 
 <style>
-/deep/ .input-with-select{
-    width: 200px;
+/deep/ .input-with-select {
+  width: 200px;
 }
 
 /deep/ .input-with-select .el-input-group__append {
-    background-color: #fff !important;
-    width: 80px !important;
+  background-color: #fff !important;
+  width: 80px !important;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/old/release/type_2.vue b/pages/index/old/release/type_2.vue
index 61ebf56..236272f 100644
--- a/pages/index/old/release/type_2.vue
+++ b/pages/index/old/release/type_2.vue
@@ -1,366 +1,468 @@
 <template>
-    <view class="flex flex-col justify-start items-start">
-        <text class="text-50">发布我的承租信息</text>
-        <text class="text-gray">承租信息越完整，成功交易越容易</text>
-        <el-form ref="form" :model="form" label-width="140px" class="mt-20">
-            <el-form-item label="信息失效时间:">
-                <el-date-picker
-                    v-model="form.expiredTime"
-                    type="datetime"
-                    placeholder="选择日期时间">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="物资分类:">
-                <el-radio-group v-model="form.category" size="small">
-                    <el-radio label="机械设备">
-                        <text>机械设备</text>
-                    </el-radio>
-                    <el-radio label="成品钢材">
-                        <text>成品钢材</text>
-                    </el-radio>
-                    <el-radio label="废旧钢材">
-                        <text>废旧钢材</text>
-                    </el-radio>
-                    <el-radio label="旧架子管">
-                        <text>旧架子管</text>
-                    </el-radio>
-                    <el-radio label="旧扣件">
-                        <text>旧扣件</text>
-                    </el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="信息标题:">
-                <el-input v-model="form.title" placeholder="一句话简介物资，如拍卖直缝钢管200吨等"/>
-            </el-form-item>
-            <el-form-item label="出租物资详情:">
-                <el-input v-model="form.desc" placeholder="请详细描述物资信息，描述内容：材料名称、材质......（限300字以内）"
-                          type="textarea" show-word-limit maxlength="300"/>
-            </el-form-item>
-            <el-form-item label="物资装货地" class="ml-10">
-                <el-row :gutter="10">
-                    <el-col :span="5">
-                        <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
-                            <template v-if="provinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
-                            <template v-if="provinceIndex !== null && cityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-input v-model="form.addressDetail"
-                                  placeholder="详细地址或几公里范围内"></el-input>
-                    </el-col>
-                </el-row>
-            </el-form-item>
-            <el-form-item label="物资交货地" class="ml-10">
-                <el-row :gutter="10">
-                    <el-col :span="5">
-                        <el-select v-model="deliverProvinceIndex" placeholder="省" @change="selectDeliverProvince">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="deliverCityIndex" placeholder="市" @change="selectDeliverCity">
-                            <template v-if="deliverProvinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[deliverProvinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="deliverAreaIndex" placeholder="区/县" @change="selectDeliverArea">
-                            <template v-if="deliverProvinceIndex !== null && deliverCityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[deliverProvinceIndex][deliverCityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-input v-model="form.addressDetail"
-                                  placeholder="详细地址或几公里范围内"></el-input>
-                    </el-col>
-                </el-row>
-            </el-form-item>
-            <view class="form-title-wrap" style="justify-content: flex-start">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        纳税和税票要求
-                    </view>
-                </view>
-                <el-radio-group v-model="form.invoice">
-                    <el-radio :label="true">含税</el-radio>
-                    <el-radio :label="false">不含税</el-radio>
-                </el-radio-group>
-            </view>
-            <view class="p-30">
-                <template v-if="form.invoice">
-                    <el-form-item label="开票时间：">
-                        <el-radio-group v-model="form.writeInvoiceTime">
-                            <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
-                            <el-radio :label="1">付款后次月</el-radio>
-                            <el-radio :label="2">付款前</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="发票种类：">
-                        <el-radio-group v-model="form.invoiceType">
-                            <el-radio :label="0">增值税专用发票13%</el-radio>
-                            <el-radio :label="1">增值税普通发票</el-radio>
-                            <el-radio :label="2">普通发票</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="其他要求：">
-                        <el-input v-model="form.invoiceOther" placeholder="请输入" size="small" type="textarea"/>
-                    </el-form-item>
-                    <el-form-item label="报价明细：">
-                        <el-input v-model="form.invoiceDetail" placeholder="请输入" size="small" type="textarea"/>
-                    </el-form-item>
-                </template>
-                <el-form-item label="报价失效时间:">
-                    <el-date-picker
-                        v-model="form.offerExpiredTime"
-                        type="datetime"
-                        placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
-            </view>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        交易说明
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-form-item label="报价区域:">
-                    <el-col :span="5">
-                        <el-select v-model="offerProvinceIndex" placeholder="省" @change="selectOfferProvince"
-                                   :disabled="form.offerAddressNoLimit">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="offerCityIndex" placeholder="市" @change="selectOfferCity"
-                                   :disabled="form.offerAddressNoLimit">
-                            <template v-if="offerProvinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[offerProvinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="offerAreaIndex" placeholder="区/县" @change="selectOfferArea"
-                                   :disabled="form.offerAddressNoLimit">
-                            <template v-if="offerProvinceIndex !== null && offerCityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[offerProvinceIndex][offerCityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-checkbox v-model="form.offerAddressNoLimit" @change="changeOfferAddressNoLimit">不限区域
-                        </el-checkbox>
-                    </el-col>
-                </el-form-item>
-            </el-row>
-            <el-form-item label="付款方式:">
-                <view class="flex justify-start items-center">
-                    <view class="flex justify-start items-center mr-35">
-                        <el-radio label="预付" v-model="form.payMethod">
-                            <text>预付</text>
-                        </el-radio>
-                        <el-input v-model="form.prePayRate" style="width: 200px"/>
-                        <text>%货到付全款</text>
-                    </view>
-                    <el-radio label="提货付全款" v-model="form.payMethod">
-                        <text>提货付全款</text>
-                    </el-radio>
-                </view>
-                <view class="flex justify-start items-center mt-40">
-                    <el-radio label="其他付款方式描述" v-model="form.payMethod">
-                        <text>其他付款方式描述</text>
-                    </el-radio>
-                    <el-input v-model="form.otherPayMethodDesc"
-                              type="textarea" show-word-limit maxlength="300"/>
-                </view>
-            </el-form-item>
-            <el-form-item label="报价形式:">
-                <el-radio label="整单报价" v-model="form.offerType">
-                    <text>整单报价</text>
-                </el-radio>
-                <el-radio label="可分项报价" v-model="form.offerType">
-                    <text>可分项报价</text>
-                </el-radio>
-            </el-form-item>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        简易合同备注和其他补充条款
-                    </view>
-                </view>
-            </view>
-            <view class="p-30">
-                <view class="mb-20 flex justify-start items-center">
-                    <el-radio v-model="form.signMethod" :label="0">法大大</el-radio>
-                    <el-radio v-model="form.signMethod" :label="1">线下签约</el-radio>
-                </view>
-                <view v-if="form.signMethod === 0">
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">违约责任:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            1.
-                            乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
-                            2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">解决纠纷的方法:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
-                            2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">不可抗力:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">其他:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                        </view>
-                    </view>
-                    <view class="flex justify-start items-start border">
-                        <view class="m-10 sign-method-header">采购方补充条款:</view>
-                        <view class="border-left m-10 pl-20 flex-1">
-                            供货方逾期供货承担采购方一切损失
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        采购商信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.buyer.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.buyer.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.buyer.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.buyer.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.buyer.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.buyer.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        供货商信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.supplier.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.supplier.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.supplier.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.supplier.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.supplier.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.supplier.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <view class="mt-20 flex justify-start items-center">
-            <text class="mr-25">您是否对以上信息进行了详细核实:</text>
-            <el-radio label="是" v-model="checked">
-                <text>是</text>
-            </el-radio>
-            <el-radio label="否" v-model="checked">
-                <text>否</text>
-            </el-radio>
+  <view class="flex flex-col justify-start items-start">
+    <text class="text-50">发布我的承租信息</text>
+    <text class="text-gray">建议合同中的采购方补充条款</text>
+    <el-form ref="form" :model="form" label-width="140px" class="mt-20">
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="信息失效时间:">
+            <el-date-picker
+              :picker-options="pickerOptions"
+              v-model="form.expiredTime"
+              type="datetime"
+              placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="租赁分类:">
+            <el-select v-model="form.rentType">
+              <el-option label="承租信息" :value="0"/>
+              <el-option label="出租信息" :value="1"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="物资分类:" required>
+        <div class="flex justify-start items-center">
+          <el-cascader :options="cateData" v-model="form.category" :disabled="form.otherCate"
+                       :props="{'label': 'name', 'value': 'name'}"/>
+          <el-checkbox v-model="form.otherCate" class="mx-20">其他分类</el-checkbox>
+          <el-input v-model="form.otherCateName" :disabled="!form.otherCate" placeholder="如物资分类选项中不能描述您的信息物资主要内容，请在此用专业或通用术语填写"
+                    class="ml-20"/>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="信息标题:" required>
+        <el-input v-model="form.title" placeholder="一句话简介物资，如 承租或出租架子管、扣件、建筑机械等"/>
+      </el-form-item>
+      <el-form-item label="附件上传:">
+        <vk-data-upload v-model="form.files" list-type="text"
+                        accept="image/*">
+        </vk-data-upload>
+      </el-form-item>
+      <el-form-item label="租赁详情:">
+        <el-input v-model="form.desc" placeholder="请详细描述物资信息，描述内容：材料名称、材质......（限300字以内）"
+                  type="textarea" show-word-limit maxlength="300"/>
+      </el-form-item>
+      <el-form-item label="物资装货地" class="ml-10" v-if="form.rentType === 0">
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
+              <template v-if="provinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
+              <template v-if="provinceIndex !== null && cityIndex !== null">
+                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
+            <el-input v-model="form.addressDetail"
+                      placeholder="详细地址或几公里范围内"></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item :label="form.rentType === 0 ? '物资交货地' : '物资装货地'" class="ml-10" required>
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-select v-model="deliverProvinceIndex" placeholder="省" @change="selectDeliverProvince">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="deliverCityIndex" placeholder="市" @change="selectDeliverCity">
+              <template v-if="deliverProvinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[deliverProvinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="deliverAreaIndex" placeholder="区/县" @change="selectDeliverArea">
+              <template v-if="deliverProvinceIndex !== null && deliverCityIndex !== null">
+                <el-option v-for="(item, index) in areaData[deliverProvinceIndex][deliverCityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
+            <el-input v-model="form.deliverAddressDetail"
+                      placeholder="详细地址或几公里范围内"></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <view class="form-title-wrap" style="justify-content: flex-start">
+        <view class="goods-info-title">
+          <view class="form-title">
+            税票要求
+          </view>
         </view>
-        <view class="flex justify-center items-center mt-30 m-a">
-            <el-button type="primary" :disabled="checked === '否'" @click="publish">立即发布</el-button>
+        <el-radio-group v-model="form.invoice">
+          <el-radio :label="true">含税</el-radio>
+          <el-radio :label="false">不含税</el-radio>
+        </el-radio-group>
+      </view>
+      <view class="p-30">
+        <template v-if="form.invoice">
+          <el-form-item label="开票时间：">
+            <el-radio-group v-model="form.writeInvoiceTime">
+              <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
+              <el-radio :label="1">付款后次月</el-radio>
+              <el-radio :label="2">付款前</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!--          <el-form-item label="发票种类：">-->
+          <!--            <el-radio-group v-model="form.invoiceType">-->
+          <!--              <el-radio :label="0">增值税专用发票13%</el-radio>-->
+          <!--              <el-radio :label="1">增值税普通发票</el-radio>-->
+          <!--              <el-radio :label="2">普通发票</el-radio>-->
+          <!--            </el-radio-group>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="其他要求：">-->
+          <!--            <el-input v-model="form.invoiceOther" placeholder="请输入其他要求" size="small"-->
+          <!--                      type="textarea"/>-->
+          <!--          </el-form-item>-->
+          <view class="mb-20 flex justify-start items-center">
+            <view class="flex-1 flex justify-start items-center">
+              <text style="width: 30%">纳税人身份：</text>
+              <el-select v-model="form.taxType" placeholder="纳税人身份" style="width: 100%">
+                <el-option
+                  v-for="item in ['一般纳税人', '小规模公司', '个体工商户']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+            <view class="flex-1 flex justify-start items-center ml-20">
+              <text style="width: 30%">发票种类：</text>
+              <el-select v-model="form.invoiceType" placeholder="发票种类" style="width: 100%">
+                <el-option
+                  v-for="item in ['专用发票', '普通发票']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <view class="flex-1 flex justify-start items-center">
+              <text style="width: 30%">税率：</text>
+              <el-select v-model="form.taxRate" placeholder="税率" style="width: 100%">
+                <el-option
+                  v-for="item in ['13%', '9%', '6%', '4%', '3%', '1%']"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </view>
+            <view class="ml-20 flex justify-start items-center flex-1 ml-20">
+              <text style="width: 30%">手动填写税票要求：</text>
+              <el-input v-model="form.invoiceOther" placeholder="如：一般纳税人 专用发票 税率13%"
+                        size="small"/>
+            </view>
+          </view>
+          <el-form-item label="报价明细：">
+            <el-input v-model="form.invoiceDetail" placeholder="请输入报价明细" size="small"
+                      type="textarea"/>
+          </el-form-item>
+        </template>
+        <!--                <el-form-item label="报价失效时间:" >-->
+        <!--                    <el-date-picker-->
+        <!--                        :picker-options="pickerOptions"-->
+        <!--                        v-model="form.offerExpiredTime"-->
+        <!--                        type="datetime"-->
+        <!--                        placeholder="选择日期时间">-->
+        <!--                    </el-date-picker>-->
+        <!--                </el-form-item>-->
+      </view>
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            交易说明
+          </view>
         </view>
+      </view>
+      <el-row :gutter="10">
+        <el-form-item label="报价区域:">
+          <el-col :span="5">
+            <el-select v-model="offerProvinceIndex" placeholder="省" @change="selectOfferProvince"
+                       :disabled="form.offerAddressNoLimit">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="offerCityIndex" placeholder="市" @change="selectOfferCity"
+                       :disabled="form.offerAddressNoLimit">
+              <template v-if="offerProvinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[offerProvinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="offerAreaIndex" placeholder="区/县" @change="selectOfferArea"
+                       :disabled="form.offerAddressNoLimit">
+              <template v-if="offerProvinceIndex !== null && offerCityIndex !== null">
+                <el-option v-for="(item, index) in areaData[offerProvinceIndex][offerCityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-checkbox v-model="form.offerAddressNoLimit" @change="changeOfferAddressNoLimit">不限区域
+            </el-checkbox>
+          </el-col>
+        </el-form-item>
+      </el-row>
+      <el-form-item label="付款方式:">
+        <el-input v-model="form.otherPayMethodDesc" placeholder="请输入付款方式" size="small" type="textarea"/>
+        <!--                <view class="flex justify-start items-center">-->
+        <!--                    <view class="flex justify-start items-center mr-35">-->
+        <!--                        <el-radio label="预付" v-model="form.payMethod">-->
+        <!--                            <text>预付</text>-->
+        <!--                        </el-radio>-->
+        <!--                        <el-input v-model="form.prePayRate" style="width: 200px"/>-->
+        <!--                        <text>%货到付全款</text>-->
+        <!--                    </view>-->
+        <!--                    <el-radio label="提货付全款" v-model="form.payMethod">-->
+        <!--                        <text>提货付全款</text>-->
+        <!--                    </el-radio>-->
+        <!--                </view>-->
+        <!--                <view class="flex justify-start items-center mt-40">-->
+        <!--                    <el-radio label="其他付款方式描述" v-model="form.payMethod">-->
+        <!--                        <text>其他付款方式描述</text>-->
+        <!--                    </el-radio>-->
+        <!--                    <el-input v-model="form.otherPayMethodDesc"-->
+        <!--                              type="textarea" show-word-limit maxlength="300"/>-->
+        <!--                </view>-->
+      </el-form-item>
+      <el-form-item label="报价形式:">
+        <el-radio label="整单报价" v-model="form.offerType">
+          <text>整单报价</text>
+        </el-radio>
+        <el-radio label="可分项报价" v-model="form.offerType">
+          <text>可分项报价</text>
+        </el-radio>
+      </el-form-item>
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            简易合同备注和其他补充条款
+          </view>
+        </view>
+      </view>
+      <view class="p-30">
+        <view class="mb-20 flex justify-start items-center">
+          <el-radio v-model="form.signMethod" :label="0">线上签约-标准合同</el-radio>
+          <el-radio v-model="form.signMethod" :label="2">线上签约-双方协商合同</el-radio>
+          <el-radio v-model="form.signMethod" :label="1">线下签约</el-radio>
+        </view>
+        <view class="my-25" v-if="form.signMethod === 2">
+          <view class="p-30">
+            <view class="mb-20 flex justify-start items-center">
+              <text style="width: 140px">合同附件：</text>
+              <vk-data-upload v-model="form.contractAttachment"
+                              :on-preview="previewUpload"
+                              accept=".pdf" list-type="text"/>
+            </view>
+          </view>
+        </view>
+        <view v-if="form.signMethod === 0">
+          <view @click="openDownload" class="pointer my-25 text-main">
+            点击查看标准合同
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">违约责任:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              1.
+              乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
+              2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">解决纠纷的方法:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
+              2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">不可抗力:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">其他:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+            </view>
+          </view>
+          <view class="flex justify-start items-start border">
+            <view class="m-10 sign-method-header">采购方补充条款:</view>
+            <view class="border-left m-10 pl-20 flex-1">
+              <el-input v-model="form.supplementary" placeholder="请输入采购方补充条款"/>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!--            <view class="form-title-wrap">-->
+      <!--                <view class="goods-info-title">-->
+      <!--                    <view class="form-title">-->
+      <!--                        采购商信息-->
+      <!--                    </view>-->
+      <!--                </view>-->
+      <!--            </view>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="公司信息">-->
+      <!--                        <el-input v-model="form.buyer.companyName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="公司联系方式">-->
+      <!--                        <el-input v-model="form.buyer.contract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="个人信息">-->
+      <!--                        <el-input v-model="form.buyer.personalName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="个人联系方式">-->
+      <!--                        <el-input v-model="form.buyer.personalContract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <!--            <el-row :gutter="10">-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="授权人姓名">-->
+      <!--                        <el-input v-model="form.buyer.managerName"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--                <el-col :span="12">-->
+      <!--                    <el-form-item label="授权联系方式">-->
+      <!--                        <el-input v-model="form.buyer.managerContract"/>-->
+      <!--                    </el-form-item>-->
+      <!--                </el-col>-->
+      <!--            </el-row>-->
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            供货商信息
+          </view>
+        </view>
+      </view>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 2">
+        <el-col :span="12">
+          <el-form-item label="公司信息">
+            <el-input v-model="form.supplier.companyName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司联系方式">
+            <el-input v-model="form.supplier.contract"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 1">
+        <el-col :span="12">
+          <el-form-item label="个人信息">
+            <el-input v-model="form.supplier.personalName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="个人联系方式">
+            <el-input v-model="form.supplier.personalContract" type="number"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="授权业务咨询人">
+            <el-select v-model="form.supplier.managerName" placeholder="点击选择业务联系人"
+                       class="w-100p" @change="selectContact">
+              <el-option
+                v-for="(item, index) in contactList"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+              <view slot="empty" class="text-gray pointer p-20">
+                <text>无业务联系人,请到</text>
+                <text class="text-main mx-15" @click="navTo">个人中心</text>
+                <text>添加</text>
+              </view>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="业务咨询联系方式">
+            <el-input v-model="form.supplier.managerContract" type="number" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">您是否对以上信息进行了详细核实:</text>
+      <el-radio label="是" v-model="checked">
+        <text>是</text>
+      </el-radio>
+      <el-radio label="否" v-model="checked">
+        <text>否</text>
+      </el-radio>
     </view>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">是否加急({{ urgentAmount }}元/次,将在旧货交易页面加急展示区展示):</text>
+      <el-radio :label="true" v-model="form.isUrgent">
+        <text>是</text>
+      </el-radio>
+      <el-radio :label="false" v-model="form.isUrgent">
+        <text>否</text>
+      </el-radio>
+    </view>
+    <view class="my-25 text-main font-bold">本月剩余旧货发布次数:{{ remainOldNum }}</view>
+    <view class="flex justify-start items-center">
+      <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+      <span class="text-main pointer font-bold" @click="showAgreement">《金久信旧货交易协议》</span>
+    </view>
+    <view class="flex justify-center items-center mt-30 m-a">
+      <el-button type="primary" @click="save" plain>暂存</el-button>
+      <el-button type="primary" :disabled="checked === '否' || !agree" @click="publish">立即发布</el-button>
+    </view>
+    <el-dialog title="金久信旧货交易协议" :visible.sync="dialogVisible" width="70%" close-on-press-escape
+               close-on-click-modal show-close
+    >
+      <div v-html="agreement"></div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
@@ -369,112 +471,275 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    name: "type_2",
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            form: {
-                type: 2,
-                category: 0,
-                files: [],
-                title: '',
-                desc: '',
-                addressRegion: [],
-                addressDetail: '',
-                deliverAddressRegion: [],
-                deliverAddressDetail: '',
-                invoice: false,
-                writeInvoiceTime: '',
-                invoiceType: '',
-                invoiceOther: '',
-                invoiceDetail: '',
-                expiredTime: '',
-                offerExpiredTime: '',
-                offerAddressRegion: [],
-                offerAddressNoLimit: false,
-                payMethod: '预付',
-                offerType: '整单报价',
-                prePayRate: '',
-                otherPayMethodDesc: '',
-                signMethod: 0,
-                buyer: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-                supplier: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-
-            },
-            provinceIndex: null,
-            cityIndex: null,
-            areaIndex: null,
-            deliverProvinceIndex: null,
-            deliverCityIndex: null,
-            deliverAreaIndex: null,
-            offerProvinceIndex: null,
-            offerCityIndex: null,
-            offerAreaIndex: null,
-            checked: '否'
-        }
+  name: "type_2",
+  props: {
+    urgentAmount: {
+      type: Number,
+      default: 10
     },
-    methods: {
-        selectProvince(index) {
-            this.form.addressRegion[0] = this.provinceData[index]
+    remainOldNum: {
+      type: Number,
+      default: 0
+    },
+    agreement: {
+      type: String,
+      default: ''
+    },
+    commonContractUrl: {
+      type: String,
+      default: ''
+    },
+    contactList: {
+      type: Array,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
         },
-        selectCity(index) {
-            this.form.addressRegion[1] = this.cityData[this.provinceIndex][index]
+      },
+      agree: false,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      allChildCate: [],
+      cateData: [],
+      form: {
+        otherCate: false,
+        otherCateName: '',
+        type: 2,
+        rentType: 0,
+        category: 0,
+        files: [],
+        title: '',
+        desc: '',
+        addressRegion: {},
+        addressDetail: '',
+        deliverAddressRegion: {},
+        deliverAddressDetail: '',
+        invoice: false,
+        writeInvoiceTime: '',
+        invoiceType: '',
+        invoiceOther: '',
+        invoiceDetail: '',
+        expiredTime: '',
+        offerExpiredTime: '',
+        offerAddressRegion: {},
+        offerAddressNoLimit: false,
+        payMethod: '其他付款方式描述',
+        offerType: '整单报价',
+        prePayRate: '',
+        otherPayMethodDesc: '',
+        signMethod: 0,
+        buyer: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectArea(index) {
-            this.form.addressRegion[2] = this.areaData[this.provinceIndex][this.cityIndex][index]
+        supplier: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectDeliverProvince(index) {
-            this.form.deliverAddressRegion[0] = this.provinceData[index]
-        },
-        selectDeliverCity(index) {
-            this.form.deliverAddressRegion[1] = this.cityData[this.deliverProvinceIndex][index]
-        },
-        selectDeliverArea(index) {
-            this.form.deliverAddressRegion[2] = this.areaData[this.deliverProvinceIndex][this.deliverCityIndex][index]
-        },
-        selectOfferProvince(index) {
-            this.form.offerAddressRegion[0] = this.provinceData[index]
-        },
-        selectOfferCity(index) {
-            this.form.offerAddressRegion[1] = this.cityData[this.offerProvinceIndex][index]
-        },
-        selectOfferArea(index) {
-            this.form.offerAddressRegion[2] = this.areaData[this.offerProvinceIndex][this.offerCityIndex][index]
-        },
-        changeOfferAddressNoLimit(val) {
-            if (val) {
-                this.form.offerAddressRegion = []
-                this.offerProvinceIndex = this.offerCityIndex = this.offerAreaIndex = null
-            }
-        },
-        async publish() {
-            await vk.callFunction({
-                url: 'client/old/kh/add',
-                data: this.form
-            })
-            this.$message({
-                message: "提交成功",
-                type: 'success'
-            })
-            vk.navigateBack()
-        }
+        contractAttachment: [],
+        isUrgent: false,
+        supplementary: ''
+      },
+      provinceIndex: null,
+      cityIndex: null,
+      areaIndex: null,
+      deliverProvinceIndex: null,
+      deliverCityIndex: null,
+      deliverAreaIndex: null,
+      offerProvinceIndex: null,
+      offerCityIndex: null,
+      offerAreaIndex: null,
+      checked: '否',
+      dialogVisible: false
+
     }
+  },
+  methods: {
+    selectProvince(index) {
+      this.form.addressRegion.province = this.provinceData[index]
+    },
+    selectCity(index) {
+      this.form.addressRegion.city = this.cityData[this.provinceIndex][index]
+    },
+    selectArea(index) {
+      this.form.addressRegion.area = this.areaData[this.provinceIndex][this.cityIndex][index]
+    },
+    selectDeliverProvince(index) {
+      this.form.deliverAddressRegion.province = this.provinceData[index]
+    },
+    selectDeliverCity(index) {
+      this.form.deliverAddressRegion.city = this.cityData[this.deliverProvinceIndex][index]
+    },
+    selectDeliverArea(index) {
+      this.form.deliverAddressRegion.area = this.areaData[this.deliverProvinceIndex][this.deliverCityIndex][index]
+    },
+    selectOfferProvince(index) {
+      this.form.offerAddressRegion.province = this.provinceData[index]
+    },
+    selectOfferCity(index) {
+      this.form.offerAddressRegion.city = this.cityData[this.offerProvinceIndex][index]
+    },
+    selectOfferArea(index) {
+      this.form.offerAddressRegion.area = this.areaData[this.offerProvinceIndex][this.offerCityIndex][index]
+    },
+    changeOfferAddressNoLimit(val) {
+      if (val) {
+        this.form.offerAddressRegion = []
+        this.offerProvinceIndex = this.offerCityIndex = this.offerAreaIndex = null
+      }
+    },
+    async publish() {
+      // if (this.provinceIndex === null || this.cityIndex === null || this.areaIndex === null) return this.$message({
+      //     message: "请选择完整的装货地址",
+      //     type: 'warning'
+      // })
+      if (this.deliverProvinceIndex === null || this.deliverCityIndex === null || this.deliverAreaIndex === null) return this.$message({
+        message: "请选择完整的交货地址",
+        type: 'warning'
+      })
+
+      // if (!this.form.addressDetail) return this.$message({
+      //     message: "请填写详细装货地址",
+      //     type: 'warning'
+      // })
+
+      if (!this.form.deliverAddressDetail) return this.$message({
+        message: "请填写交货详细地址",
+        type: 'warning'
+      })
+
+      if (!this.form.title) return this.$message({
+        message: "请填写标题",
+        type: 'warning'
+      })
+      if (!this.form.otherCate) {
+        if (!this.form.category) return this.$message({
+          message: "请选择分类",
+          type: 'warning'
+        })
+      } else {
+        if (!this.form.otherCateName) return this.$message({
+          message: "请输入其他分类",
+          type: 'warning'
+        })
+        this.form.category = ['', this.form.otherCateName]
+      }
+      if (!this.form.expiredTime) return this.$message({
+        message: "请选择失效时间",
+        type: 'warning'
+      })
+      // if (!this.form.offerExpiredTime) return this.$message({
+      //     message: "请选择报价失效时间",
+      //     type: 'warning'
+      // })
+      const res = await vk.callFunction({
+        url: 'client/old/kh/add',
+        data: this.form
+      })
+      localStorage.removeItem("old_2")
+      this.$message({
+        message: "您的信息已经提交，等待管理员审核，请您耐心等待！",
+        type: 'success'
+      })
+      if (this.form.isUrgent) {
+        vk.navigateTo({
+          url: `/pages/index/shop/pay?id=${res.data}`
+        })
+      } else {
+        vk.redirectTo({url: '/pages/index/old/old'});
+      }
+    },
+    showAgreement() {
+      // this.$confirm(this.agreement, '金久信旧货交易协议', {
+      //     cancelButtonText: '关闭',
+      //     showConfirmButton: false,
+      //     dangerouslyUseHTMLString: true,
+      //     customClass: 'confirm-box'
+      // })
+      this.dialogVisible = true
+    },
+    openDownload() {
+      window.open(this.commonContractUrl)
+    },
+    previewUpload({url}) {
+      window.open(url)
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.form.supplier.managerContract = contact.phone
+    },
+    save() {
+      localStorage.setItem("old_2", JSON.stringify({
+        form: this.form,
+        deliverProvinceIndex: this.deliverProvinceIndex,
+        deliverCityIndex: this.deliverCityIndex,
+        deliverAreaIndex: this.deliverAreaIndex,
+        offerProvinceIndex: this.offerProvinceIndex,
+        offerCityIndex: this.offerCityIndex,
+        offerAreaIndex: this.offerAreaIndex
+      }))
+      this.$message({
+        message: "已保存",
+        type: 'success'
+      })
+    }
+
+  },
+  mounted() {
+    vk.callFunction({
+      url: 'client/old/pub/getTree',
+      title: '请求中...',
+      data: {type: 2},
+      success: (data) => {
+        this.cateData = data.rows.map(item => {
+          item.children.forEach(child => {
+            delete child.children
+          })
+          return item
+        })
+      }
+    });
+    if (vk.getVuex('$user.userInfo.accountType') === 2) {
+      this.form.supplier.companyName = vk.getVuex('$user.userInfo.company.companyName')
+      this.form.supplier.contract = vk.getVuex('$user.userInfo.company.mobile')
+    } else {
+      this.form.supplier.personalName = vk.getVuex('$user.userInfo.person.personName')
+      this.form.supplier.personalContract = vk.getVuex('$user.userInfo.person.mobile')
+    }
+    if (!!localStorage.getItem("old_2")) {
+      this.$confirm('您有一份暂存数据，是否恢复?', '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        const savedData = JSON.parse(localStorage.getItem("old_2"))
+        this.form = savedData.form
+        this.deliverProvinceIndex = savedData.deliverProvinceIndex
+        this.deliverCityIndex = savedData.deliverCityIndex
+        this.deliverAreaIndex = savedData.deliverAreaIndex
+        this.offerProvinceIndex = savedData.offerProvinceIndex
+        this.offerCityIndex = savedData.offerCityIndex
+        this.offerAreaIndex = savedData.offerAreaIndex
+      })
+    }
+
+  }
 }
 </script>
 
@@ -482,38 +747,38 @@ export default {
 @import "@/common/css/app.scss";
 
 .form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+  }
 
-    .goods-info-title {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-    }
-
-    .form-title {
-        padding-left: 10px;
-        color: $--color-primary;
-        font-size: 18px;
-        line-height: 18px;
-        border-left: 4px solid $--color-primary;
-    }
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
 
 }
 
 .sign-method-header {
-    width: 120px;
+  width: 120px;
 }
 </style>
 
 <style>
-/deep/ .input-with-select{
-    width: 200px;
+/deep/ .input-with-select {
+  width: 200px;
 }
 
 /deep/ .input-with-select .el-input-group__append {
-    background-color: #fff !important;
-    width: 80px !important;
+  background-color: #fff !important;
+  width: 80px !important;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/old/release/type_3.vue b/pages/index/old/release/type_3.vue
index f9c7538..65449b2 100644
--- a/pages/index/old/release/type_3.vue
+++ b/pages/index/old/release/type_3.vue
@@ -1,135 +1,158 @@
 <template>
-    <view class="flex flex-col justify-start items-start">
-        <text class="text-50">发布我的回收信息</text>
-        <text class="text-gray">回收信息越完整，成功交易越容易</text>
-        <el-form ref="form" :model="form" label-width="140px" class="mt-20">
-            <el-form-item label="信息失效时间:">
-                <el-date-picker
-                    v-model="form.expiredTime"
-                    type="datetime"
-                    placeholder="选择日期时间">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="物资分类:">
-                <el-radio-group v-model="form.category" size="small">
-                    <el-radio label="机械设备">
-                        <text>机械设备</text>
-                    </el-radio>
-                    <el-radio label="成品钢材">
-                        <text>成品钢材</text>
-                    </el-radio>
-                    <el-radio label="废旧钢材">
-                        <text>废旧钢材</text>
-                    </el-radio>
-                    <el-radio label="旧架子管">
-                        <text>旧架子管</text>
-                    </el-radio>
-                    <el-radio label="旧扣件">
-                        <text>旧扣件</text>
-                    </el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="信息标题:">
-                <el-input v-model="form.title" placeholder="一句话简介物资，如拍卖直缝钢管200吨等"/>
-            </el-form-item>
-            <el-form-item label="回收方简述:">
-                <el-input v-model="form.desc" placeholder="请详细描述物资信息，描述内容：材料名称、材质......（限300字以内）"
-                          type="textarea" show-word-limit maxlength="300"/>
-            </el-form-item>
-            <el-form-item label="回收物实景照片:">
-                <vk-data-upload v-model="form.files"
-                                accept="image/*">
-                </vk-data-upload>
-            </el-form-item>
-            <el-form-item label="回收单位地址" class="ml-10">
-                <el-row :gutter="10">
-                    <el-col :span="5">
-                        <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
-                            <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
-                                       :label="item.name"/>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
-                            <template v-if="provinceIndex !== null">
-                                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
-                                           :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
-                            <template v-if="provinceIndex !== null && cityIndex !== null">
-                                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
-                                           :key="index" :value="index"
-                                           :label="item.name"/>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-input v-model="form.addressDetail"
-                                  placeholder="详细地址或几公里范围内"></el-input>
-                    </el-col>
-                </el-row>
-            </el-form-item>
-            <view class="form-title-wrap">
-                <view class="goods-info-title">
-                    <view class="form-title">
-                        回收单位信息
-                    </view>
-                </view>
-            </view>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="公司信息">
-                        <el-input v-model="form.supplier.companyName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="公司联系方式">
-                        <el-input v-model="form.supplier.contract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="个人信息">
-                        <el-input v-model="form.supplier.personalName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="个人联系方式">
-                        <el-input v-model="form.supplier.personalContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="10">
-                <el-col :span="12">
-                    <el-form-item label="授权人姓名">
-                        <el-input v-model="form.supplier.managerName"/>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="授权联系方式">
-                        <el-input v-model="form.supplier.managerContract"/>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <view class="mt-20 flex justify-start items-center">
-            <text class="mr-25">您是否对以上信息进行了详细核实:</text>
-            <el-radio label="是" v-model="checked">
-                <text>是</text>
-            </el-radio>
-            <el-radio label="否" v-model="checked">
-                <text>否</text>
-            </el-radio>
-        </view>
-        <view class="flex justify-center items-center mt-30 m-a">
-            <el-button type="primary" :disabled="checked === '否'" @click="publish">立即发布</el-button>
+  <view class="flex flex-col justify-start items-start">
+    <text class="text-50">发布我的回收信息</text>
+    <text class="text-gray">回收信息越完整，成功交易越容易</text>
+    <el-form ref="form" :model="form" label-width="140px" class="mt-20">
+      <el-form-item label="信息失效时间:" required>
+        <el-date-picker
+          :picker-options="pickerOptions"
+          v-model="form.expiredTime"
+          type="datetime"
+          placeholder="选择日期时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="物资分类:" required>
+        <div class="flex justify-start items-center">
+          <el-cascader :options="cateData" v-model="form.category" :disabled="form.otherCate"
+                       :props="{'label': 'name', 'value': 'name'}"/>
+          <el-checkbox v-model="form.otherCate" class="mx-20">其他分类</el-checkbox>
+          <el-input v-model="form.otherCateName" :disabled="!form.otherCate" placeholder="如物资分类选项中不能描述您的信息物资主要内容，请在此用专业或通用术语填写"
+                    class="ml-20"/>
+        </div>
+      </el-form-item>
+      <el-form-item label="信息标题:" required>
+        <el-input v-model="form.title" placeholder="一句话简介回收内容，如 常年回收 二手、废旧螺纹钢、型材等"/>
+      </el-form-item>
+      <el-form-item label="回收方简述:">
+        <el-input v-model="form.desc" placeholder="请详细描述物资信息，描述内容：材料名称、材质......（限300字以内）"
+                  type="textarea" show-word-limit maxlength="300"/>
+      </el-form-item>
+      <el-form-item label="回收物实景照片:">
+        <vk-data-upload v-model="form.files" list-type="text"
+                        accept="image/*">
+        </vk-data-upload>
+      </el-form-item>
+      <el-form-item label="回收单位地址" class="ml-10" required>
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-select v-model="provinceIndex" placeholder="省" @change="selectProvince">
+              <el-option v-for="(item, index) in provinceData" :key="index" :value="index"
+                         :label="item.name"/>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="cityIndex" placeholder="市" @change="selectCity">
+              <template v-if="provinceIndex !== null">
+                <el-option v-for="(item, index) in cityData[provinceIndex]" :key="index"
+                           :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="5">
+            <el-select v-model="areaIndex" placeholder="区/县" @change="selectArea">
+              <template v-if="provinceIndex !== null && cityIndex !== null">
+                <el-option v-for="(item, index) in areaData[provinceIndex][cityIndex]"
+                           :key="index" :value="index"
+                           :label="item.name"/>
+              </template>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
+            <el-input v-model="form.addressDetail"
+                      placeholder="详细地址或几公里范围内"></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <view class="form-title-wrap">
+        <view class="goods-info-title">
+          <view class="form-title">
+            回收单位信息
+          </view>
         </view>
+      </view>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 2">
+        <el-col :span="12">
+          <el-form-item label="公司信息">
+            <el-input v-model="form.supplier.companyName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司联系方式">
+            <el-input v-model="form.supplier.contract"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="vk.getVuex('$user.userInfo.accountType') === 1">
+        <el-col :span="12">
+          <el-form-item label="个人信息">
+            <el-input v-model="form.supplier.personalName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="个人联系方式">
+            <el-input v-model="form.supplier.personalContract"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="授权业务咨询人">
+            <el-select v-model="form.supplier.managerName" placeholder="点击选择业务联系人"
+                       class="w-100p" @change="selectContact">
+              <el-option
+                v-for="(item, index) in contactList"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+              <view slot="empty" class="text-gray pointer p-20">
+                <text>无业务联系人,请到</text>
+                <text class="text-main mx-15" @click="navTo">个人中心</text>
+                <text>添加</text>
+              </view>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="flex justify-start items-center">
+          <el-form-item label="业务咨询联系方式">
+            <el-input v-model="form.supplier.managerContract" type="number" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">您是否对以上信息进行了详细核实:</text>
+      <el-radio label="是" v-model="checked">
+        <text>是</text>
+      </el-radio>
+      <el-radio label="否" v-model="checked">
+        <text>否</text>
+      </el-radio>
     </view>
+    <view class="mt-20 flex justify-start items-center">
+      <text class="mr-25">是否加急({{ urgentAmount }}元/次,将在旧货交易页面加急展示区展示):</text>
+      <el-radio :label="true" v-model="form.isUrgent">
+        <text>是</text>
+      </el-radio>
+      <el-radio :label="false" v-model="form.isUrgent">
+        <text>否</text>
+      </el-radio>
+    </view>
+    <view class="my-25 text-main font-bold">本月剩余旧货发布次数:{{ remainOldNum }}</view>
+    <view class="flex justify-start items-center">
+      <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+      <span class="text-main pointer font-bold" @click="showAgreement">《金久信旧货交易协议》</span>
+    </view>
+    <view class="flex justify-center items-center mt-30 m-a">
+      <el-button type="primary" :disabled="checked === '否' || !agree" @click="publish">立即发布</el-button>
+    </view>
+    <el-dialog title="金久信旧货交易协议" :visible.sync="dialogVisible" width="70%" close-on-press-escape
+               close-on-click-modal show-close
+    >
+      <div v-html="agreement"></div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
@@ -138,59 +161,206 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    name: "type_3",
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            form: {
-                type: 3,
-                category: 0,
-                files: [],
-                title: '',
-                desc: '',
-                addressRegion: [],
-                addressDetail: '',
-                expiredTime: '',
-                supplier: {
-                    companyName: '',
-                    contract: '',
-                    personalName: '',
-                    personalContract: '',
-                    managerName: '',
-                    managerContract: '',
-                },
-
-            },
-            provinceIndex: null,
-            cityIndex: null,
-            areaIndex: null,
-            checked: '否'
-        }
+  name: "type_3",
+  props: {
+    urgentAmount: {
+      type: Number,
+      default: 10
     },
-    methods: {
-        selectProvince(index) {
-            this.form.addressRegion[0] = this.provinceData[index]
+    remainOldNum: {
+      type: Number,
+      default: 0
+    },
+    agreement: {
+      type: String,
+      default: ''
+    },
+    contactList: {
+      type: Array,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
         },
-        selectCity(index) {
-            this.form.addressRegion[1] = this.cityData[this.provinceIndex][index]
+      },
+      agree: false,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      allChildCate: [],
+      cateData: [],
+      form: {
+        otherCate: false,
+        otherCateName: '',
+        type: 3,
+        category: 0,
+        files: [],
+        title: '',
+        desc: '',
+        addressRegion: {},
+        addressDetail: '',
+        expiredTime: '',
+        supplier: {
+          companyName: '',
+          contract: '',
+          personalName: '',
+          personalContract: '',
+          managerName: '',
+          managerContract: '',
         },
-        selectArea(index) {
-            this.form.addressRegion[2] = this.areaData[this.provinceIndex][this.cityIndex][index]
-        },
-        async publish() {
-            await vk.callFunction({
-                url: 'client/old/kh/add',
-                data: this.form
-            })
-            this.$message({
-                message: "提交成功",
-                type: 'success'
-            })
-            vk.navigateBack()
-        }
+        isUrgent: false
+      },
+      provinceIndex: null,
+      cityIndex: null,
+      areaIndex: null,
+      checked: '否',
+      dialogVisible: false
+
     }
+  },
+  methods: {
+    selectProvince(index) {
+      this.form.addressRegion.province = this.provinceData[index]
+    },
+    selectCity(index) {
+      this.form.addressRegion.city = this.cityData[this.provinceIndex][index]
+    },
+    selectArea(index) {
+      this.form.addressRegion.area = this.areaData[this.provinceIndex][this.cityIndex][index]
+    },
+    async publish() {
+      if (this.remainOldNum === 0) {
+        this.$confirm('您的旧货发布次数已用完，是否立即购买？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async ({confirm}) => {
+          if (confirm) {
+            const {data} = await vk.callFunction({
+              url: 'client/old/kh/buyNum',
+            })
+            vk.navigateTo({
+              url: `/pages/index/shop/pay?id=${data}`
+            })
+          }
+        })
+        return
+      }
+      if (this.provinceIndex === null || this.cityIndex === null || this.areaIndex === null) return this.$message({
+        message: "请选择完整的地址",
+        type: 'warning'
+      })
+      if (!this.form.addressDetail) return this.$message({
+        message: "请填写详细地址",
+        type: 'warning'
+      })
+      if (!this.form.title) return this.$message({
+        message: "请填写标题",
+        type: 'warning'
+      })
+      if (!this.form.otherCate) {
+        if (!this.form.category) return this.$message({
+          message: "请选择分类",
+          type: 'warning'
+        })
+      } else {
+        if (!this.form.otherCateName) return this.$message({
+          message: "请输入其他分类",
+          type: 'warning'
+        })
+        this.form.category = ['', this.form.otherCateName]
+      }
+      if (!this.form.expiredTime) return this.$message({
+        message: "请选择失效时间",
+        type: 'warning'
+      })
+      const res = await vk.callFunction({
+        url: 'client/old/kh/add',
+        data: this.form
+      })
+      localStorage.removeItem("old_3")
+      this.$message({
+        message: "您的信息已经提交，等待管理员审核，请您耐心等待！",
+        type: 'success'
+      })
+      if (this.form.isUrgent) {
+        vk.navigateTo({
+          url: `/pages/index/shop/pay?id=${res.data}`
+        })
+      } else {
+        vk.redirectTo({url: '/pages/index/old/old'});
+      }
+    },
+    showAgreement() {
+      // this.$confirm(this.agreement, '金久信旧货交易协议', {
+      //     cancelButtonText: '关闭',
+      //     showConfirmButton: false,
+      //     dangerouslyUseHTMLString: true,
+      //     customClass: 'confirm-box'
+      // })
+      this.dialogVisible = true
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.form.supplier.managerContract = contact.phone
+    },
+    save() {
+      localStorage.setItem("old_3", JSON.stringify({
+        form: this.form,
+        provinceIndex: this.provinceIndex,
+        cityIndex: this.cityIndex,
+        areaIndex: this.areaIndex,
+      }))
+      this.$message({
+        message: "已保存",
+        type: 'success'
+      })
+    }
+
+  },
+  mounted() {
+    vk.callFunction({
+      url: 'client/old/pub/getTree',
+      title: '请求中...',
+      data: {type: 3},
+      success: (data) => {
+        this.cateData = data.rows.map(item => {
+          item.children.forEach(child => {
+            delete child.children
+          })
+          return item
+        })
+      }
+    });
+
+    if (vk.getVuex('$user.userInfo.accountType') === 2) {
+      this.form.supplier.companyName = vk.getVuex('$user.userInfo.company.companyName')
+      this.form.supplier.contract = vk.getVuex('$user.userInfo.company.mobile')
+    } else {
+      this.form.supplier.personalName = vk.getVuex('$user.userInfo.person.personName')
+      this.form.supplier.personalContract = vk.getVuex('$user.userInfo.person.mobile')
+    }
+    if (!!localStorage.getItem("old_3")) {
+      this.$confirm('您有一份暂存数据，是否恢复?', '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        const savedData = JSON.parse(localStorage.getItem("old_3"))
+        this.form = savedData.form
+        this.provinceIndex = savedData.provinceIndex
+        this.cityIndex = savedData.cityIndex
+        this.areaIndex = savedData.areaIndex
+      })
+    }
+
+  }
 }
 </script>
 
@@ -198,38 +368,42 @@ export default {
 @import "@/common/css/app.scss";
 
 .form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+  }
 
-    .goods-info-title {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-    }
-
-    .form-title {
-        padding-left: 10px;
-        color: $--color-primary;
-        font-size: 18px;
-        line-height: 18px;
-        border-left: 4px solid $--color-primary;
-    }
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
 
 }
 
 .sign-method-header {
-    width: 120px;
+  width: 120px;
 }
 </style>
 
 <style>
-/deep/ .input-with-select{
-    width: 200px;
+/deep/ .input-with-select {
+  width: 200px;
 }
 
 /deep/ .input-with-select .el-input-group__append {
-    background-color: #fff !important;
-    width: 80px !important;
+  background-color: #fff !important;
+  width: 80px !important;
+}
+
+.confirm-box .el-dialog {
+  width: 70%;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/self-support/companyQuote.vue b/pages/index/self-support/companyQuote.vue
index 5b576b7..957ad3f 100644
--- a/pages/index/self-support/companyQuote.vue
+++ b/pages/index/self-support/companyQuote.vue
@@ -1,191 +1,247 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200 m-a">
-            <u-swiper :list="list" :height="380" borderRadius="0"></u-swiper>
-            <view class="bg-white p-40">
-                <view v-for="(item, index) in configList" :key="index"
-                      class="my-20 flex flex-col justify-start items-start">
-                    <view class="flex flex-col justify-start items-start">
-                        <view class="flex justify-start items-center text-35 mb-20">
-                            <text>服务内容:{{ item.name }}</text>
-                            <view class="flex flex-col justify-start items-start">
-                                <view v-for="(content, contentIndex) in item.contents" :key="contentIndex"
-                                      class="mb-40 flex justify-start items-center">
-                                    <view class="ml-35">
-                                        <text>业务编号:</text>
-                                        <text>{{ content.code }}</text>
-                                    </view>
-                                    <view class="flex justify-start items-center">
-                                        <text class="ml-35">服务服务项目:</text>
-                                        <el-checkbox v-model="configList[index].contents[contentIndex].checked"
-                                                     :disabled="!content.amountList || content.amountList.length === 0">
-                                            {{ content.title }}
-                                        </el-checkbox>
-                                    </view>
-                                    <view class="flex justify-start items-center ml-35">
-                                        <el-select v-model="configList[index].contents[contentIndex].amountIndex"
-                                                   clearable @change="selectAmount(index, contentIndex, $event)"
-                                                   :disabled="!content.amountList || content.amountList.length === 0">
-                                            <el-option v-for="(amount, amountIndex) in content.amountList"
-                                                       :key="amountIndex"
-                                                       :label="amount.title" :value="amountIndex"/>
-                                        </el-select>
-                                        <text class="ml-35" v-if="content.amountIndex !== null">
-                                            {{ content.amountList[content.amountIndex].amount }}元/次
-                                        </text>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                        <view>备注: {{ item.remark }}</view>
-                    </view>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200 m-a">
+      <common-swiper page="self-support-company-swiper"/>
+      <view class="flex justify-end items-center text-main pointer my-20 " @click="demoDownload">示例下载</view>
+      <view class="bg-white p-40">
+        <view v-for="(item, index) in configList" :key="index"
+              class="server-item my-20 flex flex-col justify-start items-start">
+          <el-checkbox @change="changeCheck(index, item.name)">
+            <view class="flex flex-col justify-start items-start">
+              <view class="flex justify-start items-center text-35 mb-20">
+                <view class="name">{{ item.name }}</view>
+                <view class="ml-15">
+                  <text>业务编号:</text>
+                  <text v-if="item.contentIndex !== null">{{
+                      item.contents[item.contentIndex].code
+                    }}
+                  </text>
                 </view>
-                <el-form ref="form" :model="form" label-width="200px">
-                    <view v-for="(item, companyIndex) in companyList" :key="companyIndex">
-                        <el-form-item label="考察对象(个人/企业全称):" required>
-                            <el-input v-model="companyList[companyIndex].name"/>
-                        </el-form-item>
-                        <el-form-item label="考察对象(个人身份证/企业信用代码):">
-                            <el-input v-model="companyList[companyIndex].code"/>
-                        </el-form-item>
-                        <el-form-item label="考察对象(个人/单位)所在地:">
-                            <el-row :gutter="10">
-                                <el-col :span="4">
-                                    <el-select v-model="addressIndex[companyIndex][0]" placeholder="请选择省">
-                                        <el-option v-for="(item, index) in provinceData" :key="index"
-                                                   :label="item.name"
-                                                   :value="index">
-                                        </el-option>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="addressIndex[companyIndex][1]" placeholder="请选择市"
-                                               :disabled="addressIndex[companyIndex].length === 0">
-                                        <template v-if="addressIndex[companyIndex][0] !== null">
-                                            <el-option v-for="(item, index) in cityData[addressIndex[companyIndex][0]]"
-                                                       :key="index"
-                                                       :label="item.name"
-                                                       :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="addressIndex[companyIndex][2]" placeholder="请选择区"
-                                               :disabled="addressIndex[companyIndex].length === 1">
-                                        <template
-                                            v-if="addressIndex[companyIndex][0] !== null && addressIndex[companyIndex][1] !== null">
-                                            <el-option
-                                                v-for="(item, index) in areaData[addressIndex[companyIndex][0]][addressIndex[companyIndex][1]]"
-                                                :key="index"
-                                                :label="item.name"
-                                                :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="11">
-                                    <el-input v-model="companyList[companyIndex].address" placeholder="请输入详细地址"/>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="接收文件电子邮箱:">
-                            <el-input v-model="companyList[companyIndex].email"/>
-                        </el-form-item>
-                        <el-form-item label="接收文件微信:">
-                            <el-input v-model="companyList[companyIndex].wechat"/>
-                        </el-form-item>
-                        <el-form-item label="接收文件寄件地址">
-                            <el-row :gutter="10">
-                                <el-col :span="4">
-                                    <el-select v-model="receiveAddressIndex[companyIndex][0]" placeholder="请选择省">
-                                        <el-option v-for="(item, index) in provinceData" :key="index"
-                                                   :label="item.name"
-                                                   :value="index">
-                                        </el-option>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="receiveAddressIndex[companyIndex][1]" placeholder="请选择市"
-                                               :disabled="receiveAddressIndex[companyIndex].length === 0">
-                                        <template v-if="receiveAddressIndex[companyIndex][0] !== null">
-                                            <el-option
-                                                v-for="(item, index) in cityData[receiveAddressIndex[companyIndex][0]]"
-                                                :key="index"
-                                                :label="item.name"
-                                                :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="receiveAddressIndex[companyIndex][2]" placeholder="请选择区"
-                                               :disabled="receiveAddressIndex[companyIndex].length === 1">
-                                        <template
-                                            v-if="receiveAddressIndex[companyIndex][0] !== null && receiveAddressIndex[companyIndex][1] !== null">
-                                            <el-option
-                                                v-for="(item, index) in areaData[receiveAddressIndex[companyIndex][0]][receiveAddressIndex[companyIndex][1]]"
-                                                :key="index"
-                                                :label="item.name"
-                                                :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="11">
-                                    <el-input v-model="companyList[companyIndex].receiveAddress" placeholder="请输入详细地址"/>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="申请人:">
-                            <el-input v-model="companyList[companyIndex].requestName"/>
-                        </el-form-item>
-                        <el-form-item label="联系人:">
-                            <el-input v-model="companyList[companyIndex].contactName"/>
-                        </el-form-item>
-                        <el-form-item label="联系方式:">
-                            <el-input v-model="companyList[companyIndex].contact"/>
-                        </el-form-item>
-                        <el-form-item label="本次服务费用小计:">
-                            <view class="flex justify-between items-start mb-20 w-100p">
-                                <view class="flex justify-start items-center">
-                                    <el-input v-model="amount" disabled/>
-                                    <view class="ml-20">
-                                        <el-button type="primary" @click.native="addCompany">增加考察对象
-                                        </el-button>
-                                    </view>
-                                    <view class="ml-20">
-                                        <el-button type="primary" plain @click.native="removeCompany(companyIndex)"
-                                                   class="ml-20"
-                                                   :disabled="companyList.length === 1">删除该对象
-                                        </el-button>
-                                    </view>
-                                </view>
-                            </view>
-                        </el-form-item>
-                    </view>
-                </el-form>
-                <view class="mt-40 flex justify-center items-center">
-                    <view class="flex justify-center items-center">
-                        <text>总价:</text>
-                        <text class="text-main font-bold text-35">{{ totalAmount }}元</text>
-                    </view>
-                    <view class="ml-35">客服联系方式: 0771-3923001</view>
+                <view class="server-item-content">
+                  <text class="ml-15">服务项目:</text>
+                  <el-select v-model="configList[index].contentIndex" clearable
+                             :disabled="!contentList.includes(index)">
+                    <el-option v-for="(content, contentIndex) in item.contents" :key="contentIndex"
+                               :label="content.title" :value="contentIndex"/>
+                  </el-select>
+                  <template v-if="item.contentIndex !== null">
+                    <el-select v-model="configList[index].amountIndex"
+                               clearable class="ml-15">
+                      <el-option
+                        v-for="(amount, amountIndex) in item.contents[item.contentIndex].amountList"
+                        :key="amountIndex"
+                        :label="amount.title" :value="amountIndex"/>
+                    </el-select>
+                  </template>
                 </view>
-                <view class="mt-40 flex justify-center items-center">
-                    <el-button type="primary" @click="newOrder"
-                               :disabled="companyList.length === 0 || !companyList[0].name">
-                        立即支付
-                    </el-button>
+                <text>金额:</text>
+                <view class="ml-15" v-if="item.contentIndex !== null && item.amountIndex!== null">
+                  {{ item.contents[item.contentIndex].amountList[item.amountIndex].amount }}元/次
                 </view>
+                <view class="ml-15" v-else>
+                  元/次
+                </view>
+              </view>
+              <view class="remark">备注: {{ item.remark }}</view>
             </view>
+          </el-checkbox>
         </view>
-        <gap/>
-        <common-footer></common-footer>
+        <el-form ref="form" :model="form" label-width="200px">
+          <view v-for="(item, companyIndex) in companyList" :key="companyIndex">
+            <el-divider>{{ item.name }}</el-divider>
+            <el-form-item label="考察对象类型:" required>
+              <el-select v-model="companyList[companyIndex].type" placeholder="请选择考察对象类型">
+                <el-option label="企业" value="企业"></el-option>
+                <el-option label="个人" value="个人"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="`考察对象(${item.type}全称):`" required>
+              <el-input v-model="companyList[companyIndex].name"/>
+            </el-form-item>
+            <template v-if="item.type === '个人'">
+              <el-form-item label="考察对象(个人身份证): " required>
+                <el-input v-model="companyList[companyIndex].code"/>
+              </el-form-item>
+              <el-form-item label="考察对象所在地:" required>
+                <el-row :gutter="10">
+                  <el-col :span="4">
+                    <el-select v-model="addressIndex[companyIndex][0]" placeholder="请选择省">
+                      <el-option v-for="(item, index) in provinceData" :key="index"
+                                 :label="item.name"
+                                 :value="index">
+                      </el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-select v-model="addressIndex[companyIndex][1]" placeholder="请选择市"
+                               :disabled="addressIndex[companyIndex].length === 0">
+                      <template v-if="addressIndex[companyIndex][0] !== null">
+                        <el-option v-for="(item, index) in cityData[addressIndex[companyIndex][0]]"
+                                   :key="index"
+                                   :label="item.name"
+                                   :value="index">
+                        </el-option>
+                      </template>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-select v-model="addressIndex[companyIndex][2]" placeholder="请选择区"
+                               :disabled="addressIndex[companyIndex].length === 1">
+                      <template
+                        v-if="addressIndex[companyIndex][0] !== null && addressIndex[companyIndex][1] !== null">
+                        <el-option
+                          v-for="(item, index) in areaData[addressIndex[companyIndex][0]][addressIndex[companyIndex][1]]"
+                          :key="index"
+                          :label="item.name"
+                          :value="index">
+                        </el-option>
+                      </template>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input v-model="companyList[companyIndex].address" placeholder="请输入详细地址"/>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </template>
+            <el-form-item label="本次服务费用小计:">
+              <view class="flex justify-between items-start mb-20 w-100p">
+                <view class="flex justify-start items-center">
+                  <el-input v-model="amount" disabled/>
+                  <view class="ml-20">
+                    <el-button type="primary" plain @click.native="removeCompany(companyIndex)"
+                               class="ml-20"
+                               :disabled="companyList.length === 1">删除该对象
+                    </el-button>
+                  </view>
+                </view>
+              </view>
+            </el-form-item>
+
+          </view>
+          <el-divider/>
+          <el-button type="primary" @click.native="addCompany">增加考察对象
+          </el-button>
+          <el-form-item label="接收文件电子邮箱:" required>
+            <el-input v-model="email"/>
+          </el-form-item>
+          <el-form-item label="接收文件微信:" required>
+            <el-input v-model="wechat"/>
+          </el-form-item>
+          <el-form-item label="接收文件寄件地址" required>
+            <el-row :gutter="10">
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[0]" placeholder="请选择省">
+                  <el-option v-for="(item, index) in provinceData" :key="index"
+                             :label="item.name"
+                             :value="index">
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[1]" placeholder="请选择市"
+                           :disabled="receiveAddressIndex.length === 0">
+                  <template v-if="receiveAddressIndex[0] !== null">
+                    <el-option
+                      v-for="(item, index) in cityData[receiveAddressIndex[0]]"
+                      :key="index"
+                      :label="item.name"
+                      :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[2]" placeholder="请选择区"
+                           :disabled="receiveAddressIndex.length === 1">
+                  <template
+                    v-if="receiveAddressIndex[0] !== null && receiveAddressIndex[1] !== null">
+                    <el-option
+                      v-for="(item, index) in areaData[receiveAddressIndex[0]][receiveAddressIndex[1]]"
+                      :key="index"
+                      :label="item.name"
+                      :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="11">
+                <el-input v-model="receiveAddress"
+                          placeholder="请输入详细地址"/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <p class="text-main text-25 text-center" style="margin-bottom: 80rpx">接收文件电子邮箱/ 接收文件微信/
+            接收文件寄件地址,以上三项选填一项即可</p>
+          <el-row :gutter="10">
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="申请人:" required>
+                <el-input v-model="requestName"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="业务联系人:" required>
+                <el-input v-model="contactName"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="业务咨询联系方式:" required>
+                <el-input v-model="contact"/>
+              </el-form-item>
+            </el-col>
+            <!--                        <el-col :span="8" class="flex justify-start items-center">-->
+            <!--                            <el-form-item label="业务联系人:" required>-->
+            <!--                                <el-select v-model="contactName" placeholder="点击选择业务联系人"-->
+            <!--                                           class="w-100p" @change="selectContact">-->
+            <!--                                    <el-option-->
+            <!--                                        v-for="(item, index) in contactList"-->
+            <!--                                        :key="index"-->
+            <!--                                        :label="item.name"-->
+            <!--                                        :value="item.name">-->
+            <!--                                    </el-option>-->
+            <!--                                    <view slot="empty" class="text-gray pointer p-20">-->
+            <!--                                        <text>无业务联系人,请到</text>-->
+            <!--                                        <text class="text-main mx-15" @click="navTo">个人中心</text>-->
+            <!--                                        <text>添加</text>-->
+            <!--                                    </view>-->
+            <!--                                </el-select>-->
+            <!--                            </el-form-item>-->
+            <!--                        </el-col>-->
+            <!--                        <el-col :span="8" class="flex justify-start items-center">-->
+            <!--                            <el-form-item label="业务咨询联系方式:" required>-->
+            <!--                                <el-input v-model="contact" type="number" disabled/>-->
+            <!--                            </el-form-item>-->
+            <!--                        </el-col>-->
+          </el-row>
+          <!--                    <el-form-item label="联系方式:" required>-->
+          <!--                        <el-input v-model="contact" disabled/>-->
+          <!--                    </el-form-item>-->
+        </el-form>
+        <view class="mt-40 flex justify-center items-center">
+          <view class="flex justify-center items-center">
+            <text>总价:</text>
+            <text class="text-main font-bold text-35">{{ totalAmount }}元</text>
+          </view>
+          <view class="ml-35">客服联系方式: 0771-3923001</view>
+        </view>
+        <view class="flex justify-start items-center">
+          <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+          <span class="text-main pointer font-bold" @click="showAgreement">《金久信自营交易协议》</span>
+        </view>
+        <view class="mt-40 flex justify-center items-center">
+          <el-button type="primary" @click="newOrder"
+                     :disabled="companyList.length === 0 || !companyList[0].name || !agree">
+            立即支付
+          </el-button>
+        </view>
+      </view>
     </view>
+    <gap/>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -195,167 +251,329 @@ import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 import Gap from "../../../components/gap/gap.vue";
 
 export default {
-    name: "companyQuote",
-    components: {Gap},
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            list: [
-                {
-                    image: '/static/images/selfSupport/swiper.jpg',
-                    title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-                },
-            ],
-            form: {},
-            configList: [],
-            checkList: [],
-            contentList: [],
-            contentNameList: [],
-            addressIndex: [[null, null, null]],
-            addressDetail: '',
-            receiveAddressIndex: [[null, null, null]],
-            receiveAddressDetail: '',
-            companyList: [
-                {
-                    name: '',
-                    code: '',
-                    addressRegion: {
-                        province: null,
-                        city: null,
-                        area: null,
-                    },
-                    address: '',
-                    email: '',
-                    wechat: '',
-                    receiveAddressRegion: {
-                        province: null,
-                        city: null,
-                        area: null,
-                    },
-                    receiveAddress: '',
-                    requestName: '',
-                    contactName: '',
-                    contact: '',
-                }
-            ],
-        }
-    },
-    methods: {
-        async getConfigList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/coop/config/pub/getList',
-                data: {type: 0}
-            })
-            if (rows) {
-                this.configList = rows.map(item => {
-                    item.contents.map(content => {
-                        content.checked = false
-                        content.amountIndex = null
-                        return content
-                    })
-                    return item
-                })
-            }
-        },
-        addCompany() {
-            this.companyList.push({
-                name: '',
-                code: '',
-                addressRegion: {
-                    province: null,
-                    city: null,
-                    area: null,
-                },
-                address: '',
-                email: '',
-                wechat: '',
-                receiveAddressRegion: {
-                    province: null,
-                    city: null,
-                    area: null,
-                },
-                receiveAddress: '',
-                requestName: '',
-                contactName: '',
-                contact: '',
-            })
-            this.addressIndex.push([null, null, null])
-            this.receiveAddressIndex.push([null, null, null])
-        },
-        removeCompany(index) {
-            this.companyList.splice(index, 1)
-            this.addressIndex.splice(index, 1)
-            this.receiveAddressIndex.splice(index, 1)
-        },
-        async newOrder() {
-            const amountList = []
-            this.configList.forEach(item => {
-                item.contents.forEach(content => {
-                    if (content.checked && content.amountList.length > 0) {
-                        content.amountList.forEach((amount, amountIndex) => {
-                            if (amountIndex === content.amountIndex) {
-                                amountList.push(amount._index)
-                            }
-                        })
-                    }
-                })
-            })
-            if (amountList.length === 0) return this.$message({
-                message: '请至少选择一项服务',
-                type: 'error'
-            })
-            this.companyList.forEach((item, index) => {
-                this.companyList[index].addressRegion = {
-                    province: this.provinceData[this.addressIndex[index][0]],
-                    city: this.cityData[this.addressIndex[index][0]][this.addressIndex[index][1]],
-                    area: this.areaData[this.addressIndex[index][0]][this.addressIndex[index][1]][this.addressIndex[index][2]],
-                }
-                this.companyList[index].receiveAddressRegion = {
-                    province: this.provinceData[this.receiveAddressIndex[index][0]],
-                    city: this.cityData[this.receiveAddressIndex[index][0]][this.receiveAddressIndex[index][1]],
-                    area: this.areaData[this.receiveAddressIndex[index][0]][this.receiveAddressIndex[index][1]][this.receiveAddressIndex[index][2]],
-                }
-            })
-            const {data} = await vk.callFunction({
-                url: 'client/selfSupport/kh/addOrder',
-                data: {
-                    type: 0,
-                    amountList,
-                    contentList: this.companyList
-                }
-            })
-            vk.navigateTo({
-                url: `/pages/index/shop/pay?id=${data}`
-            })
-        },
-        selectAmount(index, contentIndex, e) {
-            console.log(index, contentIndex, e)
-        }
-    },
-    onLoad() {
-        this.getConfigList()
-    },
-    computed: {
-        amount() {
-            let tmpAmount = 0
-            this.configList.forEach(item => {
-                item.contents.forEach(content => {
-                    if (content.checked && content.amountList.length > 0) {
-                        content.amountList.forEach((amount, amountIndex) => {
-                            if (amountIndex === content.amountIndex) {
-                                tmpAmount += parseFloat(amount.amount)
-                            }
-                        })
-                    }
-                })
-            })
-            return tmpAmount
-        },
-        totalAmount() {
-            return this.amount * this.companyList.length
+  name: "companyQuote",
+  components: {Gap},
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      form: {},
+      configList: [],
+      checkList: [],
+      contentList: [],
+      contentNameList: [],
+      addressIndex: [[null, null, null]],
+      addressDetail: '',
+      receiveAddressIndex: [null, null, null],
+      receiveAddressDetail: '',
+      companyList: [
+        {
+          name: '',
+          code: '',
+          type: '企业',
+          addressRegion: {
+            province: null,
+            city: null,
+            area: null,
+          },
+          address: '',
         }
+      ],
+      email: '',
+      wechat: '',
+      receiveAddressRegion: {
+        province: null,
+        city: null,
+        area: null,
+      },
+      receiveAddress: '',
+      requestName: '',
+      contactName: '',
+      contact: '',
+      agreement: '',
+      agree: false,
+      contactList: []
     }
+  },
+  methods: {
+
+    async getConfigList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/coop/config/pub/getList',
+        data: {type: 0}
+      })
+      if (rows) {
+        this.configList = rows.map(item => {
+          item.contentIndex = null
+          item.amountIndex = null
+          return item
+        })
+      }
+    },
+    changeCheck(itemIndex, name) {
+      const index = this.contentList.indexOf(itemIndex)
+      if (index === -1) {
+        this.contentList.push(itemIndex)
+        this.contentNameList.push(name)
+      } else {
+        this.contentList.splice(index, 1)
+        this.contentNameList.splice(index, 1)
+        this.configList[itemIndex].contentIndex = null
+        this.configList[itemIndex].amountIndex = null
+      }
+    },
+    addCompany() {
+      this.companyList.push({
+        name: '',
+        code: '',
+        type: '企业',
+        addressRegion: {
+          province: null,
+          city: null,
+          area: null,
+        },
+      })
+      this.addressIndex.push([null, null, null])
+      this.receiveAddressIndex.push([null, null, null])
+    },
+    removeCompany(index) {
+      this.companyList.splice(index, 1)
+      this.addressIndex.splice(index, 1)
+      this.receiveAddressIndex.splice(index, 1)
+    },
+    async newOrder() {
+      const amountList = []
+      this.configList.forEach(item => {
+        item.contents.forEach((content, contentIndex) => {
+          if (contentIndex === item.contentIndex && content.amountList.length > 0) {
+            content.amountList.forEach((amount, amountIndex) => {
+              if (amountIndex === item.amountIndex) {
+                amountList.push(`${content._index},${amount._index}`)
+              }
+            })
+          }
+        })
+      })
+      if (amountList.length === 0) return this.$message({
+        message: '请至少选择一项服务',
+        type: 'error'
+      })
+      // if (this.addressIndex[0][2] === null) return this.$message({
+      //   message: '请选择地址',
+      //   type: 'error'
+      // })
+      if (!this.email && !this.wechat && this.receiveAddressIndex[0][2] === null) return this.$message({
+        message: '请选择接收文件地址/微信/邮箱',
+        type: 'error'
+      })
+      this.companyList.forEach((item, index) => {
+        if (this.addressIndex[index][2]) {
+          const companyProvince = this.provinceData[this.addressIndex[index][0]]
+          const companyCity = this.cityData[this.addressIndex[index][0]][this.addressIndex[index][1]]
+          const companyArea = this.areaData[this.addressIndex[index][0]][this.addressIndex[index][1]][this.addressIndex[index][2]]
+          this.companyList[index].addressRegion = {
+            province: {code: companyProvince.code, name: companyProvince.name},
+            city: {code: companyCity.code, name: companyCity.name},
+            area: {code: companyArea.code, name: companyArea.name},
+          }
+        }
+      })
+      for (let i = 0; i < this.companyList.length; i++) {
+        if (!this.companyList[i].name) return this.$message({
+          message: '请填写考察对象名称',
+          type: 'error'
+        })
+        if (this.companyList[i].type === '个人') {
+          if (!this.companyList[i].code) return this.$message({
+            type: 'error',
+            message: '请填写考察个人身份证号',
+          })
+          if (!this.companyList[i].address) return this.$message({
+            type: 'error',
+            message: '请填写个人地址',
+          })
+          if (this.addressIndex[i][2] === null) return this.$message({
+            type: 'error',
+            message: '请填写个人地址',
+          })
+        }
+      }
+      if (!this.requestName) return this.$message({
+        type: 'error',
+        message: '请填写申请人',
+      })
+      if (!this.contactName) return this.$message({
+        type: 'error',
+        message: '请填写业务联系人姓名',
+      })
+      if (!this.contact) return this.$message({
+        type: 'error',
+        message: '请填写联系人电话',
+      })
+      if (this.receiveAddressIndex.length > 0 && this.receiveAddressIndex[2] !== null) {
+        const province = this.provinceData[this.receiveAddressIndex[0]]
+        const city = this.cityData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]]
+        const area = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]][this.receiveAddressIndex[2]]
+        this.receiveAddressRegion = {
+          province: {code: province.code, name: province.name},
+          city: {code: city.code, name: city.name},
+          area: {code: area.code, name: area.name},
+        }
+      }
+      const {data} = await vk.callFunction({
+        url: 'client/selfSupport/kh/addOrder',
+        title: '提交中...',
+        data: {
+          type: 0,
+          amountList,
+          contentList: this.companyList,
+          receiveAddressRegion: this.receiveAddressRegion,
+          email: this.email,
+          wechat: this.wechat,
+          receiveAddress: this.receiveAddress,
+          requestName: this.requestName,
+          contactName: this.contactName,
+          contact: this.contact,
+        }
+      })
+      vk.navigateTo({
+        url: `/pages/index/shop/pay?id=${data}`
+      })
+    },
+    showAgreement() {
+      this.$confirm(this.agreement, '金久信自营交易协议', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true,
+      })
+    },
+    async getAgreement() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '65885d4c09664c1c8d8e8476'
+        },
+      })
+      this.agreement = res.content
+    },
+    demoDownload() {
+      vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '6588642a99c624e89199fbb4'
+        },
+        success: res => {
+          window.open(res.content)
+        }
+      })
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.contact = contact.phone
+    }
+  },
+  onLoad() {
+    const userInfo = vk.getVuex('$user.userInfo')
+    if (parseInt(userInfo.accountType) === 2) {
+      this.email = userInfo.company.contactEmail
+      this.requestName = userInfo.manager.personName
+      this.contactName = userInfo.manager.personName
+      this.contact = userInfo.company.mobile
+      if (userInfo.company && userInfo.company.addressRegion) {
+        this.receiveAddressIndex[0] = this.provinceData.findIndex(item => item.name === userInfo.company.addressRegion.province.name)
+        this.receiveAddressIndex[1] = this.cityData[this.receiveAddressIndex[0]].findIndex(item => item.name === userInfo.company.addressRegion.city.name)
+        this.receiveAddressIndex[2] = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]].findIndex(item => item.name === userInfo.company.addressRegion.area.name)
+      }
+      if (userInfo.company.addressDetail) this.receiveAddress = userInfo.company.addressDetail
+    } else {
+      if (userInfo.businessCard && userInfo.businessCard.email) this.email = userInfo.businessCard.email
+      this.requestName = userInfo.person.personName
+      this.contactName = userInfo.person.personName
+      this.contact = userInfo.person.mobile
+      if (userInfo.person && userInfo.person.addressRegion) {
+        this.receiveAddressIndex[0] = this.provinceData.findIndex(item => item.name === userInfo.person.addressRegion.province.name)
+        this.receiveAddressIndex[1] = this.cityData[this.receiveAddressIndex[0]].findIndex(item => item.name === userInfo.person.addressRegion.city.name)
+        this.receiveAddressIndex[2] = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]].findIndex(item => item.name === userInfo.person.addressRegion.area.name)
+      }
+      if (userInfo.person.addressDetail) this.receiveAddress = userInfo.person.addressDetail
+    }
+    this.getAgreement()
+    this.getConfigList()
+    // this.getContactList()
+  },
+  computed: {
+    amount() {
+      let tmpAmount = 0
+      this.configList.forEach(item => {
+        item.contents.forEach((content, contentIndex) => {
+          if (contentIndex === item.contentIndex && content.amountList.length > 0) {
+            content.amountList.forEach((amount, amountIndex) => {
+              if (amountIndex === item.amountIndex) {
+                tmpAmount += parseFloat(amount.amount)
+              }
+            })
+          }
+        })
+      })
+      return tmpAmount
+    },
+    totalAmount() {
+      return this.amount * this.companyList.length
+    }
+  }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.server-item {
+  background-color: #fbf8f8;
+  border: 2px solid #fbebf1;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
+
+  .items-center {
+    width: 1100px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex: 1;
+
+    view {
+      width: 300px;
+    }
+
+    .ml-35 {
+      font-weight: normal;
+      font-size: 13px;
+    }
+  }
+
+  .server-item-content {
+    display: flex;
+    align-items: center;
+    width: 600px !important;
+  }
+
+  .remark {
+    color: #999999;
+    font-weight: normal;
+  }
+}
+
+.divider-title {
+  font-size: 17px;
+  font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/self-support/costQuote.vue b/pages/index/self-support/costQuote.vue
new file mode 100644
index 0000000..fb1c1ee
--- /dev/null
+++ b/pages/index/self-support/costQuote.vue
@@ -0,0 +1,525 @@
+<template>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200 m-a">
+      <common-swiper page="self-support-quote-swiper"/>
+      <view class="flex justify-end items-center text-main pointer my-20 " @click="demoDownload">示例下载</view>
+      <view class="bg-white p-40">
+        <view v-for="(item, index) in configList" :key="index"
+              class="server-item my-20 flex flex-col justify-start items-start">
+          <el-checkbox @change="changeCheck(index, item.name)">
+            <view class="flex flex-col justify-start items-start">
+              <view class="flex justify-start items-center text-35 mb-20">
+                <view class="name" style="width: 120px;">{{ item.name }}</view>
+                <view class="ml-15" style="width: 120px;">
+                  <text>业务编号:</text>
+                  <text v-if="item.contentIndex !== null">{{
+                      item.contents[item.contentIndex].code
+                    }}
+                  </text>
+                </view>
+                <view class="server-item-content">
+                  <text class="ml-15">服务项目:</text>
+                  <el-select v-model="configList[index].contentIndex" clearable style="width: 200px"
+                             :disabled="!contentList.includes(index)">
+                    <el-option v-for="(content, contentIndex) in item.contents" :key="contentIndex"
+                               :label="content.title" :value="contentIndex"/>
+                  </el-select>
+                  <template v-if="item.contentIndex !== null">
+                    <el-select v-model="configList[index].amountIndex" @change="changeAmountIndex(index)"
+                               clearable class="ml-15" style="width: 300px">
+                      <el-option
+                        v-for="(amount, amountIndex) in item.contents[item.contentIndex].amountList"
+                        :key="amountIndex"
+                        :label="amount.title" :value="amountIndex"/>
+                    </el-select>
+                    <template v-if="configList[index].amountIndex !== null">
+                      <text class="ml-15">清单单品项数:</text>
+                      <el-input v-model="configList[index].num" style="width: 200px"/>
+                    </template>
+                  </template>
+                </view>
+              </view>
+              <view class="remark">备注: {{ item.remark }}</view>
+            </view>
+          </el-checkbox>
+        </view>
+        <el-form ref="form" :model="form" label-width="200px">
+          <view v-for="(item, companyIndex) in companyList" :key="companyIndex">
+            <el-divider>{{ item.name }}</el-divider>
+            <el-form-item label="产品明细：" required>
+              <vk-data-upload v-model="companyList[companyIndex].files" list-type="text"
+                              :on-preview="previewUpload"
+                              accept=".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf">
+              </vk-data-upload>
+            </el-form-item>
+            <el-form-item label="产品应用地址:" required>
+              <el-row :gutter="10">
+                <el-col :span="4">
+                  <el-select v-model="addressIndex[companyIndex][0]" placeholder="请选择省">
+                    <el-option v-for="(item, index) in provinceData" :key="index"
+                               :label="item.name"
+                               :value="index">
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="4">
+                  <el-select v-model="addressIndex[companyIndex][1]" placeholder="请选择市"
+                             :disabled="addressIndex[companyIndex].length === 0">
+                    <template v-if="addressIndex[companyIndex][0] !== null">
+                      <el-option v-for="(item, index) in cityData[addressIndex[companyIndex][0]]"
+                                 :key="index"
+                                 :label="item.name"
+                                 :value="index">
+                      </el-option>
+                    </template>
+                  </el-select>
+                </el-col>
+                <el-col :span="4">
+                  <el-select v-model="addressIndex[companyIndex][2]" placeholder="请选择区"
+                             :disabled="addressIndex[companyIndex].length === 1">
+                    <template
+                      v-if="addressIndex[companyIndex][0] !== null && addressIndex[companyIndex][1] !== null">
+                      <el-option
+                        v-for="(item, index) in areaData[addressIndex[companyIndex][0]][addressIndex[companyIndex][1]]"
+                        :key="index"
+                        :label="item.name"
+                        :value="index">
+                      </el-option>
+                    </template>
+                  </el-select>
+                </el-col>
+                <el-col :span="11">
+                  <el-input v-model="companyList[companyIndex].address" placeholder="请输入详细地址"/>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </view>
+          <el-divider/>
+          <el-form-item label="接收文件电子邮箱:" required>
+            <el-input v-model="email"/>
+          </el-form-item>
+          <el-form-item label="接收文件微信:" required>
+            <el-input v-model="wechat"/>
+          </el-form-item>
+          <el-form-item label="接收文件寄件地址" required>
+            <el-row :gutter="10">
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[0]" placeholder="请选择省">
+                  <el-option v-for="(item, index) in provinceData" :key="index"
+                             :label="item.name"
+                             :value="index">
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[1]" placeholder="请选择市"
+                           :disabled="receiveAddressIndex.length === 0">
+                  <template v-if="receiveAddressIndex[0] !== null">
+                    <el-option
+                      v-for="(item, index) in cityData[receiveAddressIndex[0]]"
+                      :key="index"
+                      :label="item.name"
+                      :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[2]" placeholder="请选择区"
+                           :disabled="receiveAddressIndex.length === 1">
+                  <template
+                    v-if="receiveAddressIndex[0] !== null && receiveAddressIndex[1] !== null">
+                    <el-option
+                      v-for="(item, index) in areaData[receiveAddressIndex[0]][receiveAddressIndex[1]]"
+                      :key="index"
+                      :label="item.name"
+                      :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="11">
+                <el-input v-model="receiveAddress" placeholder="请输入详细地址"/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <p class="text-main text-25 text-center" style="margin-bottom: 80rpx">接收文件电子邮箱/ 接收文件微信/
+            接收文件寄件地址,以上三项选填一项即可</p>
+          <el-row :gutter="10">
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="申请人:" required>
+                <el-input v-model="requestName"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="业务联系人:" required>
+                <el-input v-model="contactName"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="业务咨询联系方式:" required>
+                <el-input v-model="contact"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <view class="mt-40 flex justify-center items-center">
+          <view class="ml-35">客服联系方式: 0771-3923001</view>
+        </view>
+        <view class="flex justify-start items-center">
+          <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+          <span class="text-main pointer font-bold" @click="showAgreement">《金久信自营交易协议》</span>
+        </view>
+        <view class="mt-40 flex justify-center items-center">
+          <el-button type="primary" @click="newOrder"
+                     :disabled="companyList.length === 0 || !agree">
+            立即提交
+          </el-button>
+        </view>
+      </view>
+    </view>
+    <gap/>
+    <common-footer></common-footer>
+  </view>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import Gap from "../../../components/gap/gap.vue";
+
+export default {
+  name: "companyQuote",
+  components: {Gap},
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      form: {},
+      configList: [],
+      checkList: [],
+      contentList: [],
+      contentNameList: [],
+      addressIndex: [[null, null, null]],
+      addressDetail: '',
+      receiveAddressIndex: [null, null, null],
+      receiveAddressDetail: '',
+      companyList: [
+        {
+          name: '',
+          code: '',
+          addressRegion: {
+            province: null,
+            city: null,
+            area: null,
+          },
+          address: '',
+        }
+      ],
+      email: '',
+      wechat: '',
+      receiveAddressRegion: {
+        province: null,
+        city: null,
+        area: null,
+      },
+      receiveAddress: '',
+      requestName: '',
+      contactName: '',
+      contact: '',
+      agreement: '',
+      agree: false,
+      contactList: []
+    }
+  },
+  methods: {
+
+    async getConfigList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/coop/config/pub/getList',
+        data: {type: 2}
+      })
+      if (rows) {
+        this.configList = rows.map(item => {
+          item.contentIndex = null
+          item.amountIndex = null
+          item.num = null
+          return item
+        })
+      }
+    },
+    changeCheck(itemIndex, name) {
+      const index = this.contentList.indexOf(itemIndex)
+      if (index === -1) {
+        this.contentList.push(itemIndex)
+        this.contentNameList.push(name)
+      } else {
+        this.contentList.splice(index, 1)
+        this.contentNameList.splice(index, 1)
+        this.configList[itemIndex].contentIndex = null
+        this.configList[itemIndex].amountIndex = null
+      }
+    },
+    addCompany() {
+      this.companyList.push({
+        name: '',
+        code: '',
+        addressRegion: {
+          province: null,
+          city: null,
+          area: null,
+        },
+      })
+      this.addressIndex.push([null, null, null])
+      this.receiveAddressIndex.push([null, null, null])
+    },
+    removeCompany(index) {
+      this.companyList.splice(index, 1)
+      this.addressIndex.splice(index, 1)
+      this.receiveAddressIndex.splice(index, 1)
+    },
+    async newOrder() {
+      const amountList = []
+      this.configList.forEach(item => {
+        item.contents.forEach((content, contentIndex) => {
+          if (contentIndex === item.contentIndex && content.amountList.length > 0) {
+            content.amountList.forEach((amount, amountIndex) => {
+              if (amountIndex === item.amountIndex) {
+                amountList.push(`${content._index},${amount._index},${item.num}`)
+              }
+            })
+          }
+        })
+      })
+      if (amountList.length === 0) return this.$message({
+        message: '请至少选择一项服务',
+        type: 'error'
+      })
+      if (this.addressIndex[0][2] === null) return this.$message({
+        message: '请选择地址',
+        type: 'error'
+      })
+      if (!this.email && !this.wechat && this.receiveAddressIndex[0][2] === null) return this.$message({
+        message: '请选择接收文件地址/微信/邮箱',
+        type: 'error'
+      })
+      this.companyList.forEach((item, index) => {
+        const companyProvince = this.provinceData[this.addressIndex[index][0]]
+        const companyCity = this.cityData[this.addressIndex[index][0]][this.addressIndex[index][1]]
+        const companyArea = this.areaData[this.addressIndex[index][0]][this.addressIndex[index][1]][this.addressIndex[index][2]]
+        this.companyList[index].addressRegion = {
+          province: {code: companyProvince.code, name: companyProvince.name},
+          city: {code: companyCity.code, name: companyCity.name},
+          area: {code: companyArea.code, name: companyArea.name},
+        }
+      })
+      for (let i = 0; i < this.companyList.length; i++) {
+        if (!this.companyList[i].files || this.companyList[i].files.length === 0) return this.$message({
+          message: '请上传产品明细',
+          type: 'error'
+        })
+        if (!this.companyList[i].address) return this.$message({
+          type: 'error',
+          message: '请填写产品应用地址',
+        })
+        if (this.addressIndex[i][2] === null) return this.$message({
+          type: 'error',
+          message: '请填写产品应用地址',
+        })
+      }
+      if (!this.requestName) return this.$message({
+        type: 'error',
+        message: '请填写申请人',
+      })
+      if (!this.contactName) return this.$message({
+        type: 'error',
+        message: '请填写业务联系人姓名',
+      })
+      if (!this.contact) return this.$message({
+        type: 'error',
+        message: '请填写联系人电话',
+      })
+      if (this.receiveAddressIndex.length > 0 && this.receiveAddressIndex[2] !== null) {
+        const province = this.provinceData[this.receiveAddressIndex[0]]
+        const city = this.cityData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]]
+        const area = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]][this.receiveAddressIndex[2]]
+        this.receiveAddressRegion = {
+          province: {code: province.code, name: province.name},
+          city: {code: city.code, name: city.name},
+          area: {code: area.code, name: area.name},
+        }
+      }
+      const {data} = await vk.callFunction({
+        url: 'client/selfSupport/kh/addOrder',
+        title: '提交中...',
+        data: {
+          type: 2,
+          amountList,
+          contentList: this.companyList,
+          receiveAddressRegion: this.receiveAddressRegion,
+          email: this.email,
+          wechat: this.wechat,
+          receiveAddress: this.receiveAddress,
+          requestName: this.requestName,
+          contactName: this.contactName,
+          contact: this.contact,
+        }
+      })
+      this.$message({
+        type: 'success',
+        message: '已提交',
+      })
+      vk.navigateBack()
+    },
+    showAgreement() {
+      this.$confirm(this.agreement, '金久信自营交易协议', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true,
+      })
+    },
+    async getAgreement() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '65885d4c09664c1c8d8e8476'
+        },
+      })
+      this.agreement = res.content
+    },
+    demoDownload() {
+      vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '6588642a99c624e89199fbb4'
+        },
+        success: res => {
+          window.open(res.content)
+        }
+      })
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.contact = contact.phone
+    },
+    changeAmountIndex(configIndex) {
+      const config = this.configList[configIndex]
+      if (config.contentIndex !== null && config.amountIndex !== null) {
+        this.configList[configIndex].num = config.contents[config.contentIndex].amountList[config.amountIndex].defaultNum
+      }
+    },
+    previewUpload({url}) {
+      window.open(url)
+    }
+  },
+  onLoad() {
+    const userInfo = vk.getVuex('$user.userInfo')
+    // console.log('userInfo', userInfo)
+    if (parseInt(userInfo.accountType) === 2) {
+      this.email = userInfo.company.contactEmail
+      this.requestName = userInfo.manager.personName
+      this.contactName = userInfo.manager.personName
+      this.contact = userInfo.company.mobile
+      if (userInfo.company && userInfo.company.addressRegion) {
+        this.receiveAddressIndex[0] = this.provinceData.findIndex(item => item.name === userInfo.company.addressRegion.province.name)
+        this.receiveAddressIndex[1] = this.cityData[this.receiveAddressIndex[0]].findIndex(item => item.name === userInfo.company.addressRegion.city.name)
+        this.receiveAddressIndex[2] = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]].findIndex(item => item.name === userInfo.company.addressRegion.area.name)
+      }
+      if (userInfo.company.addressDetail) this.receiveAddress = userInfo.company.addressDetail
+    } else {
+      if (userInfo.businessCard && userInfo.businessCard.email) this.email = userInfo.businessCard.email
+      this.requestName = userInfo.person.personName
+      this.contactName = userInfo.person.personName
+      this.contact = userInfo.person.mobile
+      if (userInfo.person && userInfo.person.addressRegion) {
+        this.receiveAddressIndex[0] = this.provinceData.findIndex(item => item.name === userInfo.person.addressRegion.province.name)
+        this.receiveAddressIndex[1] = this.cityData[this.receiveAddressIndex[0]].findIndex(item => item.name === userInfo.person.addressRegion.city.name)
+        this.receiveAddressIndex[2] = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]].findIndex(item => item.name === userInfo.person.addressRegion.area.name)
+      }
+      if (userInfo.person.addressDetail) this.receiveAddress = userInfo.person.addressDetail
+    }
+    this.getAgreement()
+    this.getConfigList()
+    // this.getContactList()
+  },
+  computed: {
+    amount() {
+      let tmpAmount = 0
+      this.configList.forEach(item => {
+        item.contents.forEach((content, contentIndex) => {
+          if (contentIndex === item.contentIndex && content.amountList.length > 0) {
+            content.amountList.forEach((amount, amountIndex) => {
+              if (amountIndex === item.amountIndex) {
+                tmpAmount += parseFloat(amount.amount)
+              }
+            })
+          }
+        })
+      })
+      return tmpAmount
+    },
+    totalAmount() {
+      return this.amount * this.companyList.length
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.server-item {
+  background-color: #fbf8f8;
+  border: 2px solid #fbebf1;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
+
+  .items-center {
+    width: 1100px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex: 1;
+
+    view {
+      width: 300px;
+    }
+
+    .ml-35 {
+      font-weight: normal;
+      font-size: 13px;
+    }
+  }
+
+  .server-item-content {
+    display: flex;
+    align-items: center;
+    flex: 1;
+    //width: 600px !important;
+  }
+
+  .remark {
+    color: #999999;
+    font-weight: normal;
+  }
+}
+
+.divider-title {
+  font-size: 17px;
+  font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/self-support/productQuote.vue b/pages/index/self-support/productQuote.vue
index 214f3df..569a40d 100644
--- a/pages/index/self-support/productQuote.vue
+++ b/pages/index/self-support/productQuote.vue
@@ -1,193 +1,270 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200 m-a">
-            <u-swiper :list="list" :height="380" borderRadius="0"></u-swiper>
-            <view class="bg-white p-40">
-                <view v-for="(item, index) in configList" :key="index"
-                      class="my-20 flex flex-col justify-start items-start">
-                    <view class="flex flex-col justify-start items-start">
-                        <view class="flex justify-start items-center text-35 mb-20">
-                            <text>服务内容:{{ item.name }}</text>
-                            <view class="flex flex-col justify-start items-start">
-                                <view v-for="(content, contentIndex) in item.contents" :key="contentIndex"
-                                      class="mb-40 flex justify-start items-center">
-                                    <view class="ml-35">
-                                        <text>业务编号:</text>
-                                        <text>{{ content.code }}</text>
-                                    </view>
-                                    <view class="flex justify-start items-center">
-                                        <text class="ml-35">服务服务项目:</text>
-                                        <el-checkbox v-model="configList[index].contents[contentIndex].checked"
-                                                     @change="selectContent(content)"
-                                                     :disabled="!content.amountList || content.amountList.length === 0">
-                                            {{ content.title }}
-                                        </el-checkbox>
-                                    </view>
-                                    <view class="flex justify-start items-center ml-35">
-                                        <el-select v-model="configList[index].contents[contentIndex].amountIndex"
-                                                   clearable
-                                                   :disabled="!content.amountList || content.amountList.length === 0">
-                                            <el-option v-for="(amount, amountIndex) in content.amountList"
-                                                       :key="amountIndex"
-                                                       :label="amount.title" :value="amountIndex"/>
-                                        </el-select>
-                                        <text class="ml-35" v-if="content.amountIndex !== null">
-                                            {{ content.amountList[content.amountIndex].amount }}元/次
-                                        </text>
-                                    </view>
-                                </view>
-                            </view>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200 m-a">
+      <common-swiper page="self-support-product-swiper"/>
+      <view class="flex justify-end items-center text-main pointer my-20 " @click="demoDownload">示例下载</view>
 
-                        </view>
-                        <view>备注: {{ item.remark }}</view>
-                    </view>
+      <view class="bg-white p-40">
+        <view v-for="(item, index) in configList" :key="index"
+              class="server-item my-20 flex flex-col justify-start items-start">
+          <el-checkbox @change="changeCheck(index, item.name)">
+            <view class="flex flex-col justify-start items-start">
+              <view class="flex justify-start items-center text-35 mb-20">
+                <view class="name">{{ item.name }}</view>
+                <view class="ml-15">
+                  <text>业务编号:</text>
+                  <text v-if="item.contentIndex !== null">{{
+                      item.contents[item.contentIndex].code
+                    }}
+                  </text>
                 </view>
-                <el-form ref="form" :model="form" label-width="200px">
-                    <view v-for="(item, productIndex) in productList" :key="productIndex">
-                        <el-form-item label="检测产品:" required>
-                            <el-input v-model="productList[productIndex].name"/>
-                        </el-form-item>
-                        <el-form-item label="检测内容">
-                            {{ contentNameList.join() }}
-                        </el-form-item>
-                        <el-form-item label="取样所在地">
-                            <el-row :gutter="10">
-                                <el-col :span="4">
-                                    <el-select v-model="addressIndex[productIndex][0]" placeholder="请选择省">
-                                        <el-option v-for="(item, index) in provinceData" :key="index"
-                                                   :label="item.name"
-                                                   :value="index">
-                                        </el-option>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="addressIndex[productIndex][1]" placeholder="请选择市"
-                                               :disabled="addressIndex[productIndex].length === 0">
-                                        <template v-if="addressIndex[productIndex][0] !== null">
-                                            <el-option v-for="(item, index) in cityData[addressIndex[productIndex][0]]"
-                                                       :key="index"
-                                                       :label="item.name"
-                                                       :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="addressIndex[productIndex][2]" placeholder="请选择区"
-                                               :disabled="addressIndex[productIndex].length === 1">
-                                        <template
-                                            v-if="addressIndex[productIndex][0] !== null && addressIndex[productIndex][1] !== null">
-                                            <el-option
-                                                v-for="(item, index) in areaData[addressIndex[productIndex][0]][addressIndex[productIndex][1]]"
-                                                :key="index"
-                                                :label="item.name"
-                                                :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="11">
-                                    <el-input v-model="productList[productIndex].address" placeholder="请输入详细地址"/>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="接收文件电子邮箱:">
-                            <el-input v-model="productList[productIndex].email"/>
-                        </el-form-item>
-                        <el-form-item label="接收文件微信:">
-                            <el-input v-model="productList[productIndex].wechat"/>
-                        </el-form-item>
-                        <el-form-item label="接收文件寄件地址">
-                            <el-row :gutter="10">
-                                <el-col :span="4">
-                                    <el-select v-model="receiveAddressIndex[productIndex][0]" placeholder="请选择省">
-                                        <el-option v-for="(item, index) in provinceData" :key="index"
-                                                   :label="item.name"
-                                                   :value="index">
-                                        </el-option>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="receiveAddressIndex[productIndex][1]" placeholder="请选择市"
-                                               :disabled="receiveAddressIndex[productIndex].length === 0">
-                                        <template v-if="receiveAddressIndex[productIndex][0] !== null">
-                                            <el-option
-                                                v-for="(item, index) in cityData[receiveAddressIndex[productIndex][0]]"
-                                                :key="index"
-                                                :label="item.name"
-                                                :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="4">
-                                    <el-select v-model="receiveAddressIndex[productIndex][2]" placeholder="请选择区"
-                                               :disabled="receiveAddressIndex[productIndex].length === 1">
-                                        <template
-                                            v-if="receiveAddressIndex[productIndex][0] !== null && receiveAddressIndex[productIndex][1] !== null">
-                                            <el-option
-                                                v-for="(item, index) in areaData[receiveAddressIndex[productIndex][0]][receiveAddressIndex[productIndex][1]]"
-                                                :key="index"
-                                                :label="item.name"
-                                                :value="index">
-                                            </el-option>
-                                        </template>
-                                    </el-select>
-                                </el-col>
-                                <el-col :span="11">
-                                    <el-input v-model="productList[productIndex].receiveAddress" placeholder="请输入详细地址"/>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="申请人:">
-                            <el-input v-model="productList[productIndex].requestName"/>
-                        </el-form-item>
-                        <el-form-item label="联系人:">
-                            <el-input v-model="productList[productIndex].contactName"/>
-                        </el-form-item>
-                        <el-form-item label="联系方式:">
-                            <el-input v-model="productList[productIndex].contact"/>
-                        </el-form-item>
-                        <el-form-item label="本次服务费用小计:">
-                            <view class="flex justify-between items-start mb-20 w-100p">
-                                <view class="flex justify-start items-center">
-                                    <el-input v-model="amount" disabled/>
-                                    <view class="ml-20">
-                                        <el-button type="primary" @click.native="addProduct">增加考察对象
-                                        </el-button>
-                                    </view>
-                                    <view class="ml-20">
-                                        <el-button type="primary" plain @click.native="removeProduct(productIndex)"
-                                                   class="ml-20"
-                                                   :disabled="productList.length === 1">删除该对象
-                                        </el-button>
-                                    </view>
-                                </view>
-                            </view>
-                        </el-form-item>
-                    </view>
-                </el-form>
-                <view class="mt-40 flex justify-center items-center">
-                    <view class="flex justify-center items-center">
-                        <text>总价:</text>
-                        <text class="text-main font-bold text-35">{{ totalAmount }}元</text>
-                    </view>
-                    <view class="ml-35">客服联系方式: 0771-3923001</view>
+                <view class="server-item-content">
+                  <text class="ml-15">服务项目:</text>
+                  <el-select v-model="configList[index].contentIndex" clearable
+                             :disabled="!contentList.includes(index)">
+                    <el-option v-for="(content, contentIndex) in item.contents" :key="contentIndex"
+                               :label="content.title" :value="contentIndex"/>
+                  </el-select>
+
+                  <template v-if="item.contentIndex !== null">
+                    <el-select v-model="configList[index].amountIndex"
+                               clearable class="ml-15">
+                      <el-option
+                        v-for="(amount, amountIndex) in item.contents[item.contentIndex].amountList"
+                        :key="amountIndex"
+                        :label="amount.title" :value="amountIndex"/>
+                    </el-select>
+                  </template>
                 </view>
-                <view class="mt-40 flex justify-center items-center">
-                    <el-button type="primary" @click.native="newOrder"
-                               :disabled="productList.length === 0 || !productList[0].name">
-                        立即支付
-                    </el-button>
+                <text>金额:</text>
+                <view class="ml-15" v-if="item.contentIndex !== null && item.amountIndex !== null">
+                  {{ item.contents[item.contentIndex].amountList[item.amountIndex].amount }}元/次
                 </view>
+                <view class="ml-15" v-else>
+                  元/次
+                </view>
+                <el-button type="primary" size="small"
+                           @click="addToAmountList(index, configList[index].contentIndex, item.amountIndex)"
+                           :disabled="item.amountIndex === null">
+                  添加
+                </el-button>
+              </view>
+              <view class="remark">备注: {{ item.remark }}</view>
             </view>
+          </el-checkbox>
         </view>
-        <gap/>
-        <common-footer></common-footer>
+        <el-form ref="form" :model="form" label-width="200px">
+          <view v-for="(item, productIndex) in productList" :key="productIndex">
+            <el-form-item label="检测产品:" required>
+              <el-input v-model="productList[productIndex].name"/>
+            </el-form-item>
+            <el-form-item label="文档上传：">
+              <vk-data-upload v-model="productList[productIndex].files" list-type="text"
+                              :on-preview="previewUpload"
+                              accept=".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf">
+              </vk-data-upload>
+            </el-form-item>
+            <el-form-item label="检测内容">
+              {{ contentNameList.join() }}
+            </el-form-item>
+            <el-form-item label="取样所在地">
+              <el-row :gutter="10">
+                <el-col :span="4">
+                  <el-select v-model="addressIndex[productIndex][0]" placeholder="请选择省">
+                    <el-option v-for="(item, index) in provinceData" :key="index"
+                               :label="item.name"
+                               :value="index">
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="4">
+                  <el-select v-model="addressIndex[productIndex][1]" placeholder="请选择市"
+                             :disabled="addressIndex[productIndex].length === 0">
+                    <template v-if="addressIndex[productIndex][0] !== null">
+                      <el-option v-for="(item, index) in cityData[addressIndex[productIndex][0]]"
+                                 :key="index"
+                                 :label="item.name"
+                                 :value="index">
+                      </el-option>
+                    </template>
+                  </el-select>
+                </el-col>
+                <el-col :span="4">
+                  <el-select v-model="addressIndex[productIndex][2]" placeholder="请选择区"
+                             :disabled="addressIndex[productIndex].length === 1">
+                    <template
+                      v-if="addressIndex[productIndex][0] !== null && addressIndex[productIndex][1] !== null">
+                      <el-option
+                        v-for="(item, index) in areaData[addressIndex[productIndex][0]][addressIndex[productIndex][1]]"
+                        :key="index"
+                        :label="item.name"
+                        :value="index">
+                      </el-option>
+                    </template>
+                  </el-select>
+                </el-col>
+                <el-col :span="11">
+                  <el-input v-model="productList[productIndex].address" placeholder="请输入详细地址"/>
+                </el-col>
+              </el-row>
+            </el-form-item>
+            <el-form-item label="本次服务费用小计:">
+              <view class="flex justify-between items-start mb-20 w-100p">
+                <view class="flex justify-start items-center">
+                  <el-input v-model="amount" disabled/>
+                </view>
+                <view class="ml-20">
+                  <el-button type="primary" plain @click.native="removeProduct(productIndex)"
+                             class="ml-20"
+                             :disabled="productList.length === 1">删除该对象
+                  </el-button>
+                </view>
+              </view>
+            </el-form-item>
+            <el-divider/>
+          </view>
+          <el-form-item label="接收文件电子邮箱:">
+            <el-input v-model="email"/>
+          </el-form-item>
+          <el-form-item label="接收文件微信:">
+            <el-input v-model="wechat"/>
+          </el-form-item>
+          <el-form-item label="接收文件寄件地址">
+            <el-row :gutter="10">
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[0]" placeholder="请选择省">
+                  <el-option v-for="(item, index) in provinceData" :key="index"
+                             :label="item.name"
+                             :value="index">
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[1]" placeholder="请选择市"
+                           :disabled="receiveAddressIndex.length === 0">
+                  <template v-if="receiveAddressIndex[0] !== null">
+                    <el-option
+                      v-for="(item, index) in cityData[receiveAddressIndex[0]]"
+                      :key="index"
+                      :label="item.name"
+                      :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="receiveAddressIndex[2]" placeholder="请选择区"
+                           :disabled="receiveAddressIndex.length === 1">
+                  <template
+                    v-if="receiveAddressIndex[0] !== null && receiveAddressIndex[1] !== null">
+                    <el-option
+                      v-for="(item, index) in areaData[receiveAddressIndex[0]][receiveAddressIndex[1]]"
+                      :key="index"
+                      :label="item.name"
+                      :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="11">
+                <el-input v-model="receiveAddress"
+                          placeholder="请输入详细地址"/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <p class="text-main text-25 text-center" style="margin-bottom: 80rpx">接收文件电子邮箱/ 接收文件微信/
+            接收文件寄件地址,以上三项选填一项即可</p>
+          <!--                    <el-form-item label="申请人:">-->
+          <!--                        <el-input v-model="requestName"/>-->
+          <!--                    </el-form-item>-->
+          <!--                    <el-form-item label="联系人:">-->
+          <!--                        <el-input v-model="contactName"/>-->
+          <!--                    </el-form-item>-->
+          <!--                    <el-form-item label="联系方式:">-->
+          <!--                        <el-input v-model="contact"/>-->
+          <!--                    </el-form-item>-->
+          <el-row :gutter="10">
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="申请人:" required>
+                <el-input v-model="requestName"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="业务联系人:" required>
+                <el-input v-model="contactName"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="flex justify-start items-center">
+              <el-form-item label="业务咨询联系方式:" required>
+                <el-input v-model="contact"/>
+              </el-form-item>
+            </el-col>
+            <!--                        <el-col :span="8" class="flex justify-start items-center">-->
+            <!--                            <el-form-item label="联系人:" required>-->
+            <!--                                <el-select v-model="contactName" placeholder="点击选择业务联系人"-->
+            <!--                                           class="w-100p" @change="selectContact">-->
+            <!--                                    <el-option-->
+            <!--                                        v-for="(item, index) in contactList"-->
+            <!--                                        :key="index"-->
+            <!--                                        :label="item.name"-->
+            <!--                                        :value="item.name">-->
+            <!--                                    </el-option>-->
+            <!--                                    <view slot="empty" class="text-gray pointer p-20">-->
+            <!--                                        <text>无业务联系人,请到</text>-->
+            <!--                                        <text class="text-main mx-15" @click="navTo">个人中心</text>-->
+            <!--                                        <text>添加</text>-->
+            <!--                                    </view>-->
+            <!--                                </el-select>-->
+            <!--                            </el-form-item>-->
+            <!--                        </el-col>-->
+            <!--                        <el-col :span="8" class="flex justify-start items-center">-->
+            <!--                            <el-form-item label="业务咨询联系方式:" required>-->
+            <!--                                <el-input v-model="contact" type="number" disabled/>-->
+            <!--                            </el-form-item>-->
+            <!--                        </el-col>-->
+          </el-row>
+          <el-form-item label="备注:">
+            <el-input v-model="remark"/>
+          </el-form-item>
+          <el-button type="primary" @click.native="addProduct">增加考察对象
+          </el-button>
+        </el-form>
+        <view class="mt-20">
+          <view>已选项目:</view>
+          <view v-for="(item, index) in amountList" :key="index" class="mt-20 flex justify-start items-center">
+            <el-button type="primary" size="small" @click="removeFromAmountList(index)">删除</el-button>
+            <p class="ml-20">{{ configList[item.index].name }} -- {{ configList[item.index].contents[item.contentIndex].title }} --
+              {{
+                configList[item.index].contents[item.contentIndex].amountList[item.amountIndex].title
+              }},{{ configList[item.index].contents[item.contentIndex].amountList[item.amountIndex].amount }}元</p>
+
+          </view>
+        </view>
+        <view class="mt-40 flex justify-center items-center">
+          <view class="flex justify-center items-center">
+            <text>总价:</text>
+            <text class="text-main font-bold text-35">{{ totalAmount }}元</text>
+          </view>
+          <view class="ml-35">客服联系方式: 0771-3923001</view>
+        </view>
+        <view class="flex justify-start items-center">
+          <el-checkbox v-model="agree">我已阅读并同意</el-checkbox>
+          <span class="text-main pointer font-bold" @click="showAgreement">《金久信自营交易协议》</span>
+        </view>
+        <view class="mt-40 flex justify-center items-center">
+          <el-button type="primary" @click.native="newOrder"
+                     :disabled="productList.length === 0 || !productList[0].name || !agree">
+            立即支付
+          </el-button>
+        </view>
+      </view>
     </view>
+    <gap/>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -196,168 +273,340 @@ import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
-    name: "productQuote",
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            list: [
-                {
-                    image: '/static/images/selfSupport/swiper.jpg',
-                    title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-                },
-            ],
-            form: {},
-            configList: [],
-            checkList: [],
-            contentList: [],
-            contentNameList: [],
-            addressIndex: [[null, null, null]],
-            addressDetail: '',
-            receiveAddressIndex: [[null, null, null]],
-            receiveAddressDetail: '',
-            productList: [
-                {
-                    name: '',
-                    code: '',
-                    addressRegion: {
-                        province: null,
-                        city: null,
-                        area: null,
-                    },
-                    address: '',
-                    email: '',
-                    wechat: '',
-                    receiveAddressRegion: {
-                        province: null,
-                        city: null,
-                        area: null,
-                    },
-                    receiveAddress: '',
-                    requestName: '',
-                    contactName: '',
-                    contact: '',
-                }
-            ],
-        }
-    },
-    methods: {
-        async getConfigList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/coop/config/pub/getList',
-                data: {type: 1}
-            })
-            if (rows) {
-                this.configList = rows.map(item => {
-                    item.contents.map(content => {
-                        content.checked = false
-                        content.amountIndex = null
-                        return content
-                    })
-                    return item
-                })
-            }
-        },
-        addProduct() {
-            this.productList.push({
-                name: '',
-                code: '',
-                addressRegion: {
-                    province: null,
-                    city: null,
-                    area: null,
-                },
-                address: '',
-                email: '',
-                wechat: '',
-                receiveAddressRegion: {
-                    province: null,
-                    city: null,
-                    area: null,
-                },
-                receiveAddress: '',
-                requestName: '',
-                contactName: '',
-                contact: '',
-            })
-            this.addressIndex.push([null, null, null])
-            this.receiveAddressIndex.push([null, null, null])
-        },
-        removeProduct(index) {
-            this.productList.splice(index, 1)
-            this.addressIndex.splice(index, 1)
-            this.receiveAddressIndex.splice(index, 1)
-        },
-        selectContent(content) {
-            const index = this.contentNameList.indexOf(content.title)
-            if (index === -1) this.contentNameList.push(content.title)
-            else this.contentNameList.splice(index, 1)
-        },
-        async newOrder() {
-            const amountList = []
-            this.configList.forEach(item => {
-                item.contents.forEach(content => {
-                    if (content.checked && content.amountList.length > 0) {
-                        content.amountList.forEach((amount, amountIndex) => {
-                            if (amountIndex === content.amountIndex) {
-                                amountList.push(amount._index)
-                            }
-                        })
-                    }
-                })
-            })
-            if (amountList.length === 0) return this.$message({
-                message: '请至少选择一项服务',
-                type: 'error'
-            })
-            this.productList.forEach((item, index) => {
-                this.productList[index].addressRegion = {
-                    province: this.provinceData[this.addressIndex[index][0]],
-                    city: this.cityData[this.addressIndex[index][0]][this.addressIndex[index][1]],
-                    area: this.areaData[this.addressIndex[index][0]][this.addressIndex[index][1]][this.addressIndex[index][2]],
-                }
-                this.productList[index].receiveAddressRegion = {
-                    province: this.provinceData[this.receiveAddressIndex[index][0]],
-                    city: this.cityData[this.receiveAddressIndex[index][0]][this.receiveAddressIndex[index][1]],
-                    area: this.areaData[this.receiveAddressIndex[index][0]][this.receiveAddressIndex[index][1]][this.receiveAddressIndex[index][2]],
-                }
-            })
-            const {data} = await vk.callFunction({
-                url: 'client/selfSupport/kh/addOrder',
-                data: {
-                    type: 1,
-                    amountList,
-                    contentList: this.productList
-                }
-            })
-            vk.navigateTo({
-                url: `/pages/index/shop/pay?id=${data}`
-            })
-        },
-    },
-    onLoad() {
-        this.getConfigList()
-    },
-    computed: {
-        amount() {
-            let tmpAmount = 0
-            this.configList.forEach(item => {
-                item.contents.forEach(content => {
-                    if (content.checked && content.amountList.length > 0) {
-                        content.amountList.forEach((amount, amountIndex) => {
-                            if (amountIndex === content.amountIndex) {
-                                tmpAmount += parseFloat(amount.amount)
-                            }
-                        })
-                    }
-                })
-            })
-            return tmpAmount
-        },
-        totalAmount() {
-            return this.amount * this.productList.length
+  name: "productQuote",
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      form: {},
+      configList: [],
+      checkList: [],
+      contentList: [],
+      contentNameList: [],
+      addressIndex: [[null, null, null]],
+      addressDetail: '',
+      receiveAddressIndex: [null, null, null],
+      receiveAddressDetail: '',
+      productList: [
+        {
+          name: '',
+          code: '',
+          addressRegion: {
+            province: null,
+            city: null,
+            area: null,
+          },
+          address: '',
         }
+      ],
+      email: '',
+      wechat: '',
+      receiveAddressRegion: {
+        province: null,
+        city: null,
+        area: null,
+      },
+      receiveAddress: '',
+      requestName: '',
+      contactName: '',
+      contact: '',
+      remark: '',
+      agreement: '',
+      agree: false,
+      contactList: [],
+      files: [],
+      amountList: []
     }
+  },
+  methods: {
+    async getConfigList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/coop/config/pub/getList',
+        data: {type: 1}
+      })
+      if (rows) {
+        this.configList = rows.map(item => {
+          item.contentIndex = null
+          item.amountIndex = null
+          return item
+        })
+      }
+    },
+    addProduct() {
+      this.productList.push({
+        name: '',
+        code: '',
+        addressRegion: {
+          province: null,
+          city: null,
+          area: null,
+        },
+        address: '',
+      })
+      this.addressIndex.push([null, null, null])
+    },
+    removeProduct(index) {
+      this.productList.splice(index, 1)
+      this.addressIndex.splice(index, 1)
+    },
+    addToAmountList(index, contentIndex, amountIndex) {
+      this.amountList.push({
+        index,
+        contentIndex,
+        amountIndex,
+        contentIndexVal: this.configList[index].contents[contentIndex]._index,
+        amountIndexVal: this.configList[index].contents[contentIndex].amountList[amountIndex]._index,
+        amount: this.configList[index].contents[contentIndex].amountList[amountIndex].amount
+      })
+      this.configList[index].contentIndex = null
+      this.configList[index].amountIndex = null
+    },
+    removeFromAmountList(index) {
+      this.amountList.splice(index, 1)
+    },
+    async newOrder() {
+      // const amountList = []
+      // this.configList.forEach(item => {
+      //   item.contents.forEach((content, contentIndex) => {
+      //     if (contentIndex === item.contentIndex && content.amountList.length > 0) {
+      //       content.amountList.forEach((amount, amountIndex) => {
+      //         if (amountIndex === item.amountIndex) {
+      //           amountList.push(`${content._index},${amount._index}`)
+      //         }
+      //       })
+      //     }
+      //   })
+      // })
+      if (this.amountList.length === 0) return this.$message({
+        message: '请至少选择一项服务',
+        type: 'error'
+      })
+      if (!this.email && !this.wechat && this.receiveAddressIndex[0][2] === null) return this.$message({
+        message: '请选择接收文件地址/微信/邮箱',
+        type: 'error'
+      })
+      if (!this.requestName) return this.$message({
+        type: 'error',
+        message: '请填写申请人',
+      })
+      if (!this.contactName) return this.$message({
+        type: 'error',
+        message: '请填写联系人姓名',
+      })
+      if (!this.contact) return this.$message({
+        type: 'error',
+        message: '请填写联系人电话',
+      })
+      for (let i = 0; i < this.productList.length; i++) {
+        if (!this.productList[i].name) return this.$message({
+          message: '请填写考察产品名称',
+          type: 'error'
+        })
+        if (!this.productList[i].address) return this.$message({
+          type: 'error',
+          message: '请填写考察产品地址',
+        })
+        if (this.addressIndex[i][2] === null) return this.$message({
+          type: 'error',
+          message: '请填写考察产品地址',
+        })
+      }
+      if (this.receiveAddressIndex.length > 0 && this.receiveAddressIndex[2] !== null) {
+        const province = this.provinceData[this.receiveAddressIndex[0]]
+        const city = this.cityData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]]
+        const area = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]][this.receiveAddressIndex[2]]
+        this.receiveAddressRegion = {
+          province: {code: province.code, name: province.name},
+          city: {code: city.code, name: city.name},
+          area: {code: area.code, name: area.name},
+        }
+      }
+      this.productList.forEach((item, index) => {
+        const companyProvince = this.provinceData[this.addressIndex[index][0]]
+        const companyCity = this.cityData[this.addressIndex[index][0]][this.addressIndex[index][1]]
+        const companyArea = this.areaData[this.addressIndex[index][0]][this.addressIndex[index][1]][this.addressIndex[index][2]]
+        this.productList[index].addressRegion = {
+          province: {code: companyProvince.code, name: companyProvince.name},
+          city: {code: companyCity.code, name: companyCity.name},
+          area: {code: companyArea.code, name: companyArea.name},
+        }
+      })
+
+      const {data} = await vk.callFunction({
+        url: 'client/selfSupport/kh/addOrder',
+        title: '请求中...',
+        data: {
+          type: 1,
+          amountList: this.amountList.map(item => `${item.contentIndexVal},${item.amountIndexVal}`),
+          contentList: this.productList,
+          receiveAddressRegion: this.receiveAddressRegion,
+          email: this.email,
+          wechat: this.wechat,
+          receiveAddress: this.receiveAddress,
+          requestName: this.requestName,
+          contactName: this.contactName,
+          contact: this.contact,
+          remark: this.remark,
+        }
+      })
+      vk.navigateTo({
+        url: `/pages/index/shop/pay?id=${data}`
+      })
+    },
+    changeCheck(itemIndex, name) {
+      const index = this.contentList.indexOf(itemIndex)
+      if (index === -1) {
+        this.contentList.push(itemIndex)
+        this.contentNameList.push(name)
+      } else {
+        this.contentList.splice(index, 1)
+        this.contentNameList.splice(index, 1)
+        this.configList[itemIndex].contentIndex = null
+        this.configList[itemIndex].amountIndex = null
+      }
+    },
+    showAgreement() {
+      this.$confirm(this.agreement, '金久信自营交易协议', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true,
+      })
+    },
+    async getAgreement() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '65885d4c09664c1c8d8e8476'
+        },
+      })
+      this.agreement = res.content
+    },
+    demoDownload() {
+      vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '6588648da7c432e4a360bb34'
+        },
+        success: res => {
+          window.open(res.content)
+        }
+      })
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.contact = contact.phone
+    },
+    previewUpload({url}) {
+      window.open(url)
+    }
+  },
+  onLoad() {
+    const userInfo = vk.getVuex('$user.userInfo')
+    // console.log('userInfo', userInfo)
+    if (parseInt(userInfo.accountType) === 2) {
+      this.email = userInfo.company.contactEmail
+      this.requestName = userInfo.manager.personName
+      this.contactName = userInfo.manager.personName
+      this.contact = userInfo.company.mobile
+      if (userInfo.company && userInfo.company.addressRegion) {
+        this.receiveAddressIndex[0] = this.provinceData.findIndex(item => item.name === userInfo.company.addressRegion.province.name)
+        this.receiveAddressIndex[1] = this.cityData[this.receiveAddressIndex[0]].findIndex(item => item.name === userInfo.company.addressRegion.city.name)
+        this.receiveAddressIndex[2] = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]].findIndex(item => item.name === userInfo.company.addressRegion.area.name)
+      }
+      if (userInfo.company.addressDetail) this.receiveAddress = userInfo.company.addressDetail
+    } else {
+      if (userInfo.businessCard && userInfo.businessCard.email) this.email = userInfo.businessCard.email
+      this.requestName = userInfo.person.personName
+      this.contactName = userInfo.person.personName
+      this.contact = userInfo.person.mobile
+      if (userInfo.person && userInfo.person.addressRegion) {
+        this.receiveAddressIndex[0] = this.provinceData.findIndex(item => item.name === userInfo.person.addressRegion.province.name)
+        this.receiveAddressIndex[1] = this.cityData[this.receiveAddressIndex[0]].findIndex(item => item.name === userInfo.person.addressRegion.city.name)
+        this.receiveAddressIndex[2] = this.areaData[this.receiveAddressIndex[0]][this.receiveAddressIndex[1]].findIndex(item => item.name === userInfo.person.addressRegion.area.name)
+      }
+      if (userInfo.person.addressDetail) this.receiveAddress = userInfo.person.addressDetail
+    }
+    this.getConfigList()
+    this.getAgreement()
+    // this.getContactList()
+  },
+  computed: {
+    amount() {
+      let tmpAmount = 0
+      // this.configList.forEach(item => {
+      //   item.contents.forEach((content, contentIndex) => {
+      //     if (contentIndex === item.contentIndex && content.amountList.length > 0) {
+      //       content.amountList.forEach((amount, amountIndex) => {
+      //         if (amountIndex === item.amountIndex) {
+      //           tmpAmount += parseFloat(amount.amount)
+      //         }
+      //       })
+      //     }
+      //   })
+      // })
+      this.amountList.forEach(item => {
+        tmpAmount += item.amount
+      })
+      return tmpAmount
+    },
+    totalAmount() {
+      return this.amount * this.productList.length
+    }
+  }
 }
-</script>
\ No newline at end of file
+</script>
+
+
+<style lang="scss" scoped>
+.server-item {
+  background-color: #fbf8f8;
+  border: 2px solid #fbebf1;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
+
+  .items-center {
+    width: 1100px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex: 1;
+
+    view {
+      width: 300px;
+    }
+
+    .ml-35 {
+      font-weight: normal;
+      font-size: 13px;
+    }
+  }
+
+  .server-item-content {
+    display: flex;
+    align-items: center;
+    width: 600px !important;
+  }
+
+  .remark {
+    color: #999999;
+    font-weight: normal;
+  }
+}
+
+.divider-title {
+  font-size: 17px;
+  font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/self-support/quote.vue b/pages/index/self-support/quote.vue
new file mode 100644
index 0000000..9aaa505
--- /dev/null
+++ b/pages/index/self-support/quote.vue
@@ -0,0 +1,214 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+
+        <view class="page-nav">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item>
+                    <navigator style="display: inline-block;" url="/pages/self-support/self-support">金久信自营</navigator>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item>填写报价信息</el-breadcrumb-item>
+            </el-breadcrumb>
+        </view>
+
+        <view class="page-main">
+            <quote-remain-num v-if="reloaded"/>
+            <vk-data-form
+                ref="form1"
+                v-model="form1.data"
+                :action="form1.props.action"
+                :columns="form1.props.columns"
+                :rules="form1.props.rules"
+                :form-type="form1.props.formType"
+                :loading.sync="form1.props.loading"
+                :auto-close="false"
+                :show-cancel="false"
+                label-width="160px"
+                @success="onFormSuccess"
+            >
+                <template v-slot:desc>
+                    <span>{{ sheet.desc }}</span>
+                </template>
+                <template v-slot:amount>
+                    <el-input v-model="form1.data.amount" placeholder="请输入货款总价" @change="formatNumber"></el-input>
+                </template>
+                <template v-slot:sheetFile="{ row, column, index }">
+                    <p v-for="(item, index) in sheet.files" :key="index" class="text-main">
+                        <a :href="item" target="_blank">预览:文件{{index + 1}}</a>
+                    </p>
+                </template>
+            </vk-data-form>
+        </view>
+        <common-footer></common-footer>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            reloaded: false,
+            // 表单相关开始-----------------------------------------------------------
+            form1: {
+                // 表单请求数据，此处可以设置默认值
+                data: {
+                    // radio: 1,
+                    // checkbox : [1,2]
+                    sheetId: null,
+                    amount: null,
+                },
+                // 表单属性
+                props: {
+                    // 表单请求地址
+                    action: "client/selfSupport/kh/addQuote",
+                    // 表单字段显示规则
+                    columns: [
+                        {key: "sheetFile", title: "询价文件", type: "html"},
+                        {key: "desc", title: "产品描述", type: "html"},
+                        {key: "amount", title: "货款总价(人民币:元)", type: "html"},
+                        {key: "files", title: "附件", type: "file", accept: '.pdf'},
+                        {key: "remark", title: "报价单详情", type: "textarea"},
+                    ],
+                    // 表单验证规则
+                    rules: {
+                        amount: [
+                            {required: true, message: "货款总价不能为空", trigger: "change,blur"},
+                        ]
+                    },
+                    // add 代表添加 update 代表修改
+                    formType: "",
+                    // 表单是否在请求中
+                    loading: false,
+                    // 是否显示表单1 的弹窗
+                    show: false
+                }
+            },
+            // 表单相关结束-----------------------------------------------------------
+            sheet: null
+        };
+    },
+    onLoad(options = {}) {
+        console.log(options)
+        const {
+            id
+        } = options
+        if (!id) {
+            vk.navigateTo('/pages/self-support/self-support');
+            return
+        }
+
+        this.enquiryId = id
+        this.form1.data.sheetId = id
+        this.getEnquiryDetail()
+    },
+    computed: {
+        totalPriceStr() {
+            if (this.totalPrice == 0) {
+                return "零元"
+            }
+            return vk.myfn.convertCurrency(this.totalPrice / 100)
+        }
+    },
+    methods: {
+        onFormSuccess() {
+            vk.redirectTo({url: `/pages/index/index`})
+        },
+        // 提交报价单
+        async submit() {
+
+            const data = await vk.userCenter.getCurrentUserInfo();
+            const {userInfo} = data
+            if (userInfo.remainQuoteNum === 0 || !userInfo.remainQuoteNum) {
+
+            }
+
+            // this.$confirm(`今日报价次数${userInfo.quoteTimes || 0}, 是否继续?`, '提示', {
+            //     confirmButtonText: '确定',
+            //     cancelButtonText: '取消',
+            //     type: 'warning',
+            //     center: true
+            // }).then(res => {
+            //
+            // })
+
+            vk.callFunction({
+                url: 'client/enquiry/quote/kh/addQuote',
+                title: '请求中...',
+                // data: {
+                //     sheet: this.sheet,
+                //     totalPrice: this.totalPrice
+                // },
+                success: (data) => {
+                    this.$message({
+                        message: "报价成功",
+                        type: 'success'
+                    })
+
+                }
+            });
+
+
+        },
+        /**
+         * 获取询价单详情
+         */
+        getEnquiryDetail() {
+            vk.callFunction({
+                url: 'client/selfSupport/kh/getDetail',
+                title: '请求中...',
+                data: {
+                    _id: this.enquiryId
+                },
+                success: (res) => {
+                    this.sheet = res
+                }
+            });
+        },
+        formatNumber(e){
+            this.form1.data.amount = parseFloat(this.form1.data.amount).toFixed(2)
+        }
+    },
+    onShow() {
+        this.reloaded = false
+        setTimeout(() => {
+            this.reloaded = true
+        }, 500)
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.page-main {
+    width: 1200px;
+    margin: 20px auto;
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.description {
+    margin-bottom: 40px;
+    width: 800px;
+}
+
+.quote {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.quote-form {
+    width: 260px;
+}
+
+.form-footer {
+    height: 40px;
+    line-height: 40px;
+    background: #fff;
+    padding-top: 0;
+    text-align: center;
+    display: block;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/self-support/selectType.vue b/pages/index/self-support/selectType.vue
index c0cf16c..0bbf16a 100644
--- a/pages/index/self-support/selectType.vue
+++ b/pages/index/self-support/selectType.vue
@@ -1,38 +1,89 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200 m-a">
-            <u-swiper :list="list" :height="380" borderRadius="0"></u-swiper>
-            <view class="flex flex-col">
-                <image src="/static/images/selfSupport/company.jpg" class="w-100p pointer" mode="widthFix"
-                       @click="navTo('/pages/index/self-support/companyQuote')"/>
-                <image src="/static/images/selfSupport/product.jpg" class="w-100p pointer mt-20" mode="widthFix"
-                       @click="navTo('/pages/index/self-support/productQuote')"/>
-            </view>
-        </view>
-        <common-footer></common-footer>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200 m-a">
+<!--      <el-carousel :height="`500px`" :style="{width: '1200px'}" class="m-a">-->
+<!--        <el-carousel-item v-for="(item, index) in list" :key="index" :style="{width: '1200px'}">-->
+<!--          <image :src="item.image" mode="scaleToFill" :style="{width: '1200px', height: '500px'}"/>-->
+<!--        </el-carousel-item>-->
+<!--      </el-carousel>-->
+      <common-swiper page="self-support-main"/>
+      <view class="flex flex-col">
+        <image :src="companyImg" class="w-100p pointer"
+               style="height: 150px"
+               @click="navTo('/pages/index/self-support/companyQuote')"/>
+        <image :src="productImg" class="w-100p pointer mt-20"
+               style="height: 150px"
+               @click="navTo('/pages/index/self-support/productQuote')"/>
+        <image :src="costImg" class="w-100p pointer mt-20"
+               style="height: 150px"
+               @click="navTo('/pages/index/self-support/costQuote')"/>
+      </view>
     </view>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
 export default {
-    name: "selectType",
-    data() {
-        return {
-            list: [
-                {
-                    image: '/static/images/selfSupport/swiper.jpg',
-                    title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-                },
-            ]
-        }
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo(url);
+  name: "selectType",
+  data() {
+    return {
+      list: [
+        {
+          image: '/static/images/selfSupport/swiper.jpg',
+          title: '昨夜星辰昨夜风，画楼西畔桂堂东'
         },
+      ],
+      companyImg: '',
+      productImg: '',
+      costImg: '',
     }
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo(url);
+    },
+    async getCompanyImg(){
+      vk.callFunction({
+        url: 'client/album/pub/list',
+        data: {
+          page: 'self-support-company'
+        },
+        success: ({swiper}) => {
+          this.companyImg = swiper[0]
+        }
+      })
+    },
+    async getProductImg(){
+      vk.callFunction({
+        url: 'client/album/pub/list',
+        data: {
+          page: 'self-support-product'
+        },
+        success: ({swiper}) => {
+          this.productImg = swiper[0]
+        }
+      })
+    },
+    async getCostImg(){
+      vk.callFunction({
+        url: 'client/album/pub/list',
+        data: {
+          page: 'self-support-quote'
+        },
+        success: ({swiper}) => {
+          this.costImg = swiper[0]
+        }
+      })
+    },
+  },
+  onLoad(){
+    this.getCompanyImg()
+    this.getProductImg()
+    this.getCostImg()
+  }
 }
 </script>
\ No newline at end of file
diff --git a/pages/index/self-support/self-support.vue b/pages/index/self-support/self-support.vue
index 6ac7850..5545ca9 100644
--- a/pages/index/self-support/self-support.vue
+++ b/pages/index/self-support/self-support.vue
@@ -1,215 +1,373 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200">
-            <u-swiper :list="list" :height="380" borderRadius="0"></u-swiper>
-            <view class="test">
-                <text class="pointer" @click="navTo('/pages/index/self-support/self-support')">自营钢城</text>
-                <text class="pointer" @click="navTo('/pages/index/self-support/selectType')">平台服务</text>
-                <text class="pointer" @click="navTo('/pages/index/shop/shop')">特产商城</text>
-            </view>
-            <view class="tool-bar">
-                <view class="search">
-                    <text>交易区域：</text>
-                    <el-cascader :options="options" :props="{label: 'name', value: 'code'}" v-model="address"
-                                 @change="getCompanyList" clearable/>
-                </view>
-                <view class="buy-btn">
-                    <el-button type="primary" plain class="empty-bg-plain-btn" :disabled="address.length === 0"
-                               @click.native="dialogVisible = true">
-                        下单询价>
-                    </el-button>
-                </view>
-            </view>
-            <!-- 合作单位/联营单位-->
-            <view class="cooperate">
-                <view class="title">合作单位/联营单位</view>
-                <u-gap height="5" bg-color="#f3f3f3"/>
-                <view class="flex justify-start items-start flex-wrap">
-                    <view class="w-25p pointer" v-for="(item, index) in companyList" :key="index">
-                        <view class="border bg-white flex flex-col justify-center items-center p-20">
-                            <image :src="item.businessCard.logo" class="logo"/>
-                            <span class="mt-20 line-1 w-100p text-center">
-                                主营: {{ item.businessCard.mainBusiness }}
-                            </span>
-                        </view>
-                    </view>
-                </view>
-                <u-gap height="5" bg-color="#f3f3f3"/>
-            </view>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200">
+      <view class="test">
+        <text class="pointer active" @click="navTo('/pages/index/self-support/self-support')">自营钢城</text>
+        <text class="pointer" @click="navTo('/pages/index/self-support/selectType')">平台服务</text>
+        <text class="pointer" @click="navTo('/pages/index/shop/shop')">特产商城</text>
+      </view>
+      <common-swiper page="self-support-index"/>
+      <view class="tool-bar">
+        <view class="search">
+          <text>交易区域：</text>
+          <el-cascader :options="options" :props="{label: 'name', value: 'code'}" v-model="address"
+                       clearable @change="getCompanyList"/>
         </view>
-        <!-- 现货市场 end -->
-        <gap height="50"/>
-        <right-bar></right-bar>
-        <common-footer></common-footer>
-        <el-dialog
-            title="下询价单"
-            :visible.sync="dialogVisible"
-            width="60%">
-            <vk-data-upload v-model="files" accept="*">
-            </vk-data-upload>
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addFiles">确 定</el-button>
-        </el-dialog>
+        <view class="flex justify-end items-start">
+          <view class="flex flex-col justify-center items-center mr-10">
+            <el-button type="primary" plain class="empty-bg-plain-btn" :disabled="address.length === 0"
+                       @mouseenter.native="showTips = true"
+                       @mouseleave.native="showTips = false"
+                       @click.native="dialogVisible = true">
+              下单询价>
+            </el-button>
+            <text class="text-main mt-10 text-20" v-if="showTips && address.length === 0">请先选择交易区域</text>
+          </view>
+          <el-button type="primary" @click.native="getList">
+            我的询价
+          </el-button>
+        </view>
+      </view>
+      <!-- 合作单位/联营单位-->
+      <view class="cooperate">
+        <view class="title">合作单位/联营单位</view>
+        <u-gap height="5" bg-color="#f3f3f3"/>
+        <view class="flex justify-start items-start flex-wrap">
+          <view class="w-25p pointer" v-for="(item, index) in companyList" :key="index"
+                @click="navTo(`/pages/yellowPage/info?id=${item.uid}`)">
+            <view class="border bg-white flex justify-start items-center p-20">
+              <image v-if="item.businessCard" :src="item.businessCard.logo" class="logo"/>
+              <image v-else src="/static/images/no-logo.jpg" class="logo" mode="aspectFill"/>
+              <div class="flex flex-col justify-start items-start ml-20 w-67p">
+                <span class="text-30 font-bold mb-25">{{ item.company.companyName }}</span>
+                <span class="mt-20 line-2 w-100p">
+                                    主营: {{
+                    (item.mainSpotCategory && item.mainSpotCategory.length > 0) ? item.mainSpotCategory.join() : ''
+                  }}
+                                </span>
+              </div>
+            </view>
+          </view>
+        </view>
+        <u-gap height="5" bg-color="#f3f3f3"/>
+      </view>
     </view>
+    <!-- 现货市场 end -->
+    <gap height="50"/>
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+    <el-dialog
+      title="下询价单"
+      :visible.sync="dialogVisible"
+      width="60%">
+      <el-form ref="form" label-width="140px">
+        <el-form-item label="联系人" required>
+          <el-select v-model="name" placeholder="点击选择业务联系人"
+                     class="w-100p" @change="selectContact">
+            <el-option
+              v-for="(item, index) in contactList"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+            <view slot="empty" class="text-gray pointer p-20">
+              <text>无业务联系人,请到</text>
+              <text class="text-main mx-15" @click="navToContact">个人中心</text>
+              <text>添加</text>
+            </view>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="联系方式" required>
+          <el-input v-model="phone" placeholder="请输入联系方式" disabled/>
+        </el-form-item>
+        <el-form-item label="用户名称" required>
+          <el-input v-model="company" placeholder="请输入您的名称"/>
+        </el-form-item>
+        <el-form-item label="询价单附件" required>
+          <vk-data-upload v-model="files" list-type="text" accept="*" :on-preview="previewUpload">
+          </vk-data-upload>
+          <!--          <p class="text-main text-25">平台目前仅支持PDF文档上传，请你谅解！</p>-->
+        </el-form-item>
+      </el-form>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="addFiles">确 定</el-button>
+    </el-dialog>
+    <el-dialog title="我的询价单" :visible.sync="showList" width="60%">
+      <el-table :data="list" style="width: 100%">
+        <el-table-column prop="name" label="联系人"/>
+        <el-table-column label="询价区域">
+          <template #default="{row}">
+            {{ row.province.name }}{{ row.city.name }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="phone" label="联系方式"/>
+        <el-table-column prop="company" label="企业名称"/>
+        <el-table-column label="附件">
+          <template #default="{row}">
+            <file-type v-for="(item, index) in row.files" :key="index" :item="item"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="_add_time_str" label="询价日期"/>
+      </el-table>
+      <div class="mt-20 text-center">
+        <el-button @click="showList = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
 import UGap from "@/uni_modules/vk-uview-ui/components/u-gap/u-gap.vue";
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import FileType from "../../../components/file-type/file-type.vue";
 
 export default {
-    components: {UGap},
-    data() {
-        return {
-            dialogVisible: false,
-            address: [],
-            files: [],
-            list: [
-                {
-                    image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-                    title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-                },
-                {
-                    image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-                    title: '身无彩凤双飞翼，心有灵犀一点通'
-                },
-                {
-                    image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-                    title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-                }
-            ],
-            options: [],
-            companyList: []
-        };
-    },
-    onLoad(options) {
-        if (options && options.menu) {
-            this.currMenu = options.menu
-        }
-        this.getCompanyList()
-        this.options = provinces.map(item => {
-            item.children = [];
-            return item
-        })
-        this.options.forEach((province, index) => {
-            citys[index].forEach(city => {
-                this.options[index].children.push(city)
-            })
-        })
-    },
-    methods: {
-        menuSelect(e) {
-            this.currMenu = e
-        },
-        navTo(url) {
-            vk.navigateTo(url);
-        },
-        async getCompanyList() {
-            const {rows} = await vk.callFunction({
-                url: 'client/user/pub/getCompany',
-                data: {
-                    isCoop: 1,
-                    city: this.address.length > 0 ? [this.address[1]] : []
-                }
-            })
-            this.companyList = rows
-        },
-        async addFiles() {
-            await vk.callFunction({
-                url: 'client/selfSupport/kh/add',
-                data: {
-                    files: this.files,
-                    city: this.address.length > 0 ? this.address[1] : []
-                }
-            })
-            this.$message({
-                message: '下单成功',
-                type: 'success'
-            })
-            this.dialogVisible = false
-        }
+  components: {FileType, UGap},
+  data() {
+    return {
+      dialogVisible: false,
+      address: [],
+      files: [],
+      options: [],
+      companyList: [],
+      name: null,
+      phone: null,
+      company: null,
+      showList: false,
+      list: [],
+      allChildCate: [],
+      contactList: [],
+      showTips: false
+    };
+  },
+  onLoad(options) {
+    if (options && options.menu) {
+      this.currMenu = options.menu
     }
+    this.getCategoryTreeData()
+    this.options = provinces.map(item => {
+      item.children = [];
+      return item
+    })
+    this.options.forEach((province, index) => {
+      citys[index].forEach(city => {
+        city.children = []
+        this.options[index].children.push(city)
+      })
+    })
+    this.options.forEach((province, index) => {
+      citys[index].forEach((city, cityIndex) => {
+        areas[index][cityIndex].forEach(area => {
+          this.options[index].children[cityIndex].children.push(area)
+        })
+      })
+    })
+    this.getContactList()
+    const user = vk.getVuex('$user.userInfo')
+    this.company = user.accountType === 2 ? user.company.companyName : user.person.personName
+  },
+  methods: {
+    getCategoryTreeData() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.allChildCate = []
+          data.rows.forEach(item => {
+            item.children.forEach(child => {
+              this.allChildCate.push(child)
+            })
+          })
+          this.getCompanyList()
+        }
+      });
+    },
+    menuSelect(e) {
+      this.currMenu = e
+    },
+    navTo(url) {
+      vk.navigateTo(url);
+    },
+    async getCompanyList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        data: {
+          isCoop: 1,
+          province: this.address.length > 0 ? [this.address[0]] : []
+        }
+      })
+      this.companyList = rows.map(item => {
+        item.name = item.company.companyName
+        item.mainSpotCategory = []
+        if (item.company && item.company.mainSpotCategoryIds) {
+          this.allChildCate.forEach(child => {
+            if (item.company.mainSpotCategoryIds.includes(child._id)) {
+              item.mainSpotCategory.push(child.name)
+            }
+          })
+        }
+        return item
+      })
+    },
+    async addFiles() {
+      if (!this.name) return this.$message({type: 'error', message: '请输入联系人'})
+      if (!this.phone) return this.$message({type: 'error', message: '请输入联系方式'})
+      if (!this.company) return this.$message({type: 'error', message: '请输入您的企业名称'})
+      if (this.files.length === 0) return this.$message({type: 'error', message: '请上传询价单附件'})
+      if (!vk.getVuex('$user.userInfo.fadadaConfirm') || [-1, 2].includes(vk.getVuex('$user.userInfo.authStatus'))) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+        this.dialogVisible = false
+        return
+      }
+      let city, province
+      this.options.forEach((provinceItem, index) => {
+        provinceItem.children.forEach(cityItem => {
+          if (cityItem.code === this.address[1]) {
+            city = cityItem
+            province = {code: provinceItem.code, name: provinceItem.name}
+          }
+        })
+      })
+      await vk.callFunction({
+        url: 'client/selfSupport/kh/add',
+        data: {
+          files: this.files,
+          city,
+          province,
+          name: this.name,
+          phone: this.phone,
+          company: this.company,
+        }
+      })
+      await this.$alert('<p style="text-align: center">您已下单成功，感谢您选择金久信</p><p style="text-align: center">请待平台为您提供竭诚服务！</p><p style="text-align: center; color: red">客服电话：0771-3923001</p>', '', {
+        dangerouslyUseHTMLString: true,
+      })
+
+      this.dialogVisible = false
+    },
+    async getList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/selfSupport/kh/getList',
+      })
+      this.list = rows
+      this.showList = true
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+    navToContact() {
+      this.dialogVisible = false
+      this.showList = false
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.phone = contact.phone
+    },
+    previewUpload({url}) {
+      window.open(url)
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 .w-1200 {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #fff;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #fff;
 
-    .test {
-        height: 50px;
-        color: #ffffff;
-        font-size: 18px;
-        background-color: #bf2b28;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+  .test {
+    height: 50px;
+    color: #ffffff;
+    font-size: 18px;
+    background-color: #bf2b28;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
-        text {
-            margin: 0 20px;
-        }
-
-        text:hover {
-            color: #F2CFCE;
-        }
+    text {
+      padding: 0 20px;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
 
-    .tool-bar {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 20px;
-        font-size: 16px;
-
-        .search {
-            display: flex;
-            align-items: center;
-        }
+    text:hover {
+      background-color: #690503
     }
 
-    .cooperate {
-        .title {
-            text-align: center;
-            color: #bf2b28;
-            font-size: 28px;
-            line-height: 3em;
-        }
-
-        .wrap {
-            flex-wrap: wrap;
-        }
-
-        .grid-content {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            padding: 10px;
-            flex-direction: column;
-
-            .comments {
-                line-height: 2em;
-            }
-        }
-
-        .bg-purple {
-            border-top: 1px solid #f3f3f3;
-            border-right: 1px solid #f3f3f3;
-
-            .image {
-                width: 140px;
-            }
-        }
+    .active {
+      background-color: #941411
     }
+  }
+
+  .tool-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    padding: 20px;
+    font-size: 16px;
+
+    .search {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .cooperate {
+    .title {
+      text-align: center;
+      color: #bf2b28;
+      font-size: 28px;
+      line-height: 3em;
+    }
+
+    .wrap {
+      flex-wrap: wrap;
+    }
+
+    .grid-content {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 10px;
+      flex-direction: column;
+
+      .comments {
+        line-height: 2em;
+      }
+    }
+
+    .bg-purple {
+      border-top: 1px solid #f3f3f3;
+      border-right: 1px solid #f3f3f3;
+
+      .image {
+        width: 140px;
+      }
+    }
+  }
 }
 
 .logo {
-    width: 80px;
-    height: 80px;
+  width: 80px;
+  height: 80px;
 }
 </style>
diff --git a/pages/index/server/server.vue b/pages/index/server/server.vue
index a0b44df..0c12df9 100644
--- a/pages/index/server/server.vue
+++ b/pages/index/server/server.vue
@@ -244,15 +244,15 @@ export default {
   data() {
     return {
       list: [{
-        image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+        image: '/static/images/swiper_5.png',
         title: '昨夜星辰昨夜风，画楼西畔桂堂东'
       },
         {
-          image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
+          image: '/static/images/swiper_5.png',
           title: '身无彩凤双飞翼，心有灵犀一点通'
         },
         {
-          image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
+          image: '/static/images/swiper_5.png',
           title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
         }
       ],
diff --git a/pages/index/shop/cart.vue b/pages/index/shop/cart.vue
index 1ef0bb7..e9c664c 100644
--- a/pages/index/shop/cart.vue
+++ b/pages/index/shop/cart.vue
@@ -9,11 +9,11 @@
                     <text class="font-bold text-40">
                         购物车(全部{{ list.length }})
                     </text>
-                    <view class="flex justify-end items-center">
-                        <text>已选商品(不含运费)</text>
-                        <text class="text-main text-40 font-bold mx-20">￥{{ amount }}</text>
-                        <el-button type="primary" round>结算</el-button>
-                    </view>
+<!--                    <view class="flex justify-end items-center">-->
+<!--                        <text>已选商品(不含运费)</text>-->
+<!--                        <text class="text-main text-40 font-bold mx-20">￥{{ amount }}</text>-->
+<!--                        <el-button type="primary" round @click.native="addFromCart">结算</el-button>-->
+<!--                    </view>-->
                 </view>
                 <view class="py-20">
                     <el-row :gutter="10">
@@ -46,23 +46,24 @@
                             <view class="flex justify-start items-start">
                                 <el-checkbox v-model="list[index].checked" @change="changeCheck($event, item._id)">
                                 </el-checkbox>
-                                <el-image :src="item.goods.cover" class="cover ml-20" fit="fit"/>
+                                <el-image  :src="item.goods.cover" class="cover ml-20" fit="fit"/>
                                 <view class="flex flex-col justify-start items-start ml-20">
-                                    {{ item.goods.name }}
+                                    <text class="font-bold mb-15">{{ item.goods.name }}</text>
+                                    <text class="text-gray">{{ item.sku.label }}</text>
                                 </view>
                             </view>
                         </el-col>
                         <el-col :span="3">
-                            <text class="text-35 font-bold flex-1">￥{{ item.goods.amount }}</text>
+                            <text class="text-35 font-bold flex-1">￥{{ item.sku.values }}</text>
                         </el-col>
                         <el-col :span="3">
                             <text class="text-35 font-bold flex-1">
-                                <el-input-number v-model="list[index].num" @change="changeNum" :min="1" size="small"/>
+                                <el-input-number v-model="list[index].num" @change="changeNum(index)" :min="1" size="small"/>
                             </text>
                         </el-col>
                         <el-col :span="3">
                             <text class="text-35 font-bold flex-1 text-main">￥{{
-                                    parseFloat(item.goods.amount) * item.num
+                                    parseFloat(item.sku.values) * item.num
                                 }}
                             </text>
                         </el-col>
@@ -72,7 +73,7 @@
                     </el-row>
                 </view>
                 <view class="mt-20 flex justify-between items-center">
-                    <el-button type="text">移出购物车</el-button>
+                    <el-button type="text" @click.native="removeMulti" :disabled="selectedList.length === 0">移出购物车</el-button>
                     <view class="flex justify-end items-center">
                         <view>
                             <text>已选商品</text>
@@ -81,7 +82,7 @@
                         </view>
                         <text class="ml-35">合计(不含运费):</text>
                         <text class="mx-15 font-bold text-40 text-main">￥{{ amount }}</text>
-                        <el-button type="primary" round :disabled="selectedList.length === 0">结算</el-button>
+                        <el-button type="primary" round :disabled="selectedList.length === 0" @click.native="addFromCart">结算</el-button>
                     </view>
                 </view>
             </view>
@@ -106,18 +107,27 @@ export default {
             const {rows} = await vk.callFunction({
                 url: "client/cart/kh/getList"
             })
+            this.selectedAll = false
             this.list = rows.map(item => {
                 item.checked = false
                 return item
             })
         },
         doSelectAll() {
+            this.selectedList = []
             this.list.forEach((item, index) => {
                 this.list[index].checked = this.selectedAll
+                if (this.selectedAll) this.selectedList.push(item._id)
             })
         },
-        changeNum(e) {
-            console.log(e)
+        changeNum(index) {
+            vk.callFunction({
+                url: "client/cart/kh/changeNum",
+                data: {
+                    id: this.list[index]._id,
+                    num: this.list[index].num
+                }
+            })
         },
         changeCheck(e, id) {
             const index = this.selectedList.indexOf(id)
@@ -126,15 +136,38 @@ export default {
             this.selectedAll = this.selectedList.length === this.list.length
         },
         remove(index) {
-            this.list.splice(index, 1)
             vk.callFunction({
                 url: "client/cart/kh/delete",
                 data: {
                     ids: [this.list[index]._id]
                 }
             })
+            this.list.splice(index, 1)
+        },
+        async removeMulti() {
+            if (this.selectedList.length === 0) return
+            await vk.callFunction({
+                url: "client/cart/kh/delete",
+                data: {
+                    ids: this.selectedList
+                }
+            })
+            this.selectedList = []
+            await this.getList()
+        },
+        async addFromCart(){
+            const {data} = await vk.callFunction({
+                url: "client/order/kh/addFromList",
+                data: {
+                    type: 0,
+                    ids: this.selectedList
+                }
+            })
+            this.selectedAll = false
+            vk.navigateTo({
+                url: `/pages/index/shop/pay?id=${data}`
+            })
         }
-
     },
     onShow() {
         this.getList()
@@ -143,8 +176,7 @@ export default {
         amount() {
             let tmpAmount = 0
             this.list.forEach(item => {
-                console.log(item.checked)
-                if (item.checked) tmpAmount += parseFloat(item.goods.amount) * parseInt(item.num)
+                if (item.checked) tmpAmount += parseFloat(item.sku.values) * parseInt(item.num)
             })
             return tmpAmount
         }
diff --git a/pages/index/shop/detail.vue b/pages/index/shop/detail.vue
index 5e7cccb..410ee68 100644
--- a/pages/index/shop/detail.vue
+++ b/pages/index/shop/detail.vue
@@ -1,142 +1,240 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200 m-a">
-            <view class="page-nav">
-                <el-breadcrumb separator=">">
-                    <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                    <el-breadcrumb-item>
-                        <navigator style="display: inline-block;" url="/pages/index/shop/shop">特产商城</navigator>
-                    </el-breadcrumb-item>
-                    <el-breadcrumb-item class="text-main">{{ info.name }}</el-breadcrumb-item>
-                </el-breadcrumb>
-            </view>
-            <view class="bg-white p-40 flex justify-start items-start">
-                <el-carousel height="400px" class="album">
-                    <el-carousel-item v-for="(item, index) in info.album" :key="index">
-                        <image :src="item" class="album-item" mode="aspectFill"/>
-                    </el-carousel-item>
-                </el-carousel>
-                <view class="ml-35 flex flex-col justify-start items-start flex-1">
-                    <view class="font-bold text-40 mb-20">{{ info.name }}</view>
-                    <view class="flex flex-col justify-start items-start flex-1">
-                        <text>产品介绍:</text>
-                        <view class="desc p-20 mt-20">{{ info.desc }}</view>
-                    </view>
-                    <view class="flex justify-between items-center w-100p mt-20">
-                        <view class="flex justify-start items-center">
-                            <text>零售价:</text>
-                            <text class="font-bold text-main">￥{{ info.amount }}</text>
-                        </view>
-                        <view class="flex justify-end is-center">
-                            <el-button type="danger" round class="add-to-cart-btn" @click.native="addToCart">加入购物车</el-button>
-                            <el-button type="primary" round class="ml-35" @click.native="newOrder">立即购买</el-button>
-                        </view>
-                    </view>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200 m-a">
+      <view class="page-nav">
+        <el-breadcrumb separator=">">
+          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+          <el-breadcrumb-item>
+            <navigator style="display: inline-block;" url="/pages/index/shop/shop">特产商城</navigator>
+          </el-breadcrumb-item>
+          <el-breadcrumb-item class="text-main">{{ info.name }}</el-breadcrumb-item>
+        </el-breadcrumb>
+      </view>
+      <view class="bg-white p-40 flex justify-start items-start">
+        <el-carousel height="500px" class="album">
+          <el-carousel-item v-for="(item, index) in info.album" :key="index">
+            <image :src="item" class="album-item" mode="aspectFill"/>
+          </el-carousel-item>
+        </el-carousel>
+        <view class="ml-35 flex flex-col justify-start items-start flex-1">
+          <view class="font-bold text-40 mb-20">{{ info.name }}</view>
+          <view class="flex flex-col justify-start items-start flex-1">
+            <text>产品介绍:</text>
+            <view class="desc p-20 mt-20">{{ info.desc }}</view>
+          </view>
+          <view class="flex flex-col items-start justify-start w-100p mt-20">
+            <view class="flex flex-col justify-start items-start flex-1 mr-25 w-100p">
+              <view class="flex justify-start items-center">
+                <text>零售价:</text>
+                <text class="font-bold text-main">￥{{ info.amount }}</text>
+              </view>
+              <view class="flex-1 w-100p" v-if="info.sku">
+                <view class="w-100p my-25 flex flex-1 justify-center items-center p-15">
+                  <text class="flex-1 text-center">规格/分类/说明</text>
+                  <text class="flex-1 text-center">数量</text>
+                  <text class="flex-1 text-center">价格</text>
                 </view>
+                <view class="border my-25 flex justify-center items-center p-15 pointer sku"
+                      v-for="(item, index) in info.sku" :key="index"
+                      :class="[selectedSku === item._index ? 'sku-selected' : '']">
+                  <el-image v-if="item.image" :src="item.image" style="width: 40px; height: 40px"
+                            @click="selectedSku = item._index"/>
+                  <text class="flex-1 text-center" @click="selectedSku = item._index">{{
+                      item.label
+                    }}
+                  </text>
+                  <view class="flex-1 flex justify-center items-center" style="z-index: 999">
+                    <el-input-number v-model="info.sku[index].num" :min="1" size="small"/>
+                  </view>
+                  <text class="flex-1 text-center" @click="selectedSku = item._index">{{
+                      item.values
+                    }}元
+                  </text>
+                </view>
+              </view>
             </view>
-            <view class="mt-40">
-                <view class="intro-title">商品介绍</view>
-                <view class="intro bg-white" v-html="info.content"></view>
+            <view class="flex justify-center items-center w-100p mt-20">
+              <el-button type="danger" round
+                         :class="selectedSku ? 'add-to-cart-btn' : 'add-to-cart-btn-disabled'"
+                         @click.native="addToCart" :disabled="!selectedSku">
+                加入购物车
+              </el-button>
+              <el-button type="primary" round class="ml-35" @click.native="newOrder"
+                         :disabled="!selectedSku">立即购买
+              </el-button>
             </view>
+            <view class="mt-20 flex justify-start items-center">
+              <template v-if="info.express">
+                <transporter theme="outline" size="16" fill="#9b9b9b" strokeLinecap="square"/>
+                <text class="ml-10">快递:{{ info.express }}</text>
+              </template>
+              <text v-if="info.deliverDate" class="ml-35">{{ info.deliverDate }}</text>
+              <text v-if="info.expressAmount !== undefined && info.expressAmount !== null" class="ml-35">
+                运费:{{ info.expressAmount === 0 ? '免运费' : info.expressAmount }}
+              </text>
+            </view>
+            <view class="mt-20 flex justify-start items-center" v-if="info.ensureService">
+              <like theme="outline" size="16" fill="#9b9b9b" strokeLinecap="square"/>
+              <text class="ml-10">{{ info.ensureService }}</text>
+            </view>
+          </view>
         </view>
-        <!-- 现货市场 end -->
-        <gap height="50"/>
-        <common-footer></common-footer>
-        <right-bar></right-bar>
-
+      </view>
+      <view class="mt-40" v-if="info.video">
+        <view class="intro-title">视频介绍</view>
+        <video :src="info.video" autoplay controls style="width: 100%; height: 800px"></video>
+      </view>
+      <view class="mt-40">
+        <view class="intro-title">商品介绍</view>
+        <view class="intro bg-white" v-html="info.content"></view>
+      </view>
     </view>
+    <!-- 现货市场 end -->
+    <gap height="50"/>
+    <common-footer></common-footer>
+    <right-bar></right-bar>
+
+  </view>
 </template>
 
 <script>
 import UGap from "@/uni_modules/vk-uview-ui/components/u-gap/u-gap.vue";
+import {Transporter, Like} from '@icon-park/vue'
 
 export default {
-    components: {UGap},
-    data() {
-        return {
-            id: null,
-            info: {
-                name: ''
-            }
-        };
-    },
-    onLoad(options) {
-        if (options && options.id) {
-            this.id = options.id;
-            this.getInfo(options.id)
-        }
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo(url);
-        },
-        async getInfo(id) {
-            this.info = await vk.callFunction({
-                url: 'client/goods/list/pub/getDetail',
-                data: {id}
-            })
-        },
-        addToCart(){
-            vk.callFunction({
-                url: 'client/cart/kh/add',
-                data: {
-                    goodsId: this.id,
-                },
-                success: (res) => {
-                    this.$message({
-                        type:'success',
-                        message: '添加成功'
-                    })
-                }
-            })
-        },
-        async newOrder(){
-            const {data} = await vk.callFunction({
-                url: 'client/order/kh/add',
-                data: {
-                    goodsId: this.id,
-                    num: 1,
-                    type: 0
-                }
-            })
-            vk.navigateTo({
-                url: `/pages/index/shop/pay?id=${data}`
-            })
-        }
+  components: {UGap, Transporter, Like},
+  data() {
+    return {
+      id: null,
+      info: {
+        name: ''
+      },
+      num: 1,
+      selectedSku: null
+    };
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.id = options.id;
+      this.getInfo(options.id)
     }
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo(url);
+    },
+    async getInfo(id) {
+      this.info = await vk.callFunction({
+        url: 'client/goods/list/pub/getDetail',
+        data: {id}
+      })
+      if (this.info.sku && this.info.sku.length > 0) {
+        this.info.sku.map((sku, index) => {
+          this.$set(this.info.sku[index], 'num', 1)
+          return sku
+        })
+        this.selectedSku = this.info.sku[0]._index
+      }
+    },
+    addToCart() {
+      if (!vk.getVuex('$user.userInfo.fadadaConfirm') || ([-1, 2].includes(vk.getVuex('$user.userInfo.authStatus')) && !vk.getVuex('$user.userInfo.userType'))) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+        return
+      }
+      vk.callFunction({
+        url: 'client/cart/kh/add',
+        data: {
+          goodsId: this.id,
+          skuId: this.selectedSku,
+          num: this.info.sku.find(item => item._index === this.selectedSku).num,
+        },
+        success: (res) => {
+          this.$message({
+            type: 'success',
+            message: '添加成功'
+          })
+        }
+      })
+    },
+    async newOrder() {
+      if (!vk.getVuex('$user.userInfo.fadadaConfirm') || ([-1, 2].includes(vk.getVuex('$user.userInfo.authStatus')) && !vk.getVuex('$user.userInfo.userType'))) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+        return
+      }
+      const {data} = await vk.callFunction({
+        url: 'client/order/kh/add',
+        title: '请求中...',
+        data: {
+          goodsId: this.id,
+          skuId: this.selectedSku,
+          num: this.info.sku.find(item => item._index === this.selectedSku).num,
+          type: 0
+        }
+      })
+      vk.navigateTo({
+        url: `/pages/index/shop/pay?id=${data}`
+      })
+    },
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .album {
-    width: 500px;
+  width: 500px;
 
-    .album-item {
-        width: 500px;
-        height: 400px;
-    }
+  .album-item {
+    width: 500px;
+    height: 400px;
+  }
 }
 
 .desc {
-    background-color: #F5E2E3;
+  background-color: #F5E2E3;
 }
 
-.add-to-cart-btn{
-    background-color: #FF7300;
+.add-to-cart-btn {
+  background-color: #FF7300;
 }
 
-.intro-title{
-    background-color: #EF0021;
-    padding: 10px 20px;
-    color: white;
-    width: 120px;
-    text-align: center;
+.add-to-cart-btn-disabled {
+  background-color: #f6aa6b;
 }
 
-.intro{
-    border-top: 1px solid #F95F6E;
+.intro-title {
+  background-color: #EF0021;
+  padding: 10px 20px;
+  color: white;
+  width: 120px;
+  text-align: center;
+}
+
+.intro {
+  border-top: 1px solid #F95F6E;
+}
+
+.sku:hover {
+  background-color: #F5E2E3;
+  border: 1px solid #EF0021;
+}
+
+.sku-selected {
+  background-color: #F5E2E3;
+  border: 1px solid #EF0021;
 }
 </style>
diff --git a/pages/index/shop/pay.vue b/pages/index/shop/pay.vue
index 09f87f6..f6d2987 100644
--- a/pages/index/shop/pay.vue
+++ b/pages/index/shop/pay.vue
@@ -1,97 +1,202 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200 m-a bg-white p-40">
-            <template v-if="info">
-                <view class="pb-20 border-bottom flex justify-between items-center">
-                    <text>订单号: {{ info.orderNo }}</text>
-                    <text>下单时间: {{ info._add_time_str }}</text>
-                </view>
-                <view class="my-20">
-                    <text class="font-bold text-35">商品详情</text>
-                    <view class="flex justify-start items-start my-20">
-                        <text class="w-15p" v-if="info.type === 0">封面</text>
-                        <text class="w-40p">名称</text>
-                        <text class="w-15p">数量</text>
-                        <text class="w-15p">单价</text>
-                        <text class="w-15p">小计</text>
-                    </view>
-                    <view class="flex justify-start items-start my-20" v-for="(item, index) in info.goods" :key="index">
-                        <text class="w-15p" v-if="info.type === 0">
-                            <image :src="item.goodsCover" mode="aspectFit" class="goods-cover"/>
-                        </text>
-                        <text class="w-40p font-bold text-35">{{ item.goodsName }}</text>
-                        <text class="w-15p">x{{ item.num }}</text>
-                        <text class="w-15p text-main">￥{{ item.goodsPrice }}</text>
-                        <text class="w-15p">{{ item.goodsPrice * item.num }}</text>
-                    </view>
-                </view>
-            </template>
-            <template v-if="info.type === 0">
-                <el-row :gutter="10" class="mb-20">
-                    <el-col :span="4">
-                        <el-input v-model="name" placeholder="请输入收件人姓名"/>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-input v-model="phone" placeholder="请输入收件人手机号"/>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="10" class="border-bottom pb-20">
-                    <el-col :span="4">
-                        <el-select v-model="addressIndex[0]" placeholder="请选择省">
-                            <el-option v-for="(item, index) in provinceData" :key="index"
-                                       :label="item.name"
-                                       :value="index">
-                            </el-option>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-select v-model="addressIndex[1]" placeholder="请选择市"
-                                   :disabled="addressIndex.length === 0">
-                            <template v-if="addressIndex[0] !== null">
-                                <el-option v-for="(item, index) in cityData[addressIndex[0]]" :key="index"
-                                           :label="item.name"
-                                           :value="index">
-                                </el-option>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="4">
-                        <el-select v-model="addressIndex[2]" placeholder="请选择区"
-                                   :disabled="addressIndex.length === 1">
-                            <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
-                                <el-option v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
-                                           :key="index"
-                                           :label="item.name"
-                                           :value="index">
-                                </el-option>
-                            </template>
-                        </el-select>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-input v-model="addressDetail" placeholder="请输入详细地址"/>
-                    </el-col>
-                </el-row>
-            </template>
-            <view class="mt-20 w-50p flex flex-col justify-center items-center m-a">
-                <text class="text-main font-bold text-40 mb-20" v-if="info">订单金额:￥{{ info.amount }}</text>
-                <el-button type="primary" round
-                           :disabled="(info.type === 0 && (!phone || !name || addressIndex.length < 3))" @click="onPay">
-                    立即支付
-                </el-button>
-            </view>
-            <div class="pay-price" v-if="billQRCode">
-                <uv-qrcode ref="qrcode" size="240px" :value="billQRCode"></uv-qrcode>
-                <div class="pay-desc">请打开手机微信，扫一扫完成支付</div>
-                <el-button type="success" @click="onPayStatus">已完成支付</el-button>
-            </div>
+  <view>
+    <top-bar></top-bar>
+<!--    <common-header></common-header>-->
+<!--    <category-bar></category-bar>-->
+    <view class="w-1200 m-a bg-white p-40 mt-20">
+      <template v-if="info">
+        <view class="pb-20 border-bottom flex justify-between items-center">
+          <text>订单号: {{ info.orderNo }}</text>
+          <text>下单时间: {{ info._add_time_str }}</text>
         </view>
-        <gap height="50"/>
-        <common-footer></common-footer>
-        <right-bar></right-bar>
+        <view class="my-20">
+          <text class="font-bold text-35">商品详情</text>
+          <view class="flex justify-start items-start my-20">
+            <text class="w-15p" v-if="info.type === 0">封面</text>
+            <text class="w-40p">商品详情</text>
+            <text class="w-15p">数量</text>
+            <text class="w-15p">单价</text>
+            <text class="w-15p">小计</text>
+          </view>
+          <view class="flex justify-start items-start my-20" v-for="(item, index) in info.goods" :key="index">
+            <text class="w-15p" v-if="info.type === 0">
+              <image :src="item.goodsCover" mode="aspectFit" class="goods-cover"/>
+            </text>
+            <template v-if="info.type === 0">
+              <view class="flex flex-col justify-start items-start w-40p">
+                <text class=" font-bold text-35">{{ item.goodsName }}</text>
+                <text class="mt-15 text-gray">{{ item.sku.label }}</text>
+              </view>
+              <text class="w-15p">x{{ item.num }}</text>
+              <text class="w-15p text-main">￥{{ item.sku.values }}</text>
+              <text class="w-15p font-bold">￥{{ item.sku.values * item.num }}</text>
+            </template>
+            <template v-else>
+              <view class="flex flex-col justify-start items-start w-40p">
+                <text class=" font-bold text-35">{{ item.goodsName }}</text>
+              </view>
+              <text class="w-15p">x{{ item.num }}</text>
+              <text class="w-15p text-main">￥{{ item.goodsPrice }}</text>
+              <text class="w-15p font-bold">￥{{ item.goodsPrice * item.num }}</text>
+            </template>
+          </view>
+        </view>
+      </template>
+      <template v-if="info.type === 0">
+        <div class="p-20 rounded border m-30 pointer address" v-if="!address" @click="showAddress">
+          点击选择地址
+        </div>
+        <div v-else
+             class="py-20 flex justify-between items-center">
+          <div class="flex flex-col justify-start items-start">
+            <div class="flex justify-start items-center">
+              <text class="font-bold">{{ address.name }}</text>
+            </div>
+            <text>{{ address.phone }}</text>
+            <text v-if="address.addressRegion && address.addressRegion.province">{{
+                address.addressRegion.province.name
+              }}{{
+                address.addressRegion.city.name
+              }}{{ address.addressRegion.area.name }}{{ address.addressDetail }}
+            </text>
+            <text v-else-if="info.address.province">{{ info.address.province.name }}{{
+                info.address.city.name
+              }}{{ info.address.area.name }}{{ info.addressDetail }}
+            </text>
+          </div>
+          <div class="flex justify-center items-center">
+            <el-button type="primary" @click="showAddress">
+              变更
+            </el-button>
+          </div>
+        </div>
+      </template>
+<!--      <view class="mt-40 font-bold text-main">您的会员等级:-->
+<!--        {{ getUserLevelLabel(vk.getVuex('$user.userInfo.userLevel')) }}-->
+<!--        {{ info.offRate !== 100 ? `,享受${info.offRate / 10}折优惠,已为您优惠${info.saveAmount}元` : '' }}-->
+<!--      </view>-->
+      <div v-if="info.type === 0" class="my-20">
+        <p>备注和要求:</p>
+        <el-input v-model="remark" type="textarea"/>
+      </div>
+      <view class="mt-40 w-50p flex flex-col justify-center items-center m-a">
+        <text class=" mb-20"
+              :class="[info.amount !== info.offAmount ? 'text-line-through text-30' : 'text-main font-bold text-40']"
+              v-if="info">
+          订单金额:￥{{ info.amount }}
+        </text>
+        <text class="text-main font-bold text-40 mb-20" v-if="info && info.amount !== info.offAmount">
+          优惠后金额:￥{{ parseFloat(info.offAmount).toFixed(2) }}
+        </text>
+        <el-button type="primary" round
+                   :disabled="(info.type === 0 && !address)" @click="onPay">
+          立即支付
+        </el-button>
+      </view>
+      <div class="pay-price" v-if="billQRCode">
+        <uv-qrcode ref="qrcode" size="240px" :value="billQRCode"></uv-qrcode>
+        <div class="pay-desc">微信、支付宝、云闪付扫码完成支付</div>
+        <el-button type="success" @click="onPayStatus">已完成支付</el-button>
+      </div>
     </view>
+    <gap height="50"/>
+    <common-footer></common-footer>
+    <right-bar></right-bar>
+    <el-dialog :visible.sync="dialogVisible" :title="dialogTitle" width="50%" :close-on-click-modal="false"
+               @close="dialogVisible = false">
+      <template v-if="dialogVisible && dialogType === 'address-list'">
+        <div v-for="(item, index) in addressList" :key="index"
+             class="py-20 border-bottom flex justify-between items-center">
+          <div class="flex flex-col justify-start items-start">
+            <div class="flex justify-start items-center">
+              <text v-if="item.isDefault" class="default-address">默</text>
+              <text class="font-bold">{{ item.name }}</text>
+            </div>
+            <text>{{ item.phone }}</text>
+            <text>{{ item.addressRegion.province.name }}{{
+                item.addressRegion.city.name
+              }}{{ item.addressRegion.area.name }}{{ item.addressDetail }}
+            </text>
+          </div>
+          <div class="flex justify-center items-center">
+            <el-button type="primary" @click="address = item; dialogVisible = false" size="small">
+              选择
+            </el-button>
+            <el-button type="warning" @click="addressEdit(item)" plain size="small" class="mt-20">
+              编辑
+            </el-button>
+          </div>
+        </div>
+        <div class="text-center">
+          <el-button plain @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="dialogType = 'address-action'; dialogTitle = '新增地址'">
+            新增地址
+          </el-button>
+        </div>
+      </template>
+      <div class="flex flex-col justify-start" v-else-if="dialogVisible && dialogType === 'address-action'">
+        <el-form ref="form" label-width="100px">
+          <el-row :gutter="10" class="mb-20">
+            <el-col :span="12">
+              <el-form-item label="收件人姓名">
+                <el-input v-model="name" placeholder="请输入收件人姓名"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="收件人手机号">
+                <el-input v-model="phone" placeholder="请输入收件人手机号"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="收件人地址">
+            <el-row :gutter="10">
+              <el-col :span="6">
+                <el-select v-model="addressIndex[0]" placeholder="请选择省" class="w-100p">
+                  <el-option v-for="(item, index) in provinceData" :key="index"
+                             :label="item.name"
+                             :value="index">
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="6">
+                <el-select v-model="addressIndex[1]" placeholder="请选择市" class="w-100p"
+                           :disabled="addressIndex.length === 0">
+                  <template v-if="addressIndex[0] !== null">
+                    <el-option v-for="(item, index) in cityData[addressIndex[0]]" :key="index"
+                               :label="item.name"
+                               :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+              <el-col :span="6">
+                <el-select v-model="addressIndex[2]" placeholder="请选择区" class="w-100p"
+                           :disabled="addressIndex.length === 1">
+                  <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
+                    <el-option v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
+                               :key="index"
+                               :label="item.name"
+                               :value="index">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item label="详细地址">
+            <el-input v-model="addressDetail" placeholder="请输入详细地址"/>
+          </el-form-item>
+          <el-form-item label="默认地址">
+            <el-switch v-model="isDefault"/>
+          </el-form-item>
+        </el-form>
+        <div class="flex justify-center items-center">
+          <el-button type="primary" @click="onAddressAction">保存</el-button>
+          <el-button @click="dialogTitle = '地址列表'; dialogType = 'address-list'">取消</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
@@ -99,131 +204,347 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 import dayjs from "dayjs";
+import {Loading} from "element-ui";
+import {getUserLevelLabel} from "../../../util";
 
 const OpenSdk = require('../../user/lib/base').default;
 
 const sdk = new OpenSdk({
-    appId: '10037e6f6823b20801682b6a5e5a0006',
-    appKey: '1c4e3b16066244ae9b236a09e5b312e8'
+  // appId: '10037e6f6823b20801682b6a5e5a0006',
+  // appKey: '1c4e3b16066244ae9b236a09e5b312e8'
+  // 正式
+  appId: '8a81c1db8fc5238d01910b9e312d0692',
+  appKey: 'a15ceac60f5b464eb758c4fe7800ee9f'
+  // 测试分账
+  // appId: 'f0ec96ad2c3848b5b810e7aadf369e2f',
+  // appKey: '775481e2556e4564985f5439a5e6a277'
 })
 
+// const mid = '8984501521190CF'
+// const tid = '20713432'
+const mid = '898450100002303'
+const tid = 'G5SBN2XJ'
+// const mid = '898310060514001'
+// const tid = '00000001'
+
 export default {
-    name: "order",
-    data() {
-        return {
-            id: null,
-            info: {
-                type: null
-            },
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            addressIndex: [null, null, null],
-            addressDetail: '',
-            name: '',
-            phone: '',
-            billQRCode: null,
-            checkPayInterval: null,
-        }
-    },
-    methods: {
-        async getInfo() {
-            this.info = await vk.callFunction({
-                url: 'client/order/kh/getInfo',
-                data: {
-                    id: this.id
-                }
-            })
-            if (this.info.orderStatus === 1) {
-                this.$message({
-                    type: 'success',
-                    message: '订单已支付成功'
-                })
-                setTimeout(() => {
-                    this.$router.push({
-                        path: '/pages/user/order',
-                    })
-                }, 1000)
-            }
-        },
-        async onPay() {
-            if (this.info.type === 0) {
-                if (this.addressIndex.length > 2 && this.addressIndex[2] === null) {
-                    await vk.callFunction({
-                        url: 'client/order/kh/updateAddress',
-                        data: {
-                            id: this.id,
-                            address: [provinces[this.addressIndex[0]], citys[this.addressIndex[0]][this.addressIndex[1]], areas[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]],
-                            addressDetail: this.addressDetail,
-                            phone: this.phone,
-                            name: this.name,
-                        }
-                    })
-                }
-            }
-            const requestTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')
-            const timestamp = dayjs().format('YYYYMMDDHHmmss')
-            const goods = []
-            let goodsName = this.info.goods[0].goodsName
-            goods.push({goodsName})
-            if (this.info.goods.length > 1) goodsName += `等${this.info.goods.length - 1}件商品`
-            let data = {
-                queryUrl: 'https://test-api-open.chinaums.com/v1/netpay/bills/get-qrcode',
-                timestamp,
-                nonce: 'rp84ufhfn20yneo3tp',
-                content: {
-                    billNo: this.info.orderNo,
-                    requestTimestamp,
-                    mid: '898201612345678',
-                    tid: '88880001',
-                    instMid: 'QRPAYDEFAULT',
-                    totalAmount: 1,
-                    notifyUrl: 'https://fc-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/pay_notify',
-                    goods
-                }
-            }
-            /**
-             * 调用函数
-             */
-            sdk.exec(data).then(res => {
-                const h = this.$createElement;
-                const result = JSON.parse(res);
-                if (result.errCode === 'SUCCESS') {
-                    this.showQrcode = true
-                    this.billQRCode = result.billQRCode
-                    setTimeout(() => {
-                        this.checkPayInterval = setInterval(() => {
-                            this.getInfo()
-                        }, 1000)
-                    }, 3000)
-                }
-            })
-        },
-    },
-    onLoad(options) {
-        if (options && options.id) {
-            this.id = options.id
-            this.getInfo()
-        }
-    },
-    onUnload() {
-        if (this.checkPayInterval) clearInterval(this.checkPayInterval)
+  name: "order",
+  data() {
+    return {
+      id: null,
+      info: {
+        type: null,
+        offRate: 100
+      },
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      addressIndex: [null, null, null],
+      addressDetail: '',
+      name: '',
+      phone: '',
+      billQRCode: null,
+      checkPayInterval: null,
+      dialogVisible: false,
+      dialogTitle: '',
+      dialogType: '',
+      address: null,
+      addressList: [],
+      selectedAddressId: null,
+      isDefault: false,
+      remark: ''
     }
+  },
+  methods: {
+    getUserLevelLabel,
+    async getInfo(resetOrderNo = false) {
+      this.info = await vk.callFunction({
+        url: 'client/order/kh/getInfo',
+        data: {
+          id: this.id,
+          resetOrderNo
+        }
+      })
+      if (this.info.name) {
+        this.address = {
+          name: this.info.name,
+          phone: this.info.phone,
+          addressDetail: this.info.addressDetail,
+          addressRegion: {
+            province: this.info.address.province,
+            city: this.info.address.city,
+            area: this.info.address.area,
+          },
+        }
+      }
+      if (this.info.orderStatus === -1) {
+        this.$message.error('订单已取消')
+        if (this.checkPayInterval) clearInterval(this.checkPayInterval)
+        vk.redirectTo({
+          url: '/pages/order/order?menuIndex=1',
+        })
+      }
+
+      if ([1, 4].includes(this.info.orderStatus)) {
+        if (this.checkPayInterval) clearInterval(this.checkPayInterval)
+        this.$message({
+          type: 'success',
+          message: '订单已支付成功'
+        })
+        setTimeout(() => {
+          if ([7, 11].includes(this.info.type)) {
+            vk.navigateBack()
+          } else if (this.info.type === 13) {
+            vk.redirectTo({
+              url: '/pages/contract/index?tab=sign',
+            })
+          } else if (this.info.type === 10) {
+            vk.redirectTo({
+              url: '/pages/index/old/release',
+            })
+          } else {
+            vk.redirectTo({
+              url: '/pages/order/order?menuIndex=1',
+            })
+          }
+        }, 1000)
+      }
+    },
+    async onPay() {
+      if (this.info.type === 0) {
+        if (!this.address) return this.$message({type: 'error', message: '请选择地址'})
+        await vk.callFunction({
+          url: 'client/order/kh/updateAddress',
+          data: {
+            id: this.id,
+            address: {
+              province: this.address.addressRegion.province,
+              city: this.address.addressRegion.city,
+              area: this.address.addressRegion.area,
+            },
+            addressDetail: this.address.addressDetail,
+            phone: this.address.phone,
+            name: this.address.name,
+            remark: this.remark,
+          }
+        })
+      }
+      // await vk.callFunction({
+      //     url: 'client/user/pub/pay',
+      //     data: {
+      //         orderNo: this.info.orderNo,
+      //         billStatus: 'PAID',
+      //         billPayment: JSON.stringify({
+      //             payTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      //             receiptAmount: this.info.offAmount * 100,
+      //             paySeqId: 'asdasd'
+      //         })
+      //     }
+      // })
+      // this.checkPayInterval = setInterval(() => {
+      //     this.getInfo()
+      // }, 1000)
+      // return
+      const requestTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      const timestamp = dayjs().format('YYYYMMDDHHmmss')
+      // 平台分账金额
+      let platformAmount = 0
+      const goodsList = []
+      // let goodsName = this.info.goods[0].goodsName
+      // goods.push({goodsName})
+      // if (this.info.goods.length > 1) goodsName += `等${this.info.goods.length - 1}件商品`
+      let subOrderAmount = 0
+      this.info.goods.forEach((goods, index) => {
+        const goodsData = {
+          goodsName: goods.goodsName
+        }
+        if (goods.company && goods.company.merchantCode && goods.company.settleRate) {
+          // subOrderAmount += parseInt((goods.company.settleRate * goods.price).toString())
+          // goodsData['subOrderAmount'] = parseInt((goods.company.settleRate * goods.price).toString())
+          subOrderAmount += 9
+          goodsData['subOrderAmount'] = 9
+          goodsData['subMerchantId'] = goods.company.merchantCode
+          goodsData['merOrderId'] = this.info.orderNo + index
+        }
+        goodsList.push(goodsData)
+      })
+      if (subOrderAmount > 0) platformAmount = this.info.offAmount * 100 - subOrderAmount
+      // let data = {
+      //   queryUrl: 'https://test-api-open.chinaums.com/v1/inip/upsp/shop/csb/get-qrcode',
+      //   sysSource: 'OPT',
+      //   vaMchntNo: mid,
+      //   vaTermNo: tid,
+      //   timestamp,
+      //   nonce: 'rp84ufhfn20yneo3tp',
+      //   billNo: this.info.orderNo,
+      //   totalAmount: 10,
+      //   notifyUrl: 'https://www.jinjiuxinzg.cn/pay_notify',
+      //   vaFld:
+      // }
+      let attachedData = this.info.goods[0].goodsName
+      if (this.info.goods.length > 1) attachedData += `等${this.info.goods.length - 1}件商品`
+      let data = {
+        queryUrl: 'https://api-mop.chinaums.com/v1/netpay/bills/get-qrcode',
+        timestamp,
+        nonce: 'rp84ufhfn20yneo3tp',
+        content: {
+          billNo: this.info.orderNo,
+          requestTimestamp,
+          mid,
+          tid,
+          instMid: 'QRPAYDEFAULT',
+          totalAmount: parseInt(this.info.offAmount * 100).toFixed(0),
+          notifyUrl: 'https://tcb-n44byxi8bmrfrki-d4bn1c4a206d.service.tcloudbase.com/pay_notify',
+          // notifyUrl: 'https://www.jinjiuxinzg.cn/pay_notify',
+          goods: goodsList,
+          attachedData,
+          billDesc: attachedData,
+        }
+      }
+      if (platformAmount > 0) {
+        data['divisionFlag'] = true
+        data['platformAmount'] = platformAmount
+      }
+      console.log(data)
+      /**
+       * 调用函数
+       */
+      const loadingInstance = Loading.service({fullscreen: true, text: '请求中'});
+
+      sdk.exec(data).then(res => {
+        this.$nextTick(() => {
+          loadingInstance.close();
+        });
+        const h = this.$createElement;
+        const result = JSON.parse(res);
+        if (result.errCode === 'SUCCESS') {
+          this.showQrcode = true
+          this.billQRCode = result.billQRCode
+          setTimeout(() => {
+            this.checkPayInterval = setInterval(() => {
+              this.getInfo()
+            }, 1000)
+          }, 3000)
+        }
+      }).catch(err => {
+        this.$nextTick(() => {
+          loadingInstance.close();
+        });
+        this.$message({
+          type: 'error',
+          message: '服务器繁忙，请稍后再试或联系平台客服'
+        })
+        setTimeout(() => {
+          vk.redirectTo({
+            url: '/pages/order/order?activeName=0&menuIndex=1',
+          })
+        }, 1500)
+      })
+    },
+    async onAddressAction() {
+      if (!this.name) return this.$message({type: 'error', message: '请填写收件人姓名'})
+      if (!this.phone) return this.$message({type: 'error', message: '请填写收件人手机号'})
+      if (!this.addressDetail || this.addressIndex[2] === null) return this.$message({
+        type: 'error',
+        message: '请填写地址'
+      })
+      const province = this.provinceData[this.addressIndex[0]]
+      const city = this.cityData[this.addressIndex[0]][this.addressIndex[1]]
+      const area = this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]
+      this.addressRegion = {
+        province: {code: province.code, name: province.name},
+        city: {code: city.code, name: city.name},
+        area: {code: area.code, name: area.name},
+      }
+      await vk.callFunction({
+        url: 'client/userAddress/kh/addUpdate',
+        data: {
+          id: this.selectedAddressId ?? null,
+          name: this.name,
+          phone: this.phone,
+          addressDetail: this.addressDetail,
+          addressRegion: this.addressRegion,
+          isDefault: this.isDefault
+        }
+      })
+      this.name = ''
+      this.phone = ''
+      this.addressDetail = ''
+      this.addressIndex = [null, null, null,]
+      this.dialogType = 'address-list'
+      this.dialogTitle = '地址列表'
+      await this.getUserAddress()
+    },
+    async getUserAddress() {
+      const {rows} = await vk.callFunction({
+        url: 'client/userAddress/kh/getList'
+      })
+      this.addressList = rows
+    },
+    showAddress() {
+      this.dialogType = 'address-list'
+      this.dialogTitle = '选择地址'
+      this.dialogVisible = true
+    },
+    addressEdit(item) {
+      this.selectedAddressId = item._id
+      this.name = item.name
+      this.phone = item.phone
+      this.addressDetail = item.addressDetail
+      this.addressIndex[0] = this.provinceData.findIndex(i => i.code === item.addressRegion.province.code)
+      this.addressIndex[1] = this.cityData[this.addressIndex[0]].findIndex(i => i.code === item.addressRegion.city.code)
+      this.addressIndex[2] = this.areaData[this.addressIndex[0]][this.addressIndex[1]].findIndex(i => i.code === item.addressRegion.area.code)
+      this.dialogType = 'address-action';
+      this.dialogTitle = ' 编辑地址'
+    }
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.id = options.id
+      this.getInfo(true)
+      this.getUserAddress()
+    }
+  },
+  beforeDestroy() {
+    if (this.checkPayInterval) clearInterval(this.checkPayInterval)
+  },
+  onUnload() {
+    if (this.checkPayInterval) clearInterval(this.checkPayInterval)
+  }
 }
 </script>
 <style lang="scss" scoped>
 .goods-cover {
-    width: 100px;
-    height: 100px;
+  width: 100px;
+  height: 100px;
 }
 
 
 .pay-price {
-    margin-top: 20px;
+  margin-top: 20px;
 }
 
 .pay-desc {
-    font-size: 16px;
-    line-height: 2em;
+  font-size: 16px;
+  line-height: 2em;
+}
+
+.address:hover {
+  border: 1px solid #a92924;
+  background-color: #f1c7c7;
+}
+
+.default-address {
+  background-color: #a92924;
+  color: #fff;
+  font-size: 14px;
+  width: 20px;
+  height: 20px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 5px;
+  padding: 2px;
 }
 </style>
\ No newline at end of file
diff --git a/pages/index/shop/shop.vue b/pages/index/shop/shop.vue
index 38e1d34..c6c4ef6 100644
--- a/pages/index/shop/shop.vue
+++ b/pages/index/shop/shop.vue
@@ -1,63 +1,89 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="w-1200">
-            <u-swiper :list="list" :height="380" borderRadius="0"></u-swiper>
-            <view class="tool-bar">
-                <view class="search">
-                    <text>地区：</text>
-                    <el-cascader :options="options" :props="{label: 'name', value: 'code'}" v-model="address"
-                                 @change="getGoodsList()" clearable/>
-                </view>
-                <view class="buy-btn">
-                    <image src="https://oss.wsdns.cn/20231204/bcc976f4396e437abf19deb11c1f06b4.png" mode="widthFix"/>
-                </view>
-            </view>
-            <view class="tool-bar">
-                <view class="item">分类：</view>
-                <view class="item" @click="selectCate(null)">全部</view>
-                <view class="item" v-for="(item, index) in categoryList" :key="index"
-                      @click="selectCate(item._id)"
-                      :class="[categoryId === item._id? 'active' : '']">{{ item.name }}
-                </view>
-            </view>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="w-1200">
+      <common-swiper page="shop"/>
+      <view class="tool-bar">
+        <view class="search">
+          <el-row :gutter="10" flex justify="center" align="center">
+            <el-col :span="8">
+              <el-input v-model="keyword" placeholder="请输入商品名称" clearable @clear="getGoodsList()"
+                        @keyup.enter.native="getGoodsList()" class="w-100"/>
+            </el-col>
+            <el-col :span="10">
+              <view class="flex justify-start items-center">
+                <text class="text-25">特产地区：</text>
+                <el-cascader :options="options" :props="{label: 'name', value: 'code'}"
+                             v-model="address"
+                             @change="getGoodsList()" clearable/>
+              </view>
+            </el-col>
+            <el-col :span="6">
+              <image src="https://oss.wsdns.cn/20231204/bcc976f4396e437abf19deb11c1f06b4.png"
+                     mode="widthFix"/>
+            </el-col>
+          </el-row>
         </view>
-
-        <view class="goods-list">
-            <view class="flex flex-wrap justify-start is-status">
-                <view class="w-20p" v-for="(item, index) in goodsList" :key="index">
-                    <view class="p-20">
-                        <view class="grid-content bg-purple pointer"
-                              @click="navTo(`/pages/index/shop/detail?id=${item._id}`)">
-                            <image :src="item.cover" mode="aspectFill"/>
-                            <view class="comments">
-                                <view class="goods-name">
-                                    {{ item.name }}
-                                </view>
-                                <view class="goods-price">￥{{ item.amount }}</view>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <div class="pagination">
-                <el-pagination
-                    background
-                    layout="prev, pager, next"
-                    :total="total"
-                    :page-size="pageSize"
-                    @click="getGoodsList"
-                >
-                </el-pagination>
-            </div>
+      </view>
+      <view class="tool-bar">
+        <view class="item">分类：</view>
+        <view class="item" @click="selectCate(null)">全部</view>
+        <view class="item" v-for="(item, index) in categoryList" :key="index"
+              @click="selectCate(item._id)"
+              :class="[categoryId === item._id? 'active' : '']">{{ item.name }}
         </view>
-        <!-- 现货市场 end -->
-        <gap height="50"/>
-        <right-bar></right-bar>
-        <common-footer></common-footer>
+      </view>
     </view>
+    <div class="m-a w-1200 flex justify-start items-center flex-wrap" v-if="adLoaded">
+      <div v-for="(ad, adIndex) in adList" :key="adIndex"
+           :style="{width: '600px'}">
+        <template v-if="ad.length > 0">
+          <el-carousel :height="`100px`" class="m-a">
+            <el-carousel-item v-for="(item, index) in ad" :key="index" :style="{width: '600px'}">
+              <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                     class="pointer" :src="item.swiper" mode="aspectFill"
+                     :style="{width: '100%', height: '100px'}"/>
+            </el-carousel-item>
+          </el-carousel>
+        </template>
+      </div>
+    </div>
+    <view class="goods-list">
+      <view class="flex flex-wrap justify-start is-status">
+        <view class="w-20p " v-for="(item, index) in goodsList" :key="index">
+          <view class="p-20 ">
+            <view class="grid-content bg-purple pointer pos-r"
+                  @click="navTo(`/pages/index/shop/detail?id=${item._id}`)">
+              <text class="recommend" v-if="item.recommend === 1">荐</text>
+              <image :src="item.cover" mode="aspectFill"/>
+              <view class="comments">
+                <view class="goods-name" style="height: 60px">
+                  {{ item.name }}
+                </view>
+                <view class="goods-price">￥{{ item.amount }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <div class="pagination">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :total="total"
+          :page-size="pageSize"
+          @click="getGoodsList"
+        >
+        </el-pagination>
+      </div>
+    </view>
+    <!-- 现货市场 end -->
+    <gap height="50"/>
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -66,184 +92,244 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 
 export default {
-    components: {UGap},
-    data() {
-        return {
-            categoryList: [],
-            goodsList: [],
-            list: [
-                {
-                    image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-                    title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-                },
-                {
-                    image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-                    title: '身无彩凤双飞翼，心有灵犀一点通'
-                },
-                {
-                    image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-                    title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-                }
-            ],
-            options: [],
-            address: [],
-            pageIndex: 1,
-            pageSize: 20,
-            total: 0,
-            categoryId: null
-        };
-    },
-    onLoad(options) {
-        if (options && options.menu) {
-            this.currMenu = options.menu
-        }
-        this.options = provinces.map(item => {
-            item.children = [];
-            return item
-        })
-        this.options.forEach((province, index) => {
-            citys[index].forEach(city => {
-                this.options[index].children.push(city)
-            })
-        })
-        this.getCategoryList()
-        this.getGoodsList()
-    },
-    methods: {
-        menuSelect(e) {
-            this.currMenu = e
-        },
-        navTo(url) {
-            vk.navigateTo(url);
-        },
-        getCategoryList() {
-            vk.callFunction({
-                url: 'client/goods/category/pub/getList'
-            }).then(res => {
-                this.categoryList = res.rows
-            })
-        },
-        getGoodsList(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/goods/list/pub/getList',
-                data: {
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    city: this.address.length > 1 ? this.address[1] : null,
-                    parentId: this.categoryId
-                }
-            }).then(res => {
-                this.goodsList = res.rows
-            })
-        },
-        selectCate(cateId) {
-            if (this.categoryId === cateId) this.categoryId = null
-            else this.categoryId = cateId
-            this.getGoodsList()
-        }
+  components: {UGap},
+  data() {
+    return {
+      categoryList: [],
+      goodsList: [],
+      options: [],
+      address: [],
+      pageIndex: 1,
+      pageSize: 20,
+      total: 0,
+      categoryId: null,
+      keyword: null,
+      adList: [],
+      adNum: 0,
+      adLoaded: false
+    };
+  },
+  async onLoad(options) {
+    await this.getCategoryList()
+    if (options && options.menu) this.currMenu = options.menu
+    if (options && options.keyword) this.keyword = options.keyword
+    if (options && options.cateName) {
+      const cate = this.categoryList.find(item => item.name === options.cateName)
+      if (cate) this.categoryId = cate._id
     }
+
+    this.options = provinces.map(item => {
+      item.children = [];
+      return item
+    })
+    this.options.forEach((province, index) => {
+      citys[index].forEach(city => {
+        this.options[index].children.push(city)
+      })
+    })
+
+    console.error(this.options)
+
+    this.getGoodsList()
+  },
+  methods: {
+    menuSelect(e) {
+      this.currMenu = e
+    },
+    navTo(url) {
+      vk.navigateTo(url);
+    },
+    async getCategoryList() {
+      const res = await vk.callFunction({
+        url: 'client/goods/category/pub/getList'
+      })
+      this.categoryList = res.rows
+    },
+    getGoodsList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/goods/list/pub/getList',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          city: this.address.length > 1 ? this.address[1] : null,
+          parentId: this.categoryId,
+          keyword: this.keyword
+        }
+      }).then(res => {
+        this.goodsList = res.rows
+        this.getAdList()
+      })
+    },
+    selectCate(cateId) {
+      if (this.categoryId === cateId) this.categoryId = null
+      else this.categoryId = cateId
+      this.getGoodsList()
+    },
+    async getAdList() {
+      this.adList = [[], [], [], [], []]
+      if (this.address.length === 0) {
+        if (!this.categoryId) {
+          for (let i = 0; i < 5; i++) {
+            const res = await vk.callFunction({
+              url: 'client/ad/pub/getList',
+              data: {
+                adKey: 27 + i
+              }
+            })
+            if (res.data) this.adList[i] = res.data
+          }
+        } else {
+          const cate = this.categoryList.find(item => item._id === this.categoryId)
+          if (cate.ad && cate.ad.length > 0) {
+            cate.ad.forEach(item => {
+              this.adList[item.adKey - 27].push(item)
+            })
+          }
+        }
+      } else {
+        for (let i = 0; i < 5; i++) {
+          const res = await vk.callFunction({
+            url: 'client/ad/pub/getList',
+            data: {
+              adKey: 27 + i,
+              region: this.address[0]
+            }
+          })
+          if (res.data) this.adList[i] = res.data
+          // rows.forEach(item => {
+          //   if (item.businessCard.album && item.businessCard.album.length > 0) {
+          //     this.adList[i].push({
+          //       swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+          //       companyId: item._id
+          //     })
+          //   }
+          // })
+        }
+      }
+      this.adNum = 0
+      for (let i = 0; i < 5; i++) {
+        if (this.adList[i].length > 0) {
+          this.adNum += 1
+        }
+      }
+      this.adLoaded = true
+      this.$forceUpdate()
+
+    },
+  }
 }
 </script>
 
 <style lang="scss">
 .w-1200 {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #fff;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #fff;
 
-    .test {
-        height: 50px;
-        color: #ffffff;
-        font-size: 18px;
-        background-color: #bf2b28;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+  .test {
+    height: 50px;
+    color: #ffffff;
+    font-size: 18px;
+    background-color: #bf2b28;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
-        text {
-            margin: 0 20px;
-        }
+    text {
+      margin: 0 20px;
+    }
+  }
+
+  .tool-bar {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 20px;
+    font-size: 16px;
+
+    .search {
+      display: flex;
+      align-items: center;
     }
 
-    .tool-bar {
-        display: flex;
-        justify-content: flex-start;
-        align-items: center;
-        padding: 20px;
-        font-size: 16px;
-
-        .search {
-            display: flex;
-            align-items: center;
-        }
-
-        .item {
-            margin-right: 10px;
-            cursor: pointer;
-        }
-
-        .item:hover, .active {
-            color: #bf2b28;
-        }
-
+    .item {
+      margin-right: 10px;
+      cursor: pointer;
     }
+
+    .item:hover, .active {
+      color: #bf2b28;
+    }
+
+  }
 }
 
 .wrap {
-    flex-wrap: wrap;
+  flex-wrap: wrap;
 }
 
 .goods-list {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 
-    .grid-content {
+  .grid-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    padding: 10px;
+    margin-bottom: 10px;
+    flex-direction: column;
+
+    .comments {
+      display: flex;
+      flex-direction: column;
+      justify-content: start;
+      align-items: flex-start;
+      line-height: 2em;
+      width: 100%;
+
+      .goods-name {
+        font-size: 16px;
         display: flex;
-        justify-content: center;
-        align-items: center;
-        background-color: #fff;
-        width: 100%;
-        padding: 10px;
-        margin-bottom: 10px;
-        flex-direction: column;
+        align-items: flex-start;
+      }
 
-        .comments {
-            display: flex;
-            flex-direction: column;
-            justify-content: start;
-            align-items: flex-start;
-            line-height: 2em;
-            width: 100%;
-
-            .goods-name {
-                font-size: 16px;
-                display: flex;
-                align-items: center;
-            }
-
-            .goods-price {
-                color: #bf2b28;
-                font-size: 20px;
-                font-weight: 600;
-            }
-        }
+      .goods-price {
+        color: #bf2b28;
+        font-size: 20px;
+        font-weight: 600;
+      }
     }
+  }
 
-    .bg-purple {
-        border-top: 1px solid #f3f3f3;
-        border-right: 1px solid #f3f3f3;
+  .bg-purple {
+    border-top: 1px solid #f3f3f3;
+    border-right: 1px solid #f3f3f3;
 
-        image {
-            width: 180px;
-            height: 180px;
-        }
+    image {
+      width: 180px;
+      height: 180px;
     }
+  }
 }
 
 .pagination {
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
+}
+
+.recommend {
+  position: absolute;
+  right: 0;
+  top: 0;
+  padding: 5px;
+  background-color: #bf2b28;
+  color: white;
+  font-size: 30rpx;
+  z-index: 999;
 }
 </style>
diff --git a/pages/order/components/expressInfo.vue b/pages/order/components/expressInfo.vue
new file mode 100644
index 0000000..09ed2c3
--- /dev/null
+++ b/pages/order/components/expressInfo.vue
@@ -0,0 +1,39 @@
+<template>
+    <el-form ref="form" label-width="80px">
+        <el-form-item label="物流公司">
+            {{ info.expressName }}
+        </el-form-item>
+        <el-form-item label="物流单号">
+            {{ info.expressNo }}
+        </el-form-item>
+        <el-form-item label="发货单">
+            <el-image v-for="(item, index) in info.expressPhoto" :key="index" :src="item"
+                       class="mr-10 mb-10"
+                      :preview-src-list="info.expressPhoto" style="width: 100px;height: 100px"/>
+        </el-form-item>
+        <el-form-item label="备注">
+            {{ info.remark }}
+        </el-form-item>
+        <div class="mt-20 flex justify-center items-center text-center">
+            <el-button type="primary" size="small" plain @click.native="close">关闭</el-button>
+        </div>
+    </el-form>
+</template>
+
+<script>
+export default {
+    name: "expressInfo",
+    props: {
+        info: Object
+    },
+    data() {
+        return {}
+    },
+    methods: {
+        close() {
+            this.$emit('close')
+        },
+
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/order/components/goods.vue b/pages/order/components/goods.vue
new file mode 100644
index 0000000..05bfb67
--- /dev/null
+++ b/pages/order/components/goods.vue
@@ -0,0 +1,131 @@
+<template>
+  <view>
+    <view class="py-20">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <text class="text-35 font-bold">商品信息</text>
+        </el-col>
+        <el-col :span="4">
+          <text class="text-35 font-bold flex-1">单价</text>
+        </el-col>
+        <el-col :span="4">
+          <text class="text-35 font-bold flex-1">数量</text>
+        </el-col>
+        <el-col :span="4">
+          <text class="text-35 font-bold flex-1">金额</text>
+        </el-col>
+      </el-row>
+    </view>
+    <view class="p-20 mb-20" v-for="(item, index) in goods" :key="index">
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <view class="flex justify-start items-start">
+            <el-image :src="item.goods.cover" class="cover ml-20" fit="fit" v-if="item.goods"/>
+            <view class="flex flex-col justify-start items-start ml-20">
+              <text class="font-bold mb-15">{{ item.goodsName }}</text>
+              <text class="text-gray" v-if="order.type === 0">{{ item.sku.label }}</text>
+            </view>
+          </view>
+        </el-col>
+        <el-col :span="4">
+          <text class="text-35 font-bold flex-1" v-if="order.type === 0">￥{{ item.sku.values }}</text>
+          <text class="text-35 font-bold flex-1" v-else>￥{{ item.goodsPrice }}</text>
+        </el-col>
+        <el-col :span="4">
+          <text class="text-35 font-bold flex-1">
+            x{{ item.num }}
+          </text>
+        </el-col>
+        <el-col :span="4">
+          <text class="text-35 font-bold flex-1 text-main" v-if="order.type === 0">￥{{
+              parseFloat(item.sku.values) * item.num
+            }}
+          </text>
+          <text class="text-35 font-bold flex-1 text-main" v-else>￥{{
+              parseFloat(item.goodsPrice) * item.num
+            }}
+          </text>
+        </el-col>
+      </el-row>
+    </view>
+
+    <view v-if="order.type === 1">
+      <p class="text-35 font-bold mb-25">服务详情</p>
+      <el-descriptions border :column="2">
+        <el-descriptions-item label="考察对象" v-if="selfProduct.type === 0">
+          <div style="margin-bottom: .5rem" v-for="(item, index) in selfProduct.contentList" :key="index">
+            <span>{{ item.name }}</span>
+            <template v-if="item.type && item.type === '个人'">
+
+              ({{
+                item.code
+              }})--{{ item.addressRegion.province.name }}{{
+                item.addressRegion.city.name
+              }}{{ item.addressRegion.area.name }}{{ item.address }}
+            </template>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="考察产品" v-else>
+          <p style="margin-bottom: .5rem" v-for="(item, index) in selfProduct.contentList" :key="index">{{
+              item.name
+            }}--{{ item.addressRegion.province.name }}{{
+              item.addressRegion.city.name
+            }}{{ item.addressRegion.area.name }}{{ item.address }}</p>
+        </el-descriptions-item>
+        <el-descriptions-item label="接收文件电子邮箱">
+          <span>{{ selfProduct.email }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="接收文件微信">
+          <span>{{ selfProduct.wechat }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="接收文件寄件地址">
+          <span v-if="selfProduct.receiveAddressRegion.province">{{
+              selfProduct.receiveAddressRegion.province.name
+            }}{{ selfProduct.receiveAddressRegion.city.name }}{{
+              selfProduct.receiveAddressRegion.area.name
+            }}{{ selfProduct.receiveAddress }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="申请人">
+          <span>{{ selfProduct.requestName }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="业务联系人">
+          <span>{{ selfProduct.contactName }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="业务联系方式">
+          <span>{{ selfProduct.contact }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="结果文件" v-if="order && order.resultFiles">
+          <div v-for="(item, index) in order.resultFiles" :key="index">
+            <a :href="item"
+               target="_blank">预览:文件{{ index + 1 }}</a>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="发送途径" v-if="order && order.sendMethod">{{ order.sendMethod }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "goods",
+  props: {
+    goods: Array,
+    order: Object,
+    selfProduct: Object,
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+
+<style lang="scss" scoped>
+.cover {
+  width: 80px;
+  height: 80px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/order/components/makePay.vue b/pages/order/components/makePay.vue
new file mode 100644
index 0000000..d30eb6b
--- /dev/null
+++ b/pages/order/components/makePay.vue
@@ -0,0 +1,191 @@
+<template>
+    <view>
+        <div class="font-bold">
+            <span>订单编号: {{ orderInfo.orderNo }}</span>
+            <span class="ml-20 text-main" v-if="orderInfo.orderStatus > 1">(已发货)</span>
+        </div>
+        <div class="font-bold my-25">订单总额: {{ orderInfo.amount }}元</div>
+        <el-form ref="form" label-width="80px">
+            <el-form-item label="支付类型" required >
+                <el-select v-model="payInfo.type" @change="changeType">
+                    <el-option
+                        v-for="item in payTypeList"
+                        :key="item"
+                        :label="item"
+                        :value="item"
+                        :disabled="(!['预付款', '货到付款', '全款'].includes(item) && orderInfo.payStatus === 0)
+                        || (['预付款', '货到付款', '全款'].includes(item) && orderInfo.payStatus > 0)"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item :label="payInfo.type" required>
+                <el-input v-model="payInfo.amount" placeholder="请输入金额"/>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input v-model="payInfo.remark"/>
+            </el-form-item>
+            <template v-if="[0, 1].includes(orderInfo.orderStatus)">
+                <el-row :gutter="10">
+                    <el-col :span="6">
+                        <el-form-item label="是否发货">
+                            <el-radio-group v-model="payInfo.isExpress"
+                                            :disabled="['货到付款', '全款'].includes(payInfo.type)">
+                                <el-radio :label="true">是</el-radio>
+                                <el-radio :label="false">否</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <!--                <el-col :span="12">-->
+                    <!--                    <el-form-item label="物流公司" required>-->
+                    <!--                        <el-input v-model="payInfo.expressName" placeholder="请输入物流公司"/>-->
+                    <!--                    </el-form-item>-->
+                    <!--                    <el-form-item label="物流单号" required>-->
+                    <!--                        <el-input v-model="payInfo.expressNo" placeholder="请输入物流单号"/>-->
+                    <!--                    </el-form-item>-->
+                    <!--                </el-col>-->
+                </el-row>
+                <el-form-item label="凭证" v-if="!payInfo.isExpress">
+                    <vk-data-upload v-model="payInfo.photos"></vk-data-upload>
+                </el-form-item>
+                <el-form-item label="凭证" v-else required>
+                    <vk-data-upload v-model="payInfo.expressPhoto"></vk-data-upload>
+                </el-form-item>
+            </template>
+            <el-form-item label="附件">
+                <vk-data-upload v-model="payInfo.ext"></vk-data-upload>
+            </el-form-item>
+        </el-form>
+        <el-row>
+            <el-col :span="24" class="text-center">
+                <el-button type="primary" size="mini" @click="setPayList">提交</el-button>
+                <el-button type="warning" size="mini" @click="close">取消
+                </el-button>
+            </el-col>
+        </el-row>
+    </view>
+</template>
+
+<script>
+export default {
+    name: "makePay",
+    props: {
+        info: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
+        payTypeList: {
+            type: Array,
+            default: () => {
+                return []
+            }
+        },
+
+    },
+    data() {
+        return {
+            payInfo: {
+                orderId: this.info._id,
+                amount: null,
+                type: null,
+                remark: '',
+                buyerRemark: '',
+                photos: [],
+                payerUid: null,
+                hasPaid: false,
+                paidVoucher: '',
+                paidAt: '',
+                sellerConfirm: false,
+                confirmAt: '',
+                buyerUid: this.info.uid,
+                sellerUid: this.info.sellerUid,
+                status: 0,
+                buyerRefuse: false,
+                refuseReason: null,
+                buyerPhotos: [],
+                expressPhoto: [],
+                isExpress: false,
+                expressName: null,
+                expressNo: null,
+                ext: [],
+            },
+            orderInfo: {
+                payStatus: 0
+            }
+        }
+    },
+    methods: {
+        close() {
+            this.$emit("close")
+        },
+        async getOrderInfo() {
+            this.orderInfo = await vk.callFunction({
+                url: 'client/order/kh/getInfo',
+                data: {
+                    id: this.info._id
+                }
+            })
+        },
+        async setPayList() {
+            if (!this.payInfo.type) return this.$message({
+                type: 'error',
+                message: '请选择支付类型'
+            })
+            if (!this.payInfo.amount) return this.$message({
+                type: 'error',
+                message: '请输入支付金额'
+            })
+            if (this.payInfo.isExpress && this.payInfo.expressPhoto.length === 0) return this.$message({
+                type: 'error',
+                message: '请上传凭证'
+            })
+            // if (this.payInfo.isExpress && !this.payInfo.expressName) return this.$message({
+            //     type: 'error',
+            //     message: '请输入物流公司'
+            // })
+            // if (this.payInfo.isExpress && !this.payInfo.expressNo) return this.$message({
+            //     type: 'error',
+            //     message: '请输入物流单号'
+            // })
+            if (this.payInfo.isExpress) {
+                this.$confirm('发货状态一旦确定无法修改，请谨慎操作', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(async () => {
+                    await vk.callFunction({
+                        url: 'client/order/kh/makePay',
+                        title: '请求中...',
+                        data: {payInfo: this.payInfo}
+                    })
+                    this.$message({
+                        type: 'success',
+                        message: '支付单创建成功'
+                    })
+                    this.close()
+                })
+            } else {
+                await vk.callFunction({
+                    url: 'client/order/kh/makePay',
+                    title: '请求中...',
+                    data: {payInfo: this.payInfo}
+                })
+                this.$message({
+                    type: 'success',
+                    message: '支付单创建成功'
+                })
+                this.close()
+            }
+        },
+        changeType() {
+            this.payInfo.isExpress = ['货到付款', '全款'].includes(this.payInfo.type)
+            console.log(this.payInfo.isExpress, this.payInfo.type)
+        }
+    },
+    mounted() {
+        this.getOrderInfo()
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/order/components/payList.vue b/pages/order/components/payList.vue
new file mode 100644
index 0000000..8041a40
--- /dev/null
+++ b/pages/order/components/payList.vue
@@ -0,0 +1,195 @@
+<template>
+    <view>
+        <view style="margin-bottom: 16px; padding: 12px; background: #fff8e8; color: #8a5a00; line-height: 1.7;">
+            <view>服务提供方（卖家）：请于系统确认支付方已依照协议或约定支付对应订单款项后，再启动对应服务。申请款项付款方在系统端完成划款授权确认操作后，款项到账时间约为工作日T+1，请届时查询确认。</view>
+            <view style="margin-top: 8px;">服务需求方（买家）：请于依照交易规则和协议完成对应服务验收后，再在系统端完成对应申请款项的授权确认操作，系统默认确认时限为72小时（含工作日，届时系统仅提供信息提醒服务），请及时完成该项确认。若您届时未确认且未提出正当异议，系统将默认您已收货或同意支付申请。</view>
+        </view>
+        <view v-for="(item, index) in payList" :key="index" class="py-20 border-bottom">
+            <el-descriptions :title="item.type" :column="2" border :labelStyle="{width: '120px'}">
+                <template slot="extra">
+                    <div class="flex justify-start items-center">
+                        <template v-if="!item.buyerRefuse">
+                            <el-button plain type="primary" size="mini" @click="showPay(item)"
+                                       v-if="item.status === 0 && item.isBuyer && !item.hasPaid">上传支付凭证
+                            </el-button>
+                            <el-button type="primary" size="mini" class="mx-20" @click="confirmPay(item)"
+                                       v-if="item.hasPaid && item.isSeller && !item.sellerConfirm">
+                                确认收款
+                            </el-button>
+                            <el-button plain type="primary" size="mini" class="mx-20" @click="paidRefuse(item)"
+                                       v-if="item.isBuyer && item.status === 0 && !item.paidVoucher">
+                                驳回
+                            </el-button>
+                        </template>
+                    </div>
+                </template>
+                <el-descriptions-item label="支付金额">{{ item.amount }}</el-descriptions-item>
+                <el-descriptions-item label="支付凭证">
+                    <template v-if="!item.buyerRefuse">
+                        <span v-if="item.isSeller && !item.hasPaid">待买方支付</span>
+                        <view v-else-if="item.paidVoucher">
+                            <el-image :src="item.paidVoucher[0]" style="width: 80px; height: 80px" fit="cover"
+                                      :preview-src-list="item.paidVoucher"/>
+                        </view>
+                        <view v-else-if="!item.paidVoucher">
+                            <span>未上传凭证</span>
+                        </view>
+                    </template>
+                    <span v-else class="text-main">买家已拒绝: {{ item.refuseReason }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="交货凭证">
+                    <el-image v-for="(photo, photoIndex) in item.expressPhoto" :key="photoIndex" :src="photo"
+                              style="width: 80px; height: 80px" fit="cover"
+                              :preview-src-list="item.expressPhoto"/>
+                </el-descriptions-item>
+                <el-descriptions-item label="备注">
+                    <text>{{ item.remark ? item.remark : '无' }}</text>
+                </el-descriptions-item>
+                <el-descriptions-item label="买家备注">
+                    <text>{{ item.buyerRemark ? item.buyerRemark : '无' }}</text>
+                </el-descriptions-item>
+                <el-descriptions-item label="图片">
+                    <template v-if="item.photos && item.photos.length > 0">
+                        <el-image v-for="(photo, photoIndex) in item.photos" :key="photoIndex" :src="photo"
+                                  style="width: 80px; height: 80px" fit="cover"
+                                  :preview-src-list="item.photos"/>
+                    </template>
+                    <span v-else>无</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="我方状态">
+                    <template v-if="item.isSeller">
+                        <span v-if="!item.hasPaid && !item.buyerRefuse">待上传凭证</span>
+                        <span v-if="!item.sellerConfirm && item.hasPaid">待确认收款</span>
+                        <span v-if="item.sellerConfirm && item.hasPaid">已完成</span>
+                    </template>
+                    <template v-if="item.isBuyer">
+                        <span v-if="!item.hasPaid && !item.buyerRefuse">待上传凭证</span>
+                        <span v-if="!item.sellerConfirm && item.hasPaid">完成支付</span>
+                        <span v-if="item.sellerConfirm && item.hasPaid">已完成</span>
+                    </template>
+                </el-descriptions-item>
+                <el-descriptions-item label="对方状态">
+                    <!--                    自己是卖家则对方是买家-->
+                    <template v-if="item.isSeller">
+                        <span v-if="!item.hasPaid && !item.buyerRefuse">待上传凭证</span>
+                        <span v-if="!item.sellerConfirm && item.hasPaid">完成支付</span>
+                        <span v-if="item.sellerConfirm && item.hasPaid">已完成</span>
+                    </template>
+                    <template v-if="item.isBuyer">
+                        <span v-if="!item.hasPaid && !item.buyerRefuse">待上传凭证</span>
+                        <span v-if="!item.sellerConfirm && item.hasPaid">待确认收款</span>
+                        <span v-if="item.sellerConfirm && item.hasPaid">已完成</span>
+                    </template>
+                </el-descriptions-item>
+            </el-descriptions>
+
+        </view>
+
+        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="50%" append-to-body="">
+            <template v-if="dialogVisible && dialogType === 'do-pay'">
+                <div class="font-bold">支付金额: {{ payInfo.amount }}元</div>
+                <el-form ref="form" label-width="80px">
+                    <el-form-item label="支付凭证" required>
+                        <vk-data-upload v-model="payInfo.paidVoucher"></vk-data-upload>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                        <el-input v-model="payInfo.buyerRemark"/>
+                    </el-form-item>
+                    <el-form-item label="图片">
+                        <vk-data-upload v-model="payInfo.buyerPhotos"></vk-data-upload>
+                    </el-form-item>
+                </el-form>
+                <el-row>
+                    <el-col :span="24" class="text-center">
+                        <el-button type="primary" size="mini" @click="uploadPayVoucher">提交</el-button>
+                        <el-button type="warning" size="mini" @click="dialogVisible = false">取消
+                        </el-button>
+                    </el-col>
+                </el-row>
+            </template>
+        </el-dialog>
+    </view>
+</template>
+
+<script>
+import ExpressInfo from "./expressInfo.vue";
+import Goods from "./goods.vue";
+import SetExpress from "./setExpress.vue";
+import MakePay from "./makePay.vue";
+
+export default {
+    name: "payList",
+    components: {MakePay, SetExpress, Goods, ExpressInfo},
+    props: {
+        payList: {
+            type: Array,
+            default: []
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            dialogType: '',
+            dialogTitle: '',
+            payInfo: null
+        }
+    },
+    methods: {
+        showPay(item) {
+            this.payInfo = item;
+            this.dialogTitle = '支付'
+            this.dialogType = 'do-pay';
+            this.dialogVisible = true;
+        },
+        async confirmPay({_id, type}) {
+            await vk.callFunction({
+                url: 'client/order/kh/paidConfirm',
+                title: '请求中...',
+                data: {
+                    id: _id
+                }
+            })
+            this.$message({
+                type: 'success',
+                message: '确认成功'
+            })
+            if (['尾款', '货到付款'].includes(type)) this.$emit('refresh', '4')
+            else this.$emit('refresh')
+        },
+        paidRefuse({_id}) {
+            this.$prompt('请输入驳回理由', '提示', {
+                showCancelButton: true,
+                showInput: true,
+            }).then(async ({value}) => {
+                await vk.callFunction({
+                    url: 'client/order/kh/payRefuse',
+                    title: '请求中...',
+                    data: {
+                        id: _id,
+                        refuseReason: value,
+                    }
+                })
+                this.$emit('refresh')
+                this.$message({
+                    type: 'success',
+                    message: '驳回成功'
+                })
+            })
+        },
+        async uploadPayVoucher() {
+            if (this.payInfo.paidVoucher.length === 0) return this.$message.error()
+            await vk.callFunction({
+                url: 'client/order/kh/uploadPayVoucher',
+                title: '请求中...',
+                data: this.payInfo
+            })
+            this.$message({
+                type: 'success',
+                message: '上传成功'
+            })
+            this.$emit('refresh')
+            this.dialogVisible = false
+        },
+    }
+}
+</script>
diff --git a/pages/order/components/setExpress.vue b/pages/order/components/setExpress.vue
new file mode 100644
index 0000000..32c820f
--- /dev/null
+++ b/pages/order/components/setExpress.vue
@@ -0,0 +1,84 @@
+<template>
+    <el-form ref="form" label-width="80px">
+        <el-form-item label="客户信息" required>
+            <p>收件人: {{ info.name }}</p>
+            <p>收件人联系方式: {{ info.phone }}</p>
+            <p>收件地址: {{ info.addressRegion.province.name }}{{ info.addressRegion.city.name }}{{ info.addressRegion.area.name }}{{ info.addressDetail }}</p>
+        </el-form-item>
+        <el-form-item label="物流公司" required>
+            <el-input v-model="expressName" placeholder="请输入物流公司"/>
+        </el-form-item>
+        <el-form-item label="物流单号" required>
+            <el-input v-model="expressNo" placeholder="请输入物流单号"/>
+        </el-form-item>
+        <el-form-item label="发货单" required>
+            <vk-data-upload v-model="expressPhoto"></vk-data-upload>
+        </el-form-item>
+        <el-form-item label="备注">
+            <el-input v-model="remark" placeholder="请输入备注"/>
+        </el-form-item>
+        <div class="mt-20 flex justify-center items-center text-center">
+            <el-button type="primary" size="small" plain @click.native="cancel">取消</el-button>
+            <el-button type="primary" size="small" @click.native="confirm">确定</el-button>
+        </div>
+    </el-form>
+</template>
+
+<script>
+export default {
+    name: "setExpress",
+    props: {
+        id: Number | String,
+        info: Object
+    },
+    data() {
+        return {
+            expressName: null,
+            expressNo: null,
+            remark: null,
+            expressPhoto: [],
+        }
+    },
+    methods: {
+        close() {
+            this.$emit('close')
+        },
+        cancel() {
+            this.expressName = null
+            this.expressNo = null
+            this.remark = null
+            this.expressPhoto = []
+            this.$emit('close')
+        },
+        async confirm() {
+            if (!this.expressName) return this.$message({
+                type: 'error',
+                message: '请填写物流公司'
+            })
+            if (!this.expressNo) return this.$message({
+                type: 'error',
+                message: '请填写物流单号'
+            })
+            if (this.expressPhoto.length === 0) return this.$message({
+                type: 'error',
+                message: '请上传发货单'
+            })
+            await vk.callFunction({
+                url: 'client/order/kh/setExpress',
+                data: {
+                    id: this.id,
+                    expressName: this.expressName,
+                    expressNo: this.expressNo,
+                    remark: this.remark,
+                    expressPhoto: this.expressPhoto
+                }
+            })
+            this.$emit('close')
+            this.$message({
+                type: 'success',
+                message: '发货成功'
+            })
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/order/components/setRefund.vue b/pages/order/components/setRefund.vue
new file mode 100644
index 0000000..7405279
--- /dev/null
+++ b/pages/order/components/setRefund.vue
@@ -0,0 +1,60 @@
+<template>
+    <el-form ref="form" label-width="80px">
+        <el-form-item label="退款原因" required>
+            <el-input v-model="refundReason" placeholder="请输入退款原因"/>
+        </el-form-item>
+        <el-form-item label="图片">
+            <vk-data-upload v-model="refundPhotos"></vk-data-upload>
+        </el-form-item>
+        <div class="mt-20 flex justify-center items-center text-center">
+            <el-button type="primary" size="small" plain @click.native="cancel">取消</el-button>
+            <el-button type="primary" size="small" @click.native="confirm">确定</el-button>
+        </div>
+    </el-form>
+</template>
+
+<script>
+export default {
+    name: "setRefund",
+    props: {
+        id: Number | String
+    },
+    data() {
+        return {
+            refundReason: null,
+            refundPhotos: [],
+        }
+    },
+    methods: {
+        close() {
+            this.$emit('close')
+        },
+        cancel() {
+            this.refundReason = null
+            this.refundPhotos = []
+            this.close()
+        },
+        async confirm() {
+            if (!this.refundReason) return this.$message({
+                type: 'error',
+                message: '请填写退款原因'
+            })
+            const res = await vk.callFunction({
+                url: 'client/order/kh/refund',
+                data: {
+                    id: this.id,
+                    refundReason: this.refundReason,
+                    refundPhotos: this.refundPhotos,
+                }
+            }).catch(err => false)
+            if (res) {
+                this.$emit('close')
+                this.$message({
+                    type: 'success',
+                    message: '平台将在2个工作日内审核，请您耐心等待'
+                })
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/order/components/setSend.vue b/pages/order/components/setSend.vue
new file mode 100644
index 0000000..960b907
--- /dev/null
+++ b/pages/order/components/setSend.vue
@@ -0,0 +1,141 @@
+<template>
+  <view>
+    <el-descriptions title="金久信自营订单详情" :column="2" border :labelStyle="{width: '120px'}" v-if="info">
+      <el-descriptions-item label="服务">
+        <p v-for="(item, index) in orderInfo.goods" :key="index">{{ item.goodsName }}</p>
+      </el-descriptions-item>
+      <el-descriptions-item label="考察对象" v-if="info.type === 0">
+        <div style="margin-bottom: .5rem" v-for="(item, index) in info.contentList" :key="index">
+          <span>{{ item.name }}</span>
+          <template v-if="item.type && item.type === '个人' && item.addressRegion">
+            ({{
+              item.code
+            }})--{{ item.addressRegion.province.name }}{{
+              item.addressRegion.city.name
+            }}{{ item.addressRegion.area.name }}{{ item.address }}
+          </template>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="考察产品" v-else>
+        <p style="margin-bottom: .5rem" v-for="(item, index) in info.contentList" :key="index">{{
+            item.name
+          }}--{{ item.addressRegion.province.name }}{{
+            item.addressRegion.city.name
+          }}{{ item.addressRegion.area.name }}{{ item.address }}</p>
+      </el-descriptions-item>
+      <el-descriptions-item label="文档">
+        <div v-for="(item, index) in info.contentList" :key="index">
+          <template v-if="item.files">
+            <a v-for="(file, fileIndex) in item.files" :key="fileIndex" :href="file"
+               target="_blank">预览:文件{{ fileIndex + 1 }}</a>
+          </template>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="接收文件电子邮箱">
+        <span>{{ info.email }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="接收文件微信">
+        <span>{{ info.wechat }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="接收文件寄件地址">
+                <span v-if="info.receiveAddressRegion.province">{{
+                    info.receiveAddressRegion.province.name
+                  }}{{ info.receiveAddressRegion.city.name }}{{
+                    info.receiveAddressRegion.area.name
+                  }}{{ info.receiveAddress }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="申请人">
+        <span>{{ info.requestName }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="业务联系人">
+        <span>{{ info.contactName }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="业务联系方式">
+        <span>{{ info.contact }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="接单公司" v-if="info.companyId">
+        <span>{{ info.company.company.companyName }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="文件上传">
+        <vk-data-upload v-model="resultFiles"
+                        :limit="9"
+                        :on-preview="previewUpload"
+                        accept=".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf" list-type="text">
+        </vk-data-upload>
+      </el-descriptions-item>
+      <el-descriptions-item label="发送途径">
+        <el-select v-model="sendMethod" placeholder="请选择发送途径">
+          <el-option label="接收文件电子邮箱" value="接收文件电子邮箱"/>
+          <el-option label="接收文件微信" value="接收文件微信"/>
+          <el-option label="邮寄接收文件地址" value="邮寄接收文件地址"/>
+        </el-select>
+      </el-descriptions-item>
+      <template slot="extra">
+        <div class="flex justify-start items-center">
+          <el-button type="primary" size="mini" @click="setSend">确认完成
+          </el-button>
+          <el-button plain type="primary" size="mini" class="mx-20" @click="close">
+            关闭
+          </el-button>
+        </div>
+      </template>
+    </el-descriptions>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "setSend",
+  props: {
+    orderInfo: Object
+  },
+  data() {
+    return {
+      info: null,
+      sendMethod: null,
+      resultFiles: []
+    }
+  },
+  methods: {
+    async getInfo() {
+      const {data} = await vk.callFunction({
+        url: 'client/selfSupport/kh/getDetailByOrder',
+        data: {
+          orderId: this.orderInfo._id
+        }
+      })
+      this.info = data
+    },
+    async setSend() {
+      if (this.resultFiles.length === 0) {
+        vk.toast("请上传文件")
+        return
+      }
+      if (!this.sendMethod) {
+        vk.toast("请选择发送途径")
+        return
+      }
+      await vk.callFunction({
+        url: 'client/order/kh/changeOrderStatus',
+        data: {
+          id: this.orderInfo._id,
+          orderStatus: 3,
+          sendMethod: this.sendMethod,
+          resultFiles: this.resultFiles,
+        }
+      })
+      this.close()
+    },
+    close() {
+      this.$emit("close")
+    },
+    previewUpload({url}) {
+      window.open(url)
+    }
+  },
+  mounted() {
+    console.log(this.orderInfo)
+    this.getInfo()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages/order/components/shopOrder.vue b/pages/order/components/shopOrder.vue
new file mode 100644
index 0000000..cb5e105
--- /dev/null
+++ b/pages/order/components/shopOrder.vue
@@ -0,0 +1,119 @@
+<template>
+    <view>
+        <el-table :data="tableData.rows" style="width: 100%" border stripe>
+            <el-table-column prop="orderNo" label="订单号" width="200"/>
+            <el-table-column label="订单类型">
+                <template v-slot="{ row }">
+                    <span>{{ row.type === 0 ? '普通订单' : '金久信自营订单' }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="商品列表" width="250">
+                <template v-slot="{ row }">
+                    <view class="flex flex-col justify-start items-start">
+                        <view v-for="(item, index) in row.goods" :key="index"
+                              class="flex justify-start items-start">
+                            <image :src="item.goodsCover" class="goods-cover" v-if="row.type === 0"/>
+                            <view class="ml-20 flex flex-col justify-start items-start">
+                                <text class="text-main font-bold">{{ item.goodsName }}</text>
+                                <text class="mt-20">￥{{ item.goodsPrice }}</text>
+                                <text class="mt-20">x{{ item.num }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+            </el-table-column>
+            <el-table-column prop="amount" label="订单金额"/>
+            <el-table-column prop="payAmount" label="支付金额"/>
+            <el-table-column label="订单状态">
+                <template v-slot="{ row }">
+                    <span v-if="row.orderStatus === 0">待支付</span>
+                    <span v-if="row.orderStatus === 1">已支付</span>
+                    <span v-if="row.orderStatus === 2">待收货</span>
+                    <span v-if="row.orderStatus === 3">已完成</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="_add_time_str" label="下单时间"/>
+            <el-table-column label="操作">
+                <template v-slot="{ row }">
+                    <text v-if="row.orderStatus === 0" class="text-main pointer" @click="repay(row)">去支付</text>
+                </template>
+            </el-table-column>
+        </el-table>
+        <view class="text-center mt-20">
+            <el-pagination
+                :page-size="pageSize"
+                @current-change="getOrderList"
+                background
+                layout="prev, pager, next"
+                :total="tableData.total">
+            </el-pagination>
+        </view>
+    </view>
+</template>
+
+<script>
+
+export default {
+    name: "shopOrder",
+    props: {
+        tableData: Object
+    },
+    data() {
+        return {
+            tableData: [],
+            activeIndex: 0,
+            pageSize: 20,
+            total: 0,
+        }
+    },
+    methods: {
+        async repay(row) {
+            await vk.callFunction({
+                url: 'client/order/kh/resetOrderNo',
+                data: {
+                    id: row._id,
+                }
+            })
+            vk.navigateTo({
+                url: `/pages/index/shop/pay?id=${row._id}`
+            })
+        },
+        getOrderList(index){
+            this.$emit('change-page', index)
+        }
+    },
+    onLoad(options) {
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.main-wrap {
+    width: 1200px;
+    margin: 20px auto;
+    position: relative;
+
+    .left-wrap {
+        position: absolute;
+        width: 220px;
+        left: -240px;
+        top: 0;
+
+        view {
+            padding: 20px;
+        }
+
+        .active {
+            background-color: #a92924;
+            color: white;
+        }
+    }
+}
+
+.goods-cover {
+    width: 80px;
+    height: 80px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/order/order.vue b/pages/order/order.vue
index d12bae5..e88316e 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -1,825 +1,1006 @@
 <template>
-	<view class="">
-		<top-bar></top-bar>
-		<common-nav></common-nav>
-		<view class="w-1200">
-			<el-row :gutter="20">
-				<el-col :span="6">
-					<el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
-						<el-menu-item index="0">
-							<i class="el-icon-edit"></i>
-							<span slot="title">我卖出的</span>
-						</el-menu-item>
-						<el-menu-item index="1">
-							<i class="el-icon-warning-outline"></i>
-							<span slot="title">我购买的</span>
-						</el-menu-item>
-						<el-menu-item index="2">
-							<i class="el-icon-circle-check"></i>
-							<span slot="title">线下交易</span>
-						</el-menu-item>
-					</el-menu>
-				</el-col>
-				<el-col :span="18">
-					<el-card shadow="never">
-						<el-tabs v-model="activeName" @tab-click="handleClick">
-							<el-tab-pane label="全部(4)" name="all">
-							</el-tab-pane>
-							<el-tab-pane label="待付款(2)" name="待付款"></el-tab-pane>
-							<el-tab-pane label="待发货(1)" name="待发货"></el-tab-pane>
-							<el-tab-pane label="待收货" name="待收货"></el-tab-pane>
-							<el-tab-pane label="待退款" name="待退款"></el-tab-pane>
-							<el-tab-pane label="已取消" name="已取消"></el-tab-pane>
-							<el-tab-pane label="已完成" name="已完成"></el-tab-pane>
-						</el-tabs>
-						<el-descriptions border size="small">
-							<el-descriptions-item label="订单编号"><input placeholder="请输入订单编号" /></el-descriptions-item>
-							<el-descriptions-item label="下单时间"><input placeholder="下单时间" /></el-descriptions-item>
-							<el-descriptions-item label="采购商品"><input placeholder="请输入采购商品" /></el-descriptions-item>
-							<el-descriptions-item label="交易方式">
-								<el-select v-model="value" size="small" placeholder="请选择">
-									<el-option v-for="item in options" :key="item.value" :label="item.label"
-										:value="item.value">
-									</el-option>
-								</el-select>
-							</el-descriptions-item>
-							<el-descriptions-item label="买家名称">
-								<input placeholder="请输入买家名称" />
-							</el-descriptions-item>
-							<el-descriptions-item label="发票管理">
-								<el-select size="small" v-model="value2" placeholder="请选择">
-									<el-option v-for="item in options2" :key="item.value" :label="item.label"
-										:value="item.value">
-									</el-option>
-								</el-select>
-							</el-descriptions-item>
+  <view class="">
+    <top-bar></top-bar>
+    <common-nav></common-nav>
+    <view class="w-1200">
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
+            <el-menu-item index="0">
+              <i class="el-icon-edit"></i>
+              <span slot="title">我卖出的</span>
+            </el-menu-item>
+            <el-menu-item index="1">
+              <i class="el-icon-warning-outline"></i>
+              <span slot="title">我购买的</span>
+            </el-menu-item>
+            <el-menu-item index="2">
+              <i class="el-icon-circle-check"></i>
+              <span slot="title">线下交易</span>
+            </el-menu-item>
+          </el-menu>
+        </el-col>
+        <el-col :span="20">
+          <el-card shadow="never">
+            <el-tabs v-model="activeName" @tab-click="query(1, true)" v-if="menuIndex !== '2'">
+              <el-tab-pane label="全部" name="all">
+              </el-tab-pane>
+              <el-tab-pane label="待付款" name="0"></el-tab-pane>
+              <el-tab-pane label="待发货" name="1"></el-tab-pane>
+              <el-tab-pane label="待收货" name="2"></el-tab-pane>
+              <!--                            <el-tab-pane label="已取消" name="-1"></el-tab-pane>-->
+              <el-tab-pane label="已完成" name="4"></el-tab-pane>
+              <el-tab-pane label="退款中" name="5"></el-tab-pane>
+              <el-tab-pane label="退款成功" name="6"></el-tab-pane>
+              <el-tab-pane label="退款拒绝" name="7"></el-tab-pane>
+            </el-tabs>
+            <el-descriptions border size="small">
+              <el-descriptions-item label="订单编号">
+                <el-input placeholder="请输入订单编号" @keyup.enter.native="query(1)"
+                          v-model="keyword"/>
+              </el-descriptions-item>
+              <!--                            <el-descriptions-item label="下单时间"><input placeholder="下单时间"/>-->
+              <!--                            </el-descriptions-item>-->
+              <!--                            <el-descriptions-item label="采购商品"><input placeholder="请输入采购商品"/>-->
+              <!--                            </el-descriptions-item>-->
+              <el-descriptions-item label="订单类型" v-if="menuIndex === '1'">
+                <el-select v-model="orderType" placeholder="请选择" @change="query(1)">
+                  <el-option :label="item" v-for="(item, index) in orderTypeList" :key="index"
+                             :value="index"/>
+                </el-select>
+              </el-descriptions-item>
+              <el-descriptions-item label="订单类型" v-else-if="menuIndex === '0'">
+                <el-select v-model="orderType" placeholder="请选择" @change="query(1)">
+                  <el-option label="商城订单" :value="0"/>
+                  <el-option label="询价订单" :value="4"/>
+                  <el-option label="加工订单" :value="5"/>
+                  <el-option label="旧货交易订单" :value="6"/>
+                </el-select>
+              </el-descriptions-item>
+              <el-descriptions-item label="订单类型" v-else>
+                <el-select v-model="orderType" placeholder="请选择" @change="query(1)">
+                  <el-option label="询价订单" :value="4"/>
+                  <el-option label="加工订单" :value="5"/>
+                  <el-option label="旧货交易订单" :value="6"/>
+                </el-select>
+              </el-descriptions-item>
+              <!--                            <el-descriptions-item label="买家名称">-->
+              <!--                                <input placeholder="请输入买家名称"/>-->
+              <!--                            </el-descriptions-item>-->
+              <!--                            <el-descriptions-item label="发票管理">-->
+              <!--                                <el-select size="small" v-model="value2" placeholder="请选择">-->
+              <!--                                    <el-option v-for="item in options2" :key="item.value" :label="item.label"-->
+              <!--                                               :value="item.value">-->
+              <!--                                    </el-option>-->
+              <!--                                </el-select>-->
+              <!--                            </el-descriptions-item>-->
 
-						</el-descriptions>
-					</el-card>
-					<el-card shadow="never" style="margin-top: 20px;">
-						<template v-if="menuIndex === '0'">
-							<view class="order-list">
-								<view class="item">
-									<view class="info">
-										<view class="title">直缝焊管 Q235B 20米 不限</view>
-										<view class="sub-title">
-											<text>订单编号：JJX008456456</text>
-											<text>创建时间：2023-05-13 10:30:55</text>
-											<text>卖家：广西某某有限责任公司</text>
-										</view>
-										<view class="action">
-											<view class="btn-buy">联系买家</view>
-											<el-divider direction="vertical"></el-divider>
-											<view class="btn-close">取消订单</view>
-										</view>
-									</view>
-									<view class="tool">
-										<view class="price">
-											<text class="red">￥22311</text>
-											<text>总金额</text>
-										</view>
-										<view class="status">
-											<view class="icon">
-												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
-											</view>
-										</view>
-									</view>
-								</view>
-
-								<view class="item">
-									<view class="info">
-										<view class="title">直缝焊管 Q235B 20米 不限</view>
-										<view class="sub-title">
-											<text>订单编号：JJX008456456</text>
-											<text>创建时间：2023-05-13 10:30:55</text>
-											<text>卖家：广西某某有限责任公司</text>
-										</view>
-										<view class="action">
-											<view class="btn-buy">联系买家</view>
-											<el-divider direction="vertical"></el-divider>
-											<view class="btn-close">取消订单</view>
-										</view>
-									</view>
-									<view class="tool">
-										<view class="price">
-											<text class="red">￥22311</text>
-											<text>总金额</text>
-										</view>
-										<view class="status">
-											<view class="icon">
-												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
-											</view>
-										</view>
-									</view>
-								</view>
-
-								<view class="item">
-									<view class="info">
-										<view class="title">直缝焊管 Q235B 20米 不限</view>
-										<view class="sub-title">
-											<text>订单编号：JJX008456456</text>
-											<text>创建时间：2023-05-13 10:30:55</text>
-											<text>卖家：广西某某有限责任公司</text>
-										</view>
-										<view class="action">
-											<view class="btn-buy">联系买家</view>
-											<el-divider direction="vertical"></el-divider>
-											<view class="btn-close">取消订单</view>
-										</view>
-									</view>
-									<view class="tool">
-										<view class="price">
-											<text class="red">￥22311</text>
-											<text>总金额</text>
-										</view>
-										<view class="status">
-											<view class="icon">
-												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
-											</view>
-										</view>
-									</view>
-								</view>
-								<view class="paginatio">
-									<el-pagination
-									  background
-									  layout="prev, pager, next"
-									  :total="1000">
-									</el-pagination>
-								</view>
-							</view>
-						</template>
-						<template v-if="menuIndex === '1'">
-							我购买的订单列表
-						</template>
-						<template v-if="menuIndex === '2'">
-              <view class="transaction-list">
-                <view class="item">
-                  <view class="info">
-                    <view class="title">
-						<view class="name">直缝钢管 <el-tag effect="plain" size="mini" class="el-tag">线下交易</el-tag></view>
-						<view class="buyer"><text>买家：</text><a>网宿信息科技有限公司</a></view>
-						<view class="seller"><text>卖家：</text><a>金久信交易平台</a></view>
-					</view>
-					<view class="caigou">
-						<view class="item">
-							<view class="icon">
-								<i class="el-icon-shopping-bag-1"></i>
-							</view>
-							<view class="infos">
-								<view class="name">采购量</view>
-								<view class="unit">500吨</view>
-							</view>
-						</view>
-						<view class="item" style="margin-left: 100px;">
-							<view class="icon">
-								<i class="el-icon-location-outline"></i>
-							</view>
-							<view class="infos">
-								<view class="name">交易地址</view>
-								<view class="unit">广西壮族自治区-南宁市-五象航洋城</view>
-							</view>
-						</view>
-					</view>
-                    <view class="sub-title">
-                      <text>交易编号：JJX008456456</text>
-                      <text>发布时间：2023-05-13 10:30:55</text>
-                    </view>
+            </el-descriptions>
+            <div class="flex justify-end items-center mt-20">
+              <el-button type="primary" size="small" @click.native="query(1)">搜索</el-button>
+              <el-button type="primary" size="small" plain @click.native="reset">重置</el-button>
+            </div>
+          </el-card>
+          <el-card shadow="never" style="margin-top: 20px;">
+            <view class="order-list">
+              <view class="item" v-for="(item, index) in tableData.rows" :key="index">
+                <view class="info">
+                  <view class="title">
+                    <text>订单编号：{{ item.orderNo }}</text>
+                    <text v-if="item.sheet" class="ml-20">({{ item.sheet.title }})</text>
                   </view>
-                  <view class="tool">
-                    <view class="btn">
-						<el-button size="small" plain style="width: 120px;">收到的报价列表</el-button>
+                  <view class="sub-title flex flex-col justify-start items-start">
+                    <view v-if="item.signMethod !== 1">订单状态：
+                      <text class="text-main">{{ orderStatusList[item.orderStatus] }}</text>
                     </view>
-                    <view class="btn">
-						<el-button size="small" type="danger" style="width: 120px;">查看交易对象</el-button>
-                    </view>
-                    <view class="btn">
-						<el-button size="small" type="text" style="width: 120px;">共收到4个报价</el-button>
+                    <view class="flex justify-start items-center">
+                      <text>订单类型：{{ orderTypeList[item.type] }}</text>
+                      <text v-if="item.type === 1">({{
+                          item.subType === 0 ? '企业' : '产品'
+                        }})
+                      </text>
+                      <text class="text-main" v-if="item.type === 3">(过期时间:{{
+                          item.upgradeExpiredAt
+                        }})
+                      </text>
+                      <text class="text-main" v-if="item.type === 8">(过期时间:{{
+                          dayjs(item.spot.topExpiredAt).format('YYYY-MM-DD HH:mm:ss')
+                        }})({{
+                          item.goods[0].goodsId === '-1' ? '全国' : provincesData.find(province => parseInt(province.code) === parseInt(item.goods[0].goodsId)).name
+                        }})
+                      </text>
                     </view>
+                    <template v-if="item.type === 7 && item.goods[0].isSingleQuote">
+                      <view v-if="item.goods[0].type === 'enquiry'">报价类型：找买家</view>
+                      <view v-if="item.goods[0].type === 'old'">报价类型：旧货交易</view>
+                      <view v-if="item.goods[0].type === 'process'">报价类型：找加工</view>
+                      <view>报价内容：{{ item.goods[0].sheet.title }}</view>
+                    </template>
+                    <template v-if="item.type === 7 && !item.goods[0].isSingleQuote">
+                      <view class="flex justify-start items-center">
+                        <span>{{ item.goods[0].goodsName }}</span>
+                        <span class="text-main" v-if="userInfo.quoteExpiredAt">(过期时间:{{
+                            dayjs(userInfo.quoteExpiredAt).format('YYYY-MM-DD HH:mm:ss')
+                          }})</span>
+                      </view>
+                    </template>
+
+                    <text>创建时间：{{ item._add_time_str }}</text>
+                    <text class="text-main" v-if="item.type > 3 && item.payList">
+                      最新支付状态：{{ item.buyerStatusStr }}
+                    </text>
+                    <template>
+                      <view class="text-main" v-if="item.type < 4 && item.orderStatus > 4 && item.refundReason">
+                        <view>
+                          退款原因：{{ item.refundReason }}
+                        </view>
+                        <view v-if="item.refundPhotos" class="mt-20">
+                          <text>退款附件：</text>
+                          <el-image v-for="(photo, photoIndex) in item.refundPhotos" :preview-src-list="item.refundPhotos"
+                                    :key="photoIndex" :src="photo" style="width: 80px; height: 80px" class="mr-25" fit="cover"/>
+                        </view>
+                      </view>
+                    </template>
+                    <text class="text-main" v-if="item.type < 4 && item.orderStatus === 7">
+                      退款拒绝原因：{{ item.refundRefuseReason }}
+                    </text>
+
+                  </view>
+                  <view class="action">
+                    <template
+                      v-if="(item.type > 3 && item.type < 7) ||  [14, 15].includes(item.type)">
+                      <el-button plain size="mini" class="btn-buy pointer" @click="contact(item)">
+                        联系交易方
+                      </el-button>
+                      <template v-if="item.type > 3 && item.orderStatus < 3 && item.isSeller">
+                        <template
+                          v-if="!item.payList || !['尾款', '货到付款'].includes(item.payList.type) || (['尾款', '货到付款'].includes(item.payList.type) && item.payList.buyerRefuse)">
+                          <el-divider direction="vertical"></el-divider>
+                          <el-button type="primary" size="mini" class="pointer"
+                                     @click="makePayList(item)">
+                            创建支付单
+                          </el-button>
+                        </template>
+                      </template>
+                      <template v-if="item.type > 3 && item.payStatus > 0">
+                        <el-divider direction="vertical"></el-divider>
+                        <el-button type="warning" size="mini" class="pointer"
+                                   @click="showPayList(item)">
+                          查看支付单
+                        </el-button>
+                      </template>
+                      <template v-if="item.contractId">
+                        <el-divider direction="vertical"></el-divider>
+                        <el-button plain size="mini" class="btn-buy pointer"
+                                   @click="viewContract(item.contractId)">
+                          查看合同
+                        </el-button>
+                      </template>
+                      <!--                                            <template v-if="item.type > 3 && item.orderStatus === 1 && item.isSeller">-->
+                      <!--                                                <el-divider direction="vertical"></el-divider>-->
+                      <!--                                                <el-button plain size="mini" class="btn-buy pointer"-->
+                      <!--                                                           @click="setExpress(item)">-->
+                      <!--                                                    发货-->
+                      <!--                                                </el-button>-->
+                      <!--                                            </template>-->
+                    </template>
+                    <template v-if="[0, 1, 2, 3, 7, 8, 9].includes(item.type)">
+                      <el-button plain size="mini" class="btn-close pointer"
+                                 v-if="[0, 1].includes(item.type)"
+                                 @click="showGoods(item)">商品列表
+                      </el-button>
+                      <template v-if="item.orderStatus === 0">
+                        <el-button plain size="mini" class="btn-close pointer"
+                                   @click="navTo(`/pages/index/shop/pay?id=${item._id}`)"
+                        >去支付
+                        </el-button>
+                        <el-divider direction="vertical"></el-divider>
+                        <el-button plain size="mini" class="pointer" type="info"
+                                   @click="cancel(item)"
+                        >取消订单
+                        </el-button>
+                        <el-divider direction="vertical"></el-divider>
+                        <template v-if="item.orderStatus === 4">
+                          <el-divider direction="vertical"/>
+                          <el-button plain size="mini"
+                                     @click="showServicePhone()">客服电话
+                          </el-button>
+                          <el-divider direction="vertical"/>
+                          <el-button plain size="mini"
+                                     @click="showServiceQR()">客服二维码
+                          </el-button>
+                        </template>
+                      </template>
+                      <template v-if="item.orderStatus >= 2 && item.type === 0">
+                        <el-divider direction="vertical"></el-divider>
+                        <el-button plain size="mini" class="btn-buy pointer"
+                                   @click="showExpressInfo(item)">
+                          物流信息
+                        </el-button>
+                        <template v-if="item.isBuyer && item.orderStatus === 2">
+                          <el-divider direction="vertical"></el-divider>
+                          <el-button size="mini" type="success"
+                                     @click="confirmExpress(item._id)">
+                            确认收货
+                          </el-button>
+                        </template>
+                        <!--                                                <template v-if="item.orderStatus === 5 && item.isSeller">-->
+                        <!--                                                    <el-button size="mini" type="success"-->
+                        <!--                                                               @click.native="changeRefundStatus(item._id, 6)">同意退款-->
+                        <!--                                                    </el-button>-->
+                        <!--                                                    <el-button size="mini" type="danger"-->
+                        <!--                                                               @click.native="changeRefundStatus(item._id, 7)">拒绝退款-->
+                        <!--                                                    </el-button>-->
+                        <!--                                                </template>-->
+                      </template>
+                      <el-button size="mini" type="success" v-if="item.orderStatus === 11 && item.isSeller"
+                                 @click.native="showSend(item)">已完成
+                      </el-button>
+                      <el-button size="mini" type="success" v-if="item.orderStatus === 3 && item.isBuyer" plain>
+                        商家已完成发送
+                      </el-button>
+                      <el-button size="mini" type="success" v-if="item.orderStatus === 3 && item.isBuyer"
+                                 @click.native="changeOrderStatus(item._id, 4)">确认收到
+                      </el-button>
+                    </template>
+                    <template
+                      v-if="([1, 2, 4, 7, 8, 9].includes(item.orderStatus)
+                                            && ((item.type > 3 && item.hasPay && item.isBuyer)
+                                            || (item.type < 3 && [1, 2, 3, 4, 7, 8, 9].includes(item.orderStatus) && item.isBuyer)
+                                            ))">
+                      <el-divider direction="vertical"/>
+                      <el-button plain size="mini" class="btn-close pointer"
+                                 @click="showRefund(item)">申请退款
+                      </el-button>
+                    </template>
+                    <template v-if="item.orderStatus === 1 && item.isSeller && item.type === 0">
+                      <el-divider direction="vertical"/>
+                      <el-button plain size="mini" class="btn-close pointer"
+                                 @click="setExpress(item)">发货
+                      </el-button>
+                    </template>
                   </view>
                 </view>
-                <view class="paginatio">
-                  <el-pagination
-                      background
-                      layout="prev, pager, next"
-                      :total="1000">
-                  </el-pagination>
+                <view class="tool" v-if="item.type < 4 || (item.type > 6 && item.type !== 14)">
+                  <view class="price">
+                    <template v-if="item.orderStatus !== 10">
+                      <text
+                        :class="[parseFloat(item.offAmount) !== parseFloat(item.amount) ? 'text-line-through text-gray': 'red']">
+                        ￥{{ item.amount ? parseFloat(item.amount).toFixed(2) : '' }}
+                      </text>
+                      <text class="red"
+                            v-if="parseFloat(item.offAmount) !== parseFloat(item.amount)">
+                        ￥{{ item.offAmount }}
+                      </text>
+                    </template>
+                    <text v-else class="red">待报价</text>
+                    <text>总金额</text>
+                  </view>
+                  <view class="status">
+                    <view class="icon">
+                      <img v-if="item.orderStatus === 0" src="/static/images/order/toBePaid.png"
+                           alt=""/>
+                    </view>
+                  </view>
                 </view>
               </view>
-						</template>
-					</el-card>
-				</el-col>
-			</el-row>
-
-		</view>
-		<common-footer></common-footer>
-
-		<el-dialog :visible.sync="form1.props.show">
-			<vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"
-				:rules="form1.props.rules" :form-type="form1.props.formType" :loading.sync="form1.props.loading"
-				:auto-close="true" label-width="140px" @success="onFormSuccess"></vk-data-form>
-		</el-dialog>
-
-		<!-- 上传合同弹窗 -->
-	</view>
+              <view class="paginatio">
+                <el-pagination
+                  @current-change="query"
+                  background
+                  layout="prev, pager, next"
+                  :page-size="pageSize"
+                  :total="tableData.total">
+                </el-pagination>
+              </view>
+            </view>
+          </el-card>
+        </el-col>
+      </el-row>
+    </view>
+    <common-footer></common-footer>
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%">
+      <make-pay v-if="dialogVisible && clickedInfo && dialogType === 'create'" :info="clickedInfo"
+                @close="dialogVisible = false;query(1)" :pay-type-list="payTypeList"/>
+      <pay-list v-else-if="dialogVisible && dialogType === 'pay-list'" :pay-list="payList"
+                @refresh="payRefresh"/>
+      <goods v-if="dialogVisible && dialogType === 'goods-list'" :goods="clickedInfo.goods" :order="clickedInfo"
+             :selfProduct="clickedInfo.selfProduct"/>
+      <set-express v-if="dialogVisible && dialogType === 'set-express'" :id="clickedInfo._id" :info="clickedInfo"
+                   @close="dialogVisible = false;query(1)"/>
+      <set-refund v-if="dialogVisible && dialogType === 'set-refund'" :id="clickedInfo._id"
+                  @close="dialogVisible = false;query(1)"/>
+      <express-info v-if="dialogVisible && dialogType === 'express-info'" :info="clickedInfo"
+                    @close="dialogVisible = false;"/>
+      <set-send v-if="dialogVisible && dialogType === 'task-send'" :order-info="clickedInfo"
+                @close="reloadOrder()"/>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
-	import {
-		Agreement
-	} from "@icon-park/vue";
+import {
+  Agreement
+} from "@icon-park/vue";
+import Shop from "../index/shop/shop.vue";
+import ShopOrder from "./components/shopOrder.vue";
+import Goods from "./components/goods.vue";
+import SetExpress from "./components/setExpress.vue";
+import ExpressInfo from "./components/expressInfo.vue";
+import MakePay from "./components/makePay.vue";
+import PayList from "./components/payList.vue";
+import SetRefund from "./components/setRefund.vue";
+import dayjs from "dayjs";
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import SetSend from "./components/setSend.vue";
 
-	export default {
-		components: {
-			Agreement
-		},
-		data() {
-			return {
-				activeName: 'all',
-				value: '',
-				options: [{
-					value: '自主交易',
-					label: '自主交易'
-				}],
-				value2: '',
-				options2: [{
-					value: '未开发票',
-					label: '自主交易'
-				}],
-				pageIndex: 1,
-				menuIndex: '0',
-				isSign: false,
-				formData: {
-					status: 0,
-					tradeMethod: null
-				},
-				tableData: {},
-				// 表单相关开始-----------------------------------------------------------
-				form1: {
-					// 表单请求数据，此处可以设置默认值
-					data: {
-						contractId: '',
-						signEndDate: '',
-						title: '',
-						contractFile: '',
-						buyerSignKeyword: '',
-						sellerSignKeyword: '',
-						otherFile: '',
-					},
-					// 表单属性
-					props: {
-						// 表单请求地址
-						action: 'client/contract/kh/launch',
-						// 表单字段显示规则
-						columns: [{
-								key: "title",
-								title: "标题",
-								type: "text"
-							},
-							{
-								key: "signEndDate",
-								title: "签署截止日期",
-								type: "date",
-								pickerOptions: {
-									disabledDate: (date) => {
-										const now = new Date()
-										return now > date
-									}
-								}
+const CREATE_PAY_LIST_CONFIRM_CONTENT = `1、您已充分知悉、了解并认可本订单及合同的全部内容以及各方的权利义务;<br>2、请您按照订单或合同约定创建支付单，否则将存在被驳回的风险。若申请被驳回，请及时沟通处理，完成整改后再次提交。`
 
-							},
-							{
-								key: "contractFile",
-								title: "签署文档",
-								type: "file",
-								limit: 1,
-								accept: ".pdf",
-								tips: "仅支持PDF文件",
-							},
-							{
-								key: "buyerSignKeyword",
-								title: "买家签章关键字",
-								type: "text",
-								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-							},
-							{
-								key: "sellerSignKeyword",
-								title: "卖家签章关键字",
-								type: "text",
-								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-							},
-							{
-								key: "otherFile",
-								title: "附件",
-								type: "file"
-							},
-						],
-						// 表单验证规则
-						rules: {
-							title: [{
-								required: true,
-								message: "标题不能为空",
-								trigger: "change"
-							}, ],
-							signEndDate: [{
-								required: true,
-								message: "签署截止日期不能为空",
-								trigger: "change"
-							}],
-							buyerSignKeyword: [{
-								required: true,
-								message: "买家签章关键字不能为空",
-								trigger: "change"
-							}],
-							sellerSignKeyword: [{
-								required: true,
-								message: "卖家签章关键字不能为空",
-								trigger: "change"
-							}],
-							contractFile: [{
-								required: true,
-								message: "签署文档不能为空",
-								trigger: "change"
-							}, ]
-						},
-						// add 代表添加 update 代表修改
-						formType: "",
-						// 表单是否在请求中
-						loading: false,
-						// 是否显示表单1 的弹窗
-						show: false
-					}
-				},
-				form2: {
-					// 表单请求数据，此处可以设置默认值
-					data: {
-						contractId: '',
-						signEndDate: '',
-						title: '',
-						contractFile: '',
-						buyerSignKeyword: '',
-						sellerSignKeyword: '',
-						otherFile: '',
-					},
-					// 表单属性
-					props: {
-						// 表单请求地址
-						action: 'client/contract/kh/addSign',
-						// 表单字段显示规则
-						columns: [{
-								key: "title",
-								title: "标题",
-								type: "text"
-							},
-							{
-								key: "phone",
-								title: "对方手机号",
-								type: "text"
-							},
-							{
-								key: "userType",
-								title: "对方身份",
-								type: "select",
-								data: [{
-										value: 1,
-										label: "买家"
-									},
-									{
-										value: 2,
-										label: "卖家"
-									}
-								]
-							},
-							{
-								key: "signEndDate",
-								title: "签署截止日期",
-								type: "date",
-								pickerOptions: {
-									disabledDate: (date) => {
-										const now = new Date()
-										return now > date
-									}
-								}
-							},
-							{
-								key: "contractFile",
-								title: "签署文档",
-								type: "file",
-								limit: 1,
-								accept: ".pdf",
-								tips: "仅支持PDF文件",
-							},
-							{
-								key: "buyerSignKeyword",
-								title: "买家签章关键字",
-								type: "text",
-								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-							},
-							{
-								key: "sellerSignKeyword",
-								title: "卖家签章关键字",
-								type: "text",
-								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
-							},
-							{
-								key: "otherFile",
-								title: "附件",
-								type: "file"
-							},
-						],
-						// 表单验证规则
-						rules: {
-							title: [{
-								required: true,
-								message: "标题不能为空",
-								trigger: "change"
-							}, ],
-							phone: [{
-								required: true,
-								message: "标题不能为空",
-								trigger: "change"
-							}, ],
-							signEndDate: [{
-								required: true,
-								message: "签署截止日期不能为空",
-								trigger: "change"
-							}],
-							buyerSignKeyword: [{
-								required: true,
-								message: "买家签章关键字不能为空",
-								trigger: "change"
-							}],
-							sellerSignKeyword: [{
-								required: true,
-								message: "卖家签章关键字不能为空",
-								trigger: "change"
-							}],
-							contractFile: [{
-								required: true,
-								message: "签署文档不能为空",
-								trigger: "change"
-							}, ]
-						},
-						// add 代表添加 update 代表修改
-						formType: "",
-						// 表单是否在请求中
-						loading: false,
-						// 是否显示表单1 的弹窗
-						show: false
-					}
-				},
-				// 表单相关结束-----------------------------------------------------------
-			}
-		},
-		onLoad(options) {
-			if (options.tab) {
-				if (options.tab === 'sign') {
-					this.isSign = true
-				} else {
-					this.menuIndex = String(options.tab)
-					this.formData.status = Number(options.tab)
-					this.isSign = false
-					this.query(1)
-				}
-			}
-		},
-		methods: {
-			menuSelect(e) {
-				this.menuIndex = String(e)
-				this.formData.status = Number(e)
-				this.isSign = false
-				this.query(1)
-			},
-			selectSign() {
-				this.isSign = true
-				this.menuIndex = ''
-			},
-			async query(pageIndex) {
-				this.tableData = await vk.callFunction({
-					url: 'client/contract/kh/getList',
-					title: '请求中...',
-					data: {
-						pageIndex,
-						pageSize: 10,
-						status: this.formData.status
-					},
+export default {
+  components: {
+    SetSend,
+    SetRefund,
+    PayList,
+    MakePay,
+    SetExpress,
+    Goods,
+    ShopOrder,
+    Shop,
+    Agreement,
+    ExpressInfo
+  },
+  data() {
+    return {
+      provincesData: provinces,
+      dialogVisible: false,
+      dialogType: '',
+      dialogTitle: '',
+      clickedInfo: null,
+      activeName: 'all',
+      value: '',
+      options: [{
+        value: '自主交易',
+        label: '自主交易'
+      }],
+      pageIndex: 1,
+      menuIndex: '0',
+      formData: {
+        status: null,
+        tradeMethod: null
+      },
+      tableData: {
+        total: 0,
+        rows: []
+      },
+      pageSize: 5,
+      orderType: null,
+      orderTypeList: [
+        '商城订单',
+        '金久信自营增值服务',
+        '保证金',
+        '会员升级',
+        '询价订单',
+        '加工订单',
+        '旧货订单',
+        '报价次数',
+        '现货广告',
+        '旧货加急',
+        '旧货次数',
+        '金久信学堂下载次数',
+        '司法调证',
+        '金久信签约宝次数',
+        '金久信签约宝',
+        '金久信自营询价',
+        // '旧货次数',
+      ],
+      orderStatusList: [
+        '待支付',
+        '待发货',
+        '待收货',
+        '待确认',
+        '已完成',
+        '退款审核中',
+        '退款成功',
+        '退款拒绝',
+        '',
+        '',
+        '待报价',
+        '已派单待完成',
+      ],
+      payList: [],
+      keyword: '',
+      orderPayList: [],
+      payInfo: {},
+      payTypeList: ['预付款', '进度款', '尾款', '货到付款', '全款'],
+      topExpiredAt: '',
+      userInfo: null
+    }
+  },
+  onLoad(options) {
+    if (!vk.getVuex('$user.userInfo.mobile')) {
+      this.$confirm('请先绑定手机号', '提示', {
+        confirmButtonText: '确定',
+        showCancelButton: false,
+        type: 'warning'
+      }).then(() => {
+        vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+      }).catch(() => {
+        vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+      })
+      return
+    }
+    if (options.menuIndex) this.menuIndex = options.menuIndex
+    if (options.activeName) this.activeName = options.activeName
+    if (options.keyword) this.keyword = options.keyword
+    this.query(1)
+    vk.userCenter.getCurrentUserInfo({
+      success: (data) => {
+        this.topExpiredAt = data.userInfo.topExpiredAt
+        this.userInfo = data.userInfo
+      }
+    })
+  },
+  methods: {
+    dayjs,
+    menuSelect(e) {
+      this.menuIndex = String(e)
+      this.query(1, true)
+    },
+    async query(pageIndex, resetFilter = false, activeName = null) {
+      if (resetFilter) {
+        this.keyword = null
+        this.orderType = null
+      }
+      if (activeName) this.activeName = activeName
+      console.log(this.activeName)
+      this.tableData = await vk.callFunction({
+        url: 'client/order/kh/getList',
+        title: '请求中...',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          keyword: this.keyword,
+          isSeller: this.menuIndex === '0' ? 1 : 0,
+          type: this.orderType,
+          signMethod: this.menuIndex === '2' ? 1 : null,
+          orderStatus: this.activeName === 'all ' ? null : parseInt(this.activeName),
+        },
+      });
+      this.tableData.rows.map(item => {
+        item.buyerStatusStr = ''
+        if (item.type > 3 && item.payList) {
+          item.buyerStatusStr = `${item.payList.type}-`
+          if (item.payList.buyerRefuse) {
+            item.buyerStatusStr += `买家已拒绝:${item.payList.refuseReason}。`
+            if (item.isSeller) item.buyerStatusStr += '请等待卖家重新创建支付单'
+            else item.buyerStatusStr += '请重新创建支付单'
+          } else {
+            if (item.payList.hasPaid) {
+              if (item.payList.sellerConfirm) item.buyerStatusStr += '卖家已确认收款'
+              else item.buyerStatusStr += '买家已支付,待卖家确认收款'
+            } else item.buyerStatusStr += '买家未支付'
+          }
+        }
+        return item
+      })
+    },
+    reset() {
+      this.orderType = null
+      this.keyword = null
+      this.query(1)
+    },
+    contact(item) {
+      try {
+        const mobile = item.isBuyer ? item.seller.mobile : item.buyer.mobile
+        this.$confirm(`交易方联系方式:${mobile}`, '', {
+          cancelButtonText: '关闭',
+          showConfirmButton: false
+        })
+      } catch (e) {
+        this.$confirm(`交易方未留下联系方式`, '', {
+          cancelButtonText: '关闭',
+          showConfirmButton: false
+        })
+      }
+    },
+    async makePayList(item) {
+      try {
+        await this.$confirm(CREATE_PAY_LIST_CONFIRM_CONTENT, '创建支付单', {
+          confirmButtonText: '我已知晓', cancelButtonText: '取消', showCancelButton: true,
+          type: 'warning', dangerouslyUseHTMLString: true
+        })
+      } catch (e) {
+        return
+      }
+      const {rows} = await vk.callFunction({
+        url: 'client/order/kh/orderPayList',
+        title: '请求中...',
+        data: {
+          id: item._id
+        },
+      });
+      if (rows.length > 0 && !rows[rows.length - 1].buyerRefuse && !rows[rows.length - 1].sellerConfirm) {
+        return this.$message.error('还有未确认的支付单,无法继续创建。请到支付单中查看并确认收款')
+      }
+      this.orderPayList = rows
+      this.clickedInfo = item
+      this.dialogType = 'create'
+      this.dialogTitle = '创建支付单'
+      this.dialogVisible = true
+    },
+    async showPayList(item) {
+      this.clickedInfo = item
+      await this.getPayList()
+      this.dialogVisible = true
+      this.dialogTitle = '查看支付单'
+      this.dialogType = 'pay-list'
+    },
+    async showSend(item) {
+      this.clickedInfo = item
+      this.dialogVisible = true
+      this.dialogTitle = '任务内容上传'
+      this.dialogType = 'task-send'
+    },
+    async getPayList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/order/kh/orderPayList',
+        title: '请求中...',
+        data: {id: this.clickedInfo._id}
+      })
+      this.payList = rows
+    },
+    viewContract(contractId) {
+      vk.callFunction({
+        url: 'client/contract/kh/viewContract',
+        title: '请求中...',
+        data: {
+          contractId
+        },
+        success: (res) => {
+          window.open(res.data)
+        }
+      });
+    },
+    navTo(url) {
+      vk.navigateTo({
+        url: url
+      })
+    },
+    async buyerRefuse(index) {
+      this.payList[index].buyerRefuse = true
+      await vk.callFunction({
+        url: 'client/order/kh/payRefuse',
+        title: '请求中...',
+        data: {
+          id: this.payList[index]._id
+        }
+      })
+    },
 
-				});
-			},
-			/**
-			 * 创建合同
-			 * @param contract
-			 */
-			createContract(contract) {
-				this.form1.data.contractId = contract._id
-				this.form1.props.action = 'client/contract/kh/launch'
-				this.form1.props.show = true
-			},
-			async changeContract(contract) {
-				this.form1.data.contractId = contract._id
-				const res = await vk.callFunction({
-					url: 'client/contract/kh/getDetail',
-					title: '请求中...',
-					data: {
-						contractId: contract._id
-					},
-				});
-				this.form1.data.signEndDate = res.signEndDate
-				this.form1.data.title = res.docTitle
-				this.form1.data.contractFile = res.contractBase
-				this.form1.data.buyerSignKeyword = res.buyerSignKeyword
-				this.form1.data.sellerSignKeyword = res.sellerSignKeyword
-				this.form1.data.otherFile = res.otherFile
-				this.form1.props.show = true
-			},
-			onFormSuccess() {
-				this.form1.props.show = false
-				this.form1.data.contractId = null
-				this.formData.status = 1
-				this.menuIndex = '1'
-				this.isSign = false
-				this.$refs.form2.resetForm()
-				this.query(1)
-			},
-			/**
-			 * 签署合同
-			 * @param {Object} contract
-			 */
-			extSign(contract) {
-				vk.callFunction({
-					url: 'client/contract/kh/extSign',
-					title: '请求中...',
-					data: {
-						contractId: contract._id
-					},
-					success: (res) => {
-						window.open(res.data)
-					}
-				});
-			},
-			viewContract(contract) {
-				vk.callFunction({
-					url: 'client/contract/kh/viewContract',
-					title: '请求中...',
-					data: {
-						contractId: contract._id
-					},
-					success: (res) => {
-						window.open(res.data)
-						this.query(1)
-					}
-				});
-			}
-		}
-	}
+    showGoods(item) {
+      this.clickedInfo = item;
+      this.dialogTitle = '商品列表'
+      this.dialogType = 'goods-list';
+      this.dialogVisible = true
+    },
+    showRefund(item) {
+      this.clickedInfo = item;
+      this.dialogTitle = '退款申请'
+      this.dialogType = 'set-refund';
+      this.dialogVisible = true
+    },
+    setExpress(item) {
+      this.clickedInfo = item;
+      this.dialogTitle = '发货'
+      this.dialogType = 'set-express';
+      this.dialogVisible = true
+    },
+    showExpressInfo(item) {
+      this.clickedInfo = item;
+      this.dialogTitle = '发货详情'
+      this.dialogType = 'express-info';
+      this.dialogVisible = true
+    },
+    confirmExpress(id) {
+      this.$confirm('只确认数量和金额，质保按双方合同约定内容执行', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        await vk.callFunction({
+          url: 'client/order/kh/changeOrderStatus',
+          title: '请求中...',
+          data: {
+            id,
+            orderStatus: 4
+          }
+        })
+        this.activeName = '4'
+        await this.query(1)
+      })
+    },
+    payRefresh(menuIndex) {
+      this.getPayList()
+      this.query(1, null, menuIndex)
+    },
+    async cancel({_id}) {
+      this.$confirm('确认取消订单吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        await vk.callFunction({
+          url: 'client/order/kh/changeOrderStatus',
+          title: '请求中...',
+          data: {
+            id: _id,
+            orderStatus: -1
+          }
+        })
+        await this.query(1)
+      })
+    },
+    async showServicePhone() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d8fca55b337cfadbe1063'
+        }
+      })
+      this.$confirm(`${res.content}`, '平台客服', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false
+      })
+    },
+    async showServiceQR() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d9025e0ec19b5040feb40'
+        }
+      })
+      const h = this.$createElement;
+      this.$confirm(`<image src="${res.content}" style="width: 100px;height: 100px;"/>`, '平台客服二维码', {
+        cancelButtonText: '关闭',
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true
+      })
+    },
+    async changeRefundStatus(id, orderStatus) {
+      if (orderStatus === 7) {
+        this.$prompt('请输入驳回理由', '提示', {
+          showCancelButton: true,
+          showInput: true,
+        }).then(async ({value}) => {
+          await vk.callFunction({
+            url: 'client/order/kh/changeRefundStatus',
+            data: {
+              id,
+              orderStatus,
+              refundRefuseReason: value
+            }
+          })
+          this.$message({
+            type: 'success',
+            message: '驳回成功'
+          })
+          await this.query(1)
+        })
+
+      } else {
+        await vk.callFunction({
+          url: 'client/order/kh/changeRefundStatus',
+          data: {
+            id,
+            orderStatus
+          }
+        })
+        await this.query(1)
+      }
+    },
+    async changeOrderStatus(id, orderStatus) {
+      await vk.callFunction({
+        url: 'client/order/kh/changeOrderStatus',
+        data: {
+          id,
+          orderStatus
+        }
+      })
+      await this.query(1)
+    },
+    reloadOrder() {
+      this.dialogVisible = false
+      this.query(1)
+    }
+
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	.w-1200 {
-		width: 1200px;
-		margin: 20px auto;
-	}
+.w-1200 {
+  width: 1200px;
+  margin: 20px auto;
+}
 
-	.contract-list {
-		background-color: #FFFFFF;
-		padding: 10px 20px 20px;
-	}
+.contract-list {
+  background-color: #FFFFFF;
+  padding: 10px 20px 20px;
+}
 
-	.order-list{
-		display: flex;
-		flex-direction: column;
-		.item{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 10px 0;
-			border-bottom: 1px solid #f3f3f3;
-			.info{
-				.title{
-					font-size: 16px;
-					font-weight: bold;
-					line-height: 2em;
-          .el-tag{
-            margin-left: 10px;
-          }
-				}
-				.sub-title{
-					color: #999999;
-				}
-				.action{
-					padding: 10px 0;
-					display: flex;
-					flex-direction: row;
-					align-items: center;
-					.btn-buy,.btn-close{
-						color: #A92924;
-					}
-				}
-			}
-			.tool{
-				display: flex;
-				background-color: #f3f3f3;
-				.price{
-					margin:0 20px;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: center;
-					.red{
-						font-size: 16px;
-						color: #A92924;
-						font-weight: bold;
-					}
-				}
-				.status{
-					.icon{
-						margin:0 20px;
-						img{
-							width: 100px;
-						}
-					}
-				}
-			}
-		}
-	}
-  .transaction-list{
+.order-list {
+  display: flex;
+  flex-direction: column;
+
+  .item {
     display: flex;
-    flex-direction: column;
-    .item{
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #f3f3f3;
-      .info{
-        .title{
-		  display: flex;
-          font-size: 16px;
-          font-weight: bold;
-          line-height: 2em;
-		  .buyer,.seller{
-				font-size: 14px;
-				font-weight: normal;
-			    display: flex;
-				margin: 0 30px;
-		  }
-          .el-tag{
-            margin-left: 10px;
-          }
-        }
-		.caigou{
-			display: flex;
-			align-items: center;
-			.item{
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 10px 0;
-				border: none;
-				.icon{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					margin: 10px;
-					background-color: #f3f3f3;
-					padding: 10px;
-					border-radius: 100px;
-					.el-icon-shopping-bag-1,.el-icon-location-outline{
-						font-size: 30px;
-					}
-				}
-				.infos{
-					display: flex;
-					flex-direction: column;
-					.unit{
-						color: #A92924
-					}
-				}
-			}
-		}
-        .sub-title{
-          color: #999999;
-        }
-        .action{
-          padding: 10px 0;
-          display: flex;
-          flex-direction: row;
-          align-items: center;
-          .btn-buy,.btn-close{
-            color: #A92924;
-          }
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 0;
+    border-bottom: 1px solid #f3f3f3;
+
+    .info {
+      .title {
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 2em;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+
+        .el-tag {
+          margin-left: 10px;
         }
       }
-      .tool{
+
+      .sub-title {
+        color: #999999;
+      }
+
+      .action {
+        padding: 10px 0;
         display: flex;
-		width: 180px;
-		align-items: center;
-		justify-content: space-around;
-		flex-direction: column;
-		.btn{
-			margin: 5px 0;
-		}
-        .price{
-          margin:0 20px;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          .red{
-            font-size: 16px;
-            color: #A92924;
-            font-weight: bold;
-          }
+        flex-direction: row;
+        align-items: center;
+
+        .btn-buy, .btn-close {
+          color: #A92924;
         }
-        .status{
-          .icon{
-            margin:0 20px;
-            img{
-              width: 100px;
-            }
+      }
+    }
+
+    .tool {
+      display: flex;
+      background-color: #f3f3f3;
+
+      .price {
+        margin: 0 20px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        height: 90px;
+
+        .red {
+          font-size: 16px;
+          color: #A92924;
+          font-weight: bold;
+        }
+      }
+
+      .status {
+        .icon {
+          margin: 0 20px;
+
+          img {
+            width: 100px;
           }
         }
       }
     }
   }
-	.paginatio {
-		margin: 20px auto;
-		display: flex;
-		justify-content: center;
-	}
+}
+
+.transaction-list {
+  display: flex;
+  flex-direction: column;
+
+  .item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 0;
+    border-bottom: 1px solid #f3f3f3;
+
+    .info {
+      .title {
+        display: flex;
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 2em;
+
+        .buyer, .seller {
+          font-size: 14px;
+          font-weight: normal;
+          display: flex;
+          margin: 0 30px;
+        }
+
+        .el-tag {
+          margin-left: 10px;
+        }
+      }
+
+      .caigou {
+        display: flex;
+        align-items: center;
+
+        .item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 10px 0;
+          border: none;
+
+          .icon {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin: 10px;
+            background-color: #f3f3f3;
+            padding: 10px;
+            border-radius: 100px;
+
+            .el-icon-shopping-bag-1, .el-icon-location-outline {
+              font-size: 30px;
+            }
+          }
+
+          .infos {
+            display: flex;
+            flex-direction: column;
+
+            .unit {
+              color: #A92924
+            }
+          }
+        }
+      }
+
+      .sub-title {
+        color: #999999;
+      }
+
+      .action {
+        padding: 10px 0;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+
+        .btn-buy, .btn-close {
+          color: #A92924;
+        }
+      }
+    }
+
+    .tool {
+      display: flex;
+      width: 180px;
+      align-items: center;
+      justify-content: space-around;
+      flex-direction: column;
+
+      .btn {
+        margin: 5px 0;
+      }
+
+      .price {
+        margin: 0 20px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .red {
+          font-size: 16px;
+          color: #A92924;
+          font-weight: bold;
+        }
+      }
+
+      .status {
+        .icon {
+          margin: 0 20px;
+
+          img {
+            width: 100px;
+          }
+        }
+      }
+    }
+  }
+}
+
+.paginatio {
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
+}
 
 
-	.contract-box {
-		display: flex;
-		justify-content: space-between;
-		border-bottom: solid 1px #e8e8e8;
-		padding: 10rpx 0;
-	}
+.contract-box {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: solid 1px #e8e8e8;
+  padding: 10rpx 0;
+}
 
-	.contract-left {}
+.contract-left {
+}
 
-	.contract-right {
-		text-align: right;
-		font-size: 13px;
-	}
+.contract-right {
+  text-align: right;
+  font-size: 13px;
+}
 
-	.trade-method {
-		display: flex;
-		margin-bottom: 20px;
-		border-bottom: solid 2px #f4f4f4;
-	}
+.trade-method {
+  display: flex;
+  margin-bottom: 20px;
+  border-bottom: solid 2px #f4f4f4;
+}
 
-	.trade-method-item {
-		cursor: pointer;
-		font-size: 18px;
-		margin-right: 15px;
-		height: 40px;
-		line-height: 40px;
-	}
+.trade-method-item {
+  cursor: pointer;
+  font-size: 18px;
+  margin-right: 15px;
+  height: 40px;
+  line-height: 40px;
+}
 
-	.trade-method-item.active {
-		color: #A92924;
-		border-bottom: solid 2px #A92924;
-	}
+.trade-method-item.active {
+  color: #A92924;
+  border-bottom: solid 2px #A92924;
+}
 
-	.contract-left-top {
-		display: flex;
-		align-items: center;
+.contract-left-top {
+  display: flex;
+  align-items: center;
 
-	}
+}
 
-	.contract-product {
-		margin: 0 10px;
-	}
+.contract-product {
+  margin: 0 10px;
+}
 
-	.contract-left-center {
-		height: 40px;
-		display: flex;
-		justify-content: flex-start;
-		align-items: flex-start;
-		color: #999999;
-		font-size: 12px;
-		flex-direction: column;
-		margin-top: 5px;
-	}
+.contract-left-center {
+  height: 40px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
+  color: #999999;
+  font-size: 12px;
+  flex-direction: column;
+  margin-top: 5px;
+}
 
-	.contract-left-bottom {
-		display: flex;
-	}
+.contract-left-bottom {
+  display: flex;
+}
 
-	.contract-status {
-		display: flex;
-	}
+.contract-status {
+  display: flex;
+}
 
-	.contract-status-tag {
-		margin-left: 2px;
-	}
+.contract-status-tag {
+  margin-left: 2px;
+}
 
-	.sign {
-		padding: 20px 20px 20px 25px;
-		font-size: 14px;
+.sign {
+  padding: 20px 20px 20px 25px;
+  font-size: 14px;
 
-		.icon {
-			line-height: 18px;
-		}
-	}
+  .icon {
+    line-height: 18px;
+  }
+}
 </style>
diff --git a/pages/otherArticle/detail.vue b/pages/otherArticle/detail.vue
index cf0d4e4..b559ec9 100644
--- a/pages/otherArticle/detail.vue
+++ b/pages/otherArticle/detail.vue
@@ -1,40 +1,52 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <gap height="50"/>
-        <view class="w-1200 m-a bg-white p-40">
-            <view class="text-50 font-bold">{{ info.name }}</view>
-            <view class="mt-20 text-gray text-28 pb-20 border-bottom">{{ info._add_time_str }}</view>
-            <view v-html="info.content" class="mt-20"></view>
-        </view>
-        <gap height="50"/>
-        <common-footer></common-footer>
+  <view>
+    <top-bar></top-bar>
+<!--    <common-header></common-header>-->
+<!--    <category-bar></category-bar>-->
+    <gap height="50"/>
+    <view class="w-1200 m-a bg-white p-40">
+      <view class="text-50 font-bold">{{ info.name }}</view>
+      <view class="mt-20 text-gray text-28 pb-20 border-bottom">{{
+          info._update_time ? info._update_time : info._add_time_str
+        }}</view>
+      <view v-html="info.content" class="mt-20"></view>
     </view>
+    <gap height="50"/>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
 export default {
-    name: "detail",
-    data() {
-        return {
-            info: {
-                name: '',
-                content: ''
-            }
-        }
-    },
-    onLoad(option) {
-        if (option.id) this.getInfo(option.id);
-    },
-    methods: {
-        async getInfo(id) {
-            this.info = await vk.callFunction({
-                url: `client/otherArticle/list/pub/getDetail`,
-                data: {id}
-            });
-        }
+  name: "detail",
+  data() {
+    return {
+      info: {
+        name: '',
+        content: ''
+      }
     }
+  },
+  onLoad(option) {
+    if (option.id) {
+      this.getInfo(option.id);
+      this.addViewNum(option.id);
+    }
+  },
+  methods: {
+    async getInfo(id) {
+      const res = await vk.callFunction({
+        url: `client/otherArticle/list/pub/getDetail`,
+        data: {id}
+      });
+      this.info = res
+    },
+    addViewNum(_id){
+      vk.callFunction({
+        url: `client/otherArticle/list/pub/addViewNum`,
+        data: {_id}
+      });
+    }
+  }
 }
 </script>
\ No newline at end of file
diff --git a/pages/otherArticle/list.vue b/pages/otherArticle/list.vue
index 784486d..3ef0e12 100644
--- a/pages/otherArticle/list.vue
+++ b/pages/otherArticle/list.vue
@@ -1,13 +1,66 @@
 <template>
-
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+        <gap height="50"/>
+        <view class="w-1200 m-a bg-white p-40">
+            <view v-for="(item, index) in list" :key="index"
+                  @click="navTo(item._id)"
+                  class="py-30 border-bottom flex justify-between items-center pointer">
+                <text class="font-bold">{{ item.name }}</text>
+                <text class="text-gray">{{ item._add_time_str }}</text>
+            </view>
+            <view class="text-center">
+                <el-pagination
+                    :page-size="pageSize"
+                    @current-change="getList"
+                    background
+                    layout="prev, pager, next"
+                    :total="total">
+                </el-pagination>
+            </view>
+        </view>
+        <gap height="50"/>
+        <common-footer></common-footer>
+    </view>
 </template>
 
 <script>
 export default {
     name: "list",
     data() {
-        return {}
+        return {
+            list: [],
+            parentId: null,
+            pageSize: 20,
+            total: 0,
+        }
     },
-    methods: {}
+    methods: {
+        getList(pageIndex) {
+            vk.callFunction({
+                url: 'client/otherArticle/list/pub/getList',
+                pageSize: this.pageSize,
+                pageIndex,
+                data: {
+                    parentId: this.parentId
+                },
+                success: res => {
+                    this.list = res.rows;
+                    this.total = res.total;
+                }
+            })
+        },
+        navTo(id) {
+            vk.navigateTo({
+                url: `/pages/otherArticle/detail?id=${id}`
+            })
+        }
+    },
+    onLoad(options) {
+        if (options) this.parentId = options.id;
+        this.getList();
+    }
 }
 </script>
\ No newline at end of file
diff --git a/pages/process/detail.vue b/pages/process/detail.vue
index 97f7eea..16f6506 100644
--- a/pages/process/detail.vue
+++ b/pages/process/detail.vue
@@ -1,261 +1,487 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="page-main" v-if="info">
-            <view class="flex justify-between items-center">
-                <text class="text-gray">加工询价单编号:{{ info.orderNo }}</text>
-                <text class="text-gray">发布时间:{{ info._add_time_str }}</text>
-            </view>
-            <view class="my-25 flex justify-between items-center">
-                <view class="flex justify-start items-center">
-                    <text class="text-40 font-bold">{{ info.title }}</text>
-                    <view class="ml-20 flex justify-start items-center">
-                        <building-one theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
-                        <view class="text-main ">
-                            <text class="mx-20">{{ info.quoteList.rows.length }}</text>
-                            <text>家已报价</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="flex justify-end items-end"
-                      v-if="info.answerEndTime && dayjs().diff(dayjs(info.answerEndTime), 'second') < 0">
-                    <text>距离加工结束还有：</text>
-                    <view class="border-main countdown text-main">{{
-                            dayjs(info.answerEndTime).diff(dayjs(), 'day')
-                        }}
-                    </view>
-                    <text>天</text>
-                    <view class="border-main countdown text-main">
-                        {{ (dayjs(info.answerEndTime).diff(dayjs(), 'hour')) % 24 }}
-                    </view>
-                    <text>时</text>
-                </view>
-            </view>
-            <view class="my-25 flex justify-between items-center pb-20 border-bottom">
-                <view class="flex justify-start items-center">
-                    <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
-                    <text class="ml-15 text-gray">
-                        {{ info.user.accountType === 1 ? info.user.person.personName : info.user.company.companyName }}
-                    </text>
-                </view>
-                <el-button type="primary" @click.native="toQuote"
-                           v-if="vk.getVuex('$user.userInfo._id') !== info.userId && info.status === 0">我要申请加工
-                </el-button>
-                <el-button type="primary" @click.native="showDialog = true"
-                           v-else-if="vk.getVuex('$user.userInfo._id') === info.userId">查看收到的申请加工
-                </el-button>
-            </view>
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            上传的附件
-                        </view>
-                    </view>
-                </view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            加工商其他要求
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">{{ info.remark }}</view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            纳税和税票
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">是否含税：{{ info.invoice ? '含税' : '不含税' }}</view>
-                <view class="mt-15">开票时间：{{ WRITE_INVOICE_TIME[info.writeInvoiceTime] }}</view>
-                <view class="mt-15">发票种类：{{ INVOICE_TYPE[info.invoiceType] }}</view>
-                <view class="mt-15">其他要求：{{ info.invoiceOther }}</view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            运输要求
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">随货资料：{{ info.transportDocuments.join() }}</view>
-                <view class="mt-15">其他要求：{{ info.otherTransportDocuments }}</view>
-                <view class="mt-15">运输限制要求：{{ info.transportLimit ? '有' : '无' }}</view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易说明
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">付款方式：{{ PROCESS_PAY_METHOD[info.payMethod] }}</view>
-                <view class="mt-15">报价形式：{{ info.offerType === 0 ? '整单报价' : '可分项报价' }}</view>
-                <view class="mt-15">报价期限：
-                    <text v-if="info.answerStartTime && info.answerEndTime">{{
-                            dayjs(info.answerStartTime).format('YYYY-MM-DD')
-                        }}~{{ dayjs(info.answerEndTime).format('YYYY-MM-DD') }}
-                    </text>
-                </view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            简易合同备注和其他补充条款
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">违约责任：</view>
-                <view class="mt-15">
-                    1.乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                </view>
-                <view class="mt-15">解决纠纷的方法：</view>
-                <view class="mt-15">
-                    1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工費和获取证据产生费用等其他相关费用。2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                </view>
-                <view class="mt-15">不可抗力：</view>
-                <view class="mt-15">
-                    甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                </view>
-                <view class="mt-15">其他：</view>
-                <view class="mt-15">
-                    本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                </view>
-                <view class="mt-15">采购方补充条款： 供货方逾期供货承担采购方一切损失</view>
-                <view class="mt-15"> 供应方补充条款：</view>
-            </view>
-
-            <view class="item-wrap">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            已收到的加工申请
-                        </view>
-                    </view>
-                </view>
-                <view class="mt-15">
-                    <view class="request-header">
-                        <text class="flex-1">加工商</text>
-                        <text class="flex-1">申请时间</text>
-                    </view>
-                    <view class="quote" v-for="(item, index) in info.quoteList.rows" :key="index">
-                        <text class="flex-1">{{
-                                item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
-                            }}
-                        </text>
-                        <text class="flex-1">{{ item._add_time_str }}</text>
-                    </view>
-                </view>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+    <view class="page-main" v-if="info">
+      <view class="flex justify-between items-center">
+        <text class="text-gray">加工询价单编号:{{ info.orderNo }}</text>
+        <text class="text-gray">发布时间:{{ info._add_time_str }}</text>
+      </view>
+      <view class="my-25 flex justify-between items-center">
+        <view class="flex justify-start items-center">
+          <text class="text-40 font-bold">{{ info.title }}</text>
+          <view class="ml-20 flex justify-start items-center">
+            <building-one theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
+            <view class="text-main ">
+              <text class="mx-20">{{ info.quoteList.rows.length }}</text>
+              <text>家已报价</text>
             </view>
+          </view>
         </view>
-        <common-footer></common-footer>
-        <el-dialog :visible.sync="showDialog" width="70%" :show-close="false">
-            <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
-                <text>收到的加工申请</text>
-                <el-button type="primary" @click.native="showDialog = false">关闭</el-button>
+        <view class="flex justify-end items-end"
+              v-if="info.answerEndTime && dayjs(info.answerEndTime).diff(dayjs(), 'second') > 0">
+          <text>距离加工结束还有：</text>
+          <view class="border-main countdown text-main">{{
+              dayjs(info.answerEndTime).diff(dayjs(), 'day')
+            }}
+          </view>
+          <text>天</text>
+          <view class="border-main countdown text-main">
+            {{ (dayjs(info.answerEndTime).diff(dayjs(), 'hour')) % 24 }}
+          </view>
+          <text>时</text>
+        </view>
+      </view>
+      <view class="my-25 flex justify-between items-center pb-20 border-bottom">
+        <view class="flex justify-start items-center">
+          <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square"/>
+          <text class="ml-15 text-gray" v-if="info.user">
+            {{ info.user.accountType === 1 ? info.user.person.personName : info.user.company.companyName }}
+          </text>
+        </view>
+        <el-button type="primary" @click.native="toQuote" :disabled="info.disabled"
+                   v-if="vk.getVuex('$user.userInfo._id') !== info.userId && info.status === 0">{{
+            info.disabled ? '已超时无法报价' : '我要申请合作'
+          }}
+        </el-button>
+        <el-button type="primary" @click.native="showDialog = true"
+                   v-else-if="vk.getVuex('$user.userInfo._id') === info.userId">查看收到的申请合作
+        </el-button>
+      </view>
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              上传的附件
             </view>
-            <view class="mt-15" v-if="info && info.quoteList">
-                <view class="request-header">
-                    <text class="flex-1">加工商</text>
-                    <text class="flex-1">报价</text>
-                    <text class="flex-1">申请时间</text>
-                    <text class="flex-1">操作</text>
-                </view>
-                <view class="quote" v-for="(item, index) in info.quoteList.rows" :key="index">
-                    <text class="flex-1">{{
-                            item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
-                        }}
-                    </text>
-                    <text class="flex-1">{{ item.totalPrice }}元</text>
-                    <text class="flex-1">{{ item._add_time_str }}</text>
-                    <text class="flex-1">
-                        <el-button type="primary" @click.native="createContract(item)" v-if="info.status === 0">选择</el-button>
-                    </text>
-                </view>
+          </view>
+        </view>
+        <view class="mt-15 mr-15" v-if="info.files">
+          <file-type :item="item" v-for="(item, index) in info.files" :key="index" @click.native="openDownload(item)"/>
+        </view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              加工产品交货地址
             </view>
-        </el-dialog>
+          </view>
+        </view>
+        <view class="mt-15">{{
+            info.addressRegion ? `${info.addressRegion.province.name}${info.addressRegion.city.name}${info.addressRegion.area ? info.addressRegion.area.name : ''}` : ``
+          }}{{
+            info.addressDetail ? info.addressDetail : ''
+          }}
+        </view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              加工商其他要求
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">{{ info.remark }}</view>
+        <template v-if="info.multiFiles">
+          <file-type :item="item" v-for="(item, index) in info.multiFiles" :key="index"
+                     @click.native="openDownload(item)"/>
+          <!--                    <el-image :src="item" v-for="(item, index) in info.multiFiles" :key="index" style="width: 100px; height: 100px" fit="cover"-->
+          <!--                              :preview-src-list="info.multiFiles"/>-->
+        </template>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              主要商品
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">{{ info.title }}</view>
+        <view class="mt-15">加工产品简述：{{ info.detail }}</view>
+        <view class="mt-15">加工量：{{ info.num }}</view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              纳税和税票
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">是否含税：{{ info.invoice ? '含税' : '不含税' }}</view>
+        <view class="mt-15">开票时间：{{ WRITE_INVOICE_TIME[info.writeInvoiceTime] }}</view>
+        <view class="mt-15" v-if="info.invoiceOther">税票要求：{{ info.invoiceOther }}</view>
+        <template v-else>
+          <view class="mt-15">纳税人身份：{{ info.taxType ? info.taxType : '无' }}</view>
+          <view class="mt-15">发票种类：{{ info.invoiceType ? info.invoiceType : '无' }}</view>
+          <view class="mt-15">税率：{{ info.taxRate ? info.taxRate : '无' }}</view>
+        </template>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              运输要求
+            </view>
+          </view>
+        </view>
+        <view class="mt-15" v-if="info.transportDocuments && info.transportDocuments.length > 0">
+          随货资料：{{ info.transportDocuments.join() }}
+        </view>
+        <view class="mt-15" v-if="info.otherTransportDocuments">其他要求：{{ info.otherTransportDocuments }}</view>
+        <view class="mt-15">运输限制要求：{{ info.transportLimit ? '有' : '无' }}</view>
+        <view class="mt-15" v-if="info.transportLimit && info.otherTransportRequest">
+          运输限制说明：{{ info.otherTransportRequest }}
+        </view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              交易模式
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">{{ info.tradeMethod === 0 ? '自主交易' : '金久信公证' }}</view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              交易说明
+            </view>
+          </view>
+        </view>
+        <!--                <view class="mt-15" v-if="info.payMethod === 0">付款方式：{{ PROCESS_PAY_METHOD[info.payMethod] }}{{-->
+        <!--                        info.payMethod === 0 ? `${info.advancePayRate}%货到付全款` : ''-->
+        <!--                    }}{{ info.payMethod === 3 ? `${info.reputationPayDay}天` :-->
+        <!--                    ( info.payMethod === 4 ? `:${info.otherPayMethod}` : '') }}-->
+        <!--                </view>-->
+        <view class="mt-15" v-if="info.payMethod === 0">付款方式：预付{{ info.advancePayRate }}%货到付全款</view>
+        <view class="mt-15" v-if="info.payMethod === 1">付款方式：加工验收合格后付全款</view>
+        <view class="mt-15" v-if="info.payMethod === 3">付款方式：加工验收合格后{{
+            info.reputationPayDay
+          }}天内支付全款
+        </view>
+        <view class="mt-15">报价形式：{{ info.offerType === 0 ? '整单报价' : '可分项报价' }}</view>
+        <view class="mt-15">报价期限：
+          <text v-if="info.answerStartTime && info.answerEndTime">{{
+              dayjs(info.answerStartTime).format('YYYY-MM-DD')
+            }}~{{ dayjs(info.answerEndTime).format('YYYY-MM-DD') }}
+          </text>
+        </view>
+      </view>
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              交易保证金要求
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">{{ info.earnestMoney }}</view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              采购商信息
+            </view>
+          </view>
+        </view>
+        <view class="mt-15" v-if="info.companyName">
+          公司信息：{{ info.companyName ? info.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6") : '' }}
+        </view>
+        <view class="mt-15" v-if="info.companyMobile">公司联系方式：{{
+            info.companyMobile ? info.companyMobile.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+          }}
+        </view>
+        <view class="mt-15" v-if="info.businessName">
+          授权业务咨询人：{{ info.businessName ? info.businessName.replace(/^(.).*(.)$/, "$1***$2") : '' }}
+        </view>
+        <view class="mt-15" v-if="info.businessMobile">业务咨询联系方式：{{
+            info.businessMobile ? info.businessMobile.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2") : ''
+          }}
+        </view>
+      </view>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-sheet-title">
+            <view class="form-title">
+              签约模式
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">{{
+            info.signMethod === 0 ? '线上签约-标准合同' : (info.signMethod !== 1 ? '线上签约-双方协商合同' : '线下签约')
+          }}
+        </view>
+      </view>
+
+      <view class="item-wrap" v-if="info.signMethod === 0">
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              简易合同备注和其他补充条款
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">违约责任：</view>
+        <view class="mt-15">
+          1.乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+        </view>
+        <view class="mt-15">解决纠纷的方法：</view>
+        <view class="mt-15">
+          1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工費和获取证据产生费用等其他相关费用。2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+        </view>
+        <view class="mt-15">不可抗力：</view>
+        <view class="mt-15">
+          甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+        </view>
+        <view class="mt-15">其他：</view>
+        <view class="mt-15">
+          本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+        </view>
+        <view class="mt-15">采购方补充条款： {{ info.supplementary }}</view>
+      </view>
+
+      <template v-else-if="info.signMethod === 2">
+        <view class="item-wrap">
+          <view class="form-title-wrap">
+            <view class="goods-sheet-title">
+              <view class="form-title">
+                合同附件
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-for="(item, index) in info.contractAttachment" :key="index" class="mr-25 my-25">
+          <file-type :item="item" @click.native="openDownload(item)"/>
+        </view>
+      </template>
+
+      <view class="item-wrap">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              已收到的加工申请
+            </view>
+          </view>
+        </view>
+        <view class="mt-15">
+          <view class="request-header">
+            <text class="flex-1">加工商</text>
+            <text class="flex-1">申请时间</text>
+          </view>
+          <view class="quote" v-for="(item, index) in info.quoteList.rows" :key="index">
+            <text class="flex-1" v-if="info.user">{{
+                item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
+              }}
+            </text>
+            <text class="flex-1">{{ item._add_time_str }}</text>
+          </view>
+        </view>
+      </view>
     </view>
+    <common-footer></common-footer>
+    <el-dialog :visible.sync="showDialog" width="70%" :show-close="false">
+      <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
+        <text>收到的加工合作申请</text>
+        <el-button type="primary" @click.native="showDialog = false">关闭</el-button>
+      </view>
+      <view class="mt-15" v-if="info && info.quoteList">
+        <view class="request-header">
+          <text class="flex-1">加工商</text>
+          <text class="flex-1">报价</text>
+          <text class="flex-1">附件</text>
+          <text class="flex-1">补充条款</text>
+          <text class="flex-1">报价详情</text>
+          <text class="flex-1">申请时间</text>
+          <text class="flex-1">操作</text>
+        </view>
+        <view class="quote" v-for="(item, index) in info.quoteList.rows" :key="index">
+          <text class="flex-1" v-if="info.user">{{
+              item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
+            }}
+          </text>
+          <text class="flex-1">{{ item.totalPrice }}元</text>
+          <view class="flex-1">
+            <view class="flex-1">
+              <!--                            <view class="mt-15 mr-15" v-for="(item, index) in item.files" :key="index">-->
+              <!--                                <template v-if="['doc', 'docx'].includes(item.split('.').pop())">-->
+              <!--                                    <file-word theme="outline" class="pointer" size="40" fill="#4a90e2" strokeLinecap="square"-->
+              <!--                                               @click.native="openDownload(item)"/>-->
+              <!--                                </template>-->
+              <!--                                <template v-else-if="['xls', 'xlsx'].includes(item.split('.').pop())">-->
+              <!--                                    <file-excel theme="outline" class="pointer" size="40" fill="#417505" strokeLinecap="square"-->
+              <!--                                                @click.native="openDownload(item)"/>-->
+              <!--                                </template>-->
+              <!--                                <template v-else-if="['pdf'].includes(item.split('.').pop())">-->
+              <!--                                    <file-pdf-one theme="outline" class="pointer" size="40" fill="#f5a623"-->
+              <!--                                                  strokeLinecap="square"-->
+              <!--                                                  @click.native="openDownload(item)"/>-->
+              <!--                                </template>-->
+              <!--                                <template v-else>-->
+              <!--                                    <el-image :src="item" style="width: 100px; height: 100px" fit="cover"-->
+              <!--                                              :preview-src-list="[item]"/>-->
+              <!--                                </template>-->
+              <!--                            </view>-->
+              <file-type :item="file" v-for="(file, fileIndex) in item.files" :key="fileIndex"
+                         @click.native="openDownload(file)"/>
+            </view>
+          </view>
+          <view class="flex-1 flex flex-col justify-start items-start">
+            <text>采购方补充条款：{{ info.supplementary ? info.supplementary : '无' }}</text>
+            <text>加工方补充条款：{{ item.supplierExt ? item.supplierExt : '无' }}</text>
+          </view>
+          <text class="flex-1">{{ item.remark }}</text>
+          <text class="flex-1">{{ item._add_time_str }}</text>
+          <text class="flex-1">
+            <el-button type="primary" @click.native="createContract(item)" v-if="info.status === 0">选择
+            </el-button>
+          </text>
+        </view>
+      </view>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
-import {BuildingOne, IdCard} from '@icon-park/vue'
+import {BuildingOne, FileExcel, FilePdfOne, FileWord, IdCard} from '@icon-park/vue'
 import dayjs from "dayjs";
 import {WRITE_INVOICE_TIME, INVOICE_TYPE, PROCESS_PAY_METHOD} from '@/util'
+import FileType from "../../components/file-type/file-type.vue";
 
 export default {
-    components: {BuildingOne, IdCard},
-    data() {
-        return {
-            WRITE_INVOICE_TIME,
-            INVOICE_TYPE,
-            PROCESS_PAY_METHOD,
-            id: null,
-            info: null,
-            showDialog: false
-        };
-    },
-    methods: {
-        dayjs,
-        getInfo() {
-            vk.callFunction({
-                url: 'client/process/sheet/pub/getInfo',
-                data: {
-                    id: this.id
-                }
-            }).then((res) => {
-                this.info = res
-            })
-        },
-        toQuote() {
-            vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
-        },
-        createContract({totalPrice, uid, _id}) {
-            vk.callFunction({
-                url: 'client/contract/kh/add',
-                data: {
-                    type: 'process',
-                    productTitle: this.info.title,
-                    transactionId: vk.pubfn.createOrderNo("P", 20),
-                    sheetId: this.id,
-                    quoteId: _id,
-                    buyer: vk.getVuex('$user.userInfo._id'),
-                    seller: uid,
-                    amount: totalPrice,
-                    partyCount: 2,
-                    signCount: 0,
-                }
-            }).then((res) => {
-                this.$message({
-                    message: '选择成功',
-                    type: 'success'
-                })
-                setTimeout(() => {
-                    vk.navigateTo('/pages/contract/index')
-                }, 1500)
-            })
+  components: {FileType, FileWord, FilePdfOne, FileExcel, BuildingOne, IdCard,},
+  data() {
+    return {
+      WRITE_INVOICE_TIME,
+      INVOICE_TYPE,
+      PROCESS_PAY_METHOD,
+      id: null,
+      info: null,
+      showDialog: false
+    };
+  },
+  methods: {
+    dayjs,
+    getInfo() {
+      vk.callFunction({
+        url: 'client/process/sheet/pub/getInfo',
+        data: {
+          id: this.id
         }
+      }).then((res) => {
+        this.info = res
+        this.info.disabled = (!this.info.answerEndTime || dayjs(this.info.answerEndTime).isBefore(dayjs()))
+      })
     },
-    onLoad(option) {
-        if (!option.id) vk.navigateBack()
-        this.id = option.id
-        this.getInfo()
+    async toQuote() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (userInfo.factoryStatus !== 1) return this.$message.error('非加工厂,无法报价,请去个人中心申请加工厂')
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        if (this.info.earnestMoney && this.info.earnestMoney > 0 && userInfo.paidEnsure < this.info.earnestMoney) {
+          this.$confirm('保证金不足,是否去充值保证金?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            vk.navigateTo({url: '/pages/user/user?menu=grade'});
+          })
+          return
+        }
+        vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
+      }
+    },
+    createContract({totalPrice, uid, _id}) {
+      vk.callFunction({
+        url: 'client/contract/kh/add',
+        title: '请求中...',
+        data: {
+          type: 'process',
+          productTitle: this.info.title,
+          transactionId: vk.pubfn.createOrderNo("P", 20),
+          sheetId: this.id,
+          quoteId: _id,
+          buyer: vk.getVuex('$user.userInfo._id'),
+          seller: uid,
+          amount: totalPrice,
+          partyCount: 2,
+          signCount: 0,
+        }
+      }).then((res) => {
+        this.$message({
+          message: '选择成功',
+          type: 'success'
+        })
+        this.showDialog = false
+        setTimeout(() => {
+          if (this.info.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+          else {
+            if (this.info.signMethod === 1) vk.navigateTo('/pages/store/buyer?menuIndex=0')
+            else vk.navigateTo('/pages/contract/index?tab=0')
+          }
+        }, 1500)
+      })
+    },
+    openDownload(url) {
+      window.open(url)
     }
+  },
+  onLoad(option) {
+    if (!option.id) vk.navigateBack()
+    this.id = option.id
+    this.getInfo()
+  }
 }
 </script>
 
@@ -263,68 +489,68 @@ export default {
 @import "@/common/css/app.scss";
 
 .page-main {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
-    border-radius: 5px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
+  border-radius: 5px;
 }
 
 .countdown {
-    padding: 2px 5px;
-    margin: 0 5px;
+  padding: 2px 5px;
+  margin: 0 5px;
 }
 
 .item-wrap {
-    margin: 24px 0;
+  margin: 24px 0;
 
-    .form-title-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .goods-info-title {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-        }
-
-        .form-title {
-            padding-left: 10px;
-            color: $--color-primary;
-            font-size: 18px;
-            line-height: 18px;
-            border-left: 4px solid $--color-primary;
-        }
+  .form-title-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
+    .goods-info-title {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
     }
+
+    .form-title {
+      padding-left: 10px;
+      color: $--color-primary;
+      font-size: 18px;
+      line-height: 18px;
+      border-left: 4px solid $--color-primary;
+    }
+
+  }
 }
 
 .request-header {
-    border: 1px solid #EDEDED;
-    background-color: #FFF8F1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 15px;
-    margin-top: 30px;
+  border: 1px solid #EDEDED;
+  background-color: #FFF8F1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+  margin-top: 30px;
 
-    text {
-        text-align: center;
-    }
+  text {
+    text-align: center;
+  }
 }
 
 .quote {
-    border-left: 1px solid #EDEDED;
-    border-right: 1px solid #EDEDED;
-    border-bottom: 1px solid #EDEDED;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 15px;
+  border-left: 1px solid #EDEDED;
+  border-right: 1px solid #EDEDED;
+  border-bottom: 1px solid #EDEDED;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
 
-    text {
-        text-align: center;
-    }
+  text {
+    text-align: center;
+  }
 }
 </style>
diff --git a/pages/process/factoryList.vue b/pages/process/factoryList.vue
new file mode 100644
index 0000000..3133977
--- /dev/null
+++ b/pages/process/factoryList.vue
@@ -0,0 +1,577 @@
+<template>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
+
+    <view class="page-nav">
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/index/process/list">找加工</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item class="text-main">加工厂列表</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-row class="">
+        <el-button @click="toRelease" type="primary" round>发布加工单</el-button>
+        <el-button @click="toMyEnquiry" type="primary" round plain>我发布的加工单</el-button>
+      </el-row>
+    </view>
+    <view class="w-1200 m-a">
+      <common-swiper page="factory"/>
+    </view>
+    <!-- 筛选表单 -->
+    <view class="w-1200 m-a" style="margin-top: 30rpx">
+      <el-form @submit.native.prevent label-width="80px">
+        <el-form-item label="关键词:" class="border-bottom pb-30">
+          <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
+            </el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="分类:" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectCate({name: -1})" class="pointer mr-25"
+                  :class="[(checkCategoryList.includes(-1) || checkCategoryList.length === 0) ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in categoryTreeData" :key="index">
+              <text @click="selectCate(item)" class="pointer mr-25"
+                    :class="[checkCategoryList.includes(item.name) ? 'text-main selected-cate' : '']">
+                {{ item.name }}
+              </text>
+            </view>
+          </view>
+        </el-form-item>
+        <el-form-item label="地区" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
+                  :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
+            </text>
+            <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
+              <text @click="selectProvince(item.code)"
+                    :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']">
+                {{ item.name }}
+              </text>
+            </view>
+          </view>
+        </el-form-item>
+      </el-form>
+    </view>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad12.length">
+        <el-carousel :height="`100px`" :style="{width: '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad12" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad122.length">
+        <el-carousel :height="`100px`" :style="{width: '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad122" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 商品列表 -->
+    <view class="goods-list">
+      <view v-for="(item, index) in list.rows" :key="index" class="goods">
+        <view class="goods-info" @click="navTo(`/pages/yellowPage/factory?userId=${item.uid}`)">
+          <!--                    <el-image src="https://oss.wsdns.cn/20231204/d35332fa6a3b4596b522edf9527ac612.png"-->
+          <!--                              class="goods-img"/>-->
+          <view class="info">
+            <view class="field">
+              <view class="desc" style="width: 1000px">
+                <view class="text">加工主体</view>
+                <view class="font-bold" v-if="item.user">{{
+                    item.user.accountType === 2 ? item.user.company.companyName : item.user.person.personName
+                  }}
+                </view>
+              </view>
+              <view class="desc">
+                <view class="text">所在地区</view>
+                <view>{{ item.addressRegion.province.name }}{{ item.addressRegion.city.name }}</view>
+              </view>
+              <view class="desc">
+                <view class="text">成立年限</view>
+                <view>{{ item.year }}年</view>
+              </view>
+              <view class="desc">
+                <view class="text">年产值</view>
+                <view>{{ item.yearsIncome }}万元</view>
+              </view>
+              <view class="desc">
+                <view class="text">员工人数</view>
+                <view>{{ item.employeeNum }}人</view>
+              </view>
+              <view class="desc">
+                <view class="text">流水线数量</view>
+                <view>{{ item.flowNum }}条</view>
+              </view>
+              <view class="desc">
+                <view class="text">厂房归属</view>
+                <view>{{ item.blongTo }}</view>
+              </view>
+              <view class="desc">
+                <view class="text">厂房面积</view>
+                <view>{{ item.size }}㎡</view>
+              </view>
+              <view class="desc">
+                <view class="text">服务信息</view>
+                <view>{{ item.serviceInfo }}</view>
+              </view>
+              <view class="desc" v-if="item.mainSpotCategory && item.mainSpotCategory.length > 0">
+                <view class="text">主营类别</view>
+                <view>{{ item.mainSpotCategory.join() }}</view>
+              </view>
+              <view class="desc">
+                <view class="text">主营工艺和业务范围</view>
+                <view>{{ item.mainProcess }}</view>
+              </view>
+
+            </view>
+          </view>
+        </view>
+        <view class="buttons">
+          <button type="default" class="btn" plain @click="doShowContract(index)">查看电话
+          </button>
+          <button type="default" class="btn green mt-20" plain @click="doShowWechat(index)">添加微信
+          </button>
+          <button type="default" class="btn mt-20" plain @click="navTo(`/pages/yellowPage/factory?userId=${item.uid}`)">
+            查看详情
+          </button>
+          <view class="wechat"
+                v-if="item.user && parseInt(item.user.accountType) === 2 && item.user.businessCard && item.user.businessCard.companyWechat && item.showWechat">
+            <el-image :src="item.user.businessCard.companyWechat" style="width: 100%; height: 100%"/>
+          </view>
+          <view class="wechat"
+                v-if="item.user && parseInt(item.user.accountType) === 1 && item.user.businessCard && item.user.businessCard.personalWechat && item.showWechat">
+            <el-image :src="item.user.businessCard.personalWechat" style="width: 100%; height: 100%"/>
+          </view>
+          <view class="mobile" v-if="item.user && item.showContract && item.user.businessCard">
+            <i class="el-icon-phone"></i>
+            <text class="ml-20">{{
+                (item.user.businessCard && item.user.businessCard.companyMobile) ? item.user.businessCard.companyMobile : '暂无电话'
+              }}
+            </text>
+          </view>
+        </view>
+      </view>
+
+      <view class="paginatio">
+        <el-pagination @current-change="search" background layout="prev, pager, next" :total="list.total"
+                       :page-size="pageSize">
+        </el-pagination>
+      </view>
+    </view>
+    <common-footer></common-footer>
+  </view>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import dayjs from "dayjs";
+
+export default {
+  data() {
+    return {
+      checkCategoryList: [],
+      clickedCateIndex: -1,
+      provinceData: provinces,
+      checkProvinceList: [],
+      keyword: '',
+      list: {
+        total: 0,
+        rows: []
+      },
+      showAllProvince: false,
+      type: 0,
+      pageSize: 20,
+      ad12: [],
+      ad122: [],
+      categoryTreeData: [],
+    };
+  },
+  onLoad(option) {
+    if (option.type) this.type = option.type
+    vk.callFunction({
+      url: 'client/process/category/pub/getTree',
+      title: '请求中...',
+      success: (data) => {
+        this.categoryTreeData = data.rows
+        this.allChildCate = []
+        this.categoryTreeData.forEach(item => {
+          item.children.forEach(child => {
+            this.allChildCate.push(child)
+          })
+        })
+      }
+    });
+  },
+  onShow() {
+    this.search(1)
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
+    },
+    selectCate({name}) {
+      if (name === -1) this.checkCategoryList = []
+      const index = this.checkCategoryList.indexOf(name)
+      if (index === -1) {
+        this.checkCategoryList = [name]
+      } else {
+        this.checkCategoryList = []
+      }
+      console.log(this.checkCategoryList)
+      this.search(1)
+    },
+    selectProvince(code) {
+      if (code === -1) this.checkProvinceList = []
+      else {
+        this.checkProvinceList = [code]
+      }
+      this.search(1)
+    },
+    toMyEnquiry() {
+      vk.navigateTo({
+        url: '/pages/process/my'
+      })
+    },
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/process/release'
+        })
+      }
+    },
+
+    search(pageIndex) {
+      // const categoryIds = []
+      // this.allChildCate.map(item => {
+      //     if (this.checkCategoryList.indexOf(item._id) > -1) categoryIds.push(item.name)
+      // })
+      vk.callFunction({
+        url: 'client/factory/pub/getList',
+        title: '加载中...',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          keyword: this.keyword,
+          mainSpotCategory: this.checkCategoryList.length ? this.checkCategoryList[0] : null
+        },
+        success: ({data}) => {
+          data.rows.map(item => {
+            item.showWechat = false
+            item.showContract = false
+            return item
+          })
+          this.list = data
+          this.getAd12()
+          this.getAd122()
+        }
+      });
+    },
+    getCertUrl() {
+      vk.callFunction({
+        url: 'client/fadada.getVerifyUrl',
+        success: (res) => {
+          location.href = res.data.url
+        }
+      });
+    },
+    doShowWechat(index) {
+      if (parseInt(this.list.rows[index].user.accountType) === 2 && !this.list.rows[index].user.businessCard.companyWechat)
+        return vk.toast('用户暂未上传')
+      else if (parseInt(this.list.rows[index].user.accountType) === 1 && !this.list.rows[index].user.businessCard.personalWechat)
+        return vk.toast('用户暂未上传')
+      this.list.rows[index].showContract = false
+      this.list.rows[index].showWechat = !this.list.rows[index].showWechat
+    },
+    doShowContract(index) {
+      this.list.rows[index].showWechat = false
+      this.list.rows[index].showContract = !this.list.rows[index].showContract
+    },
+    async getAd12() {
+      this.ad12 = []
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 12,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad12 = res.data
+    },
+    async getAd122() {
+      this.ad122 = []
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 122,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad122 = res.data
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.carousel {
+  width: 1200px;
+  margin: 20px auto;
+}
+
+.page-nav {
+  display: flex;
+  justify-content: space-between;
+}
+
+.carousel-img {
+  width: 100%;
+  height: 100%;
+}
+
+.goods-options {
+  background-color: #FFFFFF;
+  padding: 20px;
+}
+
+.filter-outer {
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
+}
+
+.tags {
+  display: flex;
+  flex-wrap: wrap;
+
+  .el-tag {
+    margin-right: 10px;
+  }
+}
+
+
+.goods-list {
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+.goods {
+  background-color: #FFFFFF;
+  box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.05);
+  text-align: center;
+  width: 1200px;
+  margin: 10px auto;
+  padding: 20px;
+  display: flex;
+  justify-content: space-between;
+
+  .goods-info {
+    display: flex;
+    flex: 1;
+
+    .goods-img {
+      width: 200px;
+      height: 150px;
+    }
+
+    .info {
+      width: 1000px;
+      text-align: left;
+      margin-left: 20px;
+
+      .goods-name {
+        font-size: 20px;
+        font-weight: 500;
+        line-height: 2.5em;
+      }
+
+      .field {
+        display: flex;
+        flex-wrap: wrap;
+
+        .desc {
+          display: flex;
+          width: 330px;
+          line-height: 2.5em;
+
+          .text {
+            width: 140px;
+            color: #999999;
+          }
+        }
+      }
+
+    }
+  }
+
+  .buttons {
+    padding: 0 20px;
+    width: 200px;
+    border-left: 1px solid #f3f3f3;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    position: relative;
+
+    .btn {
+      width: 120px;
+    }
+
+    .green {
+      background-color: #7ec050 !important;
+      color: #ffffff;
+    }
+
+    .wechat {
+      position: absolute;
+      left: -140px;
+      top: 0;
+      width: 150px;
+      height: 150px;
+      background-color: white;
+      border-radius: 10px;
+      padding: 5px;
+      box-shadow: 0 1px 10px 0 #eee
+    }
+
+    .mobile {
+      position: absolute;
+      left: -110px;
+      top: 10px;
+      background-color: white;
+      border-radius: 10px;
+      padding: 5px;
+      box-shadow: 0 1px 10px 0 #eee;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  &-title {
+    font-size: 15px;
+    color: #101010;
+    height: 62px;
+    padding-top: 20px;
+    font-weight: bold;
+  }
+
+  &-stock {
+    font-size: 12px;
+    color: #BD3124;
+  }
+
+  &-address {
+    font-size: 12px;
+    margin: 10px 0;
+  }
+
+  &-image {
+    width: 200px;
+    height: 70px;
+    margin: 0 auto;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &-company {
+    color: #4F4F4F;
+    font-size: 14px;
+    margin: 10px 0;
+  }
+
+  &-buy {
+    width: 108px;
+    height: 30px;
+    line-height: 30px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(169, 41, 36, 1);
+    font-size: 13px;
+    text-align: center;
+    font-family: Roboto;
+    border: 1px solid rgba(169, 41, 36, 1);
+    margin: 0 auto;
+    cursor: pointer;
+  }
+
+  .goods-image {
+    width: 100%;
+  }
+}
+
+.paginatio {
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
+}
+
+.selected-cate {
+  border-bottom: 2px solid #BD3124;
+  line-height: 40rpx;
+}
+
+.child-cate {
+  background-color: #DB8382;
+  color: white;
+  margin-top: 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
+}
+</style>
diff --git a/pages/process/list.vue b/pages/process/list.vue
index 19883ef..d0ee845 100644
--- a/pages/process/list.vue
+++ b/pages/process/list.vue
@@ -1,388 +1,542 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <!-- <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-            </el-breadcrumb>
-        </view> -->
+    <!-- <view class="page-nav">
+        <el-breadcrumb separator="/">
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+        </el-breadcrumb>
+    </view> -->
 
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-            <view class="goods-options">
-                <el-row class="">
-                    <el-button @click="toRelease" type="primary" round>发布加工单</el-button>
-                    <el-button @click="toMyEnquiry" type="primary" round plain>我发布的加工单</el-button>
-                </el-row>
-            </view>
-        </view>
-
-
-        <!-- 筛选表单 -->
-        <view class="filter-outer">
-            <el-form @submit.native.prevent label-width="80px">
-                <el-form-item label="关键词:" class="border-bottom pb-30">
-                    <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
-                        <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                        <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
-                        </el-button>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="分类:" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="clickedCateIndex = -1" class="pointer mr-25"
-                              :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in categoryTreeData" :key="index">
-                            <text @click="clickedCateIndex = index" class="pointer mr-25"
-                                  :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                    </view>
-                    <view class="child-cate flex justify-start items-center flex-wrap">
-                        <template v-if="clickedCateIndex === -1">
-                            <text class="pointer mr-25" @click="selectCate(item)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
-                            </text>
-                        </template>
-                        <template v-else>
-                            <text class="pointer mr-25" @click="selectCate(item)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
-                                {{ item.name }}
-                            </text>
-                        </template>
-                        <!--                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" >查看更多-->
-                        <!--                        </text>-->
-                    </view>
-                </el-form-item>
-                <el-form-item label="供应商:" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="selectCompany(-1)" class="pointer mr-25"
-                              :class="[checkCompanyList.length === 0 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in companyList" :key="index">
-                            <text @click="selectCompany(item._id)" class="pointer mr-25"
-                                  :class="[checkCompanyList.includes(item._id) ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10 || showAllCompany">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                        <text @click="showAllCompany = !showAllCompany" class="pointer mr-25"
-                              v-if="companyList.length > 10">查看更多
-                        </text>
-                    </view>
-                </el-form-item>
-                <el-form-item label="已选择">
-                    <view class="tags">
-                        <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
-                    </view>
-                </el-form-item>
-            </el-form>
-        </view>
-
-        <!-- 商品列表 -->
-        <view class="sheet-list">
-            <el-table :data="list.rows" style="width: 100%">
-                <el-table-column align="center" label="标题">
-                    <template v-slot="{ row }">
-                        <p class="text-main">{{ row.title }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="num" label="加工量"/>
-                <el-table-column align="center" label="采购企业">
-                    <template v-slot="{ row }">
-                        <p>{{
-                                row.user.accountType === 1 ? row.user.person.personName : row.user.company.companyName
-                            }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="报价情况">
-                    <template v-slot="{ row }">
-                        <p>{{ `${row.quoteNum}家已报价` }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="_add_time_srt" label="发布时间"/>
-                <el-table-column align="center" label="操作">
-                    <template v-slot="{ row }">
-                        <el-button size="mini" type="primary" plain @click.native="toDetail(row._id)">
-                            {{ vk.getVuex('$user.userInfo._id') === row.userId ? '查看' : '申请加工' }}
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div class="mt-20 text-center">
-                <el-pagination @current-change="search" background layout="prev, pager, next"
-                               :total="list.total" :page-size="pageSize"/>
-            </div>
-        </view>
-
-        <right-bar></right-bar>
-        <common-footer></common-footer>
+    <view class="carousel">
+      <common-swiper page="process"/>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布加工单</el-button>
+          <el-button @click="toMyEnquiry" type="primary" round plain>我发布的加工单</el-button>
+          <el-button @click="toMyQuote" type="primary" round plain>我的报价</el-button>
+          <el-button @click="navTo('/pages/process/factoryList')" type="success" round plain>加工厂列表</el-button>
+        </el-row>
+      </view>
     </view>
+
+
+    <!-- 筛选表单 -->
+    <view class="filter-outer">
+      <el-form @submit.native.prevent label-width="80px">
+        <el-form-item label="关键词:" class="border-bottom pb-30">
+          <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
+            </el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="分类:" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectCate({_id: -1})" class="pointer mr-25"
+                  :class="[checkCategoryList.length === 0 ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in categoryTreeData" :key="index">
+              <text @click="selectCate(item)" class="pointer mr-25"
+                    :class="[checkCategoryList.length && checkCategoryList.includes(item._id)  ? 'text-main selected-cate' : '']">
+                {{ item.name }}
+              </text>
+            </view>
+          </view>
+          <!--          <view class="child-cate flex justify-start items-center flex-wrap">-->
+          <!--            <template v-if="clickedCateIndex === -1">-->
+          <!--              <text class="pointer mr-25" @click="selectCate(item)"-->
+          <!--                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"-->
+          <!--                    v-for="(item, index) in allChildCate" :key="index">{{ item.name }}-->
+          <!--              </text>-->
+          <!--            </template>-->
+          <!--            <template v-else>-->
+          <!--              <text class="pointer mr-25" @click="selectCate(item)"-->
+          <!--                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"-->
+          <!--                    v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">-->
+          <!--                {{ item.name }}-->
+          <!--              </text>-->
+          <!--            </template>-->
+          <!--            &lt;!&ndash;                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" >查看更多&ndash;&gt;-->
+          <!--            &lt;!&ndash;                        </text>&ndash;&gt;-->
+          <!--          </view>-->
+        </el-form-item>
+        <!--                <el-form-item label="供应商:" class="border-bottom pb-30">-->
+        <!--                    <view class="flex justify-start items-center flex-wrap">-->
+        <!--                        <text @click="selectCompany(-1)" class="pointer mr-25"-->
+        <!--                              :class="[checkCompanyList.length === 0 ? 'text-main selected-cate' : '']">全部-->
+        <!--                        </text>-->
+        <!--                        <view v-for="(item, index) in companyList" :key="index">-->
+        <!--                            <text @click="selectCompany(item._id)" class="pointer mr-25"-->
+        <!--                                  :class="[checkCompanyList.includes(item._id) ? 'text-main selected-cate' : '']"-->
+        <!--                                  v-if="index < 10 || showAllCompany">-->
+        <!--                                {{ item.name }}-->
+        <!--                            </text>-->
+        <!--                        </view>-->
+        <!--                        <text @click="showAllCompany = !showAllCompany" class="pointer mr-25"-->
+        <!--                              v-if="companyList.length > 10">查看更多-->
+        <!--                        </text>-->
+        <!--                    </view>-->
+        <!--                </el-form-item>-->
+        <el-form-item label="地区:" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
+                  :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
+            </text>
+            <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
+              <text @click="selectProvince(item.code)"
+                    :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']">
+                {{ item.name }}
+              </text>
+            </view>
+            <!--                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多-->
+            <!--                        </text>-->
+          </view>
+        </el-form-item>
+        <el-form-item label="已选择">
+          <view class="tags">
+            <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
+          </view>
+        </el-form-item>
+      </el-form>
+    </view>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad13.length">
+        <el-carousel :height="`100px`" :style="{width: ad14.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad13" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad14.length">
+        <el-carousel :height="`100px`" :style="{width: ad13.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad14" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 商品列表 -->
+    <view class="sheet-list">
+      <view class="flex justify-start items-center my-20">
+        <el-button @click="changeStatus(0)" type="primary" :plain="status === 1" round>正在询价</el-button>
+        <el-button @click="changeStatus(1)" type="primary" :plain="status === 0" round>合作成交
+        </el-button>
+      </view>
+      <el-table :data="list.rows" style="width: 100%" :loading="loading">
+        <el-table-column align="center" label="标题">
+          <template v-slot="{ row }">
+            <p class="text-main">{{ row.title }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="加工量" width="80"/>
+        <el-table-column align="center" label="采购企业" width="260">
+          <template v-slot="{ row }">
+            <p v-if="row.user">{{
+                row.user.accountType === 1 ? row.user.person.personName : row.user.company.companyName
+              }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="加工产品交货地址">
+          <template v-slot="{ row }">
+            <p v-if="row.addressRegion && row.addressRegion.province">{{
+                row.addressRegion.province.name
+              }}{{ row.addressRegion.city.name }}{{
+                row.addressRegion.area.name
+              }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报价情况">
+          <template v-slot="{ row }">
+            <p>{{ `${row.quoteNum}家已报价` }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="_add_time_str" label="发布时间"/>
+        <el-table-column align="center" label="操作">
+          <template v-slot="{ row }">
+            <el-button size="mini" type="primary" plain @click.native="toDetail(row._id)" v-if="status === 0">
+              {{ vk.getVuex('$user.userInfo._id') === row.userId ? '查看' : '申请合作' }}
+            </el-button>
+            <el-button size="mini" type="primary" plain @click.native="toDetail(row._id)" v-if="status === 1">
+              查看详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="mt-20 text-center">
+        <el-pagination @current-change="search" background layout="prev, pager, next"
+                       :total="list.total" :page-size="pageSize"/>
+      </div>
+    </view>
+
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 
 export default {
-    data() {
-        return {
-            categoryTreeData: [],
-            checkProvinceList: [],
-            allChildCate: [],
-            companyList: [],
-            checkCompanyList: [],
-            clickedCateIndex: -1,
-            checkCategoryList: [],
-            checkCategoryNameList: [],
-            showAllCompany: false,
-            keyword: '',
-            queryParam: {},
-            list: {
-                rows: [],
-                total: 0
-            },
-            pageSize: 20
-        };
+  data() {
+    return {
+      categoryTreeData: [],
+      checkProvinceList: [],
+      allChildCate: [],
+      companyList: [],
+      checkCompanyList: [],
+      clickedCateIndex: -1,
+      checkCategoryList: [],
+      checkCategoryNameList: [],
+      showAllCompany: false,
+      keyword: '',
+      queryParam: {},
+      list: {
+        rows: [],
+        total: 0
+      },
+      pageSize: 20,
+      provinceData: provinces,
+      showAllProvince: true,
+      loading: true,
+      status: 0,
+      ad13: [],
+      ad14: [],
+    };
+  },
+  onLoad(options) {
+    if (options && options.keyword) this.keyword = options.keyword
+    // this.search(1)
+    vk.callFunction({
+      url: 'client/process/category/pub/getTree',
+      title: '请求中...',
+      success: (data) => {
+        this.categoryTreeData = data.rows
+        this.allChildCate = []
+        this.categoryTreeData.forEach(item => {
+          item.children.forEach(child => {
+            console.log(child)
+            this.allChildCate.push(child)
+          })
+        })
+      }
+    });
+    this.search()
+    this.getCompany()
+  },
+  methods: {
+    selectCate({_id, name}) {
+      if (_id === -1) {
+        this.checkCategoryList = []
+        this.checkCategoryNameList = []
+        return this.search(1)
+      }
+      const index = this.checkCategoryList.indexOf(_id)
+      if (index === -1) {
+        this.checkCategoryList = [_id]
+        this.checkCategoryNameList = [name]
+      } else {
+        this.checkCategoryList.splice(index, 1)
+        this.checkCategoryNameList.splice(index, 1)
+      }
+      this.search(1)
     },
-    onLoad() {
-        // this.search(1)
-        vk.callFunction({
-            url: 'client/spot/category/pub/getTree',
-            title: '请求中...',
-            data: {},
-            success: (data) => {
-                this.categoryTreeData = data.rows
-                this.allChildCate = []
-                this.categoryTreeData.forEach(item => {
-                    item.children.forEach(child => {
-                        this.allChildCate.push(child)
-                    })
-                })
-            }
-        });
-        this.search()
-        this.getCompany()
+    selectProvince(code) {
+      if (code === -1) this.checkProvinceList = []
+      else {
+        //   const index = this.checkProvinceList.indexOf(code)
+        //   if (index === -1) this.checkProvinceList.push(code)
+        //   else this.checkProvinceList.splice(index, 1)
+        this.checkProvinceList = [code]
+      }
+      this.search(1)
     },
-    methods: {
-        selectCate({_id, name}) {
-            const index = this.checkCategoryList.indexOf(_id)
-            console.log(_id, name, index)
-            if (index === -1) {
-                this.checkCategoryList.push(_id)
-                this.checkCategoryNameList.push(name)
-            } else {
-                this.checkCategoryList.splice(index, 1)
-                this.checkCategoryNameList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        selectTexture(id) {
-            if (id === -1) this.checkTextureList = []
-            else {
-                const index = this.checkTextureList.indexOf(id)
-                if (index === -1) this.checkTextureList.push(id)
-                else this.checkTextureList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        selectCompany(id) {
-            if (id === -1) this.checkCompanyList = []
-            else {
-                const index = this.checkCompanyList.indexOf(id)
-                if (index === -1) this.checkCompanyList.push(id)
-                else this.checkCompanyList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        getCompany() {
-            vk.callFunction({
-                url: 'client/user/pub/getCompany',
-                title: '请求中...',
-                data: {},
-                success: (data) => {
-                    this.companyList = data.rows.map(item => {
-                        item.name = item.company.companyName
-                        return item
-                    })
-                }
-            });
-        },
-        toMyEnquiry() {
-            vk.navigateTo({
-                url: '/pages/process/my'
-            })
-        },
-        async toRelease() {
-            const {userInfo} = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=business-card'});
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/process/release'
-                })
-            }
-        },
-        async toDetail(id) {
-            const {userInfo} = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo('/pages/user/user?menu=business-card');
-                })
-            } else {
-                vk.navigateTo({
-                    url: `/pages/process/detail?id=${id}`
-                })
-            }
-        },
-        search(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/process/sheet/pub/getList',
-                data: {
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    keyword: this.keyword,
-                    companyList: this.checkCompanyList,
-                    categoryIds: this.checkCategoryList
-                },
-                success: (data) => {
-                    this.list = data
-                    console.log(this.list)
-                }
-            });
-        },
-        getCertUrl() {
-            vk.callFunction({
-                url: 'client/fadada.getVerifyUrl',
-                success: (res) => {
-                    location.href = res.data.url
-                }
-            });
-        },
-    },
-    computed: {
-        checkCategoryArr() {
-            let arr = []
-
-            this.checkCategoryNameList.forEach(name => {
-                arr.push({name})
-            })
-
-            this.checkProvinceList.forEach(item => {
-                arr.push({
-                    ...item
-                })
-            })
-
-            return arr
+    getCompany() {
+      vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.companyList = data.rows.map(item => {
+            item.name = item.company.companyName
+            return item
+          })
         }
+      });
+    },
+    toMyEnquiry() {
+      vk.navigateTo({
+        url: '/pages/process/my'
+      })
+    },
+    toMyQuote() {
+      vk.navigateTo({
+        url: '/pages/process/quote/my'
+      })
+    },
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/process/release'
+        })
+      }
+    },
+    async toDetail(id) {
+      const {userInfo} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo('/pages/user/user?menu=fadada');
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: `/pages/process/detail?id=${id}`
+        })
+      }
+    },
+    search(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/process/sheet/pub/getList',
+        title: '请求中...',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          keyword: this.keyword,
+          // companyList: this.checkCompanyList,
+          categoryIds: this.checkCategoryList.length ? this.checkCategoryList : null,
+          provinceCodes: this.checkProvinceList,
+          status: this.status,
+        },
+        success: (data) => {
+          this.list = data
+          this.loading = false
+          this.getAd13()
+          this.getAd14()
+        }
+      });
+    },
+    getCertUrl() {
+      vk.callFunction({
+        url: 'client/fadada.getVerifyUrl',
+        success: (res) => {
+          location.href = res.data.url
+        }
+      });
+    },
+    navTo(url) {
+      vk.navigateTo({url});
+    },
+    changeStatus(status) {
+      this.status = status
+      this.search(1)
+    },
+    async getAd13() {
+      this.ad13 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 13,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad13 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 1,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad13.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+    async getAd14() {
+      this.ad14 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 14,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad14 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 2,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad14.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
 
+  },
+  computed: {
+    checkCategoryArr() {
+      let arr = []
+
+      this.checkCategoryNameList.forEach(name => {
+        arr.push({name})
+      })
+
+      this.provinceData.forEach(item => {
+        if (this.checkProvinceList.includes(item.code)) {
+          arr.push(item)
+        }
+      })
+
+      return arr
     }
+
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
+  display: flex;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 
 .sheet-list {
-    width: 1200px;
-    margin: 20px auto;
-    // display: flex;
+  width: 1200px;
+  margin: 20px auto;
+  // display: flex;
 
 }
 
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 
 .selected-cate {
-    border-bottom: 2px solid #BD3124;
-    line-height: 40rpx;
+  border-bottom: 2px solid #BD3124;
+  line-height: 40rpx;
 }
 
 .child-cate {
-    background-color: #DB8382;
-    color: white;
-    margin-top: 10rpx;
-    border-radius: 15rpx;
-    padding: 0 20rpx;
+  background-color: #DB8382;
+  color: white;
+  margin-top: 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
 }
 </style>
diff --git a/pages/process/my.vue b/pages/process/my.vue
index 7b86ea4..a0edcdd 100644
--- a/pages/process/my.vue
+++ b/pages/process/my.vue
@@ -1,293 +1,347 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <!-- <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-            </el-breadcrumb>
-        </view> -->
-
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-            <view class="goods-options">
-                <el-row class="">
-                    <el-button @click="toRelease" type="primary" round>发布加工单</el-button>
-                    <!--                    <el-button @click="toMyEnquiry" type="primary" round plain>我发布的加工单</el-button>-->
-                </el-row>
-            </view>
-        </view>
-
-        <!-- 加工单列表 -->
-        <view class="sheet-list">
-            <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
-                           :customRightBtns="table1.customRightBtns"
-                           :pagination="true"></vk-data-table>
-        </view>
-
-        <common-footer></common-footer>
+    <!-- <view class="page-nav">
+        <el-breadcrumb separator="/">
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+        </el-breadcrumb>
+    </view> -->
 
+    <view class="carousel">
+      <!--            <el-carousel height="170px">-->
+      <!--                <el-carousel-item v-for="item in 4" :key="item">-->
+      <!--                    <image class="carousel-img"-->
+      <!--                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"-->
+      <!--                           mode="aspectFill"></image>-->
+      <!--                </el-carousel-item>-->
+      <!--            </el-carousel>-->
+      <common-swiper page="process-mine" :height="200"/>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布加工单</el-button>
+          <!--                    <el-button @click="toMyEnquiry" type="primary" round plain>我发布的加工单</el-button>-->
+        </el-row>
+      </view>
     </view>
+
+    <!-- 加工单列表 -->
+    <view class="sheet-list">
+      <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
+                     :customRightBtns="table1.customRightBtns"
+                     :pagination="true"></vk-data-table>
+    </view>
+
+    <common-footer></common-footer>
+
+  </view>
 </template>
 
 <script>
 
 export default {
-    data() {
-        return {
-            categoryTreeData: [],
-            checkCategoryList: [],
-            checkProvinceList: [],
-            keyword: '',
-            // 表格相关开始 -----------------------------------------------------------
-            table1: {
-                // 表格数据请求地址
-                action: (obj = {}) => {
-                    let {data, success, fail, complete} = obj;
-                    vk.callFunction({
-                        url: `client/process/sheet/pub/getList`,
-                        data: {
-                            ...data, ...{
-                                userId: vk.getVuex('$user.userInfo._id')
-                            }
-                        },
-                        success: (res) => {
-                            if (typeof success === "function") {
-                                success({
-                                    rows: res.rows, // 列表数据
-                                    total: res.total, // 总记录数
-                                });
-                            }
-                        },
-                        fail: (err => {
-
-                        }),
-                        complete: (res) => {
-                            if (typeof complete === "function") complete(res);
-                        }
-                    })
-                },
-                customRightBtns: [{
-                    title: '详情',
-                    icon: 'el-icon-search',
-                    type: 'primary',
-                    onClick: (item) => {
-                        vk.navigateTo('/pages/process/detail?id=' + item._id);
-                    }
-                },],
-                // 表格字段显示规则
-                columns: [
-                    {
-                        key: "title",
-                        title: "标题",
-                        type: "text",
-                    },
-                    {
-                        key: "num",
-                        title: "加工量",
-                        type: "text"
-                    },
-                    {
-                        key: "productList",
-                        title: "收货地",
-                        type: "text",
-                        minWidth: 200,
-                        formatter: (val, row, column, index) => {
-                            let str = ""
-                            try {
-                                str = val.map(item => {
-                                    const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
-                                    return addressStr
-                                }).join("/")
-                            } catch (err) {
-                                str = ""
-                            }
-
-                            return str
-                        }
-                    },
-                    // {
-                    // 	key: "user",
-                    // 	title: "采购单位",
-                    // 	type: "text",
-                    // 	width: 280,
-                    // 	formatter: (val, row, column, index) => {
-                    // 		if(val.accountType == 1) {
-                    // 			return val.person.personName
-                    // 		}else {
-                    // 			return val.company.companyName
-                    // 		}
-                    // 	}
-                    //
-                    // },
-                    {
-                        key: "_add_time_srt",
-                        title: "添加时间",
-                        type: "time",
-                        width: 160
-                    },
-
-                ],
-                // 多选框选中的值
-                multipleSelection: [],
-                // 当前高亮的记录
-                selectItem: "",
-
+  data() {
+    return {
+      categoryTreeData: [],
+      checkCategoryList: [],
+      checkProvinceList: [],
+      keyword: '',
+      // 表格相关开始 -----------------------------------------------------------
+      table1: {
+        // 表格数据请求地址
+        action: (obj = {}) => {
+          let {data, success, fail, complete} = obj;
+          vk.callFunction({
+            url: `client/process/sheet/pub/getList`,
+            data: {
+              ...data, ...{
+                userId: vk.getVuex('$user.userInfo._id'),
+                isUser: true
+              }
             },
-            // 表格相关结束 -----------------------------------------------------------
-        };
-    },
-    onLoad() {
-        // this.search(1)
-        vk.callFunction({
-            url: 'client/spot/category/pub/getTree',
-            title: '请求中...',
-            data: {},
-            success: (data) => {
-                this.categoryTreeData = data.rows
-                for (var i = 0; i < data.rows.length; i++) {
-                    this.checkCategoryList.push([])
-                }
+            success: (res) => {
+              if (typeof success === "function") {
+                success({
+                  rows: res.rows, // 列表数据
+                  total: res.total, // 总记录数
+                });
+              }
+            },
+            fail: (err => {
+
+            }),
+            complete: (res) => {
+              if (typeof complete === "function") complete(res);
             }
-        });
-
-    },
-    methods: {
-        toMyEnquiry() {
-            vk.navigateTo({
-                url: '/pages/enquiry/my'
-            })
+          })
         },
-        toRelease() {
-
-            if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.getCertUrl()
-                })
-            } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo('/pages/user/user?menu=business-card');
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/process/release'
-                })
+        customRightBtns: [
+          {
+            title: '详情',
+            icon: 'el-icon-search',
+            type: 'primary',
+            onClick: (item) => {
+              vk.navigateTo('/pages/process/detail?id=' + item._id);
             }
-
-
-        },
-        search(pageIndex) {
-            const categoryIds = []
-            this.checkCategoryList.forEach(item => {
-                item.forEach(sitem => {
-                    categoryIds.push(sitem._id)
+          },
+          {
+            title: '删除',
+            icon: 'el-icon-delete',
+            type: 'primary',
+            onClick: (item) => {
+              this.$confirm('如果你要删除此条信息，之前其他客户填写的留言将无法查看', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                vk.callFunction({
+                  url: 'client/process/sheet/kh/delete',
+                  title: '请求中...',
+                  data: {
+                    _id: item._id
+                  },
+                }).then(res => {
+                  this.$refs.table1.refresh()
                 })
-            })
-
-            let provinceCodes = this.checkProvinceList.map(item => item.code)
-
-            if (provinceCodes.includes(9999)) {
-                provinceCodes = []
+              })
             }
+          },
+        ],
+        // 表格字段显示规则
+        columns: [
+          {
+            key: "orderNo",
+            title: "单号",
+            type: "text",
+          },
+          {
+            key: "title",
+            title: "标题",
+            type: "text",
+          },
+          {
+            key: "num",
+            title: "加工量",
+            type: "text"
+          },
+          {
+            key: "quoteNum",
+            title: "报价数",
+            type: "text",
+            formatter: (val, row, column, index) => {
+              return `${val}家已报价`
+            }
+          },
+          // {
+          //     key: "productList",
+          //     title: "收货地",
+          //     type: "text",
+          //     minWidth: 200,
+          //     formatter: (val, row, column, index) => {
+          //         let str = ""
+          //         try {
+          //             str = val.map(item => {
+          //                 const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
+          //                 return addressStr
+          //             }).join("/")
+          //         } catch (err) {
+          //             str = ""
+          //         }
+          //
+          //         return str
+          //     }
+          // },
+          // {
+          // 	key: "user",
+          // 	title: "采购单位",
+          // 	type: "text",
+          // 	width: 280,
+          // 	formatter: (val, row, column, index) => {
+          // 		if(val.accountType == 1) {
+          // 			return val.person.personName
+          // 		}else {
+          // 			return val.company.companyName
+          // 		}
+          // 	}
+          //
+          // },
+          {
+            key: "_add_time_str",
+            title: "发布时间",
+            type: "time",
+          },
 
-            vk.callFunction({
-                url: 'client/process/sheet/pub/getList',
-                data: {
-                    pageIndex: pageIndex,
-                    pageSize: 20,
-                    keyword: this.keyword,
-                },
-                success: (data) => {
-                    console.log('data: ', data);
+        ],
+        // 多选框选中的值
+        multipleSelection: [],
+        // 当前高亮的记录
+        selectItem: "",
 
-                    this.goodsData = data
-                }
-            });
-        },
-    },
-    computed: {
-        checkCategoryArr() {
-            let arr = []
-
-            this.checkCategoryList.forEach(item => {
-                arr.push(...item)
-            })
-
-            this.checkProvinceList.forEach(item => {
-                arr.push({
-                    ...item
-                })
-            })
-
-            return arr
+      },
+      // 表格相关结束 -----------------------------------------------------------
+    };
+  },
+  onLoad() {
+    // this.search(1)
+    vk.callFunction({
+      url: 'client/spot/category/pub/getTree',
+      title: '请求中...',
+      data: {},
+      success: (data) => {
+        this.categoryTreeData = data.rows
+        for (var i = 0; i < data.rows.length; i++) {
+          this.checkCategoryList.push([])
         }
+      }
+    });
 
+  },
+  methods: {
+    toMyEnquiry() {
+      vk.navigateTo({
+        url: '/pages/enquiry/my'
+      })
+    },
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/process/release'
+        })
+      }
+    },
+    search(pageIndex) {
+      const categoryIds = []
+      this.checkCategoryList.forEach(item => {
+        item.forEach(sitem => {
+          categoryIds.push(sitem._id)
+        })
+      })
+
+      let provinceCodes = this.checkProvinceList.map(item => item.code)
+
+      if (provinceCodes.includes(9999)) {
+        provinceCodes = []
+      }
+
+      vk.callFunction({
+        url: 'client/process/sheet/pub/getList',
+        data: {
+          pageIndex: pageIndex,
+          pageSize: 20,
+          keyword: this.keyword,
+        },
+        success: (data) => {
+          console.log('data: ', data);
+
+          this.goodsData = data
+        }
+      });
+    },
+  },
+  computed: {
+    checkCategoryArr() {
+      let arr = []
+
+      this.checkCategoryList.forEach(item => {
+        arr.push(...item)
+      })
+
+      this.checkProvinceList.forEach(item => {
+        arr.push({
+          ...item
+        })
+      })
+
+      return arr
     }
+
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
+  display: flex;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 
 .sheet-list {
-    width: 1200px;
-    margin: 20px auto;
-    // display: flex;
+  width: 1200px;
+  margin: 20px auto;
+  // display: flex;
 
 }
 
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 </style>
\ No newline at end of file
diff --git a/pages/process/quote.vue b/pages/process/quote.vue
index cc90699..7083c41 100644
--- a/pages/process/quote.vue
+++ b/pages/process/quote.vue
@@ -15,6 +15,7 @@
         </view>
 
         <view class="page-main">
+            <quote-remain-num v-if="reloaded" :amount="sheet.quoteAmount" type="process" :id="sheetId"/>
             <vk-data-form
                 ref="form1"
                 v-model="form1.data"
@@ -24,9 +25,16 @@
                 :form-type="form1.props.formType"
                 :loading.sync="form1.props.loading"
                 :auto-close="true"
-                label-width="140px"
+                label-width="180px"
+                :show-cancel="false"
                 @success="onFormSuccess"
-            ></vk-data-form>
+                :need-alert="false"
+                @fail="onFormFail"
+            >
+                <template v-slot:totalPrice>
+                    <el-input v-model="form1.data.totalPrice" placeholder="请输入货款总价" @change="formatNumber"></el-input>
+                </template>
+            </vk-data-form>
         </view>
 
         <common-footer></common-footer>
@@ -37,13 +45,17 @@
 export default {
     data() {
         return {
+            reloaded: false,
+            sheet: null,
+            sheetId: null,
             // 表单相关开始-----------------------------------------------------------
             form1: {
                 // 表单请求数据，此处可以设置默认值
                 data: {
                     // radio: 1,
                     // checkbox : [1,2]
-                    sheetId: null
+                    sheetId: null,
+                    totalPrice: null,
                 },
                 // 表单属性
                 props: {
@@ -51,14 +63,15 @@ export default {
                     action: "client/process/quote/kh/addQuote",
                     // 表单字段显示规则
                     columns: [
-                        {key: "totalPrice", title: "货款总价", type: "number"},
-                        {key: "totalPriceStr", title: "人民币大写", type: "text"},
-                        {key: "remark", title: "报价单详情", type: "editor"},
+                        {key: "totalPrice", title: "加工总价(人民币:元)", type: "html"},
+                        {key: "files", title: "附件", type: "file", accept: '.pdf', tips: '仅限PDF格式附件或合同，非协议合同将读取为合同附件，请仔细核查'},
+                        {key: "remark", title: "报价单详情", type: "textarea"},
+                        {key: "supplierExt", title: "合同补充条款", type: "textarea"},
                     ],
                     // 表单验证规则
                     rules: {
-                        text: [
-                            {required: true, message: "text不能为空", trigger: "change"},
+                        totalPrice: [
+                            {required: true, message: "货款总价不能为空", trigger: "change,blur"},
                         ]
                     },
                     // add 代表添加 update 代表修改
@@ -84,7 +97,7 @@ export default {
 
         this.sheetId = sheetId
         this.form1.data.sheetId = sheetId
-        // this.getEnquiryDetail()
+        this.getDetail()
     },
     computed: {
 
@@ -97,7 +110,26 @@ export default {
     },
     methods: {
         onFormSuccess() {
-            vk.navigateBack()
+            vk.redirectTo({url: `/pages/process/detail?id=${this.sheetId}`})
+        },
+        onFormFail(data) {
+            if (data.data.code === 12) {
+                this.$confirm(data.data.msg, '提示', {
+                    confirmButtonText: '确定',
+                    showCancelButton: false,
+                    type: 'warning'
+                }).then(() => {
+                    vk.redirectTo({url: `/pages/user/user?menu=grade`})
+                })
+            }else {
+                this.$confirm(data.data.msg, '提示', {
+                    confirmButtonText: '确定',
+                    showCancelButton: false,
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateBack()
+                })
+            }
         },
         // 提交报价单
         async submit() {
@@ -127,29 +159,27 @@ export default {
         /**
          * 获取询价单详情
          */
-        // getEnquiryDetail() {
-        //     vk.callFunction({
-        //         url: 'client/progress/sheet/pub/getDetail',
-        //         title: '请求中...',
-        //         data: {
-        //             _id: this.sheetId
-        //         },
-        //         success: (res) => {
-        //
-        //             res.data.productList.forEach(item => {
-        //                 item.unitPrice = 0
-        //                 const keys = Object.keys(item.extraAttributes)
-        //                 keys.forEach(citem => {
-        //                     item.extraAttributes[citem] = JSON.parse(item.extraAttributes[
-        //                         citem])
-        //                 })
-        //             })
-        //
-        //
-        //             this.sheet = res.data
-        //         }
-        //     });
-        // }
+        getDetail() {
+            vk.callFunction({
+                url: 'client/process/sheet/pub/getInfo',
+                title: '请求中...',
+                data: {
+                    id: this.sheetId
+                },
+                success: (res) => {
+                    this.sheet = res
+                }
+            });
+        },
+        formatNumber(e){
+            this.form1.data.totalPrice = parseFloat(this.form1.data.totalPrice).toFixed(2)
+        }
+    },
+    onShow() {
+        this.reloaded = false
+        setTimeout(() => {
+            this.reloaded = true
+        }, 500)
     }
 }
 </script>
diff --git a/pages/process/quote/my.vue b/pages/process/quote/my.vue
new file mode 100644
index 0000000..c96348b
--- /dev/null
+++ b/pages/process/quote/my.vue
@@ -0,0 +1,290 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+
+        <!-- <view class="page-nav">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+            </el-breadcrumb>
+        </view> -->
+
+        <view class="carousel">
+            <el-carousel height="170px">
+                <el-carousel-item v-for="item in 4" :key="item">
+                    <image class="carousel-img"
+                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
+                           mode="aspectFill"></image>
+                </el-carousel-item>
+            </el-carousel>
+            <view class="goods-options">
+                <el-row class="">
+                    <el-button @click="toRelease" type="primary" round>发布加工单</el-button>
+                    <!--                    <el-button @click="toMyEnquiry" type="primary" round plain>我发布的加工单</el-button>-->
+                </el-row>
+            </view>
+        </view>
+
+        <!-- 加工单列表 -->
+        <view class="sheet-list">
+            <vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
+                           :customRightBtns="table1.customRightBtns"
+                           :pagination="true"></vk-data-table>
+        </view>
+
+        <common-footer></common-footer>
+
+    </view>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            categoryTreeData: [],
+            checkCategoryList: [],
+            checkProvinceList: [],
+            keyword: '',
+            // 表格相关开始 -----------------------------------------------------------
+            table1: {
+                // 表格数据请求地址
+                action: (obj = {}) => {
+                    let {data, success, fail, complete} = obj;
+                    vk.callFunction({
+                        url: `client/process/quote/kh/getList`,
+                        data: {
+                            ...data, ...{
+                                userId: vk.getVuex('$user.userInfo._id')
+                            }
+                        },
+                        success: (res) => {
+                            if (typeof success === "function") {
+                                success({
+                                    rows: res.rows, // 列表数据
+                                    total: res.total, // 总记录数
+                                });
+                            }
+                        },
+                        fail: (err => {
+
+                        }),
+                        complete: (res) => {
+                            if (typeof complete === "function") complete(res);
+                        }
+                    })
+                },
+                customRightBtns: [
+                    {
+                        title: '详情',
+                        icon: 'el-icon-search',
+                        type: 'primary',
+                        onClick: (item) => {
+                            vk.navigateTo('/pages/process/detail?id=' + item.sheetId);
+                        }
+                    },
+                ],
+                // 表格字段显示规则
+                columns: [
+                    {
+                        key: "sheet.title",
+                        title: "加工标题",
+                        type: "text",
+                    },
+                    {
+                        key: "sheet.num",
+                        title: "加工量",
+                        type: "text"
+                    },
+                    {
+                        key: "totalPrice",
+                        title: "金额",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            return `${val}元`
+                        }
+                    },
+                    {
+                        key: "remark",
+                        title: "备注",
+                        type: "text"
+                    },
+                    {
+                        key: "_add_time_str",
+                        title: "发布时间",
+                        type: "time",
+                    },
+
+                ],
+                // 多选框选中的值
+                multipleSelection: [],
+                // 当前高亮的记录
+                selectItem: "",
+
+            },
+            // 表格相关结束 -----------------------------------------------------------
+        };
+    },
+    onLoad() {
+        // this.search(1)
+        vk.callFunction({
+            url: 'client/spot/category/pub/getTree',
+            title: '请求中...',
+            data: {},
+            success: (data) => {
+                this.categoryTreeData = data.rows
+                for (var i = 0; i < data.rows.length; i++) {
+                    this.checkCategoryList.push([])
+                }
+            }
+        });
+
+    },
+    methods: {
+        toMyEnquiry() {
+            vk.navigateTo({
+                url: '/pages/enquiry/my'
+            })
+        },
+        async toRelease() {
+            const {userInfo, accountNum} = await vk.callFunction({
+                url: 'user/kh/getMyUserInfo'
+            })
+            if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+                this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+                this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (accountNum === 0 ) {
+                this.$confirm('请先到个人中心添加收款账户', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=account'});
+                })
+            } else {
+                if (userInfo.businessCard.status !== 1) {
+                    this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    })
+                    return
+                }
+                vk.navigateTo({
+                    url: '/pages/process/release'
+                })
+            }
+        },
+        search(pageIndex) {
+            const categoryIds = []
+            this.checkCategoryList.forEach(item => {
+                item.forEach(sitem => {
+                    categoryIds.push(sitem._id)
+                })
+            })
+
+            let provinceCodes = this.checkProvinceList.map(item => item.code)
+
+            if (provinceCodes.includes(9999)) {
+                provinceCodes = []
+            }
+
+            vk.callFunction({
+                url: 'client/process/sheet/pub/getList',
+                data: {
+                    pageIndex: pageIndex,
+                    pageSize: 20,
+                    keyword: this.keyword,
+                },
+                success: (data) => {
+                    console.log('data: ', data);
+
+                    this.goodsData = data
+                }
+            });
+        },
+    },
+    computed: {
+        checkCategoryArr() {
+            let arr = []
+
+            this.checkCategoryList.forEach(item => {
+                arr.push(...item)
+            })
+
+            this.checkProvinceList.forEach(item => {
+                arr.push({
+                    ...item
+                })
+            })
+
+            return arr
+        }
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.carousel {
+    width: 1200px;
+    margin: 20px auto;
+}
+
+.carousel-img {
+    width: 100%;
+    height: 100%;
+}
+
+.goods-options {
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.filter-outer {
+    width: 1200px;
+    margin: 20px auto;
+    background-color: #FFFFFF;
+    padding: 20px;
+}
+
+.tags {
+    display: flex;
+
+    .el-tag {
+        margin-right: 10px;
+    }
+}
+
+
+.sheet-list {
+    width: 1200px;
+    margin: 20px auto;
+    // display: flex;
+
+}
+
+
+.paginatio {
+    float: none;
+    width: 1200px;
+    margin: 20px auto;
+    display: flex;
+    justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/process/release.vue b/pages/process/release.vue
index d284ae1..d57dbfd 100644
--- a/pages/process/release.vue
+++ b/pages/process/release.vue
@@ -1,307 +1,470 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item>
-                    <navigator style="display: inline-block;" url="/pages/process/list">加工单</navigator>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>发布加工单</el-breadcrumb-item>
-            </el-breadcrumb>
-        </view>
-
-        <view class="form-view">
-
-            <view class="m-20">
-                <view class="title-main">请填写加工单</view>
-                <view class="title-sub">加工单信息越完整，加工商报价越精准</view>
-            </view>
-
-            <!--            <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"-->
-            <!--                          :rules="form1.props.rules" :form-type="form1.props.formType" :loading.sync="form1.props.loading"-->
-            <!--                          :before-action="form1.props.beforeAction" label-width="140px" cancel-text="保存草稿" submit-text="提交加工单"-->
-            <!--                          @success="onFormSuccess" :footer-show="false">-->
-            <!--            </vk-data-form>-->
-
-            <el-form ref="form" :model="form1.data" label-width="120px">
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            加工信息
-                        </view>
-                    </view>
-                    <view class="sales-code flex justify-end items-center">
-                        <text>金九信业务员编号:</text>
-                        <el-input v-model="form1.data.salesCode" placeholder="请输入编号没有则留空" size="small"/>
-                    </view>
-                </view>
-
-                <view class="p-30">
-                    <el-form-item label="品名/材质" required>
-                        <el-input v-model="form1.data.title" disabled/>
-                    </el-form-item>
-                    <view class="flex justify-start items-center my-20">
-                        <text class="text-30">点击添加加工商品</text>
-                        <text class="text-gray text-25">(至少选择1个商品,最多选择5个商品)</text>
-                    </view>
-                    <view class="flex justify-start items-start flex-wrap mb-40">
-                        <text class="text-35 mr-25 mb-20 pointer"
-                              :class="[form1.data.productList.includes(item._id) ? 'text-main' : '']"
-                              v-for="(item, index) in productList"
-                              :key="index" @click="selectGoods(item)">{{ item.name }}
-                        </text>
-                    </view>
-                    <el-form-item label="加工量" required>
-                        <el-input v-model="form1.data.num" type="number"/>
-                    </el-form-item>
-                    <el-form-item label="附件内容" required>
-                        <!--                        <el-upload action="#" :before-upload="upload">-->
-                        <vk-data-upload v-model="form1.data.files" v-if="!form1.data.attachment" :limit="1" accept="image/*,application/pdf"/>
-                        <data-file theme="two-tone" size="24" :fill="['#333' ,'#ffffff']" strokeLinecap="square"
-                                   v-else/>
-                        <!--                            <el-image v-else :url="form1.data.attachment" fit="cover"/>-->
-
-                    </el-form-item>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            加工商其他要求
-                        </view>
-                    </view>
-                </view>
-
-                <view class="p-30">
-                    <el-radio-group v-model="hasRequire" class="my-20">
-                        <el-radio :label="true">有</el-radio>
-                        <el-radio :label="false">无</el-radio>
-                    </el-radio-group>
-                    <view class="pos-r">
-                        <el-input type="textarea" v-model="form1.data.remark" :disabled="!hasRequire"
-                                  placeholder="复杂加工提供图纸、简单加工详细说明加工内容，如：镀锌、刷漆、防腐、折弯、裁剪等"
-                                  :rows="5"/>
-                        <view class="remark-upload">
-                            <i class="el-icon-plus"/>
-                        </view>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            发票要求
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20">
-                        <el-radio-group v-model="form1.data.invoice">
-                            <el-radio :label="true">含税</el-radio>
-                            <el-radio :label="false">不含税</el-radio>
-                        </el-radio-group>
-                    </view>
-                    <template v-if="form1.data.invoice">
-                        <view class="mb-20 flex justify-start items-center">
-                            <text>开票时间：</text>
-                            <el-radio-group v-model="form1.data.writeInvoiceTime">
-                                <el-radio v-for="(item, index) in WRITE_INVOICE_TIME" :key="index" :label="index">
-                                    {{ item }}
-                                </el-radio>
-                            </el-radio-group>
-                        </view>
-                        <view class="mb-20 flex justify-start items-center">
-                            <text>发票种类：</text>
-                            <el-radio-group v-model="form1.data.invoiceType">
-                                <el-radio v-for="(item, index) in INVOICE_TYPE" :key="index" :label="index">{{
-                                        item
-                                    }}
-                                </el-radio>
-                            </el-radio-group>
-                            <view class="ml-20 flex justify-start items-center">
-                                <text class="label-width">其他要求：</text>
-                                <el-input v-model="form1.data.invoiceOther" placeholder="请输入" size="small"/>
-                            </view>
-                        </view>
-                    </template>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            运输要求
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>随货资料：</text>
-                        <el-checkbox-group v-model="form1.data.transportDocuments">
-                            <el-checkbox label="合格证"/>
-                            <el-checkbox label="检测报告"/>
-                            <el-checkbox label="销售清单"/>
-                            <el-checkbox label="磅重"/>
-                        </el-checkbox-group>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text class="label-width">其他要求：</text>
-                        <el-input v-model="form1.data.otherTransportDocuments" placeholder="请输入"/>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>运输限制：</text>
-                        <el-radio-group v-model="form1.data.transportLimit">
-                            <el-radio :label="false">无</el-radio>
-                            <el-radio :label="true">有</el-radio>
-                        </el-radio-group>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易模式
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>交易模式：</text>
-                        <el-radio-group v-model="form1.data.tradeMethod">
-                            <el-radio :label="0">自主交易</el-radio>
-                            <el-radio :label="1">金久信公证</el-radio>
-                        </el-radio-group>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易说明
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>付款方式：</text>
-                        <el-radio v-model="form1.data.payMethod" :label="0">预付</el-radio>
-                        <view class="flex justify-start items-center">
-                            <el-input v-model="form1.data.advancePayRate"
-                                      class="advance-pay-rate"/>
-                            <text>%货到付全款</text>
-                        </view>
-                        <view class="mx-20">
-                            <el-radio v-model="form1.data.payMethod" :label="1">货到验收后付款</el-radio>
-                        </view>
-                        <el-radio v-model="form1.data.payMethod" :label="2">提货付全款</el-radio>
-                        <view class="mx-20 flex justify-start items-center">
-                            <el-radio v-model="form1.data.payMethod" :label="3">信誉采购，货到签单后账期：</el-radio>
-                            <el-input v-model="form1.data.reputationPayDay"
-                                      class="advance-pay-rate">
-                                <template slot="suffix">天</template>
-                            </el-input>
-                        </view>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <el-radio v-model="form1.data.payMethod" :label="4">其他付款方式</el-radio>
-                        <el-input v-model="form1.data.otherPayMethod"/>
-                    </view>
-
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>报价形式：</text>
-                        <el-radio v-model="form1.data.offerType" :label="0">整单报价</el-radio>
-                        <el-radio v-model="form1.data.offerType" :label="1">可分项报价</el-radio>
-                    </view>
-                    <view class="mb-20 flex justify-start items-center">
-                        <text>报价时限：</text>
-                        <view class="flex justify-start items-center">
-                            <el-date-picker
-                                v-model="form1.data.answerStartTime"
-                                type="datetime"/>
-                            <view class="mx-15">~</view>
-                            <el-date-picker
-                                v-model="form1.data.answerEndTime"
-                                type="datetime"/>
-                        </view>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            交易说明
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <text style="width: 140px">交保证金要求：</text>
-                        <el-input v-model="form1.data.earnestMoney" placeholder="请输入交保证金要求（如无要求则留空）"/>
-                    </view>
-                </view>
-
-                <view class="form-title-wrap">
-                    <view class="goods-info-title">
-                        <view class="form-title">
-                            简易合同备注和其他补充条款
-                        </view>
-                    </view>
-                </view>
-                <view class="p-30">
-                    <view class="mb-20 flex justify-start items-center">
-                        <el-radio v-model="form1.data.signMethod" :label="0">法大大</el-radio>
-                        <el-radio v-model="form1.data.signMethod" :label="1">线下签约</el-radio>
-                    </view>
-                    <view v-if="form1.data.signMethod === 0">
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">违约责任:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                1.
-                                乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
-                                2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">解决纠纷的方法:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
-                                2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">不可抗力:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">其他:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-start border">
-                            <view class="m-10 sign-method-header">采购方补充条款:</view>
-                            <view class="border-left m-10 pl-20 flex-1">
-                                供货方逾期供货承担采购方一切损失
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-            </el-form>
-            <view class="form-footer">
-                <el-button type="" @click="draft">保存草稿</el-button>
-                <el-button type="primary" @click="submit">提交加工单</el-button>
-            </view>
-            <!-- <el-divider content-position="left">其他设置</el-divider> -->
-        </view>
-        <Gap/>
-        <common-footer></common-footer>
+    <view class="page-nav">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <navigator style="display: inline-block;" url="/pages/process/list">加工单</navigator>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>发布加工单</el-breadcrumb-item>
+      </el-breadcrumb>
     </view>
+
+    <view class="form-view">
+
+      <view class="m-20">
+        <view class="title-main">请填写加工单</view>
+        <view class="title-sub">加工单信息越完整，加工商报价越精准</view>
+      </view>
+
+      <!--            <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"-->
+      <!--                          :rules="form1.props.rules" :form-type="form1.props.formType" :loading.sync="form1.props.loading"-->
+      <!--                          :before-action="form1.props.beforeAction" label-width="140px" cancel-text="保存草稿" submit-text="提交加工单"-->
+      <!--                          @success="onFormSuccess" :footer-show="false">-->
+      <!--            </vk-data-form>-->
+
+      <el-form ref="form" :model="form1.data" label-width="120px">
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              加工分类
+            </view>
+          </view>
+        </view>
+
+        <view class="p-30">
+          <!--                    <el-form-item label="品名/材质" required>-->
+          <!--                        <el-input v-model="form1.data.title" disabled/>-->
+          <!--                    </el-form-item>-->
+          <view class="flex justify-start items-center my-20">
+            <text class="text-30">点击添加加工商品</text>
+            <text class="text-gray text-25">(至少选择1个商品,最多选择5个商品)</text>
+          </view>
+          <view class="flex justify-start items-start flex-wrap mb-40">
+            <text class="product-item"
+                  :class="[form1.data.productList.includes(item._id) ? 'product-item-active' : '']"
+                  v-for="(item, index) in productList"
+                  :key="index" @click="selectGoods(item)">{{ item.name }}
+            </text>
+          </view>
+          <view class="form-title-wrap mb-25">
+            <view class="goods-info-title">
+              <view class="form-title">
+                加工信息
+              </view>
+            </view>
+            <view class="sales-code flex justify-end items-center">
+              <text>金久信业务员编号:</text>
+              <el-input v-model="form1.data.salesCode" placeholder="请输入编号没有则留空" size="small"/>
+            </view>
+          </view>
+          <el-form-item label="加工产品简述:">
+            <el-input v-model="form1.data.detail" placeholder="如产品名称、加工内容等"/>
+          </el-form-item>
+          <el-form-item label="加工量" required>
+            <el-input v-model="form1.data.num"/>
+          </el-form-item>
+          <el-form-item label="附件内容" required>
+            <!--                        <el-upload action="#" :before-upload="upload">-->
+            <vk-data-upload v-model="form1.data.files"
+                            :on-preview="previewUpload"
+                            accept=".pdf" list-type="text"/>
+            <!--                        <data-file theme="two-tone" size="24" :fill="['#333' ,'#ffffff']" strokeLinecap="square"-->
+            <!--                                   v-else/>-->
+            <!--                            <el-image v-else :url="form1.data.attachment" fit="cover"/>-->
+
+          </el-form-item>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              加工产品交货地址
+            </view>
+          </view>
+        </view>
+        <view class="my-25">
+          <el-row :gutter="10">
+            <el-col :span="6">
+              <vk-data-input-address v-model="form1.data.addressRegion" placeholder="请选择省市区"
+                                     :level="3" class="w-100p"/>
+            </el-col>
+            <el-col :span="18">
+              <el-input v-model="form1.data.addressDetail" placeholder="请输入详细地址"/>
+            </el-col>
+          </el-row>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              加工商其他要求
+            </view>
+          </view>
+        </view>
+
+        <view class="p-30">
+          <el-radio-group v-model="hasRequire" class="my-20">
+            <el-radio :label="true">有</el-radio>
+            <el-radio :label="false">无</el-radio>
+          </el-radio-group>
+          <view class="pos-r">
+            <el-input type="textarea" v-model="form1.data.remark" :disabled="!hasRequire"
+                      placeholder="复杂加工提供图纸、简单加工详细说明加工内容，如：镀锌、刷漆、防腐、折弯、裁剪等"
+                      :rows="15"/>
+            <view class="remark-upload">
+              <view class="flex flex-col justify-start items-start">
+                <p class="tips mb-20">仅限PDF格式附件或合同，非协议合同将读取为合同附件，请仔细核查</p>
+                <vk-data-upload v-model="form1.data.multiFiles" accept=".pdf"
+                                :on-preview="previewUpload"
+                                list-type="text">
+                </vk-data-upload>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              发票要求
+            </view>
+          </view>
+        </view>
+        <view class="mb-20 flex justify-start items-center">
+          <text>开票时间：</text>
+          <el-radio-group v-model="form1.data.writeInvoiceTime">
+            <el-radio :label="0">付款当月（限20号之前付款，20号之后付款次月开票）</el-radio>
+            <el-radio :label="1">付款后次月</el-radio>
+            <el-radio :label="2">付款前</el-radio>
+          </el-radio-group>
+        </view>
+        <view class="mb-20 flex justify-start items-center">
+          <view class="flex-1 flex justify-start items-center">
+            <text style="width: 30%">纳税人身份：</text>
+            <el-select v-model="form1.data.taxType" placeholder="纳税人身份" style="width: 100%">
+              <el-option
+                v-for="item in ['一般纳税人', '小规模公司', '个体工商户']"
+                :key="item"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+          </view>
+          <view class="flex-1 flex justify-start items-center ml-20">
+            <text style="width: 30%">发票种类：</text>
+            <el-select v-model="form1.data.invoiceType" placeholder="发票种类" style="width: 100%">
+              <el-option
+                v-for="item in ['专用发票', '普通发票']"
+                :key="item"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+          </view>
+        </view>
+        <view class="mb-20 flex justify-start items-center">
+          <view class="flex-1 flex justify-start items-center">
+            <text style="width: 30%">税率：</text>
+            <el-select v-model="form1.data.taxRate" placeholder="税率" style="width: 100%">
+              <el-option
+                v-for="item in ['13%', '9%', '6%', '4%', '3%', '1%']"
+                :key="item"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+          </view>
+          <view class="ml-20 flex justify-start items-center flex-1 ml-20">
+            <text style="width: 30%">手动填写税票要求：</text>
+            <el-input v-model="form1.data.invoiceOther" placeholder="如：一般纳税人 专用发票 税率13%"
+                      size="small"/>
+          </view>
+        </view>
+        <!--                <view class="p-30">-->
+        <!--                    <view class="mb-20">-->
+        <!--                        <el-radio-group v-model="form1.data.invoice">-->
+        <!--                            <el-radio :label="true">含税</el-radio>-->
+        <!--                            <el-radio :label="false">不含税</el-radio>-->
+        <!--                        </el-radio-group>-->
+        <!--                    </view>-->
+        <!--                    <template v-if="form1.data.invoice">-->
+        <!--                        <view class="mb-20 flex justify-start items-center">-->
+        <!--                            <text>开票时间：</text>-->
+        <!--                            <el-radio-group v-model="form1.data.writeInvoiceTime">-->
+        <!--                                <el-radio v-for="(item, index) in WRITE_INVOICE_TIME" :key="index" :label="index">-->
+        <!--                                    {{ item }}-->
+        <!--                                </el-radio>-->
+        <!--                            </el-radio-group>-->
+        <!--                        </view>-->
+        <!--                        <view class="mb-20 flex justify-start items-center">-->
+        <!--                            <text>发票种类：</text>-->
+        <!--                            <el-radio-group v-model="form1.data.invoiceType">-->
+        <!--                                <el-radio v-for="(item, index) in INVOICE_TYPE" :key="index" :label="index">{{-->
+        <!--                                        item-->
+        <!--                                    }}-->
+        <!--                                </el-radio>-->
+        <!--                            </el-radio-group>-->
+        <!--                            <view class="ml-20 flex justify-start items-center">-->
+        <!--                                <text class="label-width">其他要求：</text>-->
+        <!--                                <el-input v-model="form1.data.invoiceOther" placeholder="请输入" size="small"/>-->
+        <!--                            </view>-->
+        <!--                        </view>-->
+        <!--                    </template>-->
+        <!--                </view>-->
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              运输要求
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text>随货资料：</text>
+            <el-checkbox-group v-model="form1.data.transportDocuments">
+              <el-checkbox label="合格证"/>
+              <el-checkbox label="检测报告"/>
+              <el-checkbox label="销售清单"/>
+              <el-checkbox label="磅重"/>
+            </el-checkbox-group>
+            <view style="margin-left: 30px">
+              <el-checkbox label="全选" @change="changeDocumentAll"/>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <text class="label-width">其他要求：</text>
+            <el-input v-model="form1.data.otherTransportDocuments" placeholder="请输入"/>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <text>运输限制：</text>
+            <el-radio-group v-model="form1.data.transportLimit">
+              <el-radio :label="false">无</el-radio>
+              <el-radio :label="true">有</el-radio>
+            </el-radio-group>
+            <view class="ml-20 flex justify-start items-center" v-if="form1.data.transportLimit">
+              <el-input v-model="form1.data.otherTransportRequest" placeholder="请输入运输限制说明"
+                        style="width: 400px"/>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              交易模式
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text>交易模式：</text>
+            <el-radio-group v-model="form1.data.tradeMethod">
+              <el-radio :label="1">金久信公证</el-radio>
+              <el-radio :label="0">自主交易</el-radio>
+            </el-radio-group>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              交易说明
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text>付款方式：</text>
+            <el-radio v-model="form1.data.payMethod" :label="0" @change="changePayMethod(0)">预付</el-radio>
+            <view class="flex justify-start items-center">
+              <el-input v-model="form1.data.advancePayRate" :disabled="form1.data.payMethod !== 0"
+                        class="advance-pay-rate"/>
+              <text>%加工验收合格后付全款</text>
+            </view>
+            <view class="mx-20">
+              <el-radio v-model="form1.data.payMethod" :label="1" @change="changePayMethod(1)">加工验收合格后付全款
+              </el-radio>
+            </view>
+            <!--                        <el-radio v-model="form1.data.payMethod" :label="2" @change="changePayMethod(2)">加工验收合格后</el-radio>-->
+            <view class="mx-20 flex justify-start items-center">
+              <el-radio v-model="form1.data.payMethod" :label="3" @change="changePayMethod(3)">加工验收合格后</el-radio>
+              <el-input v-model="form1.data.reputationPayDay" :disabled="form1.data.payMethod !== 3"
+                        class="advance-pay-rate">
+              </el-input>
+              <text>天内支付全款</text>
+            </view>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <el-radio v-model="form1.data.payMethod" :label="4">其他付款方式</el-radio>
+            <el-input v-model="form1.data.otherPayMethod"/>
+          </view>
+
+          <view class="mb-20 flex justify-start items-center">
+            <text>报价形式：</text>
+            <el-radio v-model="form1.data.offerType" :label="0">整单报价</el-radio>
+            <el-radio v-model="form1.data.offerType" :label="1">可分项报价</el-radio>
+          </view>
+          <view class="mb-20 flex justify-start items-center">
+            <text>报价时限：</text>
+            <view class="flex justify-start items-center">
+              <el-date-picker :picker-options="pickerOptions"
+                              v-model="form1.data.answerStartTime"
+                              type="datetime"/>
+              <view class="mx-15">~</view>
+              <el-date-picker :picker-options="pickerOptions"
+                              v-model="form1.data.answerEndTime"
+                              type="datetime"/>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              交易保证金要求
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <text style="width: 140px">人民币金额≥</text>
+            <el-input-number :min="0" :precision="2" v-model="form1.data.earnestMoney"
+                             placeholder="请输入交易保证金要求（如无要求则留空）"/>
+          </view>
+        </view>
+
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              简易合同备注和其他补充条款
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <view class="mb-20 flex justify-start items-center">
+            <el-radio v-model="form1.data.signMethod" :label="0">线上签约-标准合同</el-radio>
+            <el-radio v-model="form1.data.signMethod" :label="2">线上签约-双方协商合同</el-radio>
+            <el-radio v-model="form1.data.signMethod" :label="1" v-if="form1.data.tradeMethod === 0">
+              线下签约
+            </el-radio>
+          </view>
+
+          <view class="my-25" v-if="form1.data.signMethod === 2">
+            <view class="p-30">
+              <view class="mb-20 flex justify-start items-center">
+                <text style="width: 140px">合同附件：</text>
+                <vk-data-upload :on-preview="previewUpload" v-model="form1.data.contractAttachment" accept=".pdf"
+                                list-type="text"/>
+              </view>
+            </view>
+          </view>
+          <view v-if="form1.data.signMethod === 0">
+            <view @click="openDownload" class="pointer my-25 text-main" v-if="form1.data.signMethod === 0">
+              点击查看标准合同
+            </view>
+            <view v-if="form1.data.signMethod === 0" class="mb-15">补充条款</view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">违约责任:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                1.
+                乙方所交产品品种、型号、规格、质量不符合规定的，如果甲方同意利用，应当按质论价；如果甲方不能利用的，应根据产品的具体情况，由乙方负责包换或包修，并承担修理、调换或退货而支付的实际费用；
+                2.乙方不予供货违约责任为甲方的实际损失+违约金，如乙方材料符合订货标准，甲方不能退货和不收货，甲方无条件应按实际本合同订货数量支付100%货款，并支付乙方因此产生的实际费用。带有甲乙双方单位相关收货人和发货人签字的本合同的发货清单事项和内容均视为本合同的补充合同，与本合同有相同的法律效力，双方应共同遵照执行。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">解决纠纷的方法:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                1、凡因本合同引起的或与本合同有关的任何争议，均可友好协商或仲裁解决，协商或仲裁不成的，双方协商同意在合同签订地人民法院管辖地起诉，违约一方或对合同争议承担主要责任的一方，应承担对方因仲裁和起诉而产生的全部律师代理费、鉴定（检验）费、诉讼保全费、诉讼保险费、公告费、差旅费、执行费、误工费和获取证据产生费用等其他相关费用。
+                2、双方本合同相关权利放弃均应有双方书面作出并加盖公章或授权委托人签字后生效。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">不可抗力:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                甲乙双方的任何一方由于不可抗力或突发公共事件的原因不能履行合同时，应及时向对方通报不能履行或不能完全履行的理由，以减轻可能给对方造成的损失，在取得有关机构证明以后，允许延期履行、部分履行或者不履行合同，并根据情况可部分或全部免予承担违约责任。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">其他:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                本合同的全部内容由双方平等共同协商一致，共同起草制定，非一方事先拟定，不属于格式条款。本合同自双方签字盖章后生效（包括电子签字、盖章），按本合同内容地址、联系方式寄送的一切文书、函件送达与否，均为视为送达有法律效力，通知途径和本合同内联系方式或地址送达文件双方均予以验证。
+              </view>
+            </view>
+            <view class="flex justify-start items-start border">
+              <view class="m-10 sign-method-header">采购方补充条款:</view>
+              <view class="border-left m-10 pl-20 flex-1">
+                <el-input v-if="form1.data.signMethod === 0" v-model="form1.data.supplementary"
+                          placeholder="请输入采购方补充条款"/>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="form-title-wrap">
+          <view class="goods-info-title">
+            <view class="form-title">
+              采购商信息
+            </view>
+          </view>
+        </view>
+        <view class="p-30">
+          <el-row :gutter="10" class="mb-20">
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">{{
+                  userInfo.accountType === 2 ? '公司信息' : '个人信息'
+                }}：
+              </text>
+              <el-input v-model="form1.data.companyName" placeholder=""/>
+            </el-col>
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">{{
+                  userInfo.accountType === 2 ? '公司联系方式' : '个人联系方式'
+                }}：
+              </text>
+              <el-input v-model="form1.data.companyMobile"/>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">授权业务咨询人：</text>
+              <el-select v-model="form1.data.businessName" placeholder="点击选择业务联系人"
+                         class="w-100p" @change="selectContact">
+                <el-option
+                  v-for="(item, index) in contactList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+                <view slot="empty" class="text-gray pointer p-20">
+                  <text>无业务联系人,请到</text>
+                  <text class="text-main mx-15" @click="navTo">个人中心</text>
+                  <text>添加</text>
+                </view>
+              </el-select>
+            </el-col>
+            <el-col :span="12" class="flex justify-start items-center">
+              <text style="width: 160px">业务咨询联系方式：</text>
+              <el-input v-model="form1.data.businessMobile" type="number" disabled/>
+            </el-col>
+          </el-row>
+        </view>
+
+      </el-form>
+      <view class="form-footer">
+        <p class="text-main my-20">如发布错误无法重新编辑，请仔细检查后再提交。</p>
+        <!--                <el-button type="" @click="draft" :disabled="disabled">保存草稿</el-button>-->
+        <el-button type="primary" @click="submit" :disabled="disabled">提交加工单</el-button>
+      </view>
+      <!-- <el-divider content-position="left">其他设置</el-divider> -->
+    </view>
+    <Gap/>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -309,349 +472,252 @@ import Gap from "../../components/gap/gap.vue";
 import {DataFile} from '@icon-park/vue'
 import dayjs from "dayjs";
 import {WRITE_INVOICE_TIME, INVOICE_TYPE} from '@/util'
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 
 export default {
-    components: {Gap, DataFile},
-    data() {
-        return {
-            WRITE_INVOICE_TIME,
-            INVOICE_TYPE,
-            // 表单相关开始-----------------------------------------------------------
-            productList: [{}],
-            baseAttributes: [],
-            form1: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    // extraAttributes: {},
-                    // attributes: {},
-                    invoice: false,
-                    salesCode: '',
-                    title: '',
-                    num: '',
-                    remark: '',
-                    transportDocuments: [],
-                    writeInvoiceTime: 0,
-                    invoiceType: 0,
-                    invoiceOther: '',
-                    otherTransportDocuments: '',
-                    transportLimit: false,
-                    tradeMethod: 0,
-                    payMethod: 0,
-                    advancePayRate: null,
-                    reputationPayDay: null,
-                    otherPayMethod: '',
-                    offerType: 0,
-                    answerStartTime: '',
-                    answerEndTime: '',
-                    earnestMoney: '',
-                    signMethod: 0,
-                    attachment: '',
-                    productList: []
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: "client/process/sheet/kh/add",
-                    // 表单字段显示规则
-                    columns: [
-                        {key: "", title: "加工信息", type: "bar-title"},
-                        {key: "title", title: "标题", type: "text",},
-                        {
-                            key: "address",
-                            title: "交货地点",
-                            type: "object",
-                            // justify: "start",
-                            showLabel: false,
-                            columns: [
-                                {key: "region", title: "交货地点", type: "address",},
-                                {key: "detail", title: "详细交货地址", type: "textarea",},
-                            ],
-                        },
-                        {
-                            key: "files",
-                            title: "附件",
-                            type: "file",
-                            tips: '上传自有加工单图片或文档，支持jpg/png/word/excel'
-                        },
-                        {key: "", title: "采购商其他要求", type: "bar-title"},
-                        {key: "remark", title: "其他要求", type: "textarea",},
-                        {key: "", title: "发票要求", type: "bar-title"},
-                        {
-                            key: "invoice", title: "发票要求", type: "radio",
-                            data: [
-                                {value: true, label: "含税"},
-                                {value: false, label: "不含税"}
-                            ],
-                        },
-                        {
-                            key: "writeInvoiceTime",
-                            title: "开票时间",
-                            type: "radio",
-                            data: [
-                                {
-                                    value: '付款当月（限20号之前付款，20号之后付款次月开票）',
-                                    label: "付款当月（限20号之前付款，20号之后付款次月开票）"
-                                },
-                                {value: '付款后次月', label: "付款后次月"},
-                                {value: '付款前', label: "付款前"},
-                            ],
-                            showRule: 'invoice == true'
-                        },
-                        {
-                            key: "nvoiceType",
-                            title: "发票种类",
-                            type: "radio",
-                            data: [
-                                {value: '增值税专用发票13%', label: "增值税专用发票13%"},
-                                {value: '增值税普通发票', label: "增值税普通发票"},
-                                {value: '普通发票', label: "普通发票"},
-                            ],
-                            showRule: 'invoice == true'
-                        },
-                        {key: "", title: "运输要求", type: "bar-title"},
-                        {
-                            key: "transportDocuments",
-                            title: "随货资料",
-                            type: "checkbox",
-                            data: [
-                                {value: '合格证', label: "合格证"},
-                                {value: '检测报告', label: "检测报告"},
-                                {value: '销售清单', label: "销售清单"},
-                                {value: '磅重', label: "磅重"},
-                            ],
-                        },
-                        {key: "otherTransportDocuments", title: "其他资料", type: "text"},
-                        {
-                            key: "transportLimit",
-                            title: "运输限制",
-                            type: "text",
-                        },
-                        {key: "", title: "交易说明", type: "bar-title", component: 'custom-form-section'},
-                        {
-                            key: "tradeMethod",
-                            title: "交易模式",
-                            type: "radio",
-                            data: [
-                                {value: 1, label: "自主交易"},
-                                {value: 0, label: "金久信公证"},
-                            ],
-                        },
-                        // {key: "", title: "交易说明", type: "bar-title"},
-                        {
-                            key: "payMethod",
-                            title: "付款方式",
-                            type: "radio",
-                            data: [
-                                {value: 1, label: "预付x%货到付全款"},
-                                {value: 2, label: "货到验收后付款"},
-                                {value: 3, label: "提货付全款"},
-                                {value: 4, label: "信誉采购"},
-                                {value: 5, label: "其他付款方式"},
-                            ],
-                        },
-                        {
-                            key: "", title: "", type: 'group', showLabel: false, justify: "start", columns: [
-                                {
-                                    key: "advancePayRate",
-                                    title: "预付百分比",
-                                    type: "percentage",
-                                    showRule: "payMethod==1"
-                                },
-                                {key: "otherPayMethod", title: "其他付款方式", type: "text", showRule: "payMethod==5"},
-                                {
-                                    key: "reputationPayDay",
-                                    title: "货到签单后账期天数",
-                                    type: "number",
-                                    showRule: "payMethod==4",
-                                    rightText: '天'
-                                },
-
-                            ]
-                        },
-                        {key: "answerTime", title: "报价时限", type: "date", dateType: "datetime"},
-                        {key: "earnestMoney", title: "保证金要求", type: "text"},
-                        {key: "", title: "合同要求", type: "bar-title"},
-                        {
-                            key: 'signMethod', title: '签约方式', type: 'radio', data: [
-                                {value: 0, label: "法大大"},
-                                {value: 1, label: "线下签约"},
-                            ]
-                        },
-                        {
-                            key: 'contractType', title: '合同选择', type: 'radio', showRule: 'signMethod==0', data: [
-                                {value: 0, label: "标准合同模板"},
-                                {value: 1, label: "自定义合同"},
-                            ]
-                        },
-                        {
-                            key: "breachLiability",
-                            title: "违约责任",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "solveDispute",
-                            title: "解决纠纷的方法",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "forceMajeure",
-                            title: "不可抗力",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "contracOther",
-                            title: "其他",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "buyerSupplement",
-                            title: "采购方补充条款",
-                            type: "textarea",
-                            readonly: true,
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        {
-                            key: "sellerSupplement",
-                            title: "供应方补充条款",
-                            type: "textarea",
-                            showRule: 'signMethod==0&&contractType==0'
-                        },
-                        // {key: "", title: "采购商信息", type: "bar-title"},
-                        {
-                            key: "files",
-                            title: "附件文档",
-                            type: "file",
-                            buttonText: "点击上传",
-                            limit: 9,
-                            accept: ".jpg,.png,.xlsx,.doc,.docx",
-                            tips: '上传自有采购单图片或文档,支持jpg/png/word/excel'
-                        },
-
-
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        title: [
-                            {required: true, message: '标题不能为空', trigger: ["change", "blur"]}
-                        ],
-                        invoice: [
-                            {required: true, message: '发票要求不能为空', trigger: ["change", "blur"]}
-                        ],
-                        writeInvoiceTime: [
-                            {required: true, message: '开票时间不能为空', trigger: ["change", "blur"]}
-                        ],
-                        nvoiceType: [
-                            {required: true, message: '发票类型不能为空', trigger: ["change", "blur"]}
-                        ],
-
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "add",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false,
-                    beforeAction: (formData) => {
-                        formData.productList = JSON.parse(JSON.stringify(this.productList))
-                        return formData
-                    }
-                }
-            },
-            // 表单相关结束-----------------------------------------------------------
-            hasRequire: false
-        };
+  components: {Gap, DataFile},
+  data() {
+    return {
+      addressOptions: [],
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+      WRITE_INVOICE_TIME,
+      INVOICE_TYPE,
+      // 表单相关开始-----------------------------------------------------------
+      productList: [{}],
+      baseAttributes: [],
+      addressIndex: [null, null],
+      disabled: false,
+      commonContractUrl: '',
+      form1: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          // extraAttributes: {},
+          // attributes: {},
+          invoice: false,
+          salesCode: '',
+          title: '',
+          num: '',
+          remark: '',
+          transportDocuments: [],
+          writeInvoiceTime: 0,
+          invoiceType: '',
+          invoiceOther: '',
+          taxType: '',
+          taxRate: '',
+          otherTransportDocuments: '',
+          transportLimit: false,
+          otherTransportRequest: '',
+          tradeMethod: 1,
+          payMethod: 0,
+          advancePayRate: null,
+          reputationPayDay: null,
+          otherPayMethod: '',
+          offerType: 0,
+          answerStartTime: '',
+          answerEndTime: '',
+          earnestMoney: '',
+          signMethod: 0,
+          attachment: '',
+          productList: [],
+          multiFiles: [],
+          files: null,
+          contractAttachment: [],
+          supplementary: '',
+          companyName: '',
+          companyMobile: '',
+          businessName: '',
+          businessMobile: '',
+          addressDetail: '',
+          detail: '',
+        },
+      },
+      // 表单相关结束-----------------------------------------------------------
+      hasRequire: false,
+      contactList: [],
+      userInfo: null
+    };
+  },
+  onLoad() {
+    this.addressOptions = provinces.map(item => {
+      item.children = [];
+      return item
+    })
+    this.addressOptions.forEach((province, index) => {
+      citys[index].forEach(city => {
+        this.addressOptions[index].children.push(city)
+      })
+    })
+    this.getProductList()
+    this.getCommonContractUrl()
+    this.getContactList()
+  },
+  onShow() {
+    this.userInfo = vk.getVuex('$user.userInfo')
+    this.form1.data.companyName = this.userInfo.accountType === 2 ? this.userInfo.company?.companyName : this.userInfo.person?.personName
+    this.form1.data.companyMobile = this.userInfo.accountType === 2 ? this.userInfo.company?.mobile : this.userInfo.person?.mobile
+  },
+  methods: {
+    getProductList() {
+      this.productList = []
+      vk.callFunction({
+        url: 'client/process/category/pub/getList',
+        data: {
+          whereJson: {
+            level: 1
+          }
+        },
+      }).then(({data}) => {
+        data.forEach(item => {
+          this.productList.push(item)
+        })
+      })
     },
-    onLoad() {
-        this.getProductList()
+    onFormSuccess() {
+      vk.navigateTo('/pages/process/list');
     },
-    methods: {
-        getProductList() {
-            this.productList = []
-            vk.callFunction({
-                url: 'client/spot/category/pub/getList',
-            }).then(({data}) => {
-                data.forEach(item => {
-                    if (item.parent_id) this.productList.push(item)
-                })
-            })
-        },
-        onFormSuccess() {
-            vk.navigateTo('/pages/process/list');
-        },
-        // 提交并发布
-        submit() {
-            this.form1.data.isShow = 1
-            this.submitAll()
-        },
-        // 提交并保存草稿
-        draft() {
-            this.form1.data.isShow = 0
-            this.submitAll()
-        },
-        async submitAll() {
-            // this.$refs.form1.submitForm()
-            vk.callFunction({
-                url: this.form1.props.action,
-                data: {
-                    ...this.form1.data, ...{
-                        orderNo: dayjs().format('YYYYMMDDHHmm') + Math.ceil((Math.random() * 1000))
-                    }
-                }
-            }).then(() => {
-                this.$message({
-                    message: "已提交",
-                    type: 'success'
-                })
-                setTimeout(() => {
-                    vk.navigateBack()
-                }, 1500)
-            })
-        },
-        upload(file) {
-            // vk.uploadFile({
-            //     title: '上传中',
-            //     file,
-            //     success: ({url}) => {
-            //         this.form1.data.attachment = url
-            //     }
-            // })
-            console.log(file)
-        },
-        selectFile(file) {
-            // vk.uploadFile({
-            //     title: '上传中',
-            //     file,
-            //     success: ({url}) => {
-            //         this.form1.data.attachment = url
-            //     }
-            // })
-            // this.$refs.uploader.clearFiles();
-            console.log(file)
-        },
-        selectGoods(item) {
-            const index = this.form1.data.productList.indexOf(item._id)
-            if (this.form1.data.productList.length === 5 && index === -1) return this.$message({
-                message: "最多选择5个商品",
-                type: 'error'
-            })
-            if (index === -1) this.form1.data.productList.push(item._id)
-            else this.form1.data.productList.splice(index, 1)
-            const list = []
-            this.productList.forEach(item => {
-                if (this.form1.data.productList.includes(item._id)) list.push(item.name)
-            })
-            this.form1.data.title = list.join()
+    // 提交并发布
+    submit() {
+      this.form1.data.isShow = 1
+      this.submitAll()
+    },
+    // 提交并保存草稿
+    draft() {
+      this.form1.data.isShow = 0
+      this.submitAll()
+    },
+    async submitAll() {
+      if (!this.form1.data.title) return this.$message({message: '请选择加工商品', type: 'error'})
+      if (!this.form1.data.num) return this.$message({message: '请输入加工量', type: 'error'})
+      if (!this.form1.data.addressRegion || !this.form1.data.addressDetail) return this.$message({
+        message: '请选择地址',
+        type: 'error'
+      })
+      if (!this.form1.data.answerEndTime || !this.form1.data.answerStartTime) return this.$message({
+        message: '请选择报价时限',
+        type: 'error'
+      })
+      if (dayjs(this.form1.data.answerEndTime).isBefore(this.form1.data.answerStartTime)) return this.$message({
+        message: '报价结束时限不能早于开始时间',
+        type: 'error'
+      })
+      if (this.form1.data.payMethod === 0 && !this.form1.data.advancePayRate) return this.$message({
+        message: '请填写预付比例',
+        type: 'error'
+      })
+      if (this.form1.data.payMethod === 3 && !this.form1.data.reputationPayDay) return this.$message({
+        message: '请填写回款日期',
+        type: 'error'
+      })
+      // if (this.addressIndex[1])
+      // let city, province
+      // this.addressOptions.forEach((provinceItem, index) => {
+      //     provinceItem.children.forEach(cityItem => {
+      //         if (cityItem.code === this.addressIndex[1]) {
+      //             city = cityItem
+      //             province = {code: provinceItem.code, name: provinceItem.name}
+      //         }
+      //     })
+      // })
+      // this.$refs.form1.submitForm()
+      this.disabled = true
+      vk.callFunction({
+        url: 'client/process/sheet/kh/add',
+        data: {
+          ...this.form1.data, ...{
+            orderNo: dayjs().format('YYYYMMDDHHmm') + Math.ceil((Math.random() * 1000)),
+          }
         }
-
+      }).then(() => {
+        this.disabled = false
+        this.$message({
+          message: "您的信息已经提交，等待管理员审核，请您耐心等待！",
+          type: 'success'
+        })
+        setTimeout(() => {
+          vk.redirectTo({url: '/pages/process/list'});
+        }, 1500)
+      })
+    },
+    upload(file) {
+      // vk.uploadFile({
+      //     title: '上传中',
+      //     file,
+      //     success: ({url}) => {
+      //         this.form1.data.attachment = url
+      //     }
+      // })
+      console.log(file)
+    },
+    selectFile(file) {
+      // vk.uploadFile({
+      //     title: '上传中',
+      //     file,
+      //     success: ({url}) => {
+      //         this.form1.data.attachment = url
+      //     }
+      // })
+      // this.$refs.uploader.clearFiles();
+      console.log(file)
+    },
+    selectGoods(item) {
+      const index = this.form1.data.productList.indexOf(item._id)
+      if (this.form1.data.productList.length === 5 && index === -1) return this.$message({
+        message: "最多选择5个商品",
+        type: 'error'
+      })
+      if (index === -1) this.form1.data.productList.push(item._id)
+      else this.form1.data.productList.splice(index, 1)
+      const list = []
+      this.productList.forEach(item => {
+        if (this.form1.data.productList.includes(item._id)) list.push(item.name)
+      })
+      this.form1.data.title = list.join()
+    },
+    async getCommonContractUrl() {
+      const res = await vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d36befe975f63af1f24e7'
+        },
+      })
+      this.commonContractUrl = res.content
+    },
+    openDownload() {
+      window.open(this.commonContractUrl)
+    },
+    async getContactList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/businessContact/kh/getList',
+      })
+      this.contactList = rows
+    },
+    navTo() {
+      vk.navigateTo({url: '/pages/user/user?menu=business-contact'})
+    },
+    selectContact(name) {
+      const contact = this.contactList.find(item => item.name === name)
+      this.form1.data.businessMobile = contact.phone
+    },
+    changePayMethod(payMethod) {
+      if ([1, 2].includes(payMethod)) {
+        this.form1.data.advancePayRate = null
+        this.form1.data.reputationPayDay = null
+      }
+    },
+    changeDocumentAll() {
+      if (this.form1.data.transportDocuments.length !== 4) {
+        this.form1.data.transportDocuments = ['合格证', '检测报告', '销售清单', '磅重']
+      } else this.form1.data.transportDocuments = []
+    },
+    previewUpload({url}) {
+      window.open(url)
     }
+  }
 }
 </script>
 
@@ -659,117 +725,137 @@ export default {
 @import "@/common/css/app.scss";
 
 .form-view {
-    width: 1200px;
-    margin: 0 auto;
-    background-color: #FFFFFF;
-    padding: 20rpx;
-    border-radius: 20px;
+  width: 1200px;
+  margin: 0 auto;
+  background-color: #FFFFFF;
+  padding: 20rpx;
+  border-radius: 20px;
 }
 
 .m-20 {
-    margin: 20px;
+  margin: 20px;
 }
 
 .title-main {
-    font-size: 18px;
-    font-weight: bold;
-    text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
 }
 
 .title-sub {
-    font-size: 14px;
-    text-align: center;
+  font-size: 14px;
+  text-align: center;
 }
 
 .btn-add-outer {
-    padding-left: 140px;
-    margin: 0 0 20px 0;
+  padding-left: 140px;
+  margin: 0 0 20px 0;
 }
 
 .form-footer {
-    height: 40px;
-    line-height: 40px;
-    background: #fff;
-    padding-top: 0;
-    text-align: center;
-    display: block;
+  //height: 40px;
+  //line-height: 40px;
+  background: #fff;
+  padding-top: 0;
+  text-align: center;
+  display: block;
 }
 
 
 .form-title-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .goods-info-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+  }
 
-    .goods-info-title {
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-    }
+  .form-title {
+    padding-left: 10px;
+    color: $--color-primary;
+    font-size: 18px;
+    line-height: 18px;
+    border-left: 4px solid $--color-primary;
+  }
 
-    .form-title {
-        padding-left: 10px;
-        color: $--color-primary;
-        font-size: 18px;
-        line-height: 18px;
-        border-left: 4px solid $--color-primary;
-    }
-
-    .enquiry-no {
-        margin-left: 10px;
-        font-size: 14px;
-    }
+  .enquiry-no {
+    margin-left: 10px;
+    font-size: 14px;
+  }
 }
 
 .sales-code {
-    text {
-        width: 400rpx;
-    }
+  text {
+    width: 400rpx;
+  }
 }
 
 
 .remark-upload {
-    position: absolute;
-    left: 15px;
-    bottom: 15px;
-    border: 1px solid #ddd;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 5px;
+  position: absolute;
+  left: 15px;
+  bottom: 15px;
+  border: 1px solid #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 5px;
 
-    i {
-        color: #ddd;
-        font-size: 18px;
-    }
+  i {
+    color: #ddd;
+    font-size: 18px;
+  }
 }
 
 .attachment-upload {
-    border: 1px solid #ddd;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 5px;
-    width: 50px;
-    height: 50px;
-    cursor: pointer;
+  border: 1px solid #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 5px;
+  width: 50px;
+  height: 50px;
+  cursor: pointer;
 
-    i {
-        color: #ddd;
-        font-size: 18px;
-    }
+  i {
+    color: #ddd;
+    font-size: 18px;
+  }
 }
 
 
 .label-width {
-    width: 100px;
+  width: 100px;
 }
 
 .advance-pay-rate {
-    width: 100px;
+  width: 100px;
 }
 
 .sign-method-header {
-    width: 120px;
+  width: 120px;
 }
+
+.product-item {
+  font-size: 35rpx;
+  margin: 10rpx;
+  padding: 20rpx;
+  cursor: pointer;
+}
+
+.product-item:hover {
+  background-color: #f1c7c7;
+  color: #a92924
+}
+
+
+.product-item-active {
+  background-color: #f1c7c7;
+  color: #a92924
+}
+
+
 </style>
\ No newline at end of file
diff --git a/pages/spot/goods/detail.vue b/pages/spot/goods/detail.vue
index f626c38..89ea0fc 100644
--- a/pages/spot/goods/detail.vue
+++ b/pages/spot/goods/detail.vue
@@ -10,33 +10,42 @@
                 <el-breadcrumb-item>
                     <navigator style="display: inline-block;" url="/pages/spot/goods/goods">现货市场</navigator>
                 </el-breadcrumb-item>
-                <el-breadcrumb-item>{{ product.name }}</el-breadcrumb-item>
             </el-breadcrumb>
         </view>
 
         <view class="card">
             <div class="card-header">
                 <view class="card-header-left">
-                    <image class="logo" :src="product.user.businessCard.logo" mode="aspectFit"></image>
+                    <image class="logo" :src="product.user.businessCard.logo" mode="aspectFit"
+                           v-if="product.user.businessCard"></image>
                     <view class="info">
-                        <view v-if="product.user.accountType === 1" class="info-name">
-                            {{ product.user.person.personName }}
-                        </view>
-                        <view v-if="product.user.accountType === 2" class="info-name">
-                            {{ product.user.company.companyName }}
-                        </view>
+                        <template v-if="product.user">
+                            <view v-if="product.user.accountType === 1" class="info-name">
+                                {{ product.user.person.personName }}
+                            </view>
+                            <view v-if="product.user.accountType === 2"
+                                  class="info-name flex justify-start items-center">
+                                <text class="mr-25">{{ product.user.company.companyName }}</text>
+                                <el-button type="primary" v-if="product.user.showInYellow === 1" size="small"
+                                           @click="navTo(`/pages/yellowPage/info?id=${product.user._id}`)">查看主页
+                                </el-button>
+                            </view>
+                        </template>
 
                         <view class="info-update">
                             <view class="info-update-time">
                                 {{ product._add_time_str }}
                             </view>
                             <view class="info-update-business">
-                                主营业务：{{ product.user.businessCard.mainBusiness }}
+                                主营业务：{{
+                                    (product.user.company.mainSpotCategory && product.user.company.mainSpotCategory.length > 0) ? product.user.company.mainSpotCategory.join() : ''
+                                }}
                             </view>
                         </view>
                     </view>
                 </view>
-                <view class="card-header-right">
+                <view class="card-header-right flex flex-col justify-center items-center">
+                    <text class="mb-20 text-main">{{ product.quoteNum }}家已申请合作</text>
                     <el-button v-if="vk.getVuex('$user.userInfo._id') !== product.userId" @click="toCooperate"
                                type="primary">申请合作
                     </el-button>
@@ -50,20 +59,36 @@
                 <div class="part-head">
                     <h3>现货详情</h3>
                 </div>
-                <view v-if="product.user.accountType == 1" class="card-body-name">{{ product.user.person.personName }}
-                </view>
-                <view v-if="product.user.accountType == 2" class="card-body-name">{{ product.user.company.companyName }}
-                </view>
-                <view class="card-body-stock">库存：{{ product.stock }}吨</view>
+                <!--                <template v-if="product.user">-->
+                <!--                    <view v-if="product.user.accountType == 1" class="card-body-name">{{-->
+                <!--                            product.user.person.personName-->
+                <!--                        }}-->
+                <!--                    </view>-->
+                <!--                    <view v-if="product.user.accountType == 2" class="card-body-name">-->
+                <!--                        {{ product.user.company.companyName }}-->
+                <!--                    </view>-->
+                <!--                </template>-->
+                <view class="card-body-stock">库存约：{{ product.stock }}吨</view>
                 <view class="card-body-address">
-                    供货地：{{ product.address.province.name + "-" + product.address.city.name + "-" + product.address.area.name }}
+                    供货地：{{
+                        product.address.province.name + "-" + product.address.city.name + "-" + product.address.area.name
+                    }}
                 </view>
             </view>
 
+            <view class="card-body">
+                <div class="part-head">
+                    <h3>报价有效期</h3>
+                </div>
+                <view class="card-body-stock">截止: {{
+                        dayjs(product.answerEndTime).format('YYYY-MM-DD HH:mm:ss')
+                    }}
+                </view>
+            </view>
 
             <view class="card-body">
                 <div class="part-head">
-                    <h3>附件</h3>
+                    <h3>产品规格单价</h3>
                 </div>
                 <ul class="el-upload-list el-upload-list--text">
                     <li @click="downloadFile(item)" v-for="(item,index) in  product.files" :key="index" tabindex="0"
@@ -76,6 +101,14 @@
                 </ul>
             </view>
 
+            <view class="card-body">
+                <div class="part-head">
+                    <h3>产品现场图片</h3>
+                </div>
+                <el-image :preview-src-list="product.images" v-for="(item, index) in product.images" :key="index"
+                          :src="item" style="width: 100px; height: 100px" class="mr-10 mb-15" fit="cover"/>
+            </view>
+
             <view class="card-body">
                 <div class="part-head">
                     <h3>已收到的合作申请</h3>
@@ -84,7 +117,8 @@
                                :customRightBtns="table1.customRightBtns"></vk-data-table>
             </view>
         </view>
-
+        <Gap/>
+        <common-footer></common-footer>
 
         <el-dialog :visible.sync="showDialog" width="70%" :show-close="false">
             <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
@@ -93,20 +127,22 @@
             </view>
             <view class="mt-15" v-if="product">
                 <view class="request-header">
+                    <text class="flex-1">企业</text>
                     <text class="flex-1">申请人</text>
-                    <text class="flex-1">申请时间</text>
                     <text class="flex-1">联系方式</text>
+                    <text class="flex-1">合作留言</text>
+                    <text class="flex-1">申请时间</text>
                     <text class="flex-1">操作</text>
                 </view>
                 <view class="quote" v-for="(item, index) in product.cooperateList" :key="index">
                     <text class="flex-1">{{
-                            item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
+                            item.user.userId !== product.userId ? item.user.company.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6") : item.user.person.personName.replace(/^(.).*(.)$/, "$1*$2")
                         }}
                     </text>
+                    <text class="flex-1">{{ item.name }}</text>
+                    <text class="flex-1">{{ item.mobile }}</text>
+                    <text class="flex-1">{{ item.remark }}</text>
                     <text class="flex-1">{{ item._add_time_str }}</text>
-                    <text class="flex-1">
-                        {{ item.user.accountType === 1 ? item.user.person.mobile : item.user.company.mobile }}
-                    </text>
                     <text class="flex-1">
                         <el-button type="primary" @click.native="doShowInfo(item)">查看申请详情</el-button>
                     </text>
@@ -115,17 +151,39 @@
         </el-dialog>
 
         <el-dialog :visible.sync="form1.props.show" title="申请合作" width="60%" mode="form">
-            <vk-data-form ref="table1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"
-                          :rules="form1.props.rules" :form-type="form1.props.formType"
-                          :loading.sync="form1.props.loading"
-                          :beforeAction="form1.props.beforeAction" :auto-close="true" label-width="140px"
-                          @success="onFormSuccess"></vk-data-form>
+            <el-form ref="form" :model="formData" label-width="120px">
+                <el-form-item label="企业名称" v-if="parseInt(vk.getVuex('$user.userInfo.accountType')) === 2">
+                    <el-input v-model="formData.companyName" placeholder="请输入企业名称"/>
+                </el-form-item>
+                <el-form-item label="联系人姓名">
+                    <el-input v-model="formData.name" placeholder="请输入联系人姓名"/>
+                </el-form-item>
+                <el-form-item label="联系人电话">
+                    <el-input v-model="formData.mobile" placeholder="请输入联系人电话"/>
+                </el-form-item>
+                <el-form-item label="合作留言">
+                    <el-input v-model="formData.remark" placeholder="请输入合作留言"/>
+                </el-form-item>
+                <el-form-item label="附件">
+                    <vk-data-upload v-model="formData.files" list-type="text"
+                                    accept=".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf"/>
+                </el-form-item>
+            </el-form>
+            <view class="text-center">
+                <el-button type="primary" @click.native="addCoop">确定</el-button>
+            </view>
+            <!--            <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"-->
+            <!--                          :rules="form1.props.rules" :form-type="form1.props.formType"-->
+            <!--                          :loading.sync="form1.props.loading" :show-cancel="false"-->
+            <!--                          :beforeAction="form1.props.beforeAction" :auto-close="true" label-width="140px"-->
+            <!--                          @success="onFormSuccess">-->
+            <!--            </vk-data-form>-->
         </el-dialog>
 
         <vk-data-dialog
             v-model="showInfo"
             title="申请详情"
-            width="600px"
+            width="60%"
             top="14vh"
             center
             :close-on-click-modal="true"
@@ -145,17 +203,38 @@
 </template>
 
 <script>
+import Gap from "../../../components/gap/gap.vue";
+import dayjs from "dayjs";
+
 export default {
+    components: {Gap},
     data() {
         return {
             showDialog: false,
             showInfo: false,
             info: null,
+            allChildCate: [],
             infoColumns: [
-                {key: "company.companyName", title: "申请人", type: "text"},
-                {key: "company.mobile", title: "联系方式", type: "text"},
-                {key: "manager.personName", title: "代理人", type: "text"},
-                {key: "manager.mobile", title: "代理人联系方式", type: "text"},
+                {key: "user.company.companyName", title: "企业", type: "text"},
+                {key: "name", title: "联系人", type: "text"},
+                {key: "mobile", title: "联系方式", type: "text"},
+                {key: "remark", title: "合作留言", type: "text"},
+                {
+                    key: "files", title: "附件", type: "html",
+                    formatter: (val = [], row, column, index) => {
+                        let content = ''
+                        val.forEach((item, itemIndex) => {
+                            content += `<a href="${item}" target="_blank">预览:文件${itemIndex + 1}</a> `
+                        })
+                        return content
+                    }
+                },
+                {
+                    key: "_add_time_str",
+                    title: "申请时间",
+                    type: "text",
+                    align: "left",
+                },
             ],
             product: {
                 name: '现货详情',
@@ -169,123 +248,52 @@ export default {
                 },
                 cooperateList: []
             },
+            formData: {
+                companyName: '',
+                name: '',
+                mobile: '',
+                remark: '',
+                accountType: parseInt(vk.getVuex('$user.userInfo.accountType')),
+                goodsId: null,
+                goodsUserId: null,
+                files: [],
+            },
             // 表单相关开始-----------------------------------------------------------
             form1: {
                 // 表单请求数据，此处可以设置默认值
-                data: {},
+                data: {
+                    companyName: '',
+                    name: '',
+                    mobile: '',
+                    remark: '',
+                },
                 // 表单属性
                 props: {
                     // 表单请求地址
                     action: "client/spot/goods/kh/addCooperate",
                     // 表单字段显示规则
-                    columns: [{
-                        key: "person",
-                        title: "个人",
-                        type: "object",
-                        showLabel: false,
-                        showRule: (formData) => {
-                            return formData.person.personName != null
-                        },
-                        columns: [{
-                            key: "personName",
-                            title: "姓名",
+                    columns: [
+                        {
+                            key: "companyName",
+                            title: "企业名称",
                             type: "text",
-                            readonly: true,
-                            disabled: true
-                        },
-                            // {
-                            // 	key: "idCard",
-                            // 	title: "身份证号",
-                            // 	type: "text",
-                            // 	readonly: true,
-                            // 	disabled: true
-                            // },
-                            {
-                                key: "mobile",
-                                title: "电话",
-                                type: "text",
-                                readonly: true,
-                                disabled: true
-                            },
-
-
-                        ]
-                    },
-                        {
-                            key: "company",
-                            title: "企业信息",
-                            type: "object",
-                            showLabel: false,
                             showRule: (formData) => {
-                                return formData.company.companyName != null
+                                return parseInt(vk.getVuex('$user.userInfo.accountType')) === 2
                             },
-                            columns: [{
-                                key: "companyName",
-                                title: "企业名称",
-                                type: "text",
-                                readonly: true,
-                                disabled: true
-                            },
-                                {
-                                    key: "organization",
-                                    title: "统一社会信用代码",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-                                {
-                                    key: "legalName",
-                                    title: "法人",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-                                {
-                                    key: "legalMobile",
-                                    title: "法人电话",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-
-                            ]
                         },
-
                         {
-                            key: "manager",
-                            title: "代理人",
-                            type: "object",
-                            showLabel: false,
-                            showRule: (formData) => {
-                                return formData.manager.personName != null
-                            },
-                            columns: [{
-                                key: "personName",
-                                title: "代理人",
-                                type: "text",
-                                readonly: true,
-                                disabled: true
-                            },
-                                // {
-                                // 	key: "idCard",
-                                // 	title: "代理人身份证号",
-                                // 	type: "text",
-                                // 	readonly: true,
-                                // 	disabled: true
-                                // },
-                                {
-                                    key: "mobile",
-                                    title: "代理人电话",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-
-                            ]
+                            key: "name",
+                            title: "联系人姓名",
+                            type: "text",
+                        },
+                        {
+                            key: "mobile",
+                            title: "联系人电话",
+                            type: "text",
                         },
                         {
                             key: "remark",
-                            title: "备注",
+                            title: "合作留言",
                             type: "textarea",
                             maxlength: 200,
                             showWordLimit: true,
@@ -293,11 +301,12 @@ export default {
                     ],
                     // 表单验证规则
                     rules: {
-                        text: [{
-                            required: true,
-                            message: "text不能为空",
-                            trigger: "change"
-                        },
+                        text: [
+                            {
+                                required: true,
+                                message: "text不能为空",
+                                trigger: "change"
+                            },
                             {
                                 required: true,
                                 message: "text不能为空",
@@ -323,55 +332,53 @@ export default {
                 // 表格数据
                 data: [],
                 // 表格字段显示规则
-                columns: [{
-                    key: "subjectName",
-                    title: "申请人",
-                    type: "text",
-                    width: 400,
-                    formatter: (val, row, column, index) => {
-                        if (vk.getVuex('$user.userInfo._id') === this.product.userId) {
-                            return val
-                        }
-                        if (row.accountType === 1) {
-                            return vk.pubfn.hidden(val, 1, 1);
-                        } else {
-                            return vk.pubfn.hidden(val, 2, 4);
-                        }
-                    }
-                },
-
+                columns: [
                     {
-                        key: "subjectMobile",
-                        title: "联系方式",
+                        key: "user.company.companyName",
+                        title: "企业",
                         type: "text",
-                        width: 120,
                         formatter: (val, row, column, index) => {
-                            let str = val
-                            if (row.managerMobile) {
-                                str = row.managerMobile
+                            if (val) {
+                                if (vk.getVuex('$user.userInfo._id') === this.product.userId) {
+                                    return val
+                                }
+                                return val.slice(0, 2) + "******";
                             }
-                            if (vk.getVuex('$user.userInfo._id') == this.product.userId) {
-                                return str
-                            }
-                            return vk.pubfn.hidden(str, 3, 4);
+                            return ''
                         }
                     },
-                    // {
-                    // 	key: "remark",
-                    // 	title: "备注",
-                    // 	type: "textarea",
-                    // 	width: 280,
-                    // 	formatter: (val, row, column, index) => {
-                    // 		let str = val
-                    // 		if (row.managerMobile) {
-                    // 			str = row.managerMobile
-                    // 		}
-                    // 		if (vk.getVuex('$user.userInfo._id') == this.product.userId) {
-                    // 			return val
-                    // 		}
-                    // 		return "******";
-                    // 	}
-                    // },
+                    {
+                        key: "name",
+                        title: "申请人",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            if (vk.getVuex('$user.userInfo._id') === this.product.userId) {
+                                return val
+                            }
+                            return val.slice(0, 1) + "**";
+                        }
+                    },
+                    {
+                        key: "mobile",
+                        title: "联系方式",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            if (vk.getVuex('$user.userInfo._id') === this.product.userId) {
+                                return val
+                            }
+                            return "******";
+                        }
+                    },
+                    {
+                        key: "remark",
+                        title: "合作留言",
+                        type: "textarea",
+                    },
+                    {
+                        key: "_add_time",
+                        title: "申请时间",
+                        type: "time",
+                    },
 
                 ],
                 customRightBtns: [{
@@ -389,23 +396,9 @@ export default {
 
         }
     },
-    onLoad({
-               id
-           }) {
+    onLoad({id}) {
         // 获取现货数据
-        vk.callFunction({
-            url: 'client/spot/goods/pub/getDetail',
-            title: '请求中...',
-            data: {
-                _id: id,
-
-            },
-            success: (data) => {
-                console.log(data);
-                this.product = data.data
-            }
-        });
-
+        this.getCategoryTreeData(id)
         // 获取用户数据
         vk.userCenter.getCurrentUserInfo({
             success: (data) => {
@@ -416,22 +409,64 @@ export default {
                 console.log('form1: ', {
                     ...this.form1.data
                 });
+                if (data.userInfo.accountType === 1) {
+                    this.formData.name = data.userInfo.person.personName
+                    this.formData.mobile = data.userInfo.person.mobile
+                } else {
+                    this.formData.companyName = data.userInfo.company.companyName
+                    this.formData.mobile = data.userInfo.company.mobile
+                    if (data.userInfo.manager) this.formData.name = data.userInfo.manager.personName
+                }
             }
         });
     },
     methods: {
+        dayjs,
+        getCategoryTreeData(id) {
+            vk.callFunction({
+                url: 'client/spot/category/pub/getTree',
+                title: '请求中...',
+                data: {},
+                success: (data) => {
+                    this.allChildCate = []
+                    data.rows.forEach(item => {
+                        item.children.forEach(child => {
+                            this.allChildCate.push(child)
+                        })
+                    })
+                    this.getInfo(id)
+                }
+            });
+        },
+        getInfo(id) {
+            vk.callFunction({
+                url: 'client/spot/goods/pub/getDetail',
+                title: '请求中...',
+                data: {
+                    _id: id,
+                },
+                success: (data) => {
+                    this.product = data.data
+                    this.product.user.company.mainSpotCategory = []
+                    if (this.product.user.company && this.product.user.company.mainSpotCategoryIds) {
+                        this.allChildCate.forEach(child => {
+                            if (this.product.user.company.mainSpotCategoryIds.includes(child._id)) {
+                                this.product.user.company.mainSpotCategory.push(child.name)
+                            }
+                        })
+                    }
+                }
+            });
+        },
         downloadFile(url) {
             location.href = url
         },
-        showCooperate() {
-            this.table2.show = true
-        },
         async toCooperate() {
-            const {userInfo} = await vk.callFunction({
+            const {userInfo, accountNum} = await vk.callFunction({
                 url: 'user/kh/getMyUserInfo'
             })
             if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
+                this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
@@ -439,12 +474,20 @@ export default {
                     vk.navigateTo({url: '/pages/user/user?menu=fadada'});
                 })
             } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
+                this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=business-card'});
+                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+                })
+            } else if (accountNum === 0) {
+                this.$confirm('请先到个人中心添加收款账户', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    vk.navigateTo({url: '/pages/user/user?menu=account'});
                 })
             } else {
                 this.form1.props.show = true
@@ -459,12 +502,25 @@ export default {
                 }
             });
         },
-        onFormSuccess() {
-            this.form1.props.show = false
-        },
         doShowInfo(info) {
             this.info = info
             this.showInfo = true
+        },
+        addCoop() {
+            if (!this.formData.name) return this.$message.error('请填写联系人姓名')
+            if (!this.formData.mobile) return this.$message.error('请填写联系方式')
+            this.formData.goodsId = this.product._id
+            this.formData.goodsUserId = this.product.userId
+            vk.callFunction({
+                url: 'client/spot/goods/kh/addCooperate',
+                data: this.formData
+            })
+            this.form1.props.show = false
+            this.$message.success('提交成功')
+            this.getInfo(this.product._id)
+        },
+        navTo(url) {
+            vk.navigateTo({url})
         }
     },
     filters: {
diff --git a/pages/spot/goods/goods.vue b/pages/spot/goods/goods.vue
index 847a06c..d23c8ec 100644
--- a/pages/spot/goods/goods.vue
+++ b/pages/spot/goods/goods.vue
@@ -1,411 +1,575 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <!-- <view class="page-nav">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-            </el-breadcrumb>
-        </view> -->
+    <!-- <view class="page-nav">
+        <el-breadcrumb separator="/">
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item><navigator url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
+        </el-breadcrumb>
+    </view> -->
 
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-            <view class="goods-options">
-                <el-row class="">
-                    <el-button @click="toRelease" type="primary" round>发布现货</el-button>
-                    <el-button @click="toMy" type="primary" round plain class="empty-bg-plain-btn">我发布的现货
-                    </el-button>
-                </el-row>
-            </view>
-        </view>
-
-
-        <!-- 筛选表单 -->
-        <view class="filter-outer">
-            <el-form @submit.native.prevent label-width="80px">
-                <el-form-item label="关键词" class="border-bottom pb-30">
-                    <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
-                        <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                        <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
-                        </el-button>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="现货分类" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="clickedCateIndex = -1" class="pointer mr-25"
-                              :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in categoryTreeData" :key="index">
-                            <text @click="clickedCateIndex = index" class="pointer mr-25"
-                                  :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                    </view>
-                    <view class="child-cate flex justify-start items-center flex-wrap">
-                        <template v-if="clickedCateIndex === -1">
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
-                            </text>
-                        </template>
-                        <template v-else>
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
-                                {{ item.name }}
-                            </text>
-                        </template>
-                    </view>
-                </el-form-item>
-                <el-form-item label="城市" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
-                              :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
-                        </text>
-                        <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
-                            <text @click="selectProvince(item.code)"
-                                  :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']"
-                                  v-if="index < 10 || showAllProvince">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多
-                        </text>
-                    </view>
-                </el-form-item>
-                <el-form-item label="已选择">
-                    <view class="tags">
-                        <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
-                    </view>
-                </el-form-item>
-
-            </el-form>
-        </view>
-
-        <!-- 商品列表 -->
-        <view class="goods-list">
-            <view v-for="(item, index) in goodsData.rows" :key="index" class="goods"
-                  :style="{marginRight:( (index + 1) % 5 === 0 && index > 0) ? 0 : '28px'}">
-                <view class="goods-title">{{ item.name }}</view>
-                <view class="goods-stock mt-40">现货库存：{{ item.stock }}吨</view>
-                <view class="goods-address text-gray">供货地：{{ item.addressStr }}</view>
-<!--                <view class="goods-image">-->
-<!--                    <image :src="item.user.businessCard.logo" mode="aspectFit"></image>-->
-<!--                </view>-->
-                <view v-if="item.user.accountType == 1" class="goods-company">{{ item.user.person.personName }}</view>
-                <view v-if="item.user.accountType == 2" class="goods-company">{{ item.user.company.companyName }}</view>
-                <el-button @click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary" plain
-                           class="empty-bg-plain-btn"
-                           size="small">立即查看
-                </el-button>
-            </view>
-        </view>
-
-        <view class="paginatio">
-            <el-pagination
-                :page-size="pageSize"
-                :current-page="goodsData.page"
-                @current-change="search"
-                background
-                layout="prev, pager, next"
-                :total="goodsData.total">
-            </el-pagination>
-        </view>
-        <right-bar></right-bar>
-        <common-footer></common-footer>
+    <view class="carousel">
+      <common-swiper page="spot"/>
+      <view class="goods-options">
+        <el-row class="">
+          <el-button @click="toRelease" type="primary" round>发布现货</el-button>
+          <el-button @click="toMy" type="primary" round plain class="empty-bg-plain-btn">我发布的现货
+          </el-button>
+        </el-row>
+      </view>
     </view>
+
+
+    <!-- 筛选表单 -->
+    <view class="filter-outer">
+      <el-form @submit.native.prevent label-width="80px">
+        <el-form-item label="关键词" class="border-bottom pb-30">
+          <el-input @keyup.enter.native="search(1)" clearable placeholder="输入关键字搜索" v-model="keyword">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            <el-button @click="search(1)" type="primary" slot="append" style="border-radius: 0">搜索
+            </el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="现货分类" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="clickedCateIndex = -1" class="pointer mr-25"
+                  :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in categoryTreeData" :key="index">
+              <text @click="clickedCateIndex = index" class="pointer mr-25"
+                    :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
+                    v-if="index < 10">
+                {{ item.name }}
+              </text>
+            </view>
+          </view>
+          <view class="child-cate flex justify-start items-center flex-wrap">
+            <template v-if="clickedCateIndex === -1">
+              <text class="pointer mr-25" @click="selectCate(item._id)"
+                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
+                    v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
+              </text>
+            </template>
+            <template v-else>
+              <text class="pointer mr-25" @click="selectCate(item._id)"
+                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
+                    v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
+                {{ item.name }}
+              </text>
+            </template>
+          </view>
+        </el-form-item>
+        <el-form-item label="城市" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
+                  :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
+            </text>
+            <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
+              <text @click="selectProvince(item.code)"
+                    :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']"
+                    v-if="index < 10 || showAllProvince">
+                {{ item.name }}
+              </text>
+            </view>
+            <!--                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多-->
+            <!--                        </text>-->
+          </view>
+        </el-form-item>
+        <el-form-item label="已选择">
+          <view class="tags">
+            <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
+          </view>
+        </el-form-item>
+
+      </el-form>
+    </view>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad9.length">
+        <el-carousel :height="`100px`" :style="{width: ad10.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad9" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad10.length">
+        <el-carousel :height="`100px`" :style="{width: ad9.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad10" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <!-- 商品列表 -->
+    <template v-if="!loading">
+
+      <template v-if="goodsData.rows.length > 0">
+        <view class="goods-list">
+          <view v-for="(item, index) in goodsData.rows" :key="index" class="goods"
+                :style="{marginRight:( (index + 1) % 5 === 0 && index > 0) ? 0 : '28px'}">
+            <view class="top" v-if="item.isTop">特别推荐</view>
+            <view class="top" v-if="!item.isTop && index < 10">最新</view>
+            <view class="goods-title">{{ item.name }}</view>
+            <view class="goods-stock mt-40">现货库存：{{ item.stock }}吨</view>
+            <view class="goods-address text-gray">供货地：{{ item.addressStr }}</view>
+            <!--                <view class="goods-image">-->
+            <!--                    <image :src="item.user.businessCard.logo" mode="aspectFit"></image>-->
+            <!--                </view>-->
+            <view class="goods-company">
+              <template v-if="item.user">
+                <view v-if="item.user.accountType == 1">{{
+                    item.user.person.personName.replace(/^(.).*$/, "$1**")
+                  }}
+                </view>
+                <view v-if="item.user.accountType == 2">{{
+                    item.user.company.companyName.replace(/^(.)(.).*(.)(.)(.)(.)$/, "$1$2***$3$4$5$6")
+                  }}
+                </view>
+              </template>
+            </view>
+            <el-button @click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary"
+                       plain
+                       class="empty-bg-plain-btn"
+                       size="small">立即查看
+            </el-button>
+          </view>
+        </view>
+      </template>
+      <view v-else class="flex justify-center items-center flex-col">
+        <data-null theme="outline" size="24" fill="#9b9b9b" strokeLinecap="square"/>
+        <text class="text-gray mt-20">暂无内容</text>
+      </view>
+    </template>
+    <view class="paginatio">
+      <el-pagination
+        :page-size="pageSize"
+        :current-page="pageIndex"
+        @current-change="search"
+        background
+        layout="prev, pager, next"
+        :total="goodsData.total">
+      </el-pagination>
+    </view>
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import {DataNull} from '@icon-park/vue'
 
 export default {
-    data() {
-        return {
-            pageSize: 20,
-            categoryTreeData: [],
-            allChildCate: [],
-            checkCategoryList: [],
-            clickedCateIndex: -1,
-            provinceData: provinces,
-            checkProvinceList: [],
-            keyword: '',
-            goodsData: {
-                total: 0,
-                rows: []
-            },
-            showAllProvince: false
-        };
+  components: {DataNull},
+  data() {
+    return {
+      pageSize: 20,
+      pageIndex: 1,
+      categoryTreeData: [],
+      allChildCate: [],
+      checkCategoryList: [],
+      clickedCateIndex: -1,
+      provinceData: provinces,
+      checkProvinceList: [],
+      keyword: '',
+      goodsData: {
+        total: 0,
+        rows: []
+      },
+      showAllProvince: true,
+      loading: false,
+      ad9: [],
+      ad10: [],
+    };
+  },
+  onLoad(options) {
+    if (options && options.keyword) this.keyword = options.keyword
+  },
+  onShow() {
+    this.search(1)
+    vk.callFunction({
+      url: 'client/spot/category/pub/getTree',
+      data: {},
+      success: (data) => {
+        this.categoryTreeData = data.rows
+        this.allChildCate = []
+        this.categoryTreeData.forEach(item => {
+          item.children.forEach(child => {
+            this.allChildCate.push(child)
+          })
+        })
+      }
+    });
+  },
+  methods: {
+    selectCate(id) {
+      const index = this.checkCategoryList.indexOf(id)
+      if (index === -1) this.checkCategoryList.push(id)
+      else this.checkCategoryList.splice(index, 1)
+      this.search(1)
     },
-    onShow() {
-        this.search(1)
-        vk.callFunction({
-            url: 'client/spot/category/pub/getTree',
-            title: '请求中...',
-            data: {},
-            success: (data) => {
-                this.categoryTreeData = data.rows
-                this.allChildCate = []
-                this.categoryTreeData.forEach(item => {
-                    item.children.forEach(child => {
-                        this.allChildCate.push(child)
-                    })
-                })
-            }
-        });
+    selectProvince(code) {
+      if (code === -1) this.checkProvinceList = []
+      else {
+        // const index = this.checkProvinceList.indexOf(code)
+        // if (index === -1) this.checkProvinceList.push(code)
+        // else this.checkProvinceList.splice(index, 1)
+        this.checkProvinceList = [code]
+      }
+      this.search(1)
     },
-    methods: {
-        selectCate(id) {
-            const index = this.checkCategoryList.indexOf(id)
-            if (index === -1) this.checkCategoryList.push(id)
-            else this.checkCategoryList.splice(index, 1)
-            this.search(1)
-        },
-        selectProvince(code) {
-            if (code === -1) this.checkProvinceList = []
-            else {
-                const index = this.checkProvinceList.indexOf(code)
-                if (index === -1) this.checkProvinceList.push(code)
-                else this.checkProvinceList.splice(index, 1)
-            }
-            this.search(1)
-        },
-        async toRelease() {
-            const {userInfo} = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                   vk.navigateTo({url: '/pages/user/user?menu=fadada'});
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=business-card'});
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/spot/release/release'
-                })
-            }
-        },
-        async toMy() {
-            const {userInfo} = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.getCertUrl()
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo('/pages/user/user?menu=business-card');
-                })
-            } else {
-                vk.navigateTo({
-                    url: '/pages/spot/goods/my'
-                })
-            }
-        },
-
-        search(pageIndex) {
-            vk.callFunction({
-                url: 'client/spot/goods/pub/getList',
-                data: {
-                    pageIndex: pageIndex,
-                    pageSize: this.pageSize,
-                    keyword: this.keyword,
-                    categoryIds: this.checkCategoryList,
-                    provinceCodes: this.checkProvinceList
-                },
-                success: (data) => {
-                    console.log('data: ', data);
-                    data.rows.forEach(item => {
-                        try {
-                            item.addressStr = item.address.province.name + "-" + item.address.city.name + "-" + item.address.area.name
-                        } catch (err) {
-                            item.addressStr = ""
-                        }
-                    })
-                    this.goodsData = data
-                }
-            });
-        },
-        getCertUrl() {
-            vk.callFunction({
-                url: 'client/fadada.getVerifyUrl',
-                success: (res) => {
-                    location.href = res.data.url
-                }
-            });
-        },
-    },
-    computed: {
-        checkCategoryArr() {
-            const arr = []
-            this.allChildCate.forEach(item => {
-                if (this.checkCategoryList.includes(item._id)) arr.push(item)
-            })
-            this.provinceData.forEach(item => {
-                if (this.checkProvinceList.includes(item.code)) {
-                    arr.push(item)
-                }
-            })
-            return arr
+    async toRelease() {
+      const {userInfo, accountNum} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      console.log(userInfo.businessCard)
+      if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (accountNum === 0) {
+        this.$confirm('请先到个人中心添加收款账户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=account'});
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
         }
+        if (userInfo.userLevel < 1) {
+          this.$confirm('非年费会员,无法发布现货', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/spot/release/release'
+        })
+      }
+    },
+    async toMy() {
+      const {userInfo} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo('/pages/user/user?menu=fadada');
+        })
+      } else {
+        if (userInfo.businessCard.status !== 1) {
+          this.$confirm('您的名片信息未审核,请耐心等待', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        if (userInfo.userLevel < 1) {
+          this.$confirm('非年费会员,无法发布现货', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          return
+        }
+        vk.navigateTo({
+          url: '/pages/spot/goods/my'
+        })
+      }
+    },
 
+    search(pageIndex) {
+      this.loading = true
+      vk.callFunction({
+        url: 'client/spot/goods/pub/getList',
+        title: '请求中...',
+        data: {
+          pageIndex: pageIndex,
+          pageSize: this.pageSize,
+          keyword: this.keyword,
+          // categoryIds: this.allChildCate.filter(item => this.checkCategoryList.includes(item._id)).map(item => item.name),
+          categoryIds: this.checkCategoryList,
+          provinceCodes: this.checkProvinceList
+        },
+        success: (data) => {
+          this.loading = false
+          data.rows.forEach(item => {
+            try {
+              item.addressStr = item.address.province.name + "-" + item.address.city.name + "-" + item.address.area.name
+            } catch (err) {
+              item.addressStr = ""
+            }
+          })
+          this.goodsData = data
+          this.getAd9()
+          this.getAd10()
+        }
+      });
+    },
+    getCertUrl() {
+      vk.callFunction({
+        url: 'client/fadada.getVerifyUrl',
+        success: (res) => {
+          location.href = res.data.url
+        }
+      });
+    },
+    async getAd9() {
+      this.ad9 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 9,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad9 = res.data
+      // }else {
+      //     const {rows} = await vk.callFunction({
+      //         url: 'client/user/pub/getCompany',
+      //         data: {
+      //             pageIndex: 1,
+      //             pageSize: 5,
+      //             isCoop: 1,
+      //             province: this.checkProvinceList
+      //         }
+      //     })
+      //     rows.forEach(item => {
+      //         if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //             this.ad9.push({
+      //                 swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //                 companyId: item._id
+      //             })
+      //         }
+      //     })
+      // }
+    },
+    async getAd10() {
+      this.ad10 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 10,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad10 = res.data
+      // } else {
+      //   const {rows} = await vk.callFunction({
+      //     url: 'client/user/pub/getCompany',
+      //     data: {
+      //       pageIndex: 2,
+      //       pageSize: 5,
+      //       isCoop: 1,
+      //       province: this.checkProvinceList
+      //     }
+      //   })
+      //   rows.forEach(item => {
+      //     if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //       this.ad10.push({
+      //         swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //         companyId: item._id
+      //       })
+      //     }
+      //   })
+      // }
+    },
+  },
+  computed: {
+    checkCategoryArr() {
+      const arr = []
+      this.allChildCate.forEach(item => {
+        if (this.checkCategoryList.includes(item._id)) arr.push(item)
+      })
+      this.provinceData.forEach(item => {
+        if (this.checkProvinceList.includes(item.code)) {
+          arr.push(item)
+        }
+      })
+      return arr
     }
+
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 
 .goods-list {
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    flex-wrap: wrap;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  flex-wrap: wrap;
 
 }
 
 .goods {
-    width: 217px;
-    background-color: #FFFFFF;
-    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);
+  width: 217px;
+  background-color: #FFFFFF;
+  box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);
+  text-align: center;
+  margin-right: 20px;
+  margin-bottom: 25px;
+  padding: 10px 20px;
+  position: relative;
+
+  .top {
+    position: absolute;
+    right: 0;
+    top: 0;
+    background-color: rgba(169, 41, 36, 1);
+    padding: 2px 5px;
+    border-radius: 0 0 0 5px;
+    color: #FFFFFF;
+  }
+
+  &-title {
+    font-size: 15px;
+    color: #101010;
+    height: 62px;
+    padding-top: 20px;
+    font-weight: bold;
+  }
+
+  &-stock {
+    font-size: 12px;
+    color: #BD3124;
+  }
+
+  &-address {
+    font-size: 12px;
+    margin: 10px 0;
+    height: 35px;
+  }
+
+  &-image {
+    width: 200px;
+    height: 70px;
+    margin: 0 auto;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &-company {
+    color: #4F4F4F;
+    font-size: 14px;
+    margin: 10px 0;
+    height: 45px;
+  }
+
+  &-buy {
+    width: 108px;
+    height: 30px;
+    line-height: 30px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(169, 41, 36, 1);
+    font-size: 13px;
     text-align: center;
-    margin-right: 20px;
-    margin-bottom: 25px;
-    padding: 10px 20px;
+    font-family: Roboto;
+    border: 1px solid rgba(169, 41, 36, 1);
+    margin: 0 auto;
+    cursor: pointer;
+  }
 
-    &-title {
-        font-size: 15px;
-        color: #101010;
-        height: 62px;
-        padding-top: 20px;
-        font-weight: bold;
-    }
-
-    &-stock {
-        font-size: 12px;
-        color: #BD3124;
-    }
-
-    &-address {
-        font-size: 12px;
-        margin: 10px 0;
-    }
-
-    &-image {
-        width: 200px;
-        height: 70px;
-        margin: 0 auto;
-
-        image {
-            width: 100%;
-            height: 100%;
-        }
-    }
-
-    &-company {
-        color: #4F4F4F;
-        font-size: 14px;
-        margin: 10px 0;
-    }
-
-    &-buy {
-        width: 108px;
-        height: 30px;
-        line-height: 30px;
-        background-color: rgba(255, 255, 255, 1);
-        color: rgba(169, 41, 36, 1);
-        font-size: 13px;
-        text-align: center;
-        font-family: Roboto;
-        border: 1px solid rgba(169, 41, 36, 1);
-        margin: 0 auto;
-        cursor: pointer;
-    }
-
-    .goods-image {
-        width: 100%;
-    }
+  .goods-image {
+    width: 100%;
+  }
 }
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 .selected-cate {
-    border-bottom: 2px solid #BD3124;
-    line-height: 40rpx;
+  border-bottom: 2px solid #BD3124;
+  line-height: 40rpx;
 }
 
 .child-cate {
-    background-color: #DB8382;
-    color: white;
-    margin-top: 10rpx;
-    border-radius: 15rpx;
-    padding: 0 20rpx;
+  background-color: #DB8382;
+  color: white;
+  margin-top: 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
 }
 </style>
diff --git a/pages/spot/goods/my.vue b/pages/spot/goods/my.vue
index 23ab4d4..8b86d70 100644
--- a/pages/spot/goods/my.vue
+++ b/pages/spot/goods/my.vue
@@ -4,13 +4,14 @@
 		<common-header></common-header>
 		<category-bar></category-bar>
 		<view class="carousel">
-			<el-carousel height="170px">
-				<el-carousel-item v-for="item in 4" :key="item">
-					<image class="carousel-img"
-						src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-						mode="aspectFill"></image>
-				</el-carousel-item>
-			</el-carousel>
+<!--			<el-carousel height="170px">-->
+<!--				<el-carousel-item v-for="item in 4" :key="item">-->
+<!--					<image class="carousel-img"-->
+<!--						src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"-->
+<!--						mode="aspectFill"></image>-->
+<!--				</el-carousel-item>-->
+<!--			</el-carousel>-->
+      <common-swiper page="spot-mine" :height="200"/>
 			<view class="goods-options">
 				<el-row class="">
 					<el-button @click="toRelease" type="primary" round>发布现货</el-button>
@@ -67,7 +68,7 @@
                                     type: 'warning'
                                 }).then(() => {
 									vk.callFunction({
-										url: 'client/enquiry/sheet/kh/delete',
+										url: 'client/spot/goods/kh/delete',
 										title: '请求中...',
 										data: {
 											_id: item._id
@@ -101,7 +102,7 @@
 						},
 
 						{
-							key: "_add_time_srt",
+							key: "_add_time_str",
 							title: "发布时间",
 							type: "time",
 							width: 160
@@ -123,20 +124,20 @@
 			toRelease() {
 
 				if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
-					this.$confirm('您尚未认证, 是否前往认证?', '提示', {
+					this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning'
 					}).then(() => {
-						this.getCertUrl()
+            vk.navigateTo({url: '/pages/user/user?menu=fadada'});
 					})
 				} else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
-					this.$confirm('请完善名片信息', '提示', {
+					this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
 						type: 'warning'
 					}).then(() => {
-						vk.navigateTo('/pages/user/user?menu=business-card');
+						vk.navigateTo('/pages/user/user?menu=fadada');
 					})
 				} else {
 					uni.navigateTo({
diff --git a/pages/spot/release/release.vue b/pages/spot/release/release.vue
index cf01bcb..dc29395 100644
--- a/pages/spot/release/release.vue
+++ b/pages/spot/release/release.vue
@@ -1,177 +1,372 @@
 <template>
-	<view>
-		<top-bar></top-bar>
-		<common-header></common-header>
-		<category-bar></category-bar>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
 
-		<view class="page-nav">
-			<el-breadcrumb separator="/">
-				<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-				<el-breadcrumb-item><navigator style="display: inline-block;" url="/pages/spot/goods/goods">现货市场</navigator></el-breadcrumb-item>
-				<el-breadcrumb-item>发布现货</el-breadcrumb-item>
-			</el-breadcrumb>
-		</view>
+        <view class="page-nav">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+                <el-breadcrumb-item>
+                    <navigator style="display: inline-block;" url="/pages/spot/goods/goods">现货市场</navigator>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item>发布现货</el-breadcrumb-item>
+            </el-breadcrumb>
+        </view>
 
-		<view class="form-view">
-			<vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"
-				:rules="form1.props.rules" :form-type="form1.props.formType" :loading.sync="form1.props.loading"
-				:before-action="form1.props.beforeAction" :auto-close="true" label-width="140px"
-				@success="onFormSuccess">
-				<template v-slot:name="{ form, keyName }">
-					<el-input v-model="productName" readonly placeholder="请添加现货分类"></el-input>
-				</template>
-			</vk-data-form>
-		</view>
-	</view>
+        <view class="form-view">
+            <!--            <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"-->
+            <!--                          :rules="form1.props.rules" :form-type="form1.props.formType"-->
+            <!--                          :loading.sync="form1.props.loading"-->
+            <!--                          :before-action="form1.props.beforeAction" :auto-close="true" label-width="140px"-->
+            <!--                          :show-cancel="false"-->
+            <!--                          @success="onFormSuccess">-->
+            <!--                <template v-slot:name="{ form, keyName }">-->
+            <!--                    <el-input v-model="productName" readonly placeholder="请添加现货分类"></el-input>-->
+            <!--                </template>-->
+            <!--            </vk-data-form>-->
+            <el-form ref="form" :model="form1.data" label-width="140px">
+                <el-form-item label="现货名称">
+                    <el-input v-model="form1.data.name" placeholder="请输入现货名称" readonly></el-input>
+                </el-form-item>
+                <el-form-item label="现货分类" required>
+                    <el-checkbox-group v-model="form1.data.categoryIds" @change="makeTitle">
+                        <el-checkbox v-for="(item, index) in category" :key="index" :label="item._id">{{
+                                item.name
+                            }}
+                        </el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label="库存（吨）" required>
+                    <el-input v-model="form1.data.stock" placeholder="请输入库存（吨）" type="number"/>
+                </el-form-item>
+                <el-form-item label="现货存放地" required>
+                    <vk-data-input-address :level="3" v-model="form1.data.address" @change="getAmount()"/>
+                </el-form-item>
+                <el-form-item label="产品规格单价">
+                    <vk-data-upload v-model="form1.data.files" list-type="text"
+                                    accept=".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf"/>
+                </el-form-item>
+                <el-form-item label="报价有效期">
+                    <el-date-picker :picker-options="pickerOptions"
+                                    v-model="form1.data.answerEndTime"
+                                    type="datetime"/>
+                </el-form-item>
+                <el-form-item label="产品现场图片">
+                    <vk-data-upload v-model="form1.data.images" list-type="text" accept=".jpg,.jpeg,.png"/>
+                </el-form-item>
+                <el-form-item label="是否购买全国广告位">
+                    <el-radio-group v-model="form1.data.buyAll" @change="getAmount(true)">
+                        <el-radio :label="true">是</el-radio>
+                        <el-radio :label="false">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="是否购买省份广告位">
+                    <el-radio-group v-model="form1.data.buyTop" @change="getAmount()"
+                                    :disabled="form1.data.buyAll || JSON.stringify(form1.data.address) === '{}' || totalAmount === 0">
+                        <el-radio :label="true">是</el-radio>
+                        <el-radio :label="false">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <p class="text-main text-25 my-20" v-if="form1.data.buyAll">
+                    您已选择购买全国广告位,无法继续购买省份广告位</p>
+                <el-form-item label="购买时长(月)">
+                    <el-input-number v-model="form1.data.buyTopNum" :min="1"/>
+                </el-form-item>
+                <el-form-item label="广告位价格">
+                    {{ totalAmount }}元
+                </el-form-item>
+            </el-form>
+            <div class="text-center">
+                <el-button type="primary" @click="add">发布</el-button>
+            </div>
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				// 表单相关开始-----------------------------------------------------------
-				form1: {
-					// 表单请求数据，此处可以设置默认值
-					data: {
 
-					},
-					// 表单属性
-					props: {
-						// 表单请求地址
-						action: "client/spot/goods/kh/addUpdate",
-						// 表单字段显示规则
-						columns: [{
-								key: "name",
-								title: "现货名称",
-								type: "text",
-							},
-							{
-								key: "categoryIds",
-								title: "现货分类",
-								type: "checkbox",
-								action: "client/spot/category/pub/getList",
-								actionData: {
-									whereJson: {
-										level: 2
-									}
-								},
-								props: {
-									list: "data",
-									value: "_id",
-									label: "name"
-								},
-								watch: ({
-									option
-								}) => {
-									console.log('res: ', option)
-									
-									this.form1.data.name = option.map(item => item.name).join('、')
-									this.productName = option.map(item => item.name).join('、')
-									console.log(this.form1);
-								}
+export default {
+    data() {
+        return {
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() < Date.now();
+                },
+            },
+            category: [],
+            // 表单相关开始-----------------------------------------------------------
+            form1: {
+                // 表单请求数据，此处可以设置默认值
+                data: {
+                    name: '',
+                    stock: '',
+                    buyTop: false,
+                    buyAll: false,
+                    buyTopNum: 1,
+                    categoryIds: [],
+                    files: [],
+                    images: [],
+                    address: {},
+                    answerEndTime: null
+                },
+                // 表单属性
+                props: {
+                    // 表单请求地址
+                    action: "client/spot/goods/kh/addUpdate",
+                    // 表单字段显示规则
+                    columns: [{
+                        key: "name",
+                        title: "现货名称",
+                        type: "text",
+                    },
+                        {
+                            key: "categoryIds",
+                            title: "现货分类",
+                            type: "checkbox",
+                            action: "client/spot/category/pub/getList",
+                            actionData: {
+                                whereJson: {
+                                    level: 2
+                                }
+                            },
+                            props: {
+                                list: "data",
+                                value: "_id",
+                                label: "name"
+                            },
+                            watch: ({
+                                        option
+                                    }) => {
+                                if (this.form1.data.categoryIds.length > 5) {
+                                    this.$message.error('最多选择五个分类')
+                                    this.form1.data.categoryIds.splice(-1, 1)
+                                    return
+                                }
 
-							},
-							{
-								key: "stock",
-								title: "库存（吨）",
-								type: "number"
-							},
-							{
-								key: "address",
-								title: "供货地",
-								type: "address"
-							},
-							{
-								key: "files",
-								title: "附件文档",
-								type: "file",
-								buttonText: "点击上传",
-								limit: 9,
-								accept: ".jpg,.png,.xlsx,.doc,.docx",
-								tips: '上传自有采购单图片或文档,支持jpg/png/word/excel'
-							},
+                                this.form1.data.name = option.map(item => item.name).join('、')
+                                this.productName = option.map(item => item.name).join('、')
+                            },
+                        },
+                        {
+                            key: "stock",
+                            title: "库存（吨）",
+                            type: "number"
+                        },
+                        {
+                            key: "address",
+                            title: "供货地",
+                            type: "address"
+                        },
+                        {
+                            key: "files",
+                            title: "附件文档",
+                            type: "file",
+                            buttonText: "点击上传",
+                            limit: 9,
+                            accept: ".jpg,.jpeg,.png,.xlsx,.doc,.docx,.pdf",
+                            tips: '上传自有采购单图片或文档,支持jpg/png/word/excel'
+                        },
+                        {
+                            key: "buyAll",
+                            title: "是否购买全国广告位",
+                            type: "radio",
+                            data: [
+                                {
+                                    value: true,
+                                    label: "是"
+                                },
+                                {
+                                    value: false,
+                                    label: "否"
+                                }
+                            ],
+                            watch: ({value, formData}) => {
+                                if (value) {
+                                    formData.buyTop = false
 
+                                }
+                            }
+                        },
+                        {
+                            key: "buyTop",
+                            title: "是否购买广告位",
+                            type: "radio",
+                            data: [
+                                {
+                                    value: true,
+                                    label: "是"
+                                },
+                                {
+                                    value: false,
+                                    label: "否"
+                                }
+                            ],
+                            disabled: formData => {
+                                return formData.buyAll
+                            }
+                        },
+                        {
+                            key: "buyTopNum",
+                            title: "购买广告位时长(月)",
+                            type: "number",
+                            controls: true,
+                            precision: 0,
+                            min: 1,
+                            step: 1,
+                            rightText: '月'
+                        },
+                        {
+                            key: "amount",
+                            title: "价格",
+                            type: "text",
+                            readonly: true,
+                            placeholder: '请选择供货地'
+                        },
 
-						],
-						// 表单验证规则
-						rules: {
-							categoryIds: [
-								{
-									required: true,
-									message: "现货名称不能为空",
-									trigger: ['blur', 'change']
-								},
-								{
-									validator: (rule, value, callback) => {
-										if (value.length > 5) {
-											callback(new Error('最多选择五个分类'));
-										} else {
-											callback()
-										}
-									},
-									trigger: ['blur', 'change']
-								},
-							],
-							stock: [
-								{
-									required: true,
-									message: "请填写库存",
-									trigger: ['blur', 'change']
-								},
-								{
-									min: 0,
-									type: 'number',
-									message: "库存不能小于0",
-									trigger: ['blur', 'change']
-								},
-							],
-							address: [
-								{
-									required: true,
-									message: "请填写地址",
-									trigger: ['blur', 'change']
-								}
-							]
-							
-						},
-						// add 代表添加 update 代表修改
-						formType: "add",
-						// 表单是否在请求中
-						loading: false,
-						// 是否显示表单1 的弹窗
-						show: false
-					}
-				},
-				productName: ''
-				// 表单相关结束-----------------------------------------------------------
-			};
-		},
-		onLoad() {
-			vk.callFunction({
-				url: 'client/spot/goods/kh/getSelfOne',
-				success: (res) => {
-					if(res.data) {
-						this.$refs.form1.setResetFormData(res.data);
-						this.$refs.form1.resetForm();
-						this.productName = res.data.name
-					}
-					
-				}
-			});
-		},
-		methods: {
-			onFormSuccess() {
-                vk.navigateBack()
+                    ],
+                    // 表单验证规则
+                    rules: {
+                        categoryIds: [
+                            {
+                                required: true,
+                                message: "现货名称不能为空",
+                                trigger: ['blur', 'change']
+                            },
+                            {
+                                validator: (rule, value, callback) => {
+                                    if (value.length > 5) {
+                                        callback(new Error('最多选择五个分类'));
+                                    } else {
+                                        callback()
+                                    }
+                                },
+                                trigger: ['blur', 'change']
+                            },
+                        ],
+                        stock: [
+                            {
+                                required: true,
+                                message: "请填写库存",
+                                trigger: ['blur', 'change']
+                            },
+                            {
+                                min: 0,
+                                type: 'number',
+                                message: "库存不能小于0",
+                                trigger: ['blur', 'change']
+                            },
+                        ],
+                        address: [
+                            {
+                                required: true,
+                                message: "请填写地址",
+                                trigger: ['blur', 'change']
+                            }
+                        ]
+                    },
+                    // add 代表添加 update 代表修改
+                    formType: "add",
+                    // 表单是否在请求中
+                    loading: false,
+                    // 是否显示表单1 的弹窗
+                    show: false
+                }
+            },
+            productName: '',
+            amount: '',
+            // 表单相关结束-----------------------------------------------------------
+        };
+    },
+    onLoad() {
+        this.getCategory()
+        vk.callFunction({
+            url: 'client/spot/goods/kh/getSelfOne',
+            success: (res) => {
+                if (res.data) {
+                    this.$refs.form1.setResetFormData(res.data);
+                    this.$refs.form1.resetForm();
+                    this.productName = res.data.name
+                }
             }
-		}
-	}
+        });
+    },
+    methods: {
+        onFormSuccess(res) {
+            if (this.form1.data.buyTop) {
+                vk.navigateTo({
+                    url: `/pages/index/shop/pay?id=${res.data.data}`
+                })
+            } else vk.redirectTo({url: '/pages/spot/goods/goods'});
+        },
+        getCategory() {
+            vk.callFunction({
+                url: 'client/spot/category/pub/getList',
+                data: {
+                    whereJson: {
+                        level: 2
+                    },
+                },
+                success: (res) => {
+                    if (res.data) {
+                        this.category = res.data;
+                    }
+                }
+            });
+        },
+        makeTitle(val) {
+            if (val.length > 5) {
+                this.form1.data.categoryIds.splice(-1)
+                return this.$message.error('最多选择五个分类');
+            }
+            this.form1.data.name = this.category.filter(item => val.includes(item._id)).map(item => item.name).join('、')
+            this.$forceUpdate()
+        },
+        getAmount(isAll = false) {
+            if (!isAll && JSON.stringify(this.form1.data.address) === '{}') return
+            vk.callFunction({
+                url: 'client/spot/amount/pub/getDetail',
+                data: {
+                    province: isAll ? -1 : this.form1.data.address.province.code,
+                },
+                success: (res) => {
+                    if (res.data) {
+                        this.amount = parseFloat(res.data.amount)
+                    }
+                }
+            });
+        },
+        async add() {
+            if (this.form1.data.categoryIds.length === 0) return this.$message.error('请选择分类')
+            if (!this.form1.data.stock) return this.$message.error('请填写库存')
+            if (JSON.stringify(this.form1.data.address) === '{}') return this.$message.error('请选择供货地')
+            const res = await vk.callFunction({
+                title: '请求中...',
+                url: 'client/spot/goods/kh/addUpdate',
+                data: this.form1.data
+            })
+            if (this.form1.data.buyTop || this.form1.data.buyAll) {
+                vk.navigateTo({
+                    url: `/pages/index/shop/pay?id=${res.data}`
+                })
+            } else vk.redirectTo({url: '/pages/spot/goods/goods'});
+        }
+    },
+    computed: {
+        totalAmount() {
+            let amount = 0
+            if (this.amount) amount = this.amount * this.form1.data.buyTopNum
+            return amount
+        }
+    }
+}
 </script>
 
 <style lang="scss">
-	.form-view {
-		width: 1200px;
-		margin: 0 auto;
-		background-color: #FFFFFF;
-		padding: 20rpx;
-	}
+.form-view {
+    width: 1200px;
+    margin: 0 auto;
+    background-color: #FFFFFF;
+    padding: 20rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/stealCal/stealCal.vue b/pages/stealCal/stealCal.vue
new file mode 100644
index 0000000..42dc1f6
--- /dev/null
+++ b/pages/stealCal/stealCal.vue
@@ -0,0 +1,24 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+        <view class="flex justify-center items-center p-20 bg-white" style="overflow: hidden">
+            <iframe src="/static/gangcai-cal/index.html" frameborder="0" scrolling="no"
+                    style="width: 500px; height: 600px;overflow: hidden"></iframe>
+            <image src="/static/images/banner@2x.png" class="ml-20" style="width: 406px;height: 512px"/>
+        </view>
+        <common-footer></common-footer>
+    </view>
+
+</template>
+
+<script>
+export default {
+    name: "stealCal",
+    data() {
+        return {}
+    },
+    methods: {}
+}
+</script>
\ No newline at end of file
diff --git a/pages/store/buyer.vue b/pages/store/buyer.vue
index e27a098..1a8e9fb 100644
--- a/pages/store/buyer.vue
+++ b/pages/store/buyer.vue
@@ -1,240 +1,434 @@
 <template>
-    <view class="">
-        <top-bar></top-bar>
-        <common-nav></common-nav>
-        <view class="w-1200">
-            <el-row :gutter="20">
-                <el-col :span="6">
-                    <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
-                        <el-menu-item index="1">
-                            <i class="el-icon-warning-outline"></i>
-                            <span slot="title">询价单管理</span>
-                        </el-menu-item>
-                        <el-menu-item index="0">
-                            <i class="el-icon-edit"></i>
-                            <span slot="title">加工单管理</span>
-                        </el-menu-item>
-                    </el-menu>
-                </el-col>
-                <el-col :span="18">
-                    <el-card shadow="never">
-                        <el-tabs v-model="activeName" @tab-click="changeStatus">
-                            <el-tab-pane :label="`全部(${allNum})`" name="all">
-                            </el-tab-pane>
-                            <el-tab-pane :label="`待报价(${noQuoteNum})`" name="noQuote"></el-tab-pane>
-                            <el-tab-pane :label="`待选商(${notPickNum})`" name="notPick"></el-tab-pane>
-                            <el-tab-pane :label="`已选商(${pickedNum})`" name="picked"></el-tab-pane>
-                        </el-tabs>
-<!--                        <div class="search">-->
-<!--                            <view class="p">-->
-<!--                                <el-select v-model="value2" placeholder="请选择">-->
-<!--                                    <el-option v-for="item in options2" :key="item.value" :label="item.label"-->
-<!--                                               :value="item.value">-->
-<!--                                    </el-option>-->
-<!--                                </el-select>-->
-<!--                            </view>-->
-<!--                            <view class="p">-->
-<!--                                <el-date-picker v-model="value1" type="date" placeholder="选择日期">-->
-<!--                                </el-date-picker>-->
-<!--                            </view>-->
-<!--                            <view class="p">-->
-<!--                                <el-input placeholder="请输入内容" v-model="input3" class="input-with-select"-->
-<!--                                          @change="onSearch">-->
-<!--                                    <i slot="append" class="el-icon-search" @click="onSearch"></i>-->
-<!--                                </el-input>-->
-<!--                            </view>-->
-<!--                        </div>-->
-                    </el-card>
-                    <el-card shadow="never" style="margin-top: 20px;">
-                        <template v-if="menuIndex === '0'">
-                            <view class="transaction-list">
-                                <view class="item" v-for="(item, index) in processList" :key="index">
-                                    <view class="info">
-                                        <view class="title">
-                                            <view class="name">
-                                                <view class="fabu-status">
-                                                    <view class="text">{{
-                                                            item.status === 0 ? '发布中' : '已选商'
-                                                        }}
-                                                    </view>
-                                                    <view class="sjx"></view>
-                                                </view>
-                                                <span>{{ item.title }}</span>
-                                                <el-tag effect="plain" size="mini" class="el-tag">签单宝</el-tag>
-                                            </view>
-                                        </view>
-                                        <view class="caigou">
-                                            <view class="item">
-                                                <view class="icon">
-                                                    <i class="el-icon-shopping-bag-1"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">加工量</view>
-                                                    <view class="unit">{{ item.num }}</view>
-                                                </view>
-                                            </view>
-<!--                                            <view class="item" style="margin-left: 100px;">-->
-<!--                                                <view class="icon">-->
-<!--                                                    <i class="el-icon-location-outline"></i>-->
-<!--                                                </view>-->
-<!--                                                <view class="infos">-->
-<!--                                                    <view class="name">交易地址</view>-->
-<!--                                                    <view class="unit">广西壮族自治区-南宁市-五象航洋城</view>-->
-<!--                                                </view>-->
-<!--                                            </view>-->
-                                        </view>
-                                        <view class="sub-title">
-                                            <text>交易编号：{{ item.orderNo }}</text>
-                                            <text>发布时间：{{ item._add_time_str }}</text>
-                                        </view>
-                                        <view class="status">
-                                            <view class="icon">
-                                                <img src="/static/images/store/choose.png" alt=""
-                                                     v-if="item.status === 1"/>
-                                                <img src="/static/images/store/unchoose.png" alt="" v-else/>
-                                            </view>
-                                        </view>
-                                    </view>
-                                    <view class="tool">
-                                        <view class="btn">
-                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"
-                                                       @click.native="editEnquiry(item._id)">编辑询价详情
-                                            </el-button>
-                                            <el-button size="small" type="success" style="width: 160px;" v-else
-                                                       @click.native="navTo('/pages/contract/index')">去创建合同
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="danger" v-if="item.status === 0"
-                                                       @click.native="showProcessModal(item)"
-                                                       style="width: 160px;">查看收到的报价列表
-                                            </el-button>
-                                            <el-button size="small" type="success" plain style="width: 160px;" v-else
-                                            >查看交易方
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="text"
-                                                       style="width: 160px;">共收到{{ item.quoteNum }}个报价
-                                            </el-button>
-                                        </view>
-                                    </view>
-                                </view>
+  <view class="">
+    <top-bar></top-bar>
+    <common-nav></common-nav>
+    <view class="w-1200">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
+            <el-menu-item index="1">
+              <i class="el-icon-warning-outline"></i>
+              <span slot="title">询价单列表</span>
+            </el-menu-item>
+            <el-menu-item index="0">
+              <i class="el-icon-edit"></i>
+              <span slot="title">加工单列表</span>
+            </el-menu-item>
+            <el-menu-item index="3">
+              <i class="el-icon-attract"></i>
+              <span slot="title">旧货</span>
+            </el-menu-item>
+            <el-menu-item index="2">
+              <i class="el-icon-s-order"></i>
+              <span slot="title">自营询价单列表</span>
+            </el-menu-item>
+          </el-menu>
+        </el-col>
+        <el-col :span="18">
+          <el-card shadow="never" v-if="['0', '1'].includes(menuIndex)">
+            <el-tabs v-model="activeName" @tab-click="changeStatus">
+              <el-tab-pane :label="`全部(${allNum})`" name="all">
+              </el-tab-pane>
+              <el-tab-pane :label="`待报价(${noQuoteNum})`" name="noQuote"></el-tab-pane>
+              <el-tab-pane :label="`待选商(${notPickNum})`" name="notPick"></el-tab-pane>
+              <el-tab-pane :label="`已选商(${pickedNum})`" name="picked"></el-tab-pane>
+            </el-tabs>
+          </el-card>
+          <el-card shadow="never" v-if="['3'].includes(menuIndex)">
+            <el-tabs v-model="oldSignMethod" @tab-click="changeOldStatus">
+              <el-tab-pane :label="`全部`" name="all">
+              </el-tab-pane>
+              <el-tab-pane :label="`线上签约`" name="0"></el-tab-pane>
+              <el-tab-pane :label="`线下签约`" name="1"></el-tab-pane>
+            </el-tabs>
+          </el-card>
+          <el-card shadow="never" v-if="['2'].includes(menuIndex)">
+            <el-tabs v-model="selfStatus" @tab-click="changeSelfStatus">
+              <el-tab-pane :label="`全部`" name="all">
+              </el-tab-pane>
+              <el-tab-pane :label="`待选商`" name="1"></el-tab-pane>
+              <el-tab-pane :label="`已选商`" name="2"></el-tab-pane>
+            </el-tabs>
+          </el-card>
+          <el-card shadow="never" style="margin-top: 20px;" v-if="['0', '1', '2', '3'].includes(menuIndex)">
+            <template v-if="menuIndex === '0'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in processList" :key="index">
+                  <view class="info ">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status pointer"
+                              @click="navTo(`/pages/process/detail?id=${item._id}`)">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx"></view>
+                        </view>
+                        <span class="item-title pointer"
+                              @click="navTo(`/pages/process/detail?id=${item._id}`)">{{
+                            item.title
+                          }}</span>
+                        <el-tag effect="plain" size="mini" class="el-tag">
+                          {{ item.signMethod === 1 ? '线下签单' : '线上签约' }}
+                        </el-tag>
+                        <view v-if="item.status === 1 && item.signMethod === 1"
+                              class="ml-20 flex justify-start items-center">
+                          <switch-icon theme="outline" size="20" fill="#000000"
+                                       strokeLinecap="square"/>
+                          <el-tag size="mini" type="warning" class="pointer"
+                                  @click.native="processChangeToOnlineSign(item._id, index)">
+                            切换至线上交易
+                          </el-tag>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">加工量</view>
+                          <view class="unit">{{ item.num }}</view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>交易编号：{{ item.orderNo }}</text>
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                    <view class="status">
+                      <view class="icon">
+                        <img src="/static/images/store/choose.png" alt=""
+                             v-if="item.status === 1"/>
+                        <img src="/static/images/store/unchoose.png" alt=""
+                             v-else-if="item.status === 0"/>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+                      <!--                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"-->
+                      <!--                                                       @click.native="editEnquiry(item._id)">编辑询价详情-->
+                      <!--                                            </el-button>-->
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && item.contract"
+                                 @click.native="navTo(`/pages/contract/index?tab=${item.contract ? (item.contract.status === 1 ? 1 : (item.contract.status === 2 ) ? 2 : 0) : 0}`)"
+                      >
+                        {{
+                          item.contract ? (item.contract.status === 1 ? '去签署合同' : (item.contract.status === 0) ? '去创建合同' : '查看合同')
+                            : '去创建合同'
+                        }}
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="danger" v-if="item.status === 0"
+                                 @click.native="showProcessModal(item)"
+                                 style="width: 160px;">查看意向合作列表
+                      </el-button>
+                      <el-button size="small" type="success" plain style="width: 160px;" v-else
+                                 @click.native="showOtherUser(item)"
+                      >查看交易方
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="text" @click.native="showProcessModal(item)"
+                                 style="width: 160px;">共收到{{ item.quoteNum }}个报价
+                      </el-button>
+                    </view>
+                  </view>
+                </view>
 
-                                <view class="paginatio">
-                                    <el-pagination background layout="prev, pager, next" :total="total"
-                                                   :page-size="pageSize" @current-change="handleCurrentChange">
-                                    </el-pagination>
-                                </view>
-                            </view>
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '1'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in enquiryList" :key="index">
+                  <view class="info ">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status pointer"
+                              @click="navTo(`/pages/enquiry/detail?id=${item._id}`)">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx pointer"></view>
+                        </view>
+                        <span class="item-title pointer"
+                              @click="navTo(`/pages/enquiry/detail?id=${item._id}`)">{{
+                            item.title
+                          }}</span>
+                        <el-tag effect="plain" size="mini" class="el-tag">
+                          {{ item.signMethod === 1 ? '线下签单' : '线上签约' }}
+                        </el-tag>
+                        <view v-if="item.status === 1 && item.signMethod === 1"
+                              class="ml-20 flex justify-start items-center">
+                          <switch-icon theme="outline" size="20" fill="#000000"
+                                       strokeLinecap="square"/>
+                          <el-tag size="mini" type="warning" class="pointer"
+                                  @click.native="enquiryChangeToOnlineSign(item._id, index)">
+                            切换至线上交易
+                          </el-tag>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">采购量</view>
+                          <view class="unit">{{
+                              item.productNum
+                            }}
+                          </view>
+                        </view>
+                      </view>
+                      <view class="item" style="margin-left: 100px;">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">交易地址</view>
+                          <view class="unit">{{ item.fullAddress }}</view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>交易编号：{{ item.enquiryNo }}</text>
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                    <view class="status">
+                      <view class="icon">
+                        <img src="/static/images/store/choose.png" alt=""
+                             v-if="[1, 2].includes(item.status)"/>
+                        <img src="/static/images/store/unchoose.png" alt=""
+                             v-if="item.status === 0"/>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+                      <!--                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"-->
+                      <!--                                                       @click.native="editEnquiry(item._id)">编辑询价详情-->
+                      <!--                                            </el-button>-->
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && item.contract"
+                                 @click.native="navTo(`/pages/contract/index?tab=${item.contract ? (item.contract.status === 1 ? 1 : (item.contract.status === 2 ) ? 2 : 0) : 0}`)"
+                      >
+                        {{
+                          item.contract ? (item.contract.status === 1 ? '去签署合同' : (item.contract.status === 0) ? '去创建合同' : '查看合同')
+                            : '去创建合同'
+                        }}
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status === 2 && parseInt(item.tradeMethod) === 1"
+                                 @click.native="navTo('/pages/order/order')">去订单
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="danger" v-if="item.status === 0"
+                                 @click.native="showEnquiryModal(item)"
+                                 style="width: 160px;">查看意向合作列表
+                      </el-button>
+                      <el-button size="small" type="success" plain style="width: 160px;" v-else
+                                 @click.native="showOtherUser(item)">查看交易方
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="text" @click.native="showEnquiryModal(item)"
+                                 style="width: 160px;">共收到{{ item.quoteNum }}个报价
+                      </el-button>
+                    </view>
+                  </view>
+                </view>
+
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '2'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in selfSupportList.rows" :key="index">
+                  <view class="info ">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status pointer">
+                          <view class="text">{{
+                              item.status === 0 ? '待报价' : (item.status === 1 ? '待选商' : '已选商')
+                            }}
+                          </view>
+                          <view class="sjx pointer"></view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">{{ item.desc ? `产品描述:${item.desc}` : '自营询价' }}</view>
+                          <view class="unit">{{ item.province.name }}{{
+                              item.city.name
+                            }}
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                    <view class="status">
+                      <view class="icon">
+                        <img src="/static/images/store/choose.png" alt=""
+                             v-if="item.status === 2"/>
+                        <img src="/static/images/store/unchoose.png" alt=""
+                             v-if="item.status === 1"/>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <el-button size="small" type="success" style="width: 160px;"
+                               v-if="item.status !== 0 && item.signMethod !== 1 && item.contract"
+                               @click.native="navTo(`/pages/contract/index?tab=${item.contract ? (item.contract.status === 1 ? 1 : (item.contract.status === 2 ) ? 2 : 0) : 0}`)"
+                    >
+                      {{
+                        item.contract ? (item.contract.status === 1 ? '去签署合同' : (item.contract.status === 0) ? '去创建合同' : '查看合同')
+                          : '去创建合同'
+                      }}
+                    </el-button>
+                    <el-button size="small" plain style="width: 160px;margin: 10px"
+                               @click.native="showDetail(item)">查看详情
+                    </el-button>
+                    <el-button size="small" type="success" plain style="width: 160px;margin: 10px"
+                               v-if="item.status === 2"
+                               @click.native="showOtherUser(item)">查看交易方
+                    </el-button>
+                  </view>
+                </view>
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="selfSupportList.total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '3'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in oldList" :key="index">
+                  <view class="info pointer" @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx"></view>
+                        </view>
+                        <span class="item-title">{{
+                            item.title
+                          }}</span>
+                        <template v-if="item.type !== 3">
+                          <el-tag effect="plain" size="mini" class="el-tag">
+                            {{ item.signMethod === 0 ? '线上签约' : '线下签单' }}
+                          </el-tag>
                         </template>
-                        <template v-if="menuIndex === '1'">
-                            <view class="transaction-list">
-                                <view class="item" v-for="(item, index) in enquiryList" :key="index">
-                                    <view class="info">
-                                        <view class="title">
-                                            <view class="name">
-                                                <view class="fabu-status">
-                                                    <view class="text">{{
-                                                            item.status === 0 ? '发布中' : '已选商'
-                                                        }}
-                                                    </view>
-                                                    <view class="sjx"></view>
-                                                </view>
-                                                <span>{{
-                                                        item.productList.map(row => `${row.goodsName}(${row.materialQuality})`).join("/")
-                                                    }}</span>
-                                                <el-tag effect="plain" size="mini" class="el-tag">
-                                                    {{ item.signMethod === 0 ? '平台交易' : '线下签单' }}
-                                                </el-tag>
-                                                <view v-if="item.status === 0 && item.signMethod === 1"
-                                                      class="ml-20 flex justify-start items-center">
-                                                    <switch-icon theme="outline" size="20" fill="#000000"
-                                                                 strokeLinecap="square"/>
-                                                    <el-tag size="mini" type="warning" class="pointer"
-                                                            @click.native="enquiryChangeToOnlineSign(item._id, index)">
-                                                        切换至线上交易
-                                                    </el-tag>
-                                                </view>
-                                            </view>
-                                        </view>
-                                        <view class="caigou">
-                                            <view class="item">
-                                                <view class="icon">
-                                                    <i class="el-icon-shopping-bag-1"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">采购量</view>
-                                                    <view class="unit">{{
-                                                            item.productList.map(row => row.procureNumber + row.procureUnit).join("/")
-                                                        }}
-                                                    </view>
-                                                </view>
-                                            </view>
-                                            <view class="item" style="margin-left: 100px;">
-                                                <view class="icon">
-                                                    <i class="el-icon-location-outline"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">交易地址</view>
-                                                    <view class="unit">{{ item.fullAddress }}</view>
-                                                </view>
-                                            </view>
-                                        </view>
-                                        <view class="sub-title">
-                                            <text>交易编号：{{ item.enquiryNo }}</text>
-                                            <text>发布时间：{{ item._add_time_str }}</text>
-                                        </view>
-                                        <view class="status">
-                                            <view class="icon">
-                                                <img src="/static/images/store/choose.png" alt=""
-                                                     v-if="item.status === 1"/>
-                                                <img src="/static/images/store/unchoose.png" alt="" v-else/>
-                                            </view>
-                                        </view>
-                                    </view>
-                                    <view class="tool">
-                                        <view class="btn">
-                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"
-                                                       @click.native="editEnquiry(item._id)">编辑询价详情
-                                            </el-button>
-                                            <el-button size="small" type="success" style="width: 160px;" v-else
-                                                       @click.native="navTo('/pages/contract/index')">去创建合同
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="danger" v-if="item.status === 0"
-                                                       @click.native="showEnquiryModal(item)"
-                                                       style="width: 160px;">查看收到的报价列表
-                                            </el-button>
-                                            <el-button size="small" type="success" plain style="width: 160px;" v-else
-                                            >查看交易方
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="text"
-                                                       style="width: 160px;">共收到{{ item.quoteNum }}个报价
-                                            </el-button>
-                                        </view>
-                                    </view>
-                                </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">类型</view>
+                          <view class="unit">{{
+                              item.typeStr
+                            }}
+                          </view>
+                        </view>
+                      </view>
+                      <view class="item" style="margin-left: 100px;">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">交易地址</view>
+                          <view class="unit"
+                                v-if="item.addressRegion && item.addressRegion.province">
+                            {{
+                              item.addressRegion.province.name
+                            }}{{
+                              item.addressRegion.city.name
+                            }}{{ item.addressRegion.area.name }}{{ item.addressDetail }}
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>交易编号：{{ item._id }}</text>
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <el-button size="mini" type="success" style="width: 160px;margin: 10px"
+                               v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 1"
+                               @click.native="$jump('/pages/contract/index?tab=1')">
+                      签署合同
+                    </el-button>
+                    <el-button size="mini" type="success" style="width: 160px;margin: 10px"
+                               v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 2"
+                               @click.native="$jump('/pages/contract/index?tab=2')">
+                      查看合同
+                    </el-button>
+                    <el-button size="mini" type="success" style="width: 160px;margin: 10px"
+                               v-if="item.status !== 0 && item.signMethod !== 1 && (!item.contract || item.contract.status === 0)"
+                               @click.native="$jump('/pages/contract/index?tab=0')">
+                      合同待创建
+                    </el-button>
+                    <el-button size="small" plain style="width: 160px;margin: 10px"
+                               @click.native="navTo(`/pages/index/old/detail?id=${item._id}`)">查看详情
+                    </el-button>
+                    <el-button size="small" type="success" plain style="width: 160px;margin: 10px"
+                               v-if="item.status === 2"
+                               @click.native="showOtherUser(item)">查看交易方
+                    </el-button>
+                  </view>
+                </view>
 
-                                <view class="paginatio">
-                                    <el-pagination background layout="prev, pager, next" :total="total"
-                                                   :page-size="pageSize" @current-change="handleCurrentChange">
-                                    </el-pagination>
-                                </view>
-                            </view>
-                        </template>
-                    </el-card>
-                </el-col>
-            </el-row>
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+          </el-card>
+          <enquiry-data v-else/>
+        </el-col>
+      </el-row>
 
-        </view>
-        <common-footer></common-footer>
-        <enquiry-modal ref="enquiryModal"/>
-        <process-modal ref="processModal"/>
     </view>
+    <common-footer></common-footer>
+    <enquiry-modal ref="enquiryModal"/>
+    <process-modal ref="processModal"/>
+    <self-support-modal ref="selfSupportModal"/>
+  </view>
 </template>
 
 <script>
@@ -242,437 +436,570 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 import {
-    Agreement,
-    Switch as SwitchIcon
+  Agreement,
+  Switch as SwitchIcon
 } from "@icon-park/vue";
 import EnquiryModal from "./components/enquiryModal.vue";
 import ProcessModal from "./components/processModal.vue";
+import EnquiryData from "./components/enquiryData.vue";
+import selfSupport from "../index/self-support/self-support.vue";
+import SelfSupportModal from "./components/selfSupportModal.vue";
 
 export default {
-    components: {
-        ProcessModal,
-        EnquiryModal,
-        Agreement,
-        SwitchIcon
-    },
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            activeName: 'all',
-            value: '',
-            value1: '',
-            options: [{
-                value: '金久信自营',
-                label: '金久信自营'
-            }],
-            value2: '',
-            options2: [{
-                value: '未开发票',
-                label: '自主交易'
-            }],
-            input3: '',
-            menuIndex: '1',
-            isSign: false,
-            formData: {
-                status: 0,
-                tradeMethod: null
-            },
-            tableData: {},
-            pageSize: 10,
-            enquiryList: [],
-            processList: [],
-            total: 0,
-            notPickNum: 0,
-            pickedNum: 0,
-            noQuoteNum: 0,
-            allNum: 0,
-        }
-    },
-    onLoad(options) {
-        if (options.menuIndex) {
-            this.menuIndex = String(options.menuIndex)
-        }
-        if (this.menuIndex === '1') this.getEnquiryList()
-        else this.getProcessList()
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo({
-                url
-            })
-        },
-        menuSelect(e) {
-            this.menuIndex = String(e)
-            this.formData.status = Number(e)
-            this.isSign = false
-            this.handleCurrentChange(1)
-        },
-        handleCurrentChange(page) {
-            if (this.menuIndex === '1') this.getEnquiryList(page)
-            else this.getProcessList(page)
-        },
-        changeStatus() {
-            if (this.menuIndex === '1') this.getEnquiryList(1)
-            else this.getProcessList(1)
-        },
-        getEnquiryList(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/enquiry/sheet/pub/getList',
-                data: {
-                    userId: vk.getVuex('$user.userInfo._id'),
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    status: this.activeName
-                },
-                success: (res) => {
-                    this.enquiryList = res.rows.map(val => {
-                        let str = ''
-                        if (val.productList !== undefined && val.productList.length > 0 && val.productList[0].addressRegion !== undefined && val.productList[0].addressRegion.length > 0) {
-                            let provinceIndex = 0, cityIndex = 0, areaIndex = 0
-                            this.provinceData.forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) {
-                                    provinceIndex = index
-                                    str = item.name
-                                }
-                            })
-                            this.cityData[provinceIndex].forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) {
-                                    cityIndex = index
-                                    str += `-${item.name}`
-                                }
-                            })
-                            this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) {
-                                    areaIndex = index
-                                    str += `-${item.name}`
-                                }
-                            })
-                            // str += val.productList[0].addressDetail
-                        }
-                        val.fullAddress = str
-                        return val
-                    })
-                    this.total = res.total
-                    this.allNum = res.all
-                    this.notPickNum = res.notPickNum
-                    this.pickedNum = res.pickedNum
-                    this.quoteNum = res.quoteNum
-                }
-            })
-        },
-        getProcessList(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/process/sheet/pub/getList',
-                data: {
-                    userId: vk.getVuex('$user.userInfo._id'),
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    status: this.activeName
-                },
-                success: (res) => {
-                    this.processList = res.rows
-                    this.total = res.total
-                    this.allNum = res.all
-                    this.notPickNum = res.notPickNum
-                    this.pickedNum = res.pickedNum
-                    this.quoteNum = res.quoteNum
-                }
-            })
-        },
-        showEnquiryModal({status, quoteList}) {
-            this.$refs.enquiryModal.open(status, quoteList)
-        },
-        showProcessModal({status, quoteList}) {
-            this.$refs.processModal.open(status, quoteList)
-        },
-        editEnquiry(id) {
-            vk.navigateTo({
-                url: `/pages/enquiry/release?id=${id}`
-            })
-        },
-        enquiryChangeToOnlineSign(id, index) {
-            vk.callFunction({
-                url: ' client/enquiry/sheet/kh/changeToOnlineSign',
-                data: {
-                    id
-                }
-            })
-            this.enquiryList[index].signMethod = 0
-        }
+  computed: {
+    selfSupport() {
+      return selfSupport
     }
+  },
+  components: {
+    SelfSupportModal,
+    EnquiryData,
+    ProcessModal,
+    EnquiryModal,
+    Agreement,
+    SwitchIcon
+  },
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      activeName: 'all',
+      value: '',
+      menuIndex: '1',
+      formData: {
+        status: 0,
+        tradeMethod: null
+      },
+      tableData: {},
+      pageSize: 10,
+      enquiryList: [],
+      processList: [],
+      selfSupportList: {},
+      total: 0,
+      notPickNum: 0,
+      pickedNum: 0,
+      noQuoteNum: 0,
+      allNum: 0,
+      oldList: [],
+      oldSignMethod: 'all',
+      selfStatus: 'all',
+    }
+  },
+  onLoad(options) {
+    if (!vk.getVuex('$user.userInfo.mobile')) {
+      this.$confirm('请先绑定手机号', '提示', {
+        confirmButtonText: '确定',
+        showCancelButton: false,
+        type: 'warning'
+      }).then(() => {
+        vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+      }).catch(() => {
+        vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+      })
+      return
+    }
+    if (options.menuIndex) {
+      this.menuIndex = String(options.menuIndex)
+    }
+    if (this.menuIndex === '1') this.getEnquiryList()
+    else if (this.menuIndex === '0') this.getProcessList()
+    else if (this.menuIndex === '2') this.getSelfSupportList()
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
+    },
+    menuSelect(e) {
+      this.menuIndex = String(e)
+      this.formData.status = Number(e)
+      this.handleCurrentChange(1)
+    },
+    handleCurrentChange(page) {
+      if (this.menuIndex === '1') this.getEnquiryList(page)
+      else if (this.menuIndex === '0') this.getProcessList(page)
+      else if (this.menuIndex === '2') this.getSelfSupportList(page)
+      else if (this.menuIndex === '3') this.getOldList(page)
+    },
+    changeStatus() {
+      if (this.menuIndex === '1') this.getEnquiryList(1)
+      else if (this.menuIndex === '0') this.getProcessList(1)
+      else if (this.menuIndex === '2') this.getSelfSupportList(1)
+      else if (this.menuIndex === '3') this.getOldList(1)
+    },
+    changeOldStatus() {
+      this.getOldList(1)
+    },
+    changeSelfStatus() {
+      this.getSelfSupportList(1)
+    },
+    getOldList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/old/kh/getList',
+        data: {
+          quoteUid: vk.getVuex('$user.userInfo._id'),
+          pageIndex,
+          pageSize: this.pageSize,
+          signMethod: this.oldSignMethod === 'all' ? null : this.oldSignMethod,
+          buyerOnly: true
+        },
+        success: (res) => {
+          this.oldList = res.rows.map(item => {
+            if (item.type === 0) item.typeStr = '拍卖'
+            else if (item.type === 1) item.typeStr = '采购'
+            else if (item.type === 2) {
+              item.typeStr = '租赁'
+              if (item.rentType === 0) item.typeStr += '-承租'
+              else item.typeStr += '-出租'
+            } else if (item.type === 3) item.typeStr = '物资回收'
+            if (item.addressRegion && item.addressRegion.length > 0)
+              item.address = item?.addressRegion[0]?.name + item?.addressRegion[1]?.name + item?.addressRegion[2]?.name + item.addressDetail
+            return item
+          })
+          this.total = res.total
+        }
+      })
+    },
+    getEnquiryList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/enquiry/sheet/kh/getList',
+        title: '加载中...',
+        data: {
+          userId: vk.getVuex('$user.userInfo._id'),
+          pageIndex,
+          pageSize: this.pageSize,
+          status: this.activeName
+        },
+        success: (res) => {
+          this.enquiryList = res.rows.map(val => {
+            let str = ''
+            val.productNum = ''
+            if (val.productList !== undefined && val.productList.length > 0 && val.productList[0].addressRegion !== undefined && val.productList[0].addressRegion.length > 0) {
+              let provinceIndex = 0, cityIndex = 0, areaIndex = 0
+              this.provinceData.forEach((item, index) => {
+                if (parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) {
+                  provinceIndex = index
+                  str = item.name
+                }
+              })
+              this.cityData[provinceIndex].forEach((item, index) => {
+                if (parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) {
+                  cityIndex = index
+                  str += `-${item.name}`
+                }
+              })
+              this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
+                if (parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) {
+                  areaIndex = index
+                  str += `-${item.name}`
+                }
+              })
+              // str += val.productList[0].addressDetail
+            }
+            const productNumList = []
+            val.productList.forEach((item, index) => {
+              if (item.procureNumber) productNumList.push(item.procureNumber + item.procureUnit)
+            })
+            val.productNum = productNumList.join('/')
+            val.fullAddress = str
+            return val
+          })
+          this.total = res.total
+          this.allNum = res.all
+          this.notPickNum = res.notPickNum
+          this.noQuoteNum = res.noQuoteNum
+          this.pickedNum = res.pickedNum
+          this.quoteNum = res.quoteNum
+        }
+      })
+    },
+    getProcessList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/process/sheet/pub/getList',
+        title: '加载中...',
+        data: {
+          isUser: true,
+          userId: vk.getVuex('$user.userInfo._id'),
+          pageIndex,
+          pageSize: this.pageSize,
+          status: this.activeName
+        },
+        success: (res) => {
+          this.processList = res.rows
+          this.total = res.total
+          this.allNum = res.all
+          this.notPickNum = res.notPickNum
+          this.pickedNum = res.pickedNum
+          this.quoteNum = res.quoteNum
+          this.noQuoteNum = res.noQuoteNum
+        }
+      })
+    },
+    async getSelfSupportList(pageIndex = 1) {
+      const data = await vk.callFunction({
+        url: 'client/selfSupport/kh/getList',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          status: this.selfStatus === 'all' ? null : this.selfStatus,
+        }
+      })
+      this.selfSupportList = data
+      this.showList = true
+    },
+    showEnquiryModal(item) {
+      this.$refs.enquiryModal.open(item)
+    },
+    showProcessModal(item) {
+      this.$refs.processModal.open(item)
+    },
+    editEnquiry(id) {
+      vk.navigateTo({
+        url: `/pages/enquiry/release?id=${id}`
+      })
+    },
+    enquiryChangeToOnlineSign(id, index) {
+      this.$confirm('确认将该订单转为线上签订吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        await vk.callFunction({
+          url: ' client/enquiry/sheet/kh/changeToOnlineSign',
+          title: '加载中...',
+          data: {
+            id
+          }
+        })
+        this.$confirm('切换成功,是否去创建合同?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/contract/index'});
+        })
+        this.enquiryList[index].signMethod = 0
+      })
+    },
+    processChangeToOnlineSign(id, index) {
+      this.$confirm('确认将该订单转为线上签订吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        await vk.callFunction({
+          url: ' client/process/sheet/kh/changeToOnlineSign',
+          title: '加载中...',
+          data: {
+            id
+          }
+        })
+        this.$confirm('切换成功,是否去创建合同?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/contract/index'});
+        })
+        this.enquiryList[index].signMethod = 0
+      })
+    },
+    showOtherUser(item) {
+      if (item.otherUser) {
+        this.$confirm(`交易方联系方式:${item.otherUser.company.mobile ?? item.otherUser.person.mobile}`, '', {
+          cancelButtonText: '关闭',
+          showConfirmButton: false
+        })
+      } else {
+        this.$confirm(`交易方未留下联系方式`, '', {
+          cancelButtonText: '关闭',
+          showConfirmButton: false
+        })
+      }
+    },
+    showDetail(info) {
+      this.$refs.selfSupportModal.open(info)
+    }
+  }
 }
 </script>
 
 <style scoped lang="scss">
 .w-1200 {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .contract-list {
-    background-color: #FFFFFF;
-    padding: 10px 20px 20px;
+  background-color: #FFFFFF;
+  padding: 10px 20px 20px;
 }
 
 
 .transaction-list {
+  display: flex;
+  flex-direction: column;
+
+  .item {
     display: flex;
-    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 0;
+    border-bottom: 1px solid #f3f3f3;
 
-    .item {
+    .info {
+      position: relative;
+      border-right: 1px solid #f3f3f3;
+      flex: 1;
+
+      .name {
         display: flex;
-        justify-content: space-between;
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 1.6em;
         align-items: center;
-        padding: 10px 0;
-        border-bottom: 1px solid #f3f3f3;
 
-        .info {
+        .fabu-status {
+          margin-right: 20px;
+          font-weight: normal;
+          display: flex;
+          width: 95px;
+
+          .text {
+            padding: 0 10px 0 20px;
+            font-size: 13px;
+            color: #fff;
+            background-color: #A92924;
+          }
+
+          .sjx {
+            border: 12px solid;
+            border-color: #A92924 #ffffff #A92924 #A92924;
             position: relative;
-            border-right: 1px solid #f3f3f3;
-            flex: 1;
+          }
 
-            .name {
-                display: flex;
-                font-size: 16px;
-                font-weight: bold;
-                line-height: 1.6em;
-                align-items: center;
 
-                .fabu-status {
-                    margin-right: 20px;
-                    font-weight: normal;
-                    display: flex;
-
-                    .text {
-                        padding: 0 10px 0 20px;
-                        font-size: 13px;
-                        color: #fff;
-                        background-color: #A92924;
-                    }
-
-                    .sjx {
-                        border: 12px solid;
-                        border-color: #A92924 #ffffff #A92924 #A92924;
-                        position: relative;
-                    }
-
-                    // .text{
-                    // 	color: #fff;
-                    // 	background-color: #A92924
-                    // }
-                }
-
-                .buyer,
-                .seller {
-                    font-size: 14px;
-                    font-weight: normal;
-                    display: flex;
-                    margin: 0 30px;
-                }
-
-                .el-tag {
-                    margin-left: 10px;
-                }
-            }
-
-            .caigou {
-                display: flex;
-                align-items: center;
-
-                .item {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    padding: 10px 0;
-                    border: none;
-
-                    .icon {
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        margin: 10px;
-                        background-color: #f3f3f3;
-                        padding: 10px;
-                        border-radius: 100px;
-
-                        .el-icon-shopping-bag-1,
-                        .el-icon-location-outline {
-                            font-size: 30px;
-                        }
-                    }
-
-                    .infos {
-                        display: flex;
-                        flex-direction: column;
-
-                        .unit {
-                            color: #A92924
-                        }
-                    }
-                }
-            }
-
-            .sub-title {
-                color: #999999;
-
-                text {
-                    margin-right: 60px;
-                }
-            }
-
-            .action {
-                padding: 10px 0;
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-
-                .btn-buy,
-                .btn-close {
-                    color: #A92924;
-                }
-            }
-
-            .status {
-                position: absolute;
-                top: 0;
-                right: 0;
-
-                .icon {
-                    margin: 0 20px;
-
-                    img {
-                        width: 80px;
-                    }
-                }
-            }
+          // .text{
+          // 	color: #fff;
+          // 	background-color: #A92924
+          // }
         }
 
-        .tool {
+        .item-title {
+          width: 200px;
+        }
+
+        .buyer,
+        .seller {
+          font-size: 14px;
+          font-weight: normal;
+          display: flex;
+          margin: 0 30px;
+        }
+
+        .el-tag {
+          margin-left: 10px;
+        }
+      }
+
+      .caigou {
+        display: flex;
+        align-items: center;
+
+        .item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 10px 0;
+          border: none;
+
+          .icon {
             display: flex;
-            width: 200px;
+            justify-content: center;
             align-items: center;
-            justify-content: space-around;
+            margin: 10px;
+            background-color: #f3f3f3;
+            padding: 10px;
+            border-radius: 100px;
+
+            .el-icon-shopping-bag-1,
+            .el-icon-location-outline {
+              font-size: 30px;
+            }
+          }
+
+          .infos {
+            display: flex;
             flex-direction: column;
 
-            .btn {
-                margin: 5px 0;
-            }
-
-            .price {
-                margin: 0 20px;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: center;
-
-                .red {
-                    font-size: 16px;
-                    color: #A92924;
-                    font-weight: bold;
-                }
+            .unit {
+              color: #A92924
             }
+          }
         }
+      }
+
+      .sub-title {
+        color: #999999;
+
+        text {
+          margin-right: 60px;
+        }
+      }
+
+      .action {
+        padding: 10px 0;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+
+        .btn-buy,
+        .btn-close {
+          color: #A92924;
+        }
+      }
+
+      .status {
+        position: absolute;
+        top: 0;
+        right: 0;
+
+        .icon {
+          margin: 0 20px;
+
+          img {
+            width: 80px;
+          }
+        }
+      }
     }
+
+    .tool {
+      display: flex;
+      width: 200px;
+      align-items: center;
+      justify-content: space-around;
+      flex-direction: column;
+
+      .btn {
+        margin: 5px 0;
+      }
+
+      .price {
+        margin: 0 20px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .red {
+          font-size: 16px;
+          color: #A92924;
+          font-weight: bold;
+        }
+      }
+    }
+  }
 }
 
 .paginatio {
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 
 .contract-box {
-    display: flex;
-    justify-content: space-between;
-    border-bottom: solid 1px #e8e8e8;
-    padding: 10rpx 0;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: solid 1px #e8e8e8;
+  padding: 10rpx 0;
 }
 
 .contract-left {
 }
 
 .contract-right {
-    text-align: right;
-    font-size: 13px;
+  text-align: right;
+  font-size: 13px;
 }
 
 .trade-method {
-    display: flex;
-    margin-bottom: 20px;
-    border-bottom: solid 2px #f4f4f4;
+  display: flex;
+  margin-bottom: 20px;
+  border-bottom: solid 2px #f4f4f4;
 }
 
 .trade-method-item {
-    cursor: pointer;
-    font-size: 18px;
-    margin-right: 15px;
-    height: 40px;
-    line-height: 40px;
+  cursor: pointer;
+  font-size: 18px;
+  margin-right: 15px;
+  height: 40px;
+  line-height: 40px;
 }
 
 .trade-method-item.active {
-    color: #A92924;
-    border-bottom: solid 2px #A92924;
+  color: #A92924;
+  border-bottom: solid 2px #A92924;
 }
 
 .contract-left-top {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 
 }
 
 .contract-product {
-    margin: 0 10px;
+  margin: 0 10px;
 }
 
 .contract-left-center {
-    height: 40px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    color: #999999;
-    font-size: 12px;
-    flex-direction: column;
-    margin-top: 5px;
+  height: 40px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
+  color: #999999;
+  font-size: 12px;
+  flex-direction: column;
+  margin-top: 5px;
 }
 
 .contract-left-bottom {
-    display: flex;
+  display: flex;
 }
 
 .contract-status {
-    display: flex;
+  display: flex;
 }
 
 .contract-status-tag {
-    margin-left: 2px;
+  margin-left: 2px;
 }
 
 .sign {
-    padding: 20px 20px 20px 25px;
-    font-size: 14px;
+  padding: 20px 20px 20px 25px;
+  font-size: 14px;
 
-    .icon {
-        line-height: 18px;
-    }
+  .icon {
+    line-height: 18px;
+  }
 }
 
 .search {
-    display: flex;
+  display: flex;
 
-    .p {
-        margin-right: 10px;
-    }
+  .p {
+    margin-right: 10px;
+  }
 }
 
 .el-select .el-input {
-    width: 130px;
+  width: 130px;
 }
 
 .input-with-select .el-input-group__prepend {
-    background-color: #fff;
+  background-color: #fff;
 }
 </style>
\ No newline at end of file
diff --git a/pages/store/components/enquiryData.vue b/pages/store/components/enquiryData.vue
new file mode 100644
index 0000000..70472c4
--- /dev/null
+++ b/pages/store/components/enquiryData.vue
@@ -0,0 +1,79 @@
+<template>
+    <el-card>
+        <view class="item-wrap">
+            <view class="form-title-wrap">
+                <view class="goods-info-title">
+                    <view class="form-title">
+                        询价单管理
+                    </view>
+                </view>
+                <text class="text-gray text-25 pointer">查看全部 <i class="el-icon-arrow-right"></i></text>
+            </view>
+        </view>
+        <view class="flex justify-center items-center">
+            <view class="flex flex-col justify-center items-center">
+                <text class="text-main text-50">{{ enquiry.noQuote }}</text>
+                <text>待报价</text>
+            </view>
+            <view class="flex flex-col justify-center items-center">
+                <text class="text-main text-50">{{ enquiry.notPick }}</text>
+                <text>待选商</text>
+            </view>
+            <view class="flex flex-col justify-center items-center">
+                <text class="text-main text-50">{{ enquiry.picked }}</text>
+                <text>已选商</text>
+            </view>
+            <view class="flex flex-col justify-center items-center">
+                <text class="text-main text-50">{{ enquiry.closed }}</text>
+                <text>已关闭</text>
+            </view>
+        </view>
+    </el-card>
+</template>
+
+<script>
+export default {
+    name: "enquiryData",
+    data() {
+        return {
+            enquiry: {
+                noQuote: 0,
+                notPick: 0,
+                picked: 0,
+                closed: 0
+            },
+
+        }
+    },
+    methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/common/css/app.scss";
+
+.item-wrap {
+    margin: 24px 0;
+
+    .form-title-wrap {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .goods-info-title {
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+        }
+
+        .form-title {
+            padding-left: 10px;
+            color: $--color-primary;
+            font-size: 18px;
+            line-height: 18px;
+            border-left: 4px solid $--color-primary;
+        }
+
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/store/components/enquiryModal.vue b/pages/store/components/enquiryModal.vue
index 25f2232..dd32980 100644
--- a/pages/store/components/enquiryModal.vue
+++ b/pages/store/components/enquiryModal.vue
@@ -11,18 +11,30 @@
         <view class="mt-15">
             <view class="request-header">
                 <text class="flex-1">供应商</text>
-                <text class="flex-1">报价时间</text>
                 <text class="flex-1">联系方式</text>
                 <text class="flex-1">报价</text>
+                <text class="flex-1">详情</text>
+                <text class="flex-1">供应商合同补充条款</text>
+                <text class="flex-1">报价时间</text>
+                <text class="flex-1">附件</text>
                 <text class="flex-1">操作</text>
             </view>
             <view class="quote" v-for="(item, index) in quoteList" :key="index">
                 <text class="flex-1">{{ item.subjectName }}</text>
-                <text class="flex-1">{{ item._add_time_str }}</text>
                 <text class="flex-1">{{ item.subjectMobile }}</text>
                 <text class="flex-1">{{ item.totalPrice }}元</text>
+                <text class="flex-1">{{ item.remark ? item.remark : '无' }}</text>
+                <text class="flex-1">{{ item.supplierExt ? item.supplierExt : '无' }}</text>
+                <text class="flex-1">{{ item._add_time_str }}</text>
                 <text class="flex-1">
-                    <el-button type="primary" v-if="status === 0" @click.native="confirm(item)">选择</el-button>
+                    <template v-if="item.files && item.files.length > 0">
+                        <file-type v-for="(file, fileIndex) in item.files" :key="fileIndex" :item="file"
+                                   @click.native="openDownload(file)"/>
+                    </template>
+                    <text v-else>无</text>
+                </text>
+                <text class="flex-1">
+                    <el-button type="primary" v-if="item.status === 0" @click.native="confirm(item)">选择</el-button>
                 </text>
             </view>
         </view>
@@ -33,8 +45,11 @@
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import FileType from "../../../components/file-type/file-type.vue";
+
 export default {
     name: "enquiryModal",
+    components: {FileType},
     data() {
         return {
             provinceData: provinces,
@@ -43,12 +58,13 @@ export default {
             id: null,
             dialogVisible: false,
             quoteList: [],
-            status: 0
+            info: null
         }
     },
     methods: {
-        open(status, quoteList) {
-            this.quoteList = quoteList
+        open(info) {
+            this.info = info
+            this.quoteList = info.quoteList
             this.dialogVisible = true
         },
         handleClose() {
@@ -72,8 +88,18 @@ export default {
                         type: 'success',
                         message: '报价确认成功'
                     })
+                    setTimeout(() => {
+                        if (this.info.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+                        else {
+                            if (this.info.signMethod === 1) vk.navigateTo('/pages/store/buyer')
+                            else vk.navigateTo('/pages/contract/index?tab=0')
+                        }
+                    }, 500)
                 }
             });
+        },
+        openDownload(url) {
+            window.open(url)
         }
     }
 }
diff --git a/pages/store/components/oldModal.vue b/pages/store/components/oldModal.vue
new file mode 100644
index 0000000..553f879
--- /dev/null
+++ b/pages/store/components/oldModal.vue
@@ -0,0 +1,178 @@
+<template>
+  <view>
+
+    <el-dialog
+      title="报价列表"
+      :visible.sync="dialogVisible"
+      width="60%"
+      :before-close="handleClose">
+      <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
+        <text>收到的报价列表</text>
+        <el-button type="primary" @click.native="dialogVisible = false">关闭</el-button>
+      </view>
+      <view class="mt-15" v-if="quoteList">
+        <view class="request-header">
+          <text class="flex-1">报价方</text>
+          <text class="flex-1">报价时间</text>
+          <text class="flex-1">联系方式</text>
+          <text class="flex-1">报价</text>
+          <text class="flex-1">详情</text>
+          <text class="flex-1">补充协议</text>
+          <text class="flex-1">附件</text>
+          <text class="flex-1">操作</text>
+        </view>
+        <view class="quote" v-for="(item, index) in quoteList" :key="index">
+          <text class="flex-1">{{ item.subjectName }}</text>
+          <text class="flex-1">{{ item._add_time_str }}</text>
+          <text class="flex-1">{{ item.user.mobile }}</text>
+          <text class="flex-1">{{ item.totalPrice }}元</text>
+          <text class="flex-1">{{ item.remark }}</text>
+          <text class="flex-1">{{ item.supplierExt ? item.supplierExt : '无' }}</text>
+          <view class="flex-1">
+            <view class="flex-1">
+              <view class="mt-15 mr-15" v-for="(file, fileIndex) in item.files" :key="fileIndex">
+                <file-type :item="file" @click.native="openDownload(file)"/>
+              </view>
+            </view>
+          </view>
+          <text class="flex-1">
+            <el-button type="primary" @click.native="createContract(item._id)" v-if="status === 0">选择</el-button>
+          </text>
+        </view>
+      </view>
+    </el-dialog>
+    <vk-data-dialog
+      v-model="showInfo"
+      title="申请详情"
+      width="600px"
+      top="14vh"
+      center
+      :close-on-click-modal="true"
+    >
+      <vk-data-detail-table
+        :data="info"
+        :columns="infoColumns"
+        size="medium"
+        label-width="150px"
+      ></vk-data-detail-table>
+      <template v-slot:footer>
+        <el-button @click="showInfo = false">关闭</el-button>
+      </template>
+    </vk-data-dialog>
+  </view>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import {FileExcel, FilePdfOne, FileWord} from "@icon-park/vue";
+
+export default {
+  name: "oldModal",
+  components: {FilePdfOne, FileExcel, FileWord},
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      id: null,
+      dialogVisible: false,
+      quoteList: [],
+      status: 0,
+      infoColumns: [
+        {key: "company.companyName", title: "申请人", type: "text"},
+        {key: "company.mobile", title: "联系方式", type: "text"},
+        {key: "manager.personName", title: "代理人", type: "text"},
+        {key: "manager.mobile", title: "代理人联系方式", type: "text"},
+      ],
+      info: null,
+      showInfo: false,
+      signMethod: 0
+    }
+  },
+  methods: {
+    open(id, status, quoteList, signMethod) {
+      this.id = id
+      this.status = status
+      this.quoteList = quoteList
+      this.signMethod = signMethod
+      this.dialogVisible = true
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    toQuote() {
+      vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
+    },
+    async createContract(quoteId) {
+      await vk.callFunction({
+        url: 'client/old/kh/confirmQuote',
+        title: '请求中...',
+        data: {
+          quoteId,
+        }
+      });
+      this.dialogVisible = false
+      this.$message({
+        message: "选择成功",
+        type: 'success'
+      })
+      if (this.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+      else {
+        if (this.signMethod === 1) vk.navigateTo('/pages/store/store?menuIndex=2')
+        else vk.navigateTo('/pages/contract/index?tab=0&tradeMethod=0')
+      }
+    },
+    getOldInfo() {
+      vk.callFunction({
+        url: 'client/old/pub/getDetail',
+        title: '请求中...',
+        data: {
+          id: this.id,
+        }
+      }).then(res => {
+        this.info = res.data
+      })
+    },
+    doShowInfo(info) {
+      this.info = info
+      this.showInfo = true
+    },
+    openDownload(url) {
+      window.open(url)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.request-header {
+  border: 1px solid #EDEDED;
+  background-color: #FFF8F1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+  margin-top: 30px;
+
+  text {
+    text-align: center;
+  }
+}
+
+.quote {
+  border-left: 1px solid #EDEDED;
+  border-right: 1px solid #EDEDED;
+  border-bottom: 1px solid #EDEDED;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+
+  text {
+    text-align: center;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/store/components/processModal.vue b/pages/store/components/processModal.vue
index 5c579e7..1453372 100644
--- a/pages/store/components/processModal.vue
+++ b/pages/store/components/processModal.vue
@@ -1,120 +1,143 @@
 <template>
-    <el-dialog
-        title="报价列表"
-        :visible.sync="dialogVisible"
-        width="60%"
-        :before-close="handleClose">
-        <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
-            <text>收到的加工申请</text>
-            <el-button type="primary" @click.native="dialogVisible = false">关闭</el-button>
+  <el-dialog
+    title="报价列表"
+    :visible.sync="dialogVisible"
+    width="60%"
+    :before-close="handleClose">
+    <view slot="title" class="text-main text-40 m-30 flex justify-between items-center">
+      <text>收到的加工申请</text>
+      <el-button type="primary" @click.native="dialogVisible = false">关闭</el-button>
+    </view>
+    <view class="mt-15">
+      <view class="request-header">
+        <text class="flex-1">申请人</text>
+        <text class="flex-1">报价</text>
+        <text class="flex-1">补充条款</text>
+        <text class="flex-1">附件</text>
+        <text class="flex-1">申请时间</text>
+        <text class="flex-1">操作</text>
+      </view>
+      <view class="quote" v-for="(item, index) in quoteList.rows" :key="index">
+        <text class="flex-1" v-if="item.user">{{
+            item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
+          }}
+        </text>
+        <text class="flex-1">{{ item.totalPrice }}元</text>
+        <view class="flex-1 flex flex-col justify-start items-start">
+          <text>加工方补充条款：{{ item.supplierExt ? item.supplierExt : '无' }}</text>
         </view>
-        <view class="mt-15" >
-            <view class="request-header">
-                <text class="flex-1">加工商</text>
-                <text class="flex-1">报价</text>
-                <text class="flex-1">申请时间</text>
-                <text class="flex-1">操作</text>
-            </view>
-            <view class="quote" v-for="(item, index) in quoteList.rows" :key="index">
-                <text class="flex-1">{{
-                        item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
-                    }}
-                </text>
-                <text class="flex-1">{{ item.totalPrice }}元</text>
-                <text class="flex-1">{{ item._add_time_str }}</text>
-                <text class="flex-1">
-                    <el-button type="primary" @click.native="createContract(item)" v-if="status === 0">选择</el-button>
-                </text>
-            </view>
-        </view>
-    </el-dialog>
+<!--        <text class="flex-1">{{ item.remark }}</text>-->
+        <text class="flex-1">
+          <file-type v-for="(file, fileIndex) in item.files" :key="fileIndex" :item="file"
+                     @click.native="openDownload(file)"/>
+        </text>
+        <text class="flex-1">{{ item._add_time_str }}</text>
+        <text class="flex-1">
+          <el-button type="primary" @click.native="createContract(item)" v-if="item.status === 0">选择</el-button>
+        </text>
+      </view>
+    </view>
+  </el-dialog>
 </template>
 
 <script>
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import FileType from "../../../components/file-type/file-type.vue";
+
 export default {
-    name: "processModal",
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            id: null,
-            dialogVisible: false,
-            quoteList: [],
-            status: 0
-        }
-    },
-    methods: {
-        open(status, quoteList) {
-            console.log(status, quoteList)
-            this.quoteList = quoteList
-            this.dialogVisible = true
-        },
-        handleClose() {
-            this.dialogVisible = false
-        },
-        toQuote() {
-            vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
-        },
-        createContract({totalPrice, uid, _id}) {
-            vk.callFunction({
-                url: 'client/contract/kh/add',
-                data: {
-                    type: 'process',
-                    productTitle: this.info.title,
-                    transactionId: vk.pubfn.createOrderNo("P", 20),
-                    sheetId: this.id,
-                    quoteId: _id,
-                    buyer: vk.getVuex('$user.userInfo._id'),
-                    seller: uid,
-                    amount: totalPrice,
-                    partyCount: 2,
-                    signCount: 0,
-                }
-            }).then((res) => {
-                this.$message({
-                    message: '选择成功',
-                    type: 'success'
-                })
-                setTimeout(() => {
-                    vk.navigateTo('/pages/contract/index')
-                }, 1500)
-            })
-        }
+  name: "processModal",
+  components: {FileType},
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      id: null,
+      info: null,
+      dialogVisible: false,
+      quoteList: [],
+      status: 0
     }
+  },
+  methods: {
+    open(info) {
+      this.info = info
+      this.id = info._id
+      this.quoteList = info.quoteList
+      this.dialogVisible = true
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    toQuote() {
+      vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
+    },
+    createContract({totalPrice, uid, _id}) {
+      vk.callFunction({
+        url: 'client/contract/kh/add',
+        data: {
+          type: 'process',
+          productTitle: this.info.title,
+          transactionId: vk.pubfn.createOrderNo("P", 20),
+          sheetId: this.id,
+          quoteId: _id,
+          buyer: vk.getVuex('$user.userInfo._id'),
+          seller: uid,
+          amount: totalPrice,
+          partyCount: 2,
+          signCount: 0,
+        }
+      }).then((res) => {
+        this.dialogVisible = false
+        this.$message({
+          message: '选择成功',
+          type: 'success'
+        })
+        setTimeout(() => {
+          if (this.info.signMethod === 0) vk.navigateTo('/pages/contract/index?tab=1')
+          else {
+            if (this.info.signMethod === 1) vk.navigateTo('/pages/store/buyer')
+            else vk.navigateTo('/pages/contract/index?tab=0')
+          }
+        }, 500)
+      })
+    },
+    openDownload(url) {
+      window.open(url)
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 
 .request-header {
-    border: 1px solid #EDEDED;
-    background-color: #FFF8F1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 15px;
-    margin-top: 30px;
+  border: 1px solid #EDEDED;
+  background-color: #FFF8F1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+  margin-top: 30px;
 
-    text {
-        text-align: center;
-    }
+  text {
+    text-align: center;
+  }
 }
 
 .quote {
-    border-left: 1px solid #EDEDED;
-    border-right: 1px solid #EDEDED;
-    border-bottom: 1px solid #EDEDED;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 15px;
+  border-left: 1px solid #EDEDED;
+  border-right: 1px solid #EDEDED;
+  border-bottom: 1px solid #EDEDED;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
 
-    text {
-        text-align: center;
-    }
+  text {
+    text-align: center;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/pages/store/components/selfSupportModal.vue b/pages/store/components/selfSupportModal.vue
new file mode 100644
index 0000000..f876040
--- /dev/null
+++ b/pages/store/components/selfSupportModal.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog
+    title="自营询价详情"
+    :visible.sync="dialogVisible"
+    width="60%"
+    :before-close="handleClose">
+
+    <el-descriptions border size="small" :column="2">
+      <el-descriptions-item label="询价区域">
+        <span>{{ info.province.name }}{{ info.city.name }} </span>
+      </el-descriptions-item>
+      <el-descriptions-item label="联系人">
+        <span>{{ info.name }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="联系方式">
+        <span>{{ info.phone }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="用户名称">
+        <span>{{ info.company }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="询价单附件">
+        <view class="mt-15 mr-15" v-for="(file, fileIndex) in info.files" :key="fileIndex">
+          <file-type :item="file" @click.native="openDownload(file)"/>
+        </view>
+      </el-descriptions-item>
+      <template v-if="info.quoteList && info.status === 1">
+        <el-descriptions-item label="报价列表">
+          <div class="py-20 border-bottom" v-for="(item, index) in info.quoteList" :key="index">
+            <p>公司:{{ item.user.company.companyName }}</p>
+            <template v-if="item.amount">
+              <p>报价:￥{{ item.amount }}</p>
+              <span v-if="item.remark">备注:{{ item.remark }}</span>
+              <view class="mt-15 mr-15" v-for="(file, fileIndex) in item.files" :key="fileIndex">
+                <file-type :item="file" @click.native="openDownload(file)"/>
+              </view>
+            </template>
+            <p v-else>未报价</p>
+          </div>
+        </el-descriptions-item>
+      </template>
+      <template v-if="info.quoteList && info.status === 2">
+        <el-descriptions-item label="报价公司">
+          <div class="py-20 border-bottom" v-for="(item, index) in info.quoteList.filter(q => q.status === 1)"
+               :key="index">
+            <p>{{ item.user.company.companyName }}</p>
+          </div>
+        </el-descriptions-item>
+      </template>
+      <template v-if="info.quote">
+        <el-descriptions-item label="报价">
+          <span>￥{{ info.quote.amount }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          <span>{{ info.quote.remark }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="报价单附件">
+          <view class="mt-15 mr-15" v-for="(file, fileIndex) in info.quote.files" :key="fileIndex">
+            <file-type :item="file" @click.native="openDownload(file)"/>
+          </view>
+        </el-descriptions-item>
+      </template>
+    </el-descriptions>
+  </el-dialog>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import FileType from "../../../components/file-type/file-type.vue";
+
+export default {
+  name: "selfSupportModal",
+  components: {FileType},
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      id: null,
+      info: null,
+      dialogVisible: false,
+      quoteList: [],
+      status: 0,
+      quote: null,
+    }
+  },
+  methods: {
+    open(info) {
+      this.info = info
+      this.dialogVisible = true
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    openDownload(url) {
+      window.open(url)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.request-header {
+  border: 1px solid #EDEDED;
+  background-color: #FFF8F1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+  margin-top: 30px;
+
+  text {
+    text-align: center;
+  }
+}
+
+.quote {
+  border-left: 1px solid #EDEDED;
+  border-right: 1px solid #EDEDED;
+  border-bottom: 1px solid #EDEDED;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 15px;
+
+  text {
+    text-align: center;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/store/components/selfSupportQuoteModal.vue b/pages/store/components/selfSupportQuoteModal.vue
new file mode 100644
index 0000000..5c27135
--- /dev/null
+++ b/pages/store/components/selfSupportQuoteModal.vue
@@ -0,0 +1,107 @@
+<template>
+    <el-dialog
+        title="自营询价详情"
+        :visible.sync="dialogVisible"
+        width="60%"
+        :before-close="handleClose">
+
+        <el-descriptions border size="small" :column="2">
+            <el-descriptions-item label="询价区域">
+                <span>{{ info.sheet.province.name }}{{ info.sheet.city.name }} </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="联系人">
+                <span>{{ info.sheet.name }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="联系方式">
+                <span>{{ info.sheet.phone }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="用户名称">
+                <span>{{ info.sheet.company }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="询价单附件">
+                <view class="mt-15 mr-15" v-for="(file, fileIndex) in info.files" :key="fileIndex">
+                    <file-type :item="file" @click.native="openDownload(file)"/>
+                </view>
+            </el-descriptions-item>
+            <el-descriptions-item label="报价">
+                <span>￥{{ info.amount }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注">
+                <span>{{ info.remark }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="报价单附件">
+                <view class="mt-15 mr-15" v-for="(file, fileIndex) in info.files" :key="fileIndex">
+                    <file-type :item="file" @click.native="openDownload(file)"/>
+                </view>
+            </el-descriptions-item>
+        </el-descriptions>
+    </el-dialog>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import FileType from "../../../components/file-type/file-type.vue";
+
+export default {
+    name: "selfSupportQuoteModal",
+    components: {FileType},
+    data() {
+        return {
+            provinceData: provinces,
+            cityData: citys,
+            areaData: areas,
+            id: null,
+            info: null,
+            dialogVisible: false,
+            quoteList: [],
+            status: 0
+        }
+    },
+    methods: {
+        open(info) {
+            this.info = info
+            console.log(this.info)
+            this.dialogVisible = true
+        },
+        handleClose() {
+            this.dialogVisible = false
+        },
+        openDownload(url) {
+            window.open(url)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.request-header {
+    border: 1px solid #EDEDED;
+    background-color: #FFF8F1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 15px;
+    margin-top: 30px;
+
+    text {
+        text-align: center;
+    }
+}
+
+.quote {
+    border-left: 1px solid #EDEDED;
+    border-right: 1px solid #EDEDED;
+    border-bottom: 1px solid #EDEDED;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 15px;
+
+    text {
+        text-align: center;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/store/components/spotModal.vue b/pages/store/components/spotModal.vue
index 878136b..f2b7575 100644
--- a/pages/store/components/spotModal.vue
+++ b/pages/store/components/spotModal.vue
@@ -12,23 +12,22 @@
             </view>
             <view class="mt-15" v-if="cooperateList">
                 <view class="request-header">
-                    <text class="flex-1">申请人</text>
-                    <text class="flex-1">申请时间</text>
+                    <text class="flex-1">公司名称</text>
+                    <text class="flex-1">联系人</text>
                     <text class="flex-1">联系方式</text>
-                    <text class="flex-1">操作</text>
+                    <text class="flex-1">备注</text>
+                    <text class="flex-1">附件</text>
+                    <text class="flex-1">申请时间</text>
                 </view>
                 <view class="quote" v-for="(item, index) in cooperateList" :key="index">
-                    <text class="flex-1">{{
-                            item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
-                        }}
-                    </text>
+                    <text class="flex-1">{{ item.user.company.companyName }}</text>
+                    <text class="flex-1">{{ item.name }}</text>
+                    <text class="flex-1"> {{ item.mobile }}</text>
+                    <text class="flex-1">{{ item.remark }}</text>
+                    <view class="flex-1">
+                        <a v-for="(file, fileIndex) in item.files" :key="fileIndex" :href="file" target="_blank">预览:文件{{ fileIndex + 1 }}</a>
+                    </view>
                     <text class="flex-1">{{ item._add_time_str }}</text>
-                    <text class="flex-1">
-                        {{ item.user.accountType === 1 ? item.user.person.mobile : item.user.company.mobile }}
-                    </text>
-                    <text class="flex-1">
-                        <el-button type="primary" @click.native="doShowInfo(item)">查看申请详情</el-button>
-                    </text>
                 </view>
             </view>
         </el-dialog>
diff --git a/pages/store/store.vue b/pages/store/store.vue
index 492843d..a306808 100644
--- a/pages/store/store.vue
+++ b/pages/store/store.vue
@@ -1,244 +1,570 @@
 <template>
-    <view class="">
-        <top-bar></top-bar>
-        <common-nav></common-nav>
-        <view class="w-1200">
-            <el-row :gutter="20">
-                <el-col :span="6">
-                    <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
-                        <!--                        <el-menu-item index="1">-->
-                        <!--                            <i class="el-icon-warning-outline"></i>-->
-                        <!--                            <span slot="title">询价单管理</span>-->
-                        <!--                        </el-menu-item>-->
-                        <el-menu-item index="0">
-                            <i class="el-icon-edit"></i>
-                            <span slot="title">现货</span>
-                        </el-menu-item>
-                    </el-menu>
-                </el-col>
-                <el-col :span="18">
-                    <!--                    <el-card shadow="never">-->
-                    <!--                        <el-tabs v-model="activeName" @tab-click="changeStatus">-->
-                    <!--                            <el-tab-pane :label="`全部(${allNum})`" name="all">-->
-                    <!--                            </el-tab-pane>-->
-                    <!--                            <el-tab-pane :label="`待报价(${noQuoteNum})`" name="noQuote"></el-tab-pane>-->
-                    <!--                            <el-tab-pane :label="`待选商(${notPickNum})`" name="notPick"></el-tab-pane>-->
-                    <!--                            <el-tab-pane :label="`已选商(${pickedNum})`" name="picked"></el-tab-pane>-->
-                    <!--                        </el-tabs>-->
-                    <!--                        <div class="search">-->
-                    <!--                            <view class="p">-->
-                    <!--                                <el-select v-model="value2" placeholder="请选择">-->
-                    <!--                                    <el-option v-for="item in options2" :key="item.value" :label="item.label"-->
-                    <!--                                               :value="item.value">-->
-                    <!--                                    </el-option>-->
-                    <!--                                </el-select>-->
-                    <!--                            </view>-->
-                    <!--                            <view class="p">-->
-                    <!--                                <el-date-picker v-model="value1" type="date" placeholder="选择日期">-->
-                    <!--                                </el-date-picker>-->
-                    <!--                            </view>-->
-                    <!--                            <view class="p">-->
-                    <!--                                <el-input placeholder="请输入内容" v-model="input3" class="input-with-select"-->
-                    <!--                                          @change="onSearch">-->
-                    <!--                                    <i slot="append" class="el-icon-search" @click="onSearch"></i>-->
-                    <!--                                </el-input>-->
-                    <!--                            </view>-->
-                    <!--                        </div>-->
-                    <!--                    </el-card>-->
-                    <el-card shadow="never" style="margin-top: 20px;">
-                        <template v-if="menuIndex === '0'">
-                            <view class="transaction-list">
-                                <view class="item" v-for="(item, index) in spotList" :key="index">
-                                    <view class="info">
-                                        <view class="title">
-                                            <view class="name">
-                                                <view class="fabu-status">
-                                                    <view class="text">{{
-                                                            item.status === 0 ? '发布中' : '已选商'
-                                                        }}
-                                                    </view>
-                                                    <view class="sjx"></view>
-                                                </view>
-                                                <span>{{ item.name }}</span>
-                                                <el-tag effect="plain" size="mini" class="el-tag">签单宝</el-tag>
-                                            </view>
-                                        </view>
-                                        <view class="caigou">
-                                            <view class="item">
-                                                <view class="icon">
-                                                    <i class="el-icon-shopping-bag-1"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">现货库存</view>
-                                                    <view class="unit">{{ item.stock }}</view>
-                                                </view>
-                                            </view>
-                                            <view class="item" style="margin-left: 100px;">
-                                                <view class="icon">
-                                                    <i class="el-icon-location-outline"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">供货地址</view>
-                                                    <view class="unit">{{
-                                                            item.address.province.name + "-" + item.address.city.name + "-" + item.address.area.name
-                                                        }}
-                                                    </view>
-                                                </view>
-                                            </view>
-                                        </view>
-                                        <view class="sub-title">
-<!--                                            <text>交易编号：{{ item.orderNo }}</text>-->
-                                            <text>发布时间：{{ item._add_time_str }}</text>
-                                        </view>
-<!--                                        <view class="status">-->
-<!--                                            <view class="icon">-->
-<!--                                                <img src="/static/images/store/choose.png" alt=""-->
-<!--                                                     v-if="item.status === 1"/>-->
-<!--                                                <img src="/static/images/store/unchoose.png" alt="" v-else/>-->
-<!--                                            </view>-->
-<!--                                        </view>-->
-                                    </view>
-                                    <view class="tool">
-                                        <view class="btn">
-                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"
-                                                       @click.native="editEnquiry(item._id)">编辑询价详情
-                                            </el-button>
-                                            <el-button size="small" type="success" style="width: 160px;" v-else
-                                                       @click.native="navTo('/pages/contract/index')">去创建合同
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="danger" v-if="item.status === 0"
-                                                       @click.native="showSpotModal(item)"
-                                                       style="width: 160px;">查看收到的报价列表
-                                            </el-button>
-                                            <el-button size="small" type="success" plain style="width: 160px;" v-else
-                                            >查看交易方
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="text"
-                                                       style="width: 160px;">共收到{{ item.quoteNum }}个报价
-                                            </el-button>
-                                        </view>
-                                    </view>
-                                </view>
+  <view class="">
+    <top-bar></top-bar>
+    <common-nav></common-nav>
+    <view class="w-1200">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
+            <el-menu-item index="1">
+              <i class="el-icon-warning-outline"></i>
+              <span slot="title">询价单管理</span>
+            </el-menu-item>
+            <el-menu-item index="0">
+              <i class="el-icon-edit"></i>
+              <span slot="title">现货</span>
+            </el-menu-item>
+            <el-menu-item index="4">
+              <i class="el-icon-edit"></i>
+              <span slot="title">加工单列表</span>
+            </el-menu-item>
+            <el-menu-item index="2">
+              <i class="el-icon-attract"></i>
+              <span slot="title">旧货</span>
+            </el-menu-item>
+            <el-menu-item index="3">
+              <i class="el-icon-s-order"></i>
+              <span slot="title">自营报价单列表</span>
+            </el-menu-item>
+          </el-menu>
+        </el-col>
+        <el-col :span="18">
+          <!--                    <el-card shadow="never">-->
+          <!--                        <el-tabs v-model="activeName" @tab-click="changeStatus">-->
+          <!--                            <el-tab-pane :label="`全部(${allNum})`" name="all">-->
+          <!--                            </el-tab-pane>-->
+          <!--                            <el-tab-pane :label="`待报价(${noQuoteNum})`" name="noQuote"></el-tab-pane>-->
+          <!--                            <el-tab-pane :label="`待选商(${notPickNum})`" name="notPick"></el-tab-pane>-->
+          <!--                            <el-tab-pane :label="`已选商(${pickedNum})`" name="picked"></el-tab-pane>-->
+          <!--                        </el-tabs>-->
+          <!--                        <div class="search">-->
+          <!--                            <view class="p">-->
+          <!--                                <el-select v-model="value2" placeholder="请选择">-->
+          <!--                                    <el-option v-for="item in options2" :key="item.value" :label="item.label"-->
+          <!--                                               :value="item.value">-->
+          <!--                                    </el-option>-->
+          <!--                                </el-select>-->
+          <!--                            </view>-->
+          <!--                            <view class="p">-->
+          <!--                                <el-date-picker v-model="value1" type="date" placeholder="选择日期">-->
+          <!--                                </el-date-picker>-->
+          <!--                            </view>-->
+          <!--                            <view class="p">-->
+          <!--                                <el-input placeholder="请输入内容" v-model="input3" class="input-with-select"-->
+          <!--                                          @change="onSearch">-->
+          <!--                                    <i slot="append" class="el-icon-search" @click="onSearch"></i>-->
+          <!--                                </el-input>-->
+          <!--                            </view>-->
+          <!--                        </div>-->
+          <!--                    </el-card>-->
+          <el-card shadow="never" v-if="['2'].includes(menuIndex)">
+            <el-tabs v-model="oldSignMethod" @tab-click="changeOldStatus">
+              <el-tab-pane :label="`全部`" name="all">
+              </el-tab-pane>
+              <el-tab-pane :label="`线上签约`" name="0"></el-tab-pane>
+              <el-tab-pane :label="`线下签约`" name="1"></el-tab-pane>
+            </el-tabs>
+          </el-card>
+          <el-card shadow="never" v-if="['3'].includes(menuIndex)">
+            <el-tabs v-model="selfStatus" @tab-click="getSelfSupportList(1)">
+              <el-tab-pane :label="`全部`" name="all">
+              </el-tab-pane>
+              <el-tab-pane :label="`未被选商`" name="0"></el-tab-pane>
+              <el-tab-pane :label="`已被选商`" name="1"></el-tab-pane>
+            </el-tabs>
+          </el-card>
+          <el-card shadow="never">
+            <template v-if="menuIndex === '0'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in spotList" :key="index">
+                  <view class="info pointer"
+                        @click="navTo(`/pages/spot/goods/detail?id=${item._id}`)">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx"></view>
+                        </view>
+                        <span class="item-title">{{ item.name }}</span>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">现货库存</view>
+                          <view class="unit">{{ item.stock }}</view>
+                        </view>
+                      </view>
+                      <view class="item" style="margin-left: 100px;">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">供货地址</view>
+                          <view class="unit">{{
+                              item.address.province.name + "-" + item.address.city.name + "-" + item.address.area.name
+                            }}
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <!--                                            <text>交易编号：{{ item.orderNo }}</text>-->
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                    <!--                                        <view class="status">-->
+                    <!--                                            <view class="icon">-->
+                    <!--                                                <img src="/static/images/store/choose.png" alt=""-->
+                    <!--                                                     v-if="item.status === 1"/>-->
+                    <!--                                                <img src="/static/images/store/unchoose.png" alt="" v-else/>-->
+                    <!--                                            </view>-->
+                    <!--                                        </view>-->
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+                      <!--                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"-->
+                      <!--                                                       @click.native="editEnquiry(item._id)">编辑询价详情-->
+                      <!--                                            </el-button>-->
+                      <el-button size="small" plain type="danger" style="width: 160px;"
+                                 @click.native="navTo(`/pages/spot/goods/detail?id=${item._id}`)">
+                        查看详情
+                      </el-button>
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1"
+                                 @click.native="navTo('/pages/contract/index')">去创建合同
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="danger" v-if="item.status === 0"
+                                 @click.native="showSpotModal(item)"
+                                 style="width: 160px;">查看意向合作列表
+                      </el-button>
+                      <el-button size="small" type="success" plain style="width: 160px;" v-else
+                      >查看交易方
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="text" @click.native="showSpotModal(item)"
+                                 style="width: 160px;">共收到{{ item.quoteNum }}个意向
+                      </el-button>
+                    </view>
+                  </view>
+                </view>
 
-                                <view class="paginatio">
-                                    <el-pagination background layout="prev, pager, next" :total="total"
-                                                   :page-size="pageSize" @current-change="handleCurrentChange">
-                                    </el-pagination>
-                                </view>
-                            </view>
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+                <view class="w-100p flex justify-end text-main mt-20 "
+                      @click="navTo('/pages/spot/goods/my')">
+                  <text class="pointer">查看历史发布记录</text>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '1'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in enquiryList" :key="index">
+                  <view class="info pointer" @click="navTo(`/pages/enquiry/detail?id=${item._id}`)">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx"></view>
+                        </view>
+                        <span class="item-title">{{ item.title }}</span>
+                        <el-tag effect="plain" size="mini" class="el-tag">
+                          {{ item.signMethod === 0 ? '线上签约' : '线下签单' }}
+                        </el-tag>
+                        <view v-if="item.status === 1 && item.signMethod === 1"
+                              class="ml-20 flex justify-start items-center">
+                          <switch-icon theme="outline" size="20" fill="#000000"
+                                       strokeLinecap="square"/>
+                          <el-tag size="mini" type="warning" class="pointer"
+                                  @click.native="enquiryChangeToOnlineSign(item._id, index)">
+                            切换至线上交易
+                          </el-tag>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">采购量</view>
+                          <view class="unit">{{
+                              item.productNum
+                            }}
+                          </view>
+                        </view>
+                      </view>
+                      <view class="item" style="margin-left: 100px;">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">交易地址</view>
+                          <view class="unit">{{ item.fullAddress }}</view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>交易编号：{{ item.enquiryNo }}</text>
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                    <view class="status">
+                      <view class="icon">
+                        <img src="/static/images/store/choose.png" alt=""
+                             v-if="item.status === 1"/>
+                        <img src="/static/images/store/unchoose.png" alt=""
+                             v-if="item.status === 0"/>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+                      <view class="btn">
+                        <el-button size="small" type="success" style="width: 160px;"
+                                   v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 1"
+                                   @click.native="navTo('/pages/contract/index?tab=1')">
+                          签署合同
+                        </el-button>
+                      </view>
+                      <view class="btn">
+                        <el-button size="small" type="success" style="width: 160px;"
+                                   v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 2"
+                                   @click.native="navTo('/pages/contract/index?tab=2')">
+                          查看合同
+                        </el-button>
+                      </view>
+                      <view class="btn">
+                        <el-button size="small" type="success" style="width: 160px;"
+                                   v-if="item.status !== 0 && item.signMethod !== 1 && (!item.contract || item.contract.status === 0)"
+                                   @click.native="navTo('/pages/contract/index?tab=0')">
+                          合同待创建
+                        </el-button>
+                      </view>
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status === 2"
+                                 @click.native="navTo('/pages/order/order')">去订单
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <!--                                            <el-button size="small" type="danger" v-if="item.status === 0"-->
+                      <!--                                                       @click.native="showEnquiryModal(item)"-->
+                      <!--                                                       style="width: 160px;">查看收到的报价列表-->
+                      <!--                                            </el-button>-->
+                      <el-button size="small" type="success" plain style="width: 160px;"
+                                 v-if="item.status === 1"
+                                 @click.native="showOtherUser(item)">查看交易方
+                      </el-button>
+                    </view>
+                    <!--                                        <view class="btn">-->
+                    <!--                                            <el-button size="small" type="text"-->
+                    <!--                                                       style="width: 160px;">共收到{{ item.quoteNum }}个报价-->
+                    <!--                                            </el-button>-->
+                    <!--                                        </view>-->
+                  </view>
+                </view>
+
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '2'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in oldList" :key="index">
+                  <view class="info pointer">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status"
+                              @click="navTo(`/pages/index/old/detail?id=${item._id}`)">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx"></view>
+                        </view>
+                        <span class="item-title"
+                              @click="navTo(`/pages/index/old/detail?id=${item._id}`)">{{
+                            item.title
+                          }}</span>
+                        <template v-if="item.type !== 3">
+                          <el-tag effect="plain" size="mini" class="el-tag">
+                            {{ item.signMethod === 0 ? '线上签约' : '线下签单' }}
+                          </el-tag>
+                          <view v-if="item.status === 1 && item.signMethod === 1"
+                                class="ml-20 flex justify-start items-center">
+                            <switch-icon theme="outline" size="20" fill="#000000"
+                                         strokeLinecap="square"/>
+                            <el-tag size="mini" type="warning" class="pointer"
+                                    @click.native="oldChangeToOnlineSign(item._id, index)">
+                              切换至线上交易
+                            </el-tag>
+                          </view>
                         </template>
-                        <template v-if="menuIndex === '1'">
-                            <view class="transaction-list">
-                                <view class="item" v-for="(item, index) in enquiryList" :key="index">
-                                    <view class="info">
-                                        <view class="title">
-                                            <view class="name">
-                                                <view class="fabu-status">
-                                                    <view class="text">{{
-                                                            item.status === 0 ? '发布中' : '已选商'
-                                                        }}
-                                                    </view>
-                                                    <view class="sjx"></view>
-                                                </view>
-                                                <span>{{
-                                                        item.productList.map(row => `${row.goodsName}(${row.materialQuality})`).join("/")
-                                                    }}</span>
-                                                <el-tag effect="plain" size="mini" class="el-tag">
-                                                    {{ item.signMethod === 0 ? '平台交易' : '线下签单' }}
-                                                </el-tag>
-                                                <view v-if="item.status === 0 && item.signMethod === 1"
-                                                      class="ml-20 flex justify-start items-center">
-                                                    <switch-icon theme="outline" size="20" fill="#000000"
-                                                                 strokeLinecap="square"/>
-                                                    <el-tag size="mini" type="warning" class="pointer"
-                                                            @click.native="enquiryChangeToOnlineSign(item._id, index)">
-                                                        切换至线上交易
-                                                    </el-tag>
-                                                </view>
-                                            </view>
-                                        </view>
-                                        <view class="caigou">
-                                            <view class="item">
-                                                <view class="icon">
-                                                    <i class="el-icon-shopping-bag-1"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">采购量</view>
-                                                    <view class="unit">{{
-                                                            item.productList.map(row => row.procureNumber + row.procureUnit).join("/")
-                                                        }}
-                                                    </view>
-                                                </view>
-                                            </view>
-                                            <view class="item" style="margin-left: 100px;">
-                                                <view class="icon">
-                                                    <i class="el-icon-location-outline"></i>
-                                                </view>
-                                                <view class="infos">
-                                                    <view class="name">交易地址</view>
-                                                    <view class="unit">{{ item.fullAddress }}</view>
-                                                </view>
-                                            </view>
-                                        </view>
-                                        <view class="sub-title">
-                                            <text>交易编号：{{ item.enquiryNo }}</text>
-                                            <text>发布时间：{{ item._add_time_str }}</text>
-                                        </view>
-                                        <view class="status">
-                                            <view class="icon">
-                                                <img src="/static/images/store/choose.png" alt=""
-                                                     v-if="item.status === 1"/>
-                                                <img src="/static/images/store/unchoose.png" alt="" v-else/>
-                                            </view>
-                                        </view>
-                                    </view>
-                                    <view class="tool">
-                                        <view class="btn">
-                                            <el-button size="small" plain style="width: 160px;" v-if="item.status === 0"
-                                                       @click.native="editEnquiry(item._id)">编辑询价详情
-                                            </el-button>
-                                            <el-button size="small" type="success" style="width: 160px;" v-else
-                                                       @click.native="navTo('/pages/contract/index')">去创建合同
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="danger" v-if="item.status === 0"
-                                                       @click.native="showEnquiryModal(item)"
-                                                       style="width: 160px;">查看收到的报价列表
-                                            </el-button>
-                                            <el-button size="small" type="success" plain style="width: 160px;" v-else
-                                            >查看交易方
-                                            </el-button>
-                                        </view>
-                                        <view class="btn">
-                                            <el-button size="small" type="text"
-                                                       style="width: 160px;">共收到{{ item.quoteNum }}个报价
-                                            </el-button>
-                                        </view>
-                                    </view>
-                                </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">类型</view>
+                          <view class="unit">{{
+                              item.typeStr
+                            }}
+                          </view>
+                        </view>
+                      </view>
+                      <view class="item" style="margin-left: 100px;">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">交易地址</view>
+                          <view class="unit"
+                                v-if="item.addressRegion && item.addressRegion.province">
+                            {{
+                              item.addressRegion.province.name
+                            }}{{
+                              item.addressRegion.city.name
+                            }}{{ item.addressRegion.area.name }}{{ item.addressDetail }}
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>交易编号：{{ item._id }}</text>
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                    <view class="status" v-if="item.type < 3">
+                      <view class="icon">
+                        <img src="/static/images/store/choose.png" alt=""
+                             v-if="item.status === 1"/>
+                        <img src="/static/images/store/unchoose.png" alt=""
+                             v-if="item.status === 0"/>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="tool" v-if="item.type < 3">
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 1"
+                                 @click.native="navTo('/pages/contract/index?tab=1')">
+                        签署合同
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 2"
+                                 @click.native="navTo('/pages/contract/index?tab=2')">
+                        查看合同
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && (!item.contract || item.contract.status === 0)"
+                                 @click.native="navTo('/pages/contract/index?tab=0')">
+                        合同待创建
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="danger" v-if="item.status === 0"
+                                 @click.native="showOldModal(item)"
+                                 style="width: 160px;">查看意向合作列表
+                      </el-button>
+                      <el-button size="small" type="success" plain style="width: 160px;" v-else
+                                 @click.native="showOtherUser(item)">查看交易方
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="text" @click.native="showOldModal(item)"
+                                 style="width: 160px;">共收到{{ item.quoteNum }}个报价
+                      </el-button>
+                    </view>
+                  </view>
+                </view>
 
-                                <view class="paginatio">
-                                    <el-pagination background layout="prev, pager, next" :total="total"
-                                                   :page-size="pageSize" @current-change="handleCurrentChange">
-                                    </el-pagination>
-                                </view>
-                            </view>
-                        </template>
-                    </el-card>
-                </el-col>
-            </el-row>
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '3'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in selfSupportList.rows" :key="index">
+                  <view class="info ">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status pointer">
+                          <view class="text">{{
+                              item.sheet.status === 0 ? '待报价' : (item.sheet.status === 1 ? '待选商' : '已选商')
+                            }}
+                          </view>
+                          <view class="sjx pointer"></view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-location-outline"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">{{ item.sheet.desc ? `产品描述:${item.sheet.desc}` : '自营询价' }}</view>
+                          <view class="unit" v-if="item.sheet.province">{{
+                              item.sheet.province.name
+                            }}{{ item.sheet.city.name }}
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>发布时间：{{ item.sheet._add_time_str }}</text>
+                    </view>
+                    <view class="status">
+                      <view class="icon">
+                        <img src="/static/images/store/choose.png" alt=""
+                             v-if="item.sheet.status === 2 && item.status === 1"/>
+                        <img src="/static/images/store/unchoose.png" alt=""
+                             v-if="item.sheet.status === 1 && item.status === 0"/>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+                      <el-button size="small" plain style="width: 160px;margin: 10px"
+                                 @click.native="showDetail(item)">查看详情
+                      </el-button>
+                      <el-button size="small" type="success" plain
+                                 style="width: 160px;margin: 10px"
+                                 v-if="item.sheet.status === 1"
+                                 @click.native="toSelfSupportQuote(item)">立即报价
+                      </el-button>
+                      <el-button size="small" type="success" plain
+                                 style="width: 160px;margin: 10px"
+                                 v-if="item.sheet.status === 2 && item.status === 1"
+                                 @click.native="showOtherUser(item)">查看交易方
+                      </el-button>
+                    </view>
+                  </view>
+                </view>
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="selfSupportList.total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+            <template v-if="menuIndex === '4'">
+              <view class="transaction-list">
+                <view class="item" v-for="(item, index) in processList" :key="index">
+                  <view class="info ">
+                    <view class="title">
+                      <view class="name">
+                        <view class="fabu-status pointer"
+                              @click="navTo(`/pages/process/detail?id=${item._id}`)">
+                          <view class="text">{{
+                              item.status === 0 ? '发布中' : '已选商'
+                            }}
+                          </view>
+                          <view class="sjx"></view>
+                        </view>
+                        <span class="item-title pointer"
+                              @click="navTo(`/pages/process/detail?id=${item._id}`)">{{
+                            item.title
+                          }}</span>
+                        <el-tag effect="plain" size="mini" class="el-tag">
+                          {{ item.signMethod === 1 ? '线下签单' : '线上签约' }}
+                        </el-tag>
+                      </view>
+                    </view>
+                    <view class="caigou">
+                      <view class="item">
+                        <view class="icon">
+                          <i class="el-icon-shopping-bag-1"></i>
+                        </view>
+                        <view class="infos">
+                          <view class="name">加工量</view>
+                          <view class="unit">{{ item.num }}</view>
+                        </view>
+                      </view>
+                    </view>
+                    <view class="sub-title">
+                      <text>交易编号：{{ item.orderNo }}</text>
+                      <text>发布时间：{{ item._add_time_str }}</text>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 1"
+                                 @click.native="navTo('/pages/contract/index?tab=1')">
+                        签署合同
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && item.contract && item.contract.status === 2"
+                                 @click.native="navTo('/pages/contract/index?tab=2')">
+                        查看合同
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="success" style="width: 160px;"
+                                 v-if="item.status !== 0 && item.signMethod !== 1 && (!item.contract || item.contract.status === 0)"
+                                 @click.native="navTo('/pages/contract/index?tab=0')">
+                        合同待创建
+                      </el-button>
+                    </view>
+                    <view class="btn">
+                      <el-button size="small" type="success" plain style="width: 160px;"
+                                 @click.native="showOtherUser(item)"
+                      >查看交易方
+                      </el-button>
+                    </view>
+                  </view>
+                </view>
+
+                <view class="paginatio">
+                  <el-pagination background layout="prev, pager, next" :total="total"
+                                 :page-size="pageSize" @current-change="handleCurrentChange">
+                  </el-pagination>
+                </view>
+              </view>
+            </template>
+          </el-card>
+        </el-col>
+      </el-row>
 
-        </view>
-        <common-footer></common-footer>
-        <enquiry-modal ref="enquiryModal"/>
-        <process-modal ref="processModal"/>
-        <spot-modal ref="spotModal"/>
     </view>
+    <common-footer></common-footer>
+    <enquiry-modal ref="enquiryModal"/>
+    <process-modal ref="processModal"/>
+    <spot-modal ref="spotModal"/>
+    <old-modal ref="oldModal"/>
+    <self-support-quote-modal ref="selfSupportQuoteModal"/>
+    <self-support-modal ref="selfSupportModal"/>
+
+  </view>
 </template>
 
 <script>
@@ -246,436 +572,575 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 import {
-    Agreement,
-    Switch as SwitchIcon
+  Agreement,
+  Switch as SwitchIcon
 } from "@icon-park/vue";
 import EnquiryModal from "./components/enquiryModal.vue";
 import ProcessModal from "./components/processModal.vue";
 import SpotModal from "./components/spotModal.vue";
+import OldModal from "./components/oldModal.vue";
+import SelfSupportModal from "./components/selfSupportModal.vue";
+import selfSupportQuoteModal from "./components/selfSupportQuoteModal.vue";
 
 export default {
-    components: {
-        SpotModal,
-        ProcessModal,
-        EnquiryModal,
-        Agreement,
-        SwitchIcon
-    },
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            activeName: 'all',
-            value: '',
-            value1: '',
-            options: [{
-                value: '金久信自营',
-                label: '金久信自营'
-            }],
-            value2: '',
-            options2: [{
-                value: '未开发票',
-                label: '自主交易'
-            }],
-            input3: '',
-            menuIndex: '0',
-            isSign: false,
-            formData: {
-                status: 0,
-                tradeMethod: null
-            },
-            tableData: {},
-            pageSize: 10,
-            enquiryList: [],
-            spotList: [],
-            total: 0,
-            notPickNum: 0,
-            pickedNum: 0,
-            noQuoteNum: 0,
-            allNum: 0,
-        }
-    },
-    onLoad(options) {
-        if (options.menuIndex) {
-            this.menuIndex = String(options.menuIndex)
-        }
-        if (this.menuIndex === '1') this.getEnquiryList()
-        else this.getSpotList()
-    },
-    methods: {
-        navTo(url) {
-            vk.navigateTo({
-                url
-            })
-        },
-        menuSelect(e) {
-            this.menuIndex = String(e)
-            this.formData.status = Number(e)
-            this.isSign = false
-            this.handleCurrentChange(1)
-        },
-        handleCurrentChange(page) {
-            if (this.menuIndex === '1') this.getEnquiryList(page)
-            else this.getSpotList(page)
-        },
-        changeStatus() {
-            if (this.menuIndex === '1') this.getEnquiryList(1)
-            else this.getSpotList(1)
-        },
-        getEnquiryList(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/enquiry/sheet/pub/getList',
-                data: {
-                    userId: vk.getVuex('$user.userInfo._id'),
-                    pageIndex,
-                    pageSize: this.pageSize,
-                    status: this.activeName
-                },
-                success: (res) => {
-                    this.enquiryList = res.rows.map(val => {
-                        let str = ''
-                        if (val.productList !== undefined && val.productList.length > 0 && val.productList[0].addressRegion !== undefined && val.productList[0].addressRegion.length > 0) {
-                            let provinceIndex = 0, cityIndex = 0, areaIndex = 0
-                            this.provinceData.forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) {
-                                    provinceIndex = index
-                                    str = item.name
-                                }
-                            })
-                            this.cityData[provinceIndex].forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) {
-                                    cityIndex = index
-                                    str += `-${item.name}`
-                                }
-                            })
-                            this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) {
-                                    areaIndex = index
-                                    str += `-${item.name}`
-                                }
-                            })
-                            // str += val.productList[0].addressDetail
-                        }
-                        val.fullAddress = str
-                        return val
-                    })
-                    this.total = res.total
-                    this.allNum = res.all
-                    this.notPickNum = res.notPickNum
-                    this.pickedNum = res.pickedNum
-                    this.quoteNum = res.quoteNum
-                }
-            })
-        },
-        getSpotList(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/spot/goods/kh/getSelfOne',
-                data: {
-                    userId: vk.getVuex('$user.userInfo._id'),
-                },
-                success: (res) => {
-                    this.spotList = res.rows
-                    this.total = res.total
-                    this.allNum = res.all
-                    this.notPickNum = res.notPickNum
-                    this.pickedNum = res.pickedNum
-                    this.quoteNum = res.quoteNum
-                }
-            })
-        },
-        showEnquiryModal({status, quoteList}) {
-            this.$refs.enquiryModal.open(status, quoteList)
-        },
-        showSpotModal({status, cooperateList}) {
-            this.$refs.spotModal.open(status, cooperateList)
-        },
-        editEnquiry(id) {
-            vk.navigateTo({
-                url: `/pages/enquiry/release?id=${id}`
-            })
-        },
-        enquiryChangeToOnlineSign(id, index) {
-            vk.callFunction({
-                url: ' client/enquiry/sheet/kh/changeToOnlineSign',
-                data: {
-                    id
-                }
-            })
-            this.enquiryList[index].signMethod = 0
-        }
+  components: {
+    selfSupportQuoteModal,
+    OldModal,
+    SpotModal,
+    ProcessModal,
+    EnquiryModal,
+    Agreement,
+    SwitchIcon,
+    SelfSupportModal,
+  },
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      activeName: 'all',
+      value: '',
+      value1: '',
+      options: [{
+        value: '金久信自营',
+        label: '金久信自营'
+      }],
+      value2: '',
+      options2: [{
+        value: '未开发票',
+        label: '自主交易'
+      }],
+      input3: '',
+      menuIndex: '1',
+      formData: {
+        status: 0,
+        tradeMethod: null
+      },
+      tableData: {},
+      pageSize: 10,
+      enquiryList: [],
+      spotList: [],
+      oldList: [],
+      selfSupportList: [],
+      total: 0,
+      notPickNum: 0,
+      pickedNum: 0,
+      noQuoteNum: 0,
+      allNum: 0,
+      processList: [],
+      oldSignMethod: 'all',
+      selfStatus: 'all',
     }
+  },
+  onLoad(options) {
+    if (!vk.getVuex('$user.userInfo.mobile')) {
+      this.$confirm('请先绑定手机号', '提示', {
+        confirmButtonText: '确定',
+        showCancelButton: false,
+        type: 'warning'
+      }).then(() => {
+        vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+      }).catch(() => {
+        vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+      })
+      return
+    }
+    if (options.menuIndex) {
+      this.menuIndex = String(options.menuIndex)
+    }
+    this.handleCurrentChange(1)
+  },
+  methods: {
+    navTo(url) {
+      vk.navigateTo({
+        url
+      })
+    },
+    menuSelect(e) {
+      this.menuIndex = String(e)
+      this.formData.status = Number(e)
+      this.handleCurrentChange(1)
+    },
+    handleCurrentChange(page) {
+      if (this.menuIndex === '1') this.getEnquiryList(page)
+      else if (this.menuIndex === '0') this.getSpotList(page)
+      else if (this.menuIndex === '2') this.getOldList(page)
+      else if (this.menuIndex === '3') this.getSelfSupportList(page)
+      else if (this.menuIndex === '4') this.getProcessList(page)
+    },
+    getEnquiryList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/enquiry/sheet/kh/getList',
+        title: '加载中...',
+        data: {
+          userId: vk.getVuex('$user.userInfo._id'),
+          pageIndex,
+          pageSize: this.pageSize,
+          status: this.activeName,
+          isSeller: true
+        },
+        success: (res) => {
+          this.enquiryList = res.rows.map(val => {
+            let str = ''
+            val.productNum = ''
+            if (val.productList !== undefined && val.productList.length > 0 && val.productList[0].addressRegion !== undefined && val.productList[0].addressRegion.length > 0) {
+              let provinceIndex = 0, cityIndex = 0, areaIndex = 0
+              this.provinceData.forEach((item, index) => {
+                if (parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) {
+                  provinceIndex = index
+                  str = item.name
+                }
+              })
+              this.cityData[provinceIndex].forEach((item, index) => {
+                if (parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) {
+                  cityIndex = index
+                  str += `-${item.name}`
+                }
+              })
+              this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
+                if (parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) {
+                  areaIndex = index
+                  str += `-${item.name}`
+                }
+              })
+              // str += val.productList[0].addressDetail
+            }
+            const productNumList = []
+            val.productList.forEach((item, index) => {
+              if (item.procureNumber) productNumList.push(item.procureNumber + item.procureUnit)
+            })
+            val.productNum = productNumList.join('/')
+            val.fullAddress = str
+            return val
+          })
+          this.total = res.total
+          this.allNum = res.all
+          this.notPickNum = res.notPickNum
+          this.noQuoteNum = res.noQuoteNum
+          this.pickedNum = res.pickedNum
+          this.quoteNum = res.quoteNum
+        }
+      })
+    },
+    getProcessList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/process/sheet/pub/getList',
+        title: '加载中...',
+        data: {
+          isUser: true,
+          otherUid: vk.getVuex('$user.userInfo._id'),
+          pageIndex,
+          pageSize: this.pageSize,
+          status: this.activeName
+        },
+        success: (res) => {
+          this.processList = res.rows
+        }
+      })
+    },
+    getSpotList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/spot/goods/kh/getSelfOne',
+        data: {
+          userId: vk.getVuex('$user.userInfo._id'),
+        },
+        success: (res) => {
+          this.spotList = res.rows
+          this.total = res.total
+          this.allNum = res.all
+          this.notPickNum = res.notPickNum
+          this.pickedNum = res.pickedNum
+          this.quoteNum = res.quoteNum
+        }
+      })
+    },
+    getOldList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/old/kh/getList',
+        data: {
+          userId: vk.getVuex('$user.userInfo._id'),
+          pageIndex,
+          pageSize: this.pageSize,
+          signMethod: this.oldSignMethod === 'all' ? null : this.oldSignMethod,
+          sellerOnly: true
+        },
+        success: (res) => {
+          this.oldList = res.rows.map(item => {
+            if (item.type === 0) item.typeStr = '拍卖'
+            else if (item.type === 1) item.typeStr = '采购'
+            else if (item.type === 2) {
+              item.typeStr = '租赁'
+              if (item.rentType === 0 ) item.typeStr += '-承租'
+              else item.typeStr += '-出租'
+            }
+            else if (item.type === 3) item.typeStr = '物资回收'
+            if (item.addressRegion && item.addressRegion.length > 0)
+              item.address = item?.addressRegion[0]?.name + item?.addressRegion[1]?.name + item?.addressRegion[2]?.name + item.addressDetail
+            return item
+          })
+          this.total = res.total
+        }
+      })
+    },
+    getSelfSupportList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/selfSupport/kh/getQuoteList',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          status: this.selfStatus === 'all' ? null : this.selfStatus
+        },
+        success: (res) => {
+          this.selfSupportList = res
+          this.total = res.total
+        }
+      })
+    },
+    toSelfSupportQuote(item) {
+      vk.navigateTo({url: `/pages/index/self-support/quote?id=${item.quoteId}`})
+    },
+    showEnquiryModal({status, quoteList}) {
+      this.$refs.enquiryModal.open(status, quoteList)
+    },
+    showSpotModal({status, cooperateList}) {
+      this.$refs.spotModal.open(status, cooperateList)
+    },
+    showOldModal({_id, status, quoteList, signMethod}) {
+      this.$refs.oldModal.open(_id, status, quoteList, signMethod)
+    },
+    editEnquiry(id) {
+      vk.navigateTo({
+        url: `/pages/enquiry/release?id=${id}`
+      })
+    },
+    enquiryChangeToOnlineSign(id, index) {
+      vk.callFunction({
+        url: ' client/enquiry/sheet/kh/changeToOnlineSign',
+        data: {
+          id
+        }
+      })
+      this.enquiryList[index].signMethod = 0
+      this.$confirm('切换成功,是否去创建合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        vk.navigateTo({url: '/pages/contract/index'});
+      })
+    },
+    showOtherUser(item) {
+      if (item.otherUser) {
+        this.$confirm(`交易方联系方式:${item.otherUser.company.mobile ?? item.otherUser.person.mobile}`, '', {
+          cancelButtonText: '关闭',
+          showConfirmButton: false
+        })
+      } else {
+        this.$confirm(`交易方未留下联系方式`, '', {
+          cancelButtonText: '关闭',
+          showConfirmButton: false
+        })
+      }
+    },
+    oldChangeToOnlineSign(id, index) {
+      vk.callFunction({
+        url: 'client/old/kh/changeToOnlineSign',
+        data: {
+          id
+        }
+      })
+      this.oldList[index].signMethod = 0
+      this.$confirm('切换成功,是否去创建合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        vk.navigateTo({url: '/pages/contract/index'});
+      })
+    },
+    showDetail(info) {
+      info.sheet.quote = info
+      this.$refs.selfSupportModal.open(info.sheet)
+    },
+    changeOldStatus() {
+      this.getOldList(1)
+    },
+  }
 }
 </script>
 
 <style scoped lang="scss">
 .w-1200 {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .contract-list {
-    background-color: #FFFFFF;
-    padding: 10px 20px 20px;
+  background-color: #FFFFFF;
+  padding: 10px 20px 20px;
 }
 
 
 .transaction-list {
+  display: flex;
+  flex-direction: column;
+
+  .item {
     display: flex;
-    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 0;
+    border-bottom: 1px solid #f3f3f3;
 
-    .item {
+    .info {
+      position: relative;
+      border-right: 1px solid #f3f3f3;
+      flex: 1;
+
+      .name {
         display: flex;
-        justify-content: space-between;
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 1.6em;
         align-items: center;
-        padding: 10px 0;
-        border-bottom: 1px solid #f3f3f3;
 
-        .info {
-            position: relative;
-            border-right: 1px solid #f3f3f3;
-            flex: 1;
-
-            .name {
-                display: flex;
-                font-size: 16px;
-                font-weight: bold;
-                line-height: 1.6em;
-                align-items: center;
-
-                .fabu-status {
-                    margin-right: 20px;
-                    font-weight: normal;
-                    display: flex;
-
-                    .text {
-                        padding: 0 10px 0 20px;
-                        font-size: 13px;
-                        color: #fff;
-                        background-color: #A92924;
-                    }
-
-                    .sjx {
-                        border: 12px solid;
-                        border-color: #A92924 #ffffff #A92924 #A92924;
-                        position: relative;
-                    }
-
-                    // .text{
-                    // 	color: #fff;
-                    // 	background-color: #A92924
-                    // }
-                }
-
-                .buyer,
-                .seller {
-                    font-size: 14px;
-                    font-weight: normal;
-                    display: flex;
-                    margin: 0 30px;
-                }
-
-                .el-tag {
-                    margin-left: 10px;
-                }
-            }
-
-            .caigou {
-                display: flex;
-                align-items: center;
-
-                .item {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    padding: 10px 0;
-                    border: none;
-
-                    .icon {
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        margin: 10px;
-                        background-color: #f3f3f3;
-                        padding: 10px;
-                        border-radius: 100px;
-
-                        .el-icon-shopping-bag-1,
-                        .el-icon-location-outline {
-                            font-size: 30px;
-                        }
-                    }
-
-                    .infos {
-                        display: flex;
-                        flex-direction: column;
-
-                        .unit {
-                            color: #A92924
-                        }
-                    }
-                }
-            }
-
-            .sub-title {
-                color: #999999;
-
-                text {
-                    margin-right: 60px;
-                }
-            }
-
-            .action {
-                padding: 10px 0;
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-
-                .btn-buy,
-                .btn-close {
-                    color: #A92924;
-                }
-            }
-
-            .status {
-                position: absolute;
-                top: 0;
-                right: 0;
-
-                .icon {
-                    margin: 0 20px;
-
-                    img {
-                        width: 80px;
-                    }
-                }
-            }
+        .item-title {
+          width: 200px;
         }
 
-        .tool {
+        .fabu-status {
+          margin-right: 20px;
+          font-weight: normal;
+          display: flex;
+
+          .text {
+            padding: 0 10px 0 20px;
+            font-size: 13px;
+            color: #fff;
+            background-color: #A92924;
+          }
+
+          .sjx {
+            border: 12px solid;
+            border-color: #A92924 #ffffff #A92924 #A92924;
+            position: relative;
+          }
+
+          // .text{
+          // 	color: #fff;
+          // 	background-color: #A92924
+          // }
+        }
+
+        .buyer,
+        .seller {
+          font-size: 14px;
+          font-weight: normal;
+          display: flex;
+          margin: 0 30px;
+        }
+
+        .el-tag {
+          margin-left: 10px;
+        }
+      }
+
+      .caigou {
+        display: flex;
+        align-items: center;
+
+        .item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 10px 0;
+          border: none;
+
+          .icon {
             display: flex;
-            width: 200px;
+            justify-content: center;
             align-items: center;
-            justify-content: space-around;
+            margin: 10px;
+            background-color: #f3f3f3;
+            padding: 10px;
+            border-radius: 100px;
+
+            .el-icon-shopping-bag-1,
+            .el-icon-location-outline {
+              font-size: 30px;
+            }
+          }
+
+          .infos {
+            display: flex;
             flex-direction: column;
 
-            .btn {
-                margin: 5px 0;
-            }
-
-            .price {
-                margin: 0 20px;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: center;
-
-                .red {
-                    font-size: 16px;
-                    color: #A92924;
-                    font-weight: bold;
-                }
+            .unit {
+              color: #A92924
             }
+          }
         }
+      }
+
+      .sub-title {
+        color: #999999;
+
+        text {
+          margin-right: 60px;
+        }
+      }
+
+      .action {
+        padding: 10px 0;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+
+        .btn-buy,
+        .btn-close {
+          color: #A92924;
+        }
+      }
+
+      .status {
+        position: absolute;
+        top: 0;
+        right: 0;
+
+        .icon {
+          margin: 0 20px;
+
+          img {
+            width: 80px;
+          }
+        }
+      }
     }
+
+    .tool {
+      display: flex;
+      width: 200px;
+      align-items: center;
+      justify-content: space-around;
+      flex-direction: column;
+
+      .btn {
+        margin: 5px 0;
+      }
+
+      .price {
+        margin: 0 20px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .red {
+          font-size: 16px;
+          color: #A92924;
+          font-weight: bold;
+        }
+      }
+    }
+  }
 }
 
 .paginatio {
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 
 .contract-box {
-    display: flex;
-    justify-content: space-between;
-    border-bottom: solid 1px #e8e8e8;
-    padding: 10rpx 0;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: solid 1px #e8e8e8;
+  padding: 10rpx 0;
 }
 
 .contract-left {
 }
 
 .contract-right {
-    text-align: right;
-    font-size: 13px;
+  text-align: right;
+  font-size: 13px;
 }
 
 .trade-method {
-    display: flex;
-    margin-bottom: 20px;
-    border-bottom: solid 2px #f4f4f4;
+  display: flex;
+  margin-bottom: 20px;
+  border-bottom: solid 2px #f4f4f4;
 }
 
 .trade-method-item {
-    cursor: pointer;
-    font-size: 18px;
-    margin-right: 15px;
-    height: 40px;
-    line-height: 40px;
+  cursor: pointer;
+  font-size: 18px;
+  margin-right: 15px;
+  height: 40px;
+  line-height: 40px;
 }
 
 .trade-method-item.active {
-    color: #A92924;
-    border-bottom: solid 2px #A92924;
+  color: #A92924;
+  border-bottom: solid 2px #A92924;
 }
 
 .contract-left-top {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 
 }
 
 .contract-product {
-    margin: 0 10px;
+  margin: 0 10px;
 }
 
 .contract-left-center {
-    height: 40px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    color: #999999;
-    font-size: 12px;
-    flex-direction: column;
-    margin-top: 5px;
+  height: 40px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
+  color: #999999;
+  font-size: 12px;
+  flex-direction: column;
+  margin-top: 5px;
 }
 
 .contract-left-bottom {
-    display: flex;
+  display: flex;
 }
 
 .contract-status {
-    display: flex;
+  display: flex;
 }
 
 .contract-status-tag {
-    margin-left: 2px;
+  margin-left: 2px;
 }
 
 .sign {
-    padding: 20px 20px 20px 25px;
-    font-size: 14px;
+  padding: 20px 20px 20px 25px;
+  font-size: 14px;
 
-    .icon {
-        line-height: 18px;
-    }
+  .icon {
+    line-height: 18px;
+  }
 }
 
 .search {
-    display: flex;
+  display: flex;
 
-    .p {
-        margin-right: 10px;
-    }
+  .p {
+    margin-right: 10px;
+  }
 }
 
 .el-select .el-input {
-    width: 130px;
+  width: 130px;
 }
 
 .input-with-select .el-input-group__prepend {
-    background-color: #fff;
+  background-color: #fff;
 }
 </style>
\ No newline at end of file
diff --git a/pages/user/components/account.vue b/pages/user/components/account.vue
new file mode 100644
index 0000000..4b578cc
--- /dev/null
+++ b/pages/user/components/account.vue
@@ -0,0 +1,155 @@
+<template>
+    <el-card>
+        <view class="flex justify-end items-center">
+            <el-button type="primary" @click="showAdd" v-if="!isAdd">新增收款账户</el-button>
+        </view>
+        <view class="mt-20" v-if="isAdd">
+            <el-form ref="form" :model="form" label-width="120px">
+                <el-form-item label="类型" required v-if="vk.getVuex('$user.userInfo.accountType') === 2">
+                    <el-select v-model="form.type" placeholder="请选择账号类型">
+                        <el-option label="对公账号" value="company"/>
+                        <el-option label="个人账号" value="person"/>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="开户行" required>
+                    <el-input v-model="form.bankName" placeholder="请输入开户行"/>
+                </el-form-item>
+                <el-form-item label="账号名称" required>
+                    <el-input v-model="form.accountName" placeholder="请输入账号名称"/>
+                </el-form-item>
+                <el-form-item label="账号" required>
+                    <el-input v-model="form.account" placeholder="请输入账号"/>
+                </el-form-item>
+                <el-form-item label="默认账号">
+                    <el-switch v-model="form.isDefault"/>
+                </el-form-item>
+            </el-form>
+            <view class="mt-30 flex justify-center items-center">
+                <el-button plain @click="isAdd = !isAdd">取消</el-button>
+                <el-button type="primary" @click="addContact">确定</el-button>
+            </view>
+        </view>
+        <view v-else>
+            <view class="py-20 border-bottom flex justify-between items-center" v-for="(item, index) in list"
+                  :key="index">
+                <view class="flex flex-col justify-start items-start">
+                    <view class="flex justify-start items-center">
+                        <el-tag type="primary" size="small" class="mr-25" v-if="item.isDefault">默认</el-tag>
+                        <el-tag type="success" size="small" class="mr-25">{{
+                                item.type === 'company' ? '对公' : '个人'
+                            }}
+                        </el-tag>
+                        <text class="font-bold text-40">{{ item.account }}</text>
+                    </view>
+                    <view class="my-20">{{ item.accountName }}</view>
+                    <view class="my-20">{{ item.bankName }}</view>
+                </view>
+                <view class="flex flex-col justify-end">
+                    <el-button type="primary" size="small" @click="edit(item)">编辑</el-button>
+                    <view class="mt-20">
+                        <el-button type="primary" size="small" @click="del(item._id)" plain>删除</el-button>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </el-card>
+</template>
+
+<script>
+export default {
+    name: "account",
+    data() {
+        return {
+            isAdd: false,
+            form: {
+                _id: null,
+                bankName: '',
+                accountName: '',
+                account: '',
+                type: '',
+                isDefault: false,
+            },
+            list: []
+        }
+    },
+    methods: {
+        async addContact() {
+            if (!this.form.bankName) {
+                this.$message.error('请输入开户行')
+                return
+            }
+            if (!this.form.accountName) {
+                this.$message.error('请输入账号名称')
+                return
+            }
+            if (!this.form.account) {
+                this.$message.error('请输入账号')
+                return
+            }
+            if (!this.form.type && parseInt(vk.getVuex('$user.userInfo.accountType')) === 2) {
+                this.$message.error('请选择类型')
+                return
+            }
+            await vk.callFunction({
+                url: 'client/account/kh/action',
+                data: this.form
+            })
+            this.$message.success(this.form._id ? '修改成功' : '新增成功')
+            await this.getList()
+            this.isAdd = false
+            this.form = {
+                _id: null,
+                bankName: '',
+                accountName: '',
+                account: '',
+                type: '',
+                isDefault: false,
+            }
+        },
+        async getList() {
+            const {rows} = await vk.callFunction({
+                url: 'client/account/kh/getList',
+            })
+            this.list = rows
+        },
+        del(_id) {
+            this.$confirm('确认删除该账号吗?', '提示', {
+                confirmButtonText: '确定',
+                showCancelButton: false,
+                type: 'warning'
+            }).then(async () => {
+                await vk.callFunction({
+                    url: 'client/account/kh/delete',
+                    data: {_id}
+                })
+                await this.getList()
+            })
+        },
+        edit(item) {
+            for (let key in this.form) this.form[key] = item[key]
+            this.isAdd = true
+        },
+        showAdd() {
+            const user = vk.getVuex('$user.userInfo')
+            if (vk.getVuex('$user.userInfo.accountType') === 2) {
+                this.form.account = user.company.companyAccount
+                this.form.bankName = user.company.companyBankName
+                this.form.accountName = user.company.companyName
+            }else {
+                this.form.account = user.person.personAccount
+                this.form.bankName = user.person.personBankName
+                this.form.accountName = user.person.accountName
+                console.log(user)
+            }
+            this.isAdd = true
+        }
+    },
+    mounted() {
+        if (parseInt(vk.getVuex('$user.userInfo.authStatus')) !== 1) {
+            this.$message.error('请先完成实名认证')
+            this.$emit('done', 'fadada')
+        }
+        this.getList()
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/user/components/added.vue b/pages/user/components/added.vue
index 4ec30b2..80754d1 100644
--- a/pages/user/components/added.vue
+++ b/pages/user/components/added.vue
@@ -51,7 +51,7 @@
         </div>
         <div class="pay-price" v-if="billQRCode">
             <uv-qrcode ref="qrcode" size="240px" :value="billQRCode"></uv-qrcode>
-            <div class="pay-desc">请打开手机微信，扫一扫完成支付</div>
+            <div class="pay-desc">微信、支付宝、云闪付扫码完成支付</div>
             <el-button type="success" @click="onPayStatus">已完成支付</el-button>
         </div>
         <el-button v-else type="danger" @click="onPay">立即支付</el-button>
@@ -202,7 +202,8 @@ export default {
                     tid: '88880001',
                     instMid: 'QRPAYDEFAULT',
                     totalAmount: 1,
-                    notifyUrl: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/'
+                    // notifyUrl: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/'
+                    notifyUrl: 'https://tcb-n44byxi8bmrfrki-d4bn1c4a206d.service.tcloudbase.com/pay_notify'
                 }
             }
             /**
@@ -214,7 +215,7 @@ export default {
                 if (result.errCode === 'SUCCESS') {
                     this.showQrcode = true
                     this.billQRCode = result.billQRCode
-                    // this.$alert('', '请打开手机微信，扫一扫完成支付', {
+                    // this.$alert('', '微信、支付宝、云闪付扫码完成支付', {
                     //   confirmButtonText: '确定',
                     //   callback: action => {
                     //     this.$message({
diff --git a/pages/user/components/business-card.vue b/pages/user/components/business-card.vue
index adfea8a..60c7784 100644
--- a/pages/user/components/business-card.vue
+++ b/pages/user/components/business-card.vue
@@ -1,224 +1,358 @@
 <template>
-    <el-card>
-        <div slot="header" class="clearfix">
-            <span>我的名片</span>
+  <el-card>
+    <div slot="header" class="clearfix">
+      <span>我的名片</span>
+    </div>
+    <p class="text-main" v-if="parseInt(vk.getVuex('$user.userInfo.authStatus')) !== 1">请先完成认证</p>
+    <template
+      v-else-if="parseInt(vk.getVuex('$user.userInfo.authStatus')) === 1 && vk.getVuex('$user.userInfo.businessCard')">
+      <div class="text-main flex justify-start items-center">
+        <info theme="outline" size="18" fill="#a92924" strokeLinecap="square"
+              style="height: 18px"/>
+        <span v-if="parseInt(vk.getVuex('$user.userInfo.businessCard.status')) === 0">名片审核中</span>
+        <span v-if="parseInt(vk.getVuex('$user.userInfo.businessCard.status')) === 2">名片审核失败: {{
+            vk.getVuex('$user.userInfo.businessCard.refuseReason')
+          }}</span>
+        <span v-if="parseInt(vk.getVuex('$user.userInfo.businessCard.status')) === 1">名片审核通过</span>
+      </div>
+    </template>
+    <!-- 表单开始 -->
+    <vk-data-form
+      v-if="parseInt(vk.getVuex('$user.userInfo.authStatus')) === 1"
+      ref="form1"
+      v-model="form1.data"
+      :rules="form1.props.rules"
+      :action="form1.props.action"
+      :form-type="form1.props.formType"
+      :columns='form1.props.columns'
+      :loading.sync="form1.props.loading"
+      label-width="140px"
+      input-width="400px"
+      :before-action="form1.props.beforeAction"
+      :show-cancel="false"
+      submit-text="保存名片"
+      :submit-disabled="!!vk.getVuex('$user.userInfo.businessCard') && parseInt(vk.getVuex('$user.userInfo.businessCard.status')) === 0"
+    >
+      <!-- v-slot:editor 中的 editor 对应 columns中的 key, form对应 form1.data keyName 对应 columns中的 key -->
+      <template v-slot:video="{ form, keyName }">
+        <vk-data-upload v-model="form1.data.video" list-type="text" :limit="1"
+                        accept="video/*">
+        </vk-data-upload>
+
+      </template>
+      <template v-slot:album="{ form, keyName }">
+        <vk-data-upload v-model="form1.data.album" list-type="picture-card"
+                        :limit="albumLimit"
+                        accept=".jpg,.jpeg,.png">
+        </vk-data-upload>
+
+      </template>
+      <template v-slot:productImageList="{ form, keyName }">
+        <vk-data-upload v-model="form1.data.productImageList" list-type="picture-card"
+                        :limit="productImageLimit"
+                        accept=".jpg,.jpeg,.png">
+        </vk-data-upload>
+
+      </template>
+      <template v-slot:exampleImageList="{ form, keyName }">
+        <vk-data-upload v-model="form1.data.exampleImageList" list-type="picture-card"
+                        :limit="productImageLimit"
+                        accept=".jpg,.jpeg,.png">
+        </vk-data-upload>
+      </template>
+      <template v-slot:map="{ form, keyName }">
+        <div class="mapDiv">
+          <tdt-map :center="center" :zoom="zoom" @click="mapClick">
+            <tdt-marker :position="[form1.data.longitude, form1.data.latitude]" :draggable="false"/>
+          </tdt-map>
         </div>
+      </template>
 
-        <!-- 表单开始 -->
-        <vk-data-form
-            ref="form1"
-            v-model="form1.data"
-            :rules="form1.props.rules"
-            :action="form1.props.action"
-            :form-type="form1.props.formType"
-            :columns='form1.props.columns'
-            :loading.sync="form1.props.loading"
-            label-width="140px"
-            input-width="400px"
-            :before-action="form1.props.beforeAction"
-            :show-cancel="false"
-            submit-text="保存名片"
-            @success="onFormSuccess"
-        >
-            <!-- v-slot:editor 中的 editor 对应 columns中的 key, form对应 form1.data keyName 对应 columns中的 key -->
-            <!-- <template v-slot:editor="{ form, keyName }">
-                <vk-data-input-editor v-model="form[keyName]" placeholder="开始输入" width="750px"></vk-data-input-editor>
-            </template> -->
-
-        </vk-data-form>
-    </el-card>
+    </vk-data-form>
+  </el-card>
 </template>
 
 <script>
+import {Info} from "@icon-park/vue";
+import MapInit from '@/util/MapInit'
+
 export default {
-    data() {
-        return {
-            // 表单相关开始-----------------------------------------------------------
-            form1: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    companyIntroduction: ''
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: "no",
-                    // 表单字段显示规则
-                    columns: [
-                        {
-                            type: 'group',
-                            columns: [
-                                {
-                                    key: "logo",
-                                    title: "Logo",
-                                    type: "image",
-                                    limit: 1
-                                },
-                                {
-                                    key: "personalWechat",
-                                    title: "个人微信",
-                                    type: "image",
-                                    limit: 1
-                                },
-                                {
-                                    key: "companyWechat",
-                                    title: "企业微信",
-                                    type: "image",
-                                    limit: 1
-                                },
-                            ]
-                        },
-                        {
-                            key: "position",
-                            title: "职位",
-                            type: "text"
-                        },
-                        {
-                            key: "companyMobile",
-                            title: "公司电话",
-                            type: "text"
-                        },
-                        {
-                            key: "managerMobile",
-                            title: "负责人电话",
-                            type: "text"
-                        },
-                        {
-                            key: "address",
-                            title: "地区",
-                            type: "address"
-                        },
-                        {
-                            key: "addressDetail",
-                            title: "详细地址",
-                            type: "text"
-                        },
-                        {
-                            key: "email",
-                            title: "邮箱",
-                            type: "text"
-                        },
-                        {
-                            key: "website",
-                            title: "网址",
-                            type: "text"
-                        },
-                        {
-                            key: "mainBusiness",
-                            title: "主营业务",
-                            type: "textarea"
-                        },
-                        {
-                            key: "companyIntroduction",
-                            title: "企业简介",
-                            type: "editor"
-                        },
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        logo: [{
-                            required: true,
-                            message: "请上传Logo",
-                            trigger: ['blur', 'change']
-                        }],
-                        personalWechat: [{
-                            required: true,
-                            message: "请上传个人微信",
-                            trigger: ['blur', 'change']
-                        }],
-                        companyWechat: [{
-                            required: true,
-                            message: "请上传企业微信",
-                            trigger: ['blur', 'change']
-                        }],
-                        personName: [{
-                            required: true,
-                            message: "姓名不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        position: [{
-                            required: true,
-                            message: "职位不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        address: [{
-                            required: true,
-                            message: "地区不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        addressDetail: [{
-                            required: true,
-                            message: "详细地址不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        email: [{
-                            required: true,
-                            message: "邮箱不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        // website: [{
-                        // 	required: true,
-                        // 	message: "logo不能为空",
-                        // 	trigger: ['blur', 'change']
-                        // }],
-                        mainBusiness: [{
-                            required: true,
-                            message: "主营业务不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        mainSpotCategoryIds: [{
-                            required: true,
-                            message: "主营商品不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "update",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false,
-                    beforeAction: (formData) => {
-                        vk.callFunction({
-                            url: 'client/user/kh/addAuth',
-                            data: {
-                                businessCard: formData
-                            },
-                            success: (data) => {
-                                // 成功后的逻辑
-                                this.$message({
-                                    type: 'success',
-                                    message: '保存成功'
-                                })
-                            }
-                        });
-                        return false;
-                    },
-                }
-            },
-            // 表单相关结束-----------------------------------------------------------
-        }
-    },
-    created() {
-        this.getUserInfo()
-    },
-    methods: {
-        getUserInfo() {
-            vk.userCenter.getCurrentUserInfo({
-                success: (data) => {
-                    if (data.userInfo.businessCard) {
-                        this.form1.data = data.userInfo.businessCard
-                    }
-                    // 成功后的逻辑
-                    console.log('用户信息: ', data);
-                }
-            });
-
+  components: {Info},
+  data() {
+    return {
+      T: null,
+      tMap: null,
+      userInfo: {
+        accountType: 1,
+        userLevel: -1,
+      },
+      productImageLimit: 2,
+      albumLimit: 2,
+      dialogVisible: false,
+      center: [108.358150, 22.826820],
+      zoom: 12,
+      // 表单相关开始-----------------------------------------------------------
+      form1: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          companyIntroduction: '',
+          video: '',
+          longitude: 108.358150,
+          latitude: 22.826820,
+          album: [],
+          productImageList: [],
+          exampleImageList: [],
         },
+        // 表单属性
+        props: {
+          // 表单请求地址
+          action: "no",
+          // 表单字段显示规则
+          columns: [
+            {
+              type: 'group',
+              columns: [
+                {
+                  key: "logo",
+                  title: "Logo",
+                  type: "image",
+                  limit: 1
+                },
+                {
+                  key: "personalWechat",
+                  title: "个人微信",
+                  type: "image",
+                  limit: 1
+                },
+                {
+                  key: "companyWechat",
+                  title: "企业微信",
+                  type: "image",
+                  limit: 1,
+                  showRule: (formData) => {
+                    console.log('formData', this.userInfo)
+                    return parseInt(this.userInfo.accountType) === 2
+                  },
+                },
+              ]
+            },
+            {
+              key: "position",
+              title: "职位",
+              type: "text",
+              showRule: (formData) => {
+                return parseInt(this.userInfo.accountType) !== 2
+              },
+            },
+            {
+              key: "companyMobile",
+              title: "公司电话",
+              type: "text"
+            },
+            {
+              key: "managerMobile",
+              title: "负责人电话",
+              type: "text"
+            },
+            {
+              key: "address",
+              title: "地区",
+              type: "address"
+            },
+            {
+              key: "addressDetail",
+              title: "详细地址",
+              type: "text"
+            },
+            {
+              key: "email",
+              title: "有效邮箱",
+              type: "text"
+            },
+            {
+              key: "website",
+              title: "网址",
+              type: "text",
+              showRule: (formData) => {
+                return parseInt(this.userInfo.accountType) === 2 && parseInt(this.userInfo.userLevel) > 2
+              },
+            },
+            {
+              key: "companyIntroduction",
+              title: "企业简介",
+              type: "editor"
+            },
+            {
+              key: "video",
+              title: "视频",
+              type: "html",
+              showRule: (formData) => {
+                return parseInt(this.userInfo.accountType) === 2 && parseInt(this.userInfo.userLevel) > 2
+              },
+            },
+            {
+              key: "album",
+              title: `首页大图`,
+              type: "html",
+            },
+            {
+              key: "productImageList",
+              title: `产品展示`,
+              type: "html",
+            },
+            {
+              key: "exampleImageList",
+              title: `案例展示`,
+              type: "html",
+            },
+            {
+              key: "map",
+              title: `地图定位`,
+              type: "html",
+              showRule: (formData) => {
+                return parseInt(this.userInfo.accountType) === 2 && parseInt(this.userInfo.userLevel) > 1
+              },
+            },
+
+          ],
+          // 表单验证规则
+          rules: {
+            logo: [{
+              required: true,
+              message: "请上传Logo",
+              trigger: ['blur', 'change']
+            }],
+            personalWechat: [{
+              required: true,
+              message: "请上传个人微信",
+              trigger: ['blur', 'change']
+            }],
+            personName: [{
+              required: true,
+              message: "姓名不能为空",
+              trigger: ['blur', 'change']
+            }],
+            address: [{
+              required: true,
+              message: "地区不能为空",
+              trigger: ['blur', 'change']
+            }],
+            addressDetail: [{
+              required: true,
+              message: "详细地址不能为空",
+              trigger: ['blur', 'change']
+            }],
+            email: [{
+              required: true,
+              message: "邮箱不能为空",
+              trigger: ['blur', 'change']
+            }],
+            // website: [{
+            // 	required: true,
+            // 	message: "logo不能为空",
+            // 	trigger: ['blur', 'change']
+            // }],
+            mainBusiness: [{
+              required: true,
+              message: "主营业务不能为空",
+              trigger: ['blur', 'change']
+            }],
+            mainSpotCategoryIds: [{
+              required: true,
+              message: "主营商品不能为空",
+              trigger: ['blur', 'change']
+            }],
+
+          },
+          // add 代表添加 update 代表修改
+          formType: "update",
+          // 表单是否在请求中
+          loading: false,
+          // 是否显示表单1 的弹窗
+          show: false,
+          beforeAction: (formData) => {
+            vk.callFunction({
+              url: 'client/user/kh/addAuth',
+              data: {
+                businessCard: {...formData, status: 0},
+                isBusinessCard: true
+              },
+              success: (data) => {
+                // 成功后的逻辑
+                this.$message({
+                  type: 'success',
+                  message: '提交成功,新信息将在审核通过后显示',
+                  duration: 5000
+                })
+                setTimeout(() => {
+                  window.location.reload()
+                }, 1000)
+              }
+            });
+            return false;
+          },
+        }
+      },
+      // 表单相关结束-----------------------------------------------------------
     }
+  },
+  created() {
+    this.getUserInfo()
+
+  },
+  methods: {
+    getUserInfo() {
+      vk.userCenter.getCurrentUserInfo({
+        success: (data) => {
+          if (data.userInfo.businessCard) {
+            this.form1.data = data.userInfo.businessCard
+          }
+          for (let key in this.userInfo) this.userInfo[key] = data.userInfo[key]
+          if (!data.userInfo.businessCard) {
+            if (this.userInfo.company.mobile) this.form1.data.companyMobile = this.userInfo.company.mobile
+            if (this.userInfo.manager.mobile) this.form1.data.managerMobile = this.userInfo.manager.mobile
+            if (this.userInfo.company.email) this.form1.data.email = this.userInfo.company.email
+          } else {
+            if (data.userInfo.businessCard.album && !Array.isArray(data.userInfo.businessCard.album)) this.form1.data.album = [data.userInfo.businessCard.album]
+          }
+          if (!this.form1.data.longitude) this.form1.data.longitude = 108.358150
+          if (!this.form1.data.latitude) this.form1.data.latitude = 22.826820
+
+          if (this.userInfo.userLevel === 0) {
+            this.albumLimit = 1
+            this.productImageLimit = 2
+          } else if (this.userInfo.userLevel === 1) {
+            this.albumLimit = 2
+            this.productImageLimit = 4
+          } else if (this.userInfo.userLevel === 2) {
+            this.albumLimit = 2
+            this.productImageLimit = 12
+          } else if (this.userInfo.userLevel > 2) {
+            this.albumLimit = 4
+            if (this.userInfo.userLevel > 3) {
+              this.albumLimit = 6
+            }
+            this.productImageLimit = 30
+          }
+        }
+      });
+    },
+    mapClick({type, lnglat}) {
+      if (type === "click") {
+        this.form1.data.longitude = parseFloat(lnglat.lng);
+        this.form1.data.latitude = parseFloat(lnglat.lat);
+        this.$message.success("已选择");
+        console.log(this.form1.data.longitude, this.form1.data.latitude)
+        this.$forceUpdate()
+      }
+    }
+  }
 }
 </script>
 
-<style>
+<style scoped>
+.mapDiv {
+  width: 100%;
+  height: 300px;
+}
 </style>
\ No newline at end of file
diff --git a/pages/user/components/business-contact.vue b/pages/user/components/business-contact.vue
new file mode 100644
index 0000000..9df3575
--- /dev/null
+++ b/pages/user/components/business-contact.vue
@@ -0,0 +1,125 @@
+<template>
+    <el-card>
+        <view class="flex justify-end items-center">
+            <el-button type="primary" @click="isAdd = !isAdd" v-if="!isAdd">新增业务联系人</el-button>
+        </view>
+        <view class="mt-20" v-if="isAdd">
+            <el-form ref="form" :model="form" label-width="120px">
+                <el-form-item label="姓名" required>
+                    <el-input v-model="form.name" placeholder="请输入姓名"/>
+                </el-form-item>
+                <el-form-item label="手机号" required>
+                    <el-input v-model="form.phone" placeholder="请输入手机号"/>
+                </el-form-item>
+                <el-form-item label="邮箱" required>
+                    <el-input v-model="form.email" placeholder="请输入邮箱"/>
+                </el-form-item>
+                <el-form-item label="职位" required>
+                    <el-input v-model="form.position" placeholder="请输入职位"/>
+                </el-form-item>
+            </el-form>
+            <view class="mt-30 flex justify-center items-center">
+                <el-button plain @click="isAdd = !isAdd">取消</el-button>
+                <el-button type="primary" @click="addContact">确定</el-button>
+            </view>
+        </view>
+        <view v-else>
+            <view class="py-20 border-bottom flex justify-between items-center" v-for="(item, index) in list"
+                  :key="index">
+                <view class="flex flex-col justify-start items-start">
+                    <view>
+                        <text class="font-bold text-40">{{ item.name }}</text>
+                        <text class="ml-20 text-gray">({{ item.position }})</text>
+                    </view>
+                    <view class="my-20">手机号:{{ item.phone }}</view>
+                    <view class="my-20">邮箱:{{ item.email }}</view>
+                </view>
+                <view class="flex flex-col justify-end">
+                    <el-button type="primary" size="small" @click="edit(item)">编辑</el-button>
+                    <view class="mt-20">
+                        <el-button type="primary" size="small" @click="del(item._id)" plain>删除</el-button>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </el-card>
+</template>
+
+<script>
+export default {
+    name: "business-contact",
+    data() {
+        return {
+            isAdd: false,
+            form: {
+                _id: null,
+                phone: '',
+                name: '',
+                email: '',
+                position: '',
+            },
+            list: []
+        }
+    },
+    methods: {
+        async addContact() {
+            if (!this.form.name) {
+                this.$message.error('请输入姓名')
+                return
+            }
+            if (!this.form.phone) {
+                this.$message.error('请输入手机号')
+                return
+            }
+            if (!this.form.email) {
+                this.$message.error('请输入邮箱')
+                return
+            }
+            if (!this.form.position) {
+                this.$message.error('请输入职位')
+                return
+            }
+            await vk.callFunction({
+                url: 'client/businessContact/kh/action',
+                data: this.form
+            })
+            this.$message.success(this.form._id ? '修改成功' : '新增成功')
+            await this.getList()
+            this.isAdd = false
+            this.form = {
+                _id: null,
+                phone: '',
+                name: '',
+                email: '',
+                position: '',
+            }
+        },
+        async getList() {
+            const {rows} = await vk.callFunction({
+                url: 'client/businessContact/kh/getList',
+            })
+            this.list = rows
+        },
+        del(_id) {
+            this.$confirm('确认删除该业务联系人吗?', '提示', {
+                confirmButtonText: '确定',
+                showCancelButton: false,
+                type: 'warning'
+            }).then(async () => {
+                await vk.callFunction({
+                    url: 'client/businessContact/kh/delete',
+                    data: {_id}
+                })
+                await this.getList()
+            })
+        },
+        edit(item) {
+            for (let key in this.form) this.form[key] = item[key]
+            this.isAdd = true
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/user/components/equity.vue b/pages/user/components/equity.vue
index 17ea643..0f14a9f 100644
--- a/pages/user/components/equity.vue
+++ b/pages/user/components/equity.vue
@@ -1,148 +1,189 @@
 <template>
-    <el-card shadow="never">
-        <view class="welcome">
-            尊敬的平台商家您好，目前您是我们平台的
-            <text>{{ userLevelStr }} LV{{ userInfo.userGrade + 1 }}</text>
-            客户，可享受相应会员权益~
-        </view>
-        <view class="user-info">
+  <el-card shadow="never">
+    <view class="welcome">
+      尊敬的平台商家您好，目前您是我们平台的
+      <text>{{ userLevelStr }}</text>
+      ，可享受相应会员权益~
+    </view>
+    <view class="user-info">
+      <view class="left">
+        <view class="member-card">
+          <view class="card-name">
+            <text class="name">{{ userLevelStr }}</text>
+            <!--                        <text class="level">LV{{ userInfo.userGrade + 1 }}</text>-->
+            <text class="grade">
+              当前等级
+            </text>
+          </view>
+          <view class="exp-time" v-if="userInfo.upgradeExpiredAt">
+            有效期至：{{ dayjs(userInfo.upgradeExpiredAt).format('YYYY-MM-DD HH:mm:ss') }}
+          </view>
+          <view class="progress-box">
             <view class="left">
-                <view class="member-card">
-                    <view class="card-name">
-                        <text class="name">{{ userLevelStr }}</text>
-                        <text class="level">LV{{ userInfo.userGrade + 1 }}</text>
-                        <text class="grade">
-                            当前等级
-                        </text>
-                    </view>
-                    <view class="exp-time" v-if="userInfo.upgradeExpiredAt">
-                        有效期至：{{ userInfo.upgradeExpiredAt }}
-                    </view>
-                    <view class="progress-box">
-                        <view class="left">
-                            <view class="total-pay">当前交易额</view>
-                            <view class="progress">
-                                <view class="price">{{ userInfo.transactionAmount }}</view>
-                                <view class="desc">还差40W升级LV2</view>
-                            </view>
-                            <view class="progress-line">
-                                <el-progress :percentage="30" color="#919191" :stroke-width="8"
-                                             :show-text="false"></el-progress>
-                            </view>
-                            <view class="level">
-                                <view class="min-level">L1</view>
-                                <view class="max-level">L10</view>
-                            </view>
-                        </view>
-                        <view class="xufei-btn">
-                            <el-image src="https://oss.wsdns.cn/20231205/aecd46b81f8b452c9294ae36ab8404f5.png"/>
-                        </view>
-                    </view>
-                </view>
+              <view class="total-pay">当前交易额</view>
+              <view class="progress">
+                <view class="price">{{ userInfo.transactionAmount }}</view>
+                <!--                                <view class="desc">还差40W升级LV2</view>-->
+              </view>
+              <view class="progress-line">
+                <el-progress :percentage="30" color="#919191" :stroke-width="8"
+                             :show-text="false"></el-progress>
+              </view>
+              <!--                            <view class="level">-->
+              <!--                                <view class="min-level">L1</view>-->
+              <!--                                <view class="max-level">L10</view>-->
+              <!--                            </view>-->
             </view>
-            <view class="right">
-                <view class="bzj-title">当前保证金
-                    <text>{{ userInfo.paidEnsure }}</text>
-                    元
-                </view>
-                <view class="desc">
-                    金久信携手千万采购商和供应商，承诺为买家和卖家打造更优质的服务平台，缴纳诚信保证金会冻结在平台，最低保证金额度5000.00元
-                </view>
-                <view class="btn-box">
-                    <el-button @click="showForm('grade')">升级会员</el-button>
-                    <el-button @click="showForm('payment')">去缴纳保证金</el-button>
-                    <el-button @click="showForm('added')">购买增值权益</el-button>
-                </view>
+            <view class="xufei-btn" @click="showForm('grade')">
+              <el-image src="/static/images/aecd46b81f8b452c9294ae36ab8404f5.png"/>
             </view>
+          </view>
         </view>
-        <view class="equity" v-if="userInfo.userGrade > -1">
-            <el-image src="https://oss.wsdns.cn/20231205/5ba845c9570e4fba95516b68ae661056.png"/>
+      </view>
+      <view class="right">
+        <view class="bzj-title">当前保证金
+          <text>{{ userInfo.paidEnsure }}</text>
+          元
         </view>
+        <view class="desc">
+          金久信携手千万采购商和供应商，承诺为买家和卖家打造更优质的服务平台，缴纳诚信保证金会冻结在平台，最低保证金额度5000.00元
+        </view>
+        <view class="btn-box">
+          <el-button @click="showForm('grade')">升级会员</el-button>
+          <!--                    <el-button @click="showForm('payment')">去缴纳保证金</el-button>-->
+          <!--                    <el-button @click="showForm('added')">购买增值权益</el-button>-->
+        </view>
+      </view>
+    </view>
+    <!--        <view class="equity" v-if="userInfo.userLevel > -1">-->
+    <!--            <el-image-->
+    <!--                :src="userLevelList.find(item => parseInt(item.level) === parseInt(userInfo.userLevel)).upgradeDescImg"/>-->
+    <!--        </view>-->
 
-        <div class="grade-list">
-            <div class="item">
-                <div class="item-box" style="background-color: #f7f7f7">
-                    <div class="title">会员等级</div>
-                    <div class="title" v-for="(item, index) in userLevelList" :key="index">{{ item.name }}</div>
-                </div>
-            </div>
-            <div class="item">
-                <div class="item-box">
-                    <div class="title">身份图标</div>
-                    <div class="title" v-for="(item, index) in userLevelList" :key="index">
-                        <el-image class="level"
-                                  :src="item.icon[0]"/>
-                    </div>
-                </div>
-            </div>
-            <div class="item">
-                <div class="item-box">
-                    <div class="title">认证缴费</div>
-                    <div class="title red" v-for="(item, index) in userLevelList" :key="index">
-                        去认证<i class="el-icon-arrow-right"></i>
-                    </div>
-                </div>
-            </div>
-            <div class="item">
-                <div class="item-box">
-                    <div class="title">获得身份方式</div>
-                    <div class="title" v-for="(item, index) in userLevelList" :key="index">
-                        <div class="get-way">
-                            <template v-if="parseInt(item.amount) === 0">
-                                <div>企业平台认证</div>
-                                <div>VIP认证方法</div>
-                                <div class="red pointer" @click="showForm('fadada')">去升级<i class="el-icon-arrow-right"></i></div>
-                            </template>
-                            <template v-else>
-                                <div>购买</div>
-                                <div>{{ item.amount }}元/年</div>
-                                <div class="red pointer" @click="showForm('grade')">去升级<i class="el-icon-arrow-right"></i></div>
-                            </template>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="item">
-                <div class="item-box">
-                    <div class="title">询报价权益</div>
-                    <div class="title" v-for="(item, index) in userLevelList" :key="index">{{
-                            parseInt(item.offerOffRate) === 100 ? '-' : `${parseInt(item.offerOffRate) / 10}折`
-                        }}
-                    </div>
-                </div>
-            </div>
+    <div class="grade-list">
+      <div class="item">
+        <div class="item-box" style="background-color: #f7f7f7">
+          <div class="title">会员等级</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">{{ item.name }}</div>
         </div>
-
-        <u-gap height="80"></u-gap>
-        <div class="grade-list">
-            <div class="item">
-                <div class="item-box" style="background-color: #f7f7f7">
-                    <div class="title">时间</div>
-                    <div class="title">详情</div>
-                    <div class="title">金额</div>
-                    <div class="title">会员权益</div>
-                </div>
-            </div>
-            <div class="item" v-for="(item, index) in userPayEnsureList" :key="index" @click="onChange(index)">
-                <div class="item-box">
-                    <div class="title">{{ item._add_time_str }}</div>
-                    <div class="title">缴纳保证金</div>
-                    <div class="title">￥{{ item.amount }}</div>
-                    <div class="title">-</div>
-                </div>
-            </div>
-            <view class="paginatio">
-                <el-pagination
-                    @current-change="search"
-                    background
-                    layout="prev, pager, next"
-                    :page-size="pageSize"
-                    :total="total">
-                </el-pagination>
-            </view>
+      </div>
+      <div class="item">
+        <div class="item-box">
+          <div class="title">身份图标</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">
+            <el-image class="level"
+                      :src="item.icon[0]"/>
+          </div>
         </div>
+      </div>
+      <div class="item" v-if="parseInt(userInfo.authStatus) !== 1">
+        <div class="item-box" @click="toAuth">
+          <div class="title">认证缴费</div>
+          <div class="title red" v-for="(item, index) in userLevelList" :key="index">
+            去认证<i class="el-icon-arrow-right"></i>
+          </div>
+        </div>
+      </div>
+      <div class="item">
+        <div class="item-box">
+          <div class="title">获得身份方式</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">
+            <div class="get-way">
+              <template v-if="parseInt(item.amount) === 0">
+                <div>企业平台认证</div>
+                <div>VIP认证方法</div>
+                <div class="red pointer"
+                     v-if="parseInt(userInfo.userLevel) < item.level"
+                     @click="showForm('fadada')">去升级<i
+                  class="el-icon-arrow-right"></i></div>
+              </template>
+              <template v-else>
+                <div>购买</div>
+                <div>{{ item.amount }}元/年</div>
+                <div v-if="item.ensureAmount && item.ensureAmount > 0">+交易保证金({{ item.ensureAmount }}元)</div>
+                <div class="red pointer" @click="showForm('grade')"
+                     v-if="parseInt(userInfo.userLevel) <= item.level">{{
+                    parseInt(userInfo.userLevel) === item.level ? '去续费' : '去升级'
+                  }}<i
+                    class="el-icon-arrow-right"></i></div>
+              </template>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="item">
+        <div class="item-box">
+          <div class="title">升级方式</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">
+            <div class="get-way">
+              <span>交易额每{{ parseFloat(item.upgradeAmount) / 10000 }}万升一级,共十级</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="item">
+        <div class="item-box">
+          <div class="title">询报价权益</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">{{
+              parseInt(item.offerOffRate) === 0 ? '不限次数,免费' :
+                (parseInt(item.offerOffRate) === 100 ? '-' : `${parseInt(item.offerOffRate) / 10}折`)
+            }}
+          </div>
+        </div>
+      </div>
+      <div class="item">
+        <div class="item-box">
+          <div class="title">增值服务</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">{{
+              (parseInt(item.valueAddRate) === 100 ? '-' : `${parseInt(item.valueAddRate) / 10}折`)
+            }}
+          </div>
+        </div>
+      </div>
+      <div class="item">
+        <div class="item-box">
+          <div class="title">加工厂店铺</div>
+          <div class="title" v-for="(item, index) in userLevelList" :key="index">可授权</div>
+        </div>
+      </div>
 
-    </el-card>
+    </div>
+
+    <u-gap height="80"></u-gap>
+    <div class="grade-list">
+      <div class="item">
+        <div class="item-box" style="background-color: #f7f7f7">
+          <div class="title">时间</div>
+          <div class="title">详情</div>
+          <div class="title">金额</div>
+          <div class="title">订单状态</div>
+          <div class="title">会员权益</div>
+        </div>
+      </div>
+      <div class="item" v-for="(item, index) in userPayEnsureList" :key="index" @click="onChange(index)">
+        <div class="item-box">
+          <div class="title">{{ item._add_time_str }}</div>
+          <div class="title">{{ item.type === 2 ? '缴纳保证金' : '会员升级' }}</div>
+          <div class="title">￥{{ item.amount }}</div>
+          <div class="title">
+            <span v-if="item.orderStatus === 0">待支付</span>
+            <span v-if="item.orderStatus > 0">已支付</span>
+          </div>
+          <div class="title">-</div>
+        </div>
+      </div>
+      <view class="paginatio">
+        <el-pagination
+          @current-change="getUserPayEnsureList"
+          background
+          layout="prev, pager, next"
+          :page-size="pageSize"
+          :total="total">
+        </el-pagination>
+      </view>
+    </div>
+
+  </el-card>
 </template>
 
 <script>
@@ -154,506 +195,471 @@ const OpenSdk = require('../lib/base').default;
 // const OpenSdk = require('ums-sdk-nodejs').default;
 
 const sdk = new OpenSdk({
-    appId: '10037e6f6823b20801682b6a5e5a0006',
-    appKey: '1c4e3b16066244ae9b236a09e5b312e8'
+  appId: '10037e6f6823b20801682b6a5e5a0006',
+  appKey: '1c4e3b16066244ae9b236a09e5b312e8'
 })
 export default {
-    components: {UGap},
-    data() {
-        return {
-            userInfo: {
-                paidEnsure: 0
-            },
-            paymentIndex: 0,
-            payment: ["银联支付"],
-            money: 5000,
-            showQrcode: false,
-            billQRCode: '',
-            gradeIndex: 0,
-            gradeList: [
-                {
-                    id: 1,
-                    grade: '身份图标',
-                    code: '金久信认证(图)',
-                    name: '供应商实力考查',
-                    type: '元/次',
-                    price: 150,
-                    company: '金久信',
-                    select: 1,
-                    comments: '实现视频并记录存档，收集相关纸质文件'
-                },
-                {
-                    id: 2,
-                    grade: '认证缴费',
-                    code: '黄金VIP(图)',
-                    name: '供应商实力考查',
-                    type: '元/次',
-                    price: 150,
-                    company: '金久信',
-                    select: 0,
-                    comments: '实现视频并记录存档，收集相关纸质文件'
-                },
-                {
-                    id: 3,
-                    grade: '获得身份方式',
-                    code: '铂金VIP(图)',
-                    name: '供应商实力考查',
-                    type: '元/次',
-                    price: 150,
-                    company: '金久信',
-                    select: 0,
-                    comments: '实现视频并记录存档，收集相关纸质文件'
-                },
-                {
-                    id: 4,
-                    grade: '获得身份方式',
-                    code: '钻石VIP',
-                    name: '供应商实力考查',
-                    type: '元/次',
-                    price: 150,
-                    company: '金久信',
-                    select: 0,
-                    comments: '实现视频并记录存档，收集相关纸质文件'
-                },
-            ],
-            userLevelList: [],
-            userLevelStr: '普通用户',
-            userPayEnsureList: [],
-            pageSize: 10,
-            total: 0
-        }
-    },
-    created() {
-        this.getUserLevelList()
-        this.getUserPayEnsureList()
-    },
-    methods: {
-        getUserPayEnsureList(pageIndex = 1) {
-            vk.callFunction({
-                url: 'client/order/kh/getList',
-                data: {
-                    pageIndex,
-                    pageSize: this.pageSize
-                },
-                success: (res) => {
-                    this.total = res.total
-                    this.userPayEnsureList = res.rows
-                }
-            });
-        },
-        getUserInfo() {
-            vk.userCenter.getCurrentUserInfo({
-                success: (data) => {
-                    this.userInfo = data.userInfo
-                    if (data.userInfo.userLevel > -1) {
-                        this.userLevelStr = this.userLevelList.find(level => parseInt(level.level) === parseInt(data.userInfo.userLevel)).name
-                    }
-                }
-            });
-        },
-        onChange(money) {
-            this.money = money
-        },
-        navTo(url) {
-            vk.navigateTo(url);
-        },
-        showForm(index) {
-            this.$emit('done', index);
-        },
-        getUserLevelList() {
-            vk.callFunction({
-                url: 'client/userLevel/pub/getList',
-                data: {
-                    pageIndex: 1,
-                    pageSize: 200
-                },
-                success: (data) => {
-                    this.userLevelList = data.rows
-                    this.getUserInfo()
-                }
-            });
-        }
+  components: {UGap},
+  data() {
+    return {
+      userInfo: {
+        paidEnsure: 0
+      },
+      paymentIndex: 0,
+      payment: ["银联支付"],
+      money: 5000,
+      showQrcode: false,
+      billQRCode: '',
+      gradeIndex: 0,
+      userLevelList: [],
+      userLevelStr: '普通用户',
+      userPayEnsureList: [],
+      pageSize: 10,
+      total: 0
     }
+  },
+  created() {
+    this.getUserLevelList()
+    this.getUserPayEnsureList()
+  },
+  methods: {
+    dayjs,
+    getUserPayEnsureList(pageIndex = 1) {
+      vk.callFunction({
+        url: 'client/order/kh/getList',
+        data: {
+          pageIndex,
+          pageSize: this.pageSize,
+          type: [2, 3]
+        },
+        success: (res) => {
+          this.total = res.total
+          this.userPayEnsureList = res.rows
+        }
+      });
+    },
+    getUserInfo() {
+      vk.userCenter.getCurrentUserInfo({
+        success: (data) => {
+          this.userInfo = data.userInfo
+          console.log(this.userInfo.paidEnsure)
+          if (data.userInfo.userLevel > -1) {
+            this.userLevelStr = this.userLevelList.find(level => parseInt(level.level) === parseInt(data.userInfo.userLevel)).name
+          }
+        }
+      });
+    },
+    onChange(money) {
+      this.money = money
+    },
+    navTo(url) {
+      vk.navigateTo(url);
+    },
+    showForm(index) {
+      this.$emit('done', index);
+    },
+    getUserLevelList() {
+      vk.callFunction({
+        url: 'client/userLevel/pub/getList',
+        data: {
+          pageIndex: 1,
+          pageSize: 200
+        },
+        success: (data) => {
+          this.userLevelList = data.rows
+          this.getUserInfo()
+        }
+      });
+    },
+    toAuth() {
+      this.$emit('done', 'fadada')
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .clearfix {
-    font-weight: bold;
-    font-size: 18px;
+  font-weight: bold;
+  font-size: 18px;
 }
 
 .bzj-price {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 
-    .item {
-        position: relative;
-        border: 1px solid #eee;
+  .item {
+    position: relative;
+    border: 1px solid #eee;
 
-        .item-box {
-            display: flex;
+    .item-box {
+      display: flex;
 
-            .title {
-                padding: 10px;
-                border-right: 1px solid #eee;
-                display: flex;
-                align-items: center;
-                width: 40px;
-                justify-content: center;
-                text-align: center;
+      :first-child {
+        width: 100px;
+      }
 
-                .level {
-                    width: 80px;
-                    height: 80px;
-                }
-            }
+      .title {
+        padding: 10px;
+        border-right: 1px solid #eee;
+        display: flex;
+        align-items: center;
+        width: 40px;
+        justify-content: center;
+        text-align: center;
 
-            .info {
-                padding: 10px;
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                justify-content: center;
-                width: 230px;
-
-                .price {
-                    font-size: 28px;
-                }
-
-                .desc {
-                    color: #ccc;
-                }
-            }
+        .level {
+          width: 60px;
+          height: 60px;
         }
+      }
 
-        .select {
-            display: none;
-        }
-    }
+      .info {
+        padding: 10px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        width: 230px;
 
-    .active {
-        border: 2px solid #bf2b28 !important;
-
-        .item-box {
-            .title {
-                border-right: 2px solid #bf2b28 !important;
-                color: #bf2b28;
-            }
-
-            .info {
-                .price {
-                    color: #bf2b28;
-                }
-
-                .desc {
-                    color: #ccc;
-                }
-            }
-        }
-
-        .select {
-            position: absolute;
-            right: 0;
-            bottom: 0;
-            border-top: 20px solid transparent;
-            border-right: 20px solid #bf2b28;
-            border-left: 20px solid transparent;
-            border-bottom: 20px solid #bf2b28;
-            display: flex;
-
-            .icon {
-                position: relative;
-
-                .el-icon-check {
-                    position: absolute;
-                    left: 0;
-                    top: 0;
-                    color: #fff;
-                }
-            }
-        }
-    }
-}
-
-.box-card {
-    margin-top: 20px;
-    border: none;
-}
-
-.sub-title {
-    color: #bf2b28;
-    font-size: 18px;
-    font-weight: bold;
-    border-left: 5px solid #bf2b28;
-    padding-left: 10px;
-    height: 20px;
-    line-height: 20px;
-    margin: 20px auto;
-}
-
-.bzj-readme {
-    margin-top: 20px;
-}
-
-.payment {
-    margin-top: 20px;
-}
-
-.pay-price {
-    margin-top: 20px;
-}
-
-.pay-desc {
-    font-size: 16px;
-    line-height: 2em;
-}
-
-.welcome {
-    color: #999999;
-    font-size: 16px;
-
-    text {
-        color: #bf2b28;
-        font-size: 18px;
-        font-weight: bold;
-    }
-}
-
-.user-info {
-    margin: 20px auto;
-    display: flex;
-    justify-content: space-between;
-
-    .left {
-        .member-card {
-            background: url("https://oss.wsdns.cn/20231205/e080605f50d3406b84bae69088418309.png");
-            background-size: 100%;
-            background-color: #626262;
-            border-radius: 20px;
-            padding: 30px;
-            width: 420px;
-            height: 230px;
-
-            .card-name {
-                .name {
-                    color: #DFBA8B;
-                    font-size: 24px;
-                    font-weight: bold;
-                }
-
-                .level {
-                    color: #DFBA8B;
-                    font-size: 18px;
-                    font-weight: bold;
-                    margin: 0 15px;
-                }
-
-                .grade {
-                    padding: 4px 7px;
-                    color: #ffffff;
-                    border: 1px solid #ffffff;
-                    border-radius: 5px;
-                    margin-left: 20px;
-                }
-            }
-
-            .exp-time {
-                color: #DFBA8B;
-                opacity: 0.5;
-            }
-
-            .progress-box {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-
-                .total-pay {
-                    margin-top: 30px;
-                    color: #BFBFBF;
-                }
-
-                .progress {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: flex-end;
-                    color: #BFBFBF;
-                    font-size: 20px;
-
-                    .price {
-
-                    }
-
-                    .desc {
-                        font-size: 12px;
-                        padding-bottom: 1px;
-                    }
-                }
-
-                .progress-line {
-                    width: 250px;
-                }
-
-                .level {
-                    display: flex;
-                    justify-content: space-between;
-                    color: #BFBFBF;
-                    line-height: 1.8em;
-                }
-
-                .xufei-btn {
-                    width: 100px;
-                    margin-left: 20px;
-                    margin-top: 12px;
-                }
-            }
-        }
-    }
-
-    .right {
-        padding: 20px;
-        border-radius: 20px;
-        width: 420px;
-
-        .bzj-title {
-            font-size: 16px;
-
-            text {
-                color: #bf2b28;
-                font-size: 24px;
-            }
+        .price {
+          font-size: 28px;
         }
 
         .desc {
-            color: #999999;
-            padding: 18px 0;
+          color: #ccc;
         }
+      }
     }
+
+    .select {
+      display: none;
+    }
+  }
+
+  .active {
+    border: 2px solid #bf2b28 !important;
+
+    .item-box {
+      .title {
+        border-right: 2px solid #bf2b28 !important;
+        color: #bf2b28;
+      }
+
+      .info {
+        .price {
+          color: #bf2b28;
+        }
+
+        .desc {
+          color: #ccc;
+        }
+      }
+    }
+
+    .select {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      border-top: 20px solid transparent;
+      border-right: 20px solid #bf2b28;
+      border-left: 20px solid transparent;
+      border-bottom: 20px solid #bf2b28;
+      display: flex;
+
+      .icon {
+        position: relative;
+
+        .el-icon-check {
+          position: absolute;
+          left: 0;
+          top: 0;
+          color: #fff;
+        }
+      }
+    }
+  }
+}
+
+.box-card {
+  margin-top: 20px;
+  border: none;
+}
+
+.sub-title {
+  color: #bf2b28;
+  font-size: 18px;
+  font-weight: bold;
+  border-left: 5px solid #bf2b28;
+  padding-left: 10px;
+  height: 20px;
+  line-height: 20px;
+  margin: 20px auto;
+}
+
+.bzj-readme {
+  margin-top: 20px;
+}
+
+.payment {
+  margin-top: 20px;
+}
+
+.pay-price {
+  margin-top: 20px;
+}
+
+.pay-desc {
+  font-size: 16px;
+  line-height: 2em;
+}
+
+.welcome {
+  color: #999999;
+  font-size: 16px;
+
+  text {
+    color: #bf2b28;
+    font-size: 18px;
+    font-weight: bold;
+  }
+}
+
+.user-info {
+  margin: 20px auto;
+  display: flex;
+  justify-content: space-between;
+
+  .left {
+    .member-card {
+      background: url("https://oss.wsdns.cn/20231205/e080605f50d3406b84bae69088418309.png");
+      background-size: 100%;
+      background-color: #626262;
+      border-radius: 20px;
+      padding: 30px;
+      width: 420px;
+      height: 230px;
+
+      .card-name {
+        .name {
+          color: #DFBA8B;
+          font-size: 24px;
+          font-weight: bold;
+        }
+
+        .level {
+          color: #DFBA8B;
+          font-size: 18px;
+          font-weight: bold;
+          margin: 0 15px;
+        }
+
+        .grade {
+          padding: 4px 7px;
+          color: #ffffff;
+          border: 1px solid #ffffff;
+          border-radius: 5px;
+          margin-left: 20px;
+        }
+      }
+
+      .exp-time {
+        color: #DFBA8B;
+        opacity: 0.5;
+      }
+
+      .progress-box {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .total-pay {
+          margin-top: 30px;
+          color: #BFBFBF;
+        }
+
+        .progress {
+          display: flex;
+          justify-content: space-between;
+          align-items: flex-end;
+          color: #BFBFBF;
+          font-size: 20px;
+
+          .price {
+
+          }
+
+          .desc {
+            font-size: 12px;
+            padding-bottom: 1px;
+          }
+        }
+
+        .progress-line {
+          width: 250px;
+        }
+
+        .level {
+          display: flex;
+          justify-content: space-between;
+          color: #BFBFBF;
+          line-height: 1.8em;
+        }
+
+        .xufei-btn {
+          width: 100px;
+          margin-left: 20px;
+          margin-top: 12px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .right {
+    padding: 20px;
+    border-radius: 20px;
+    width: 420px;
+
+    .bzj-title {
+      font-size: 16px;
+
+      text {
+        color: #bf2b28;
+        font-size: 24px;
+      }
+    }
+
+    .desc {
+      color: #999999;
+      padding: 18px 0;
+    }
+  }
 }
 
 .equity {
-    text-align: center;
-    color: #999999;
-    font-size: 16px;
+  text-align: center;
+  color: #999999;
+  font-size: 16px;
 
-    text {
-        padding: 15px;
-    }
+  text {
+    padding: 15px;
+  }
 
-    .el-icon-minus {
-    }
+  .el-icon-minus {
+  }
 }
 
 
 .grade-list {
-    display: flex;
-    flex-direction: column;
-    font-size: 12px;
+  display: flex;
+  flex-direction: column;
+  font-size: 12px;
 
-    .item {
+  .item {
+    position: relative;
+    border: 1px solid #eee;
+
+    .item-box {
+      display: flex;
+      font-size: 14px;
+
+      .red {
+        color: #bf2b28;
+      }
+
+      .title {
+        padding: 10px;
+        border-right: 1px solid #eee;
+        display: flex;
+        align-items: center;
+        flex: 1;
+        justify-content: center;
+        text-align: center;
+
+        .get-way {
+          display: flex;
+          flex-direction: column;
+          font-size: 13px;
+          line-height: 2em;
+        }
+
+        .level {
+          width: 60px;
+          height: 60px;
+        }
+      }
+
+      .info {
+        padding: 10px;
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        width: 230px;
+
+        .price {
+        }
+
+        .desc {
+          color: #ccc;
+        }
+      }
+    }
+
+    .select {
+      display: none;
+    }
+  }
+
+  .active {
+    border: 2px solid #bf2b28 !important;
+
+    .item-box {
+      .title {
+        color: #bf2b28;
+      }
+
+      .info {
+        .price {
+          color: #bf2b28;
+        }
+
+        .desc {
+          color: #ccc;
+        }
+      }
+    }
+
+    .select {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      border-top: 20px solid transparent;
+      border-right: 20px solid #bf2b28;
+      border-left: 20px solid transparent;
+      border-bottom: 20px solid #bf2b28;
+      display: flex;
+
+      .icon {
         position: relative;
-        border: 1px solid #eee;
 
-        .item-box {
-            display: flex;
-            font-size: 14px;
-
-            .red {
-                color: #bf2b28;
-            }
-
-            .title {
-                padding: 10px;
-                border-right: 1px solid #eee;
-                display: flex;
-                align-items: center;
-                flex: 1;
-                justify-content: center;
-                text-align: center;
-
-                .get-way {
-                    display: flex;
-                    flex-direction: column;
-                    font-size: 13px;
-                    line-height: 2em;
-                }
-
-                .level {
-                    width: 80px;
-                    height: 80px;
-                }
-            }
-
-            .info {
-                padding: 10px;
-                display: flex;
-                flex: 1;
-                flex-direction: column;
-                align-items: center;
-                justify-content: center;
-                width: 230px;
-
-                .price {
-                }
-
-                .desc {
-                    color: #ccc;
-                }
-            }
-        }
-
-        .select {
-            display: none;
-        }
-    }
-
-    .active {
-        border: 2px solid #bf2b28 !important;
-
-        .item-box {
-            .title {
-                color: #bf2b28;
-            }
-
-            .info {
-                .price {
-                    color: #bf2b28;
-                }
-
-                .desc {
-                    color: #ccc;
-                }
-            }
-        }
-
-        .select {
-            position: absolute;
-            right: 0;
-            bottom: 0;
-            border-top: 20px solid transparent;
-            border-right: 20px solid #bf2b28;
-            border-left: 20px solid transparent;
-            border-bottom: 20px solid #bf2b28;
-            display: flex;
-
-            .icon {
-                position: relative;
-
-                .el-icon-check {
-                    position: absolute;
-                    left: 0;
-                    top: 0;
-                    color: #fff;
-                }
-            }
+        .el-icon-check {
+          position: absolute;
+          left: 0;
+          top: 0;
+          color: #fff;
         }
+      }
     }
+  }
 }
 
 .paginatio {
-    float: none;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 </style>
diff --git a/pages/user/components/factory.vue b/pages/user/components/factory.vue
new file mode 100644
index 0000000..bc8e66d
--- /dev/null
+++ b/pages/user/components/factory.vue
@@ -0,0 +1,334 @@
+<template>
+  <el-card shadow="never">
+    <p class="text-main font-bold mb-20">加工商状态: {{
+        (isNaN(factoryStatus) || factoryStatus === -1) ? '未提交审核' : (factoryStatus === 0 ? '审核中' : (factoryStatus === 1 ? '审核通过' : `审核不通过:${refuseReason}`))
+      }}</p>
+    <p class="text-main font-bold mb-20" v-if="factoryStatus === 0">
+      温馨提示:审核中不能修改内容，如有数据变更审核通过后再次修改提交。
+    </p>
+    <el-form ref="form" :model="form" label-width="140px">
+      <el-divider>
+        <span class="text-50 text-main font-bold">工厂信息</span>
+      </el-divider>
+      <el-row :gutter="10">
+        <el-col :span="12">
+          <el-form-item label="成立年限" required>
+            <el-input v-model="form.year" placeholder="请输入成立年限" type="number"
+                      :readonly="factoryStatus === 0">
+              <template #append>年</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="年产值" required>
+            <el-input v-model="form.yearsIncome" placeholder="请输入年产值" type="number"
+                      :readonly="factoryStatus === 0">
+              <template #append>万元</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" class="mt-20">
+        <el-col :span="12">
+          <el-form-item label="员工人数" required>
+            <el-input v-model="form.employeeNum" placeholder="请输入员工人数" type="number"
+                      :readonly="factoryStatus === 0">
+              <template #append>人</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="流水线数量" required>
+            <el-input v-model="form.flowNum" placeholder="请输入流水线数量" type="number"
+                      :readonly="factoryStatus === 0">
+              <template #append>条</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" class="mt-20">
+        <el-col :span="12">
+          <el-form-item label="厂房归属" required>
+            <el-input v-model="form.blongTo" placeholder="请输入厂房归属" :readonly="factoryStatus === 0"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="厂房面积" required>
+            <el-input v-model="form.size" placeholder="请输入厂房面积" :readonly="factoryStatus === 0">
+              <template #append>平方米</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="所在地" required>
+        <el-cascader :options="options" :props="{label: 'name', value: 'code'}" v-model="addressRegion"
+                     clearable :disabled="factoryStatus === 0"/>
+      </el-form-item>
+      <el-form-item label="主营类别" required>
+        <el-select multiple v-model="form.mainSpotCategory" style="width: 100%">
+          <el-option v-for="(item, index) in goodsCate" :key="index" :value="item.name">{{ item.name }}</el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="主营工艺和业务范围">
+        <el-input v-model="form.mainProcess" placeholder="请输入主营工艺和业务范围"
+                  :readonly="factoryStatus === 0"/>
+      </el-form-item>
+      <el-form-item label="服务信息">
+        <el-input v-model="form.serviceInfo" placeholder="请输入服务信息" type="textarea"
+                  :readonly="factoryStatus === 0"/>
+      </el-form-item>
+      <el-form-item label="视频">
+        <vk-data-upload v-model="form.video" list-type="text"
+                        accept="video/*">
+        </vk-data-upload>
+      </el-form-item>
+      <el-divider>
+        <span class="text-50 text-main font-bold">设备信息</span>
+      </el-divider>
+      <el-row :gutter="10" class="p-20 bg-gray-light">
+        <el-col :span="3">
+          <p class="text-center">设备名称</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">设备数量({{ deviceNum }}台)</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">设备来源</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">设备类型</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">品牌</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">型号</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">投产年限</p>
+        </el-col>
+        <el-col :span="3">
+          <p class="text-center">特点描述</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" class="p-20 bg-gray-light pos-r" v-for="(item, index) in form.deviceList" :key="index">
+        <el-col :span="3">
+          <el-input v-model="form.deviceList[index].name" placeholder="设备名称"
+                    :readonly="factoryStatus === 0"/>
+        </el-col>
+        <el-col :span="3">
+          <el-input v-model="form.deviceList[index].num" placeholder="设备数量" type="number"
+                    :readonly="factoryStatus === 0"/>
+        </el-col>
+        <el-col :span="3">
+          <el-select v-model="form.deviceList[index].source" placeholder="请选择设备来源"
+                     :disabled="factoryStatus === 0">
+            <el-option v-for="item in deviceSource" :key="item" :label="item" :value="item"/>
+          </el-select>
+        </el-col>
+        <el-col :span="3">
+          <el-select v-model="form.deviceList[index].type" placeholder="请选择设备类型"
+                     :disabled="factoryStatus === 0">
+            <el-option v-for="item in deviceType" :key="item" :label="item" :value="item"/>
+          </el-select>
+        </el-col>
+        <el-col :span="3">
+          <el-input v-model="form.deviceList[index].brand" placeholder="品牌"
+                    :readonly="factoryStatus === 0"/>
+        </el-col>
+        <el-col :span="3">
+          <el-input v-model="form.deviceList[index].model" placeholder="型号"
+                    :readonly="factoryStatus === 0"/>
+        </el-col>
+        <el-col :span="3">
+          <el-input v-model="form.deviceList[index].year" placeholder="投产年限" type="number"
+                    :readonly="factoryStatus === 0"/>
+        </el-col>
+        <el-col :span="3">
+          <el-input v-model="form.deviceList[index].desc" placeholder="特点描述"
+                    :readonly="factoryStatus === 0"/>
+        </el-col>
+        <i class="el-icon-remove pointer text-main text-40 pos-a" style="right: -10px; top: 20px"
+           @click="remove(index)" v-if="factoryStatus !== 0"/>
+      </el-row>
+      <div class="mt-20 text-center">
+        <el-button type="text" @click.native="addDevice" v-if="factoryStatus !== 0">添加设备</el-button>
+      </div>
+      <el-divider>
+        <span class="text-50 text-main font-bold">工厂实景</span>
+      </el-divider>
+      <vk-data-upload v-model="form.album" :limit="userLevel.factoryPicNum"
+                      :disabled="factoryStatus === 0"></vk-data-upload>
+      <div class="mt-20 text-center">
+        <el-button type="primary" @click.native="submit" v-if="factoryStatus !== 0">提交</el-button>
+      </div>
+    </el-form>
+  </el-card>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+
+export default {
+  name: "factory",
+  data() {
+    return {
+      form: {
+        year: null,
+        yearsIncome: null,
+        employeeNum: null,
+        flowNum: null,
+        blongTo: null,
+        size: null,
+        addressRegion: {
+          province: null,
+          city: null,
+        },
+        mainProcess: null,
+        serviceInfo: null,
+        video: '',
+        deviceList: [],
+        album: [],
+        mainSpotCategory: [],
+      },
+      options: [],
+      addressRegion: [],
+      deviceSource: ['国产', '进口'],
+      deviceType: ['生产设备', '维护设备'],
+      userLevel: {
+        factoryPicNum: 0
+      },
+      factoryStatus: parseInt(vk.getVuex('$user.userInfo.factoryStatus')),
+      refuseReason: '',
+      goodsCate: []
+    }
+  },
+  methods: {
+    addDevice() {
+      this.form.deviceList.push({
+        name: null,
+        num: null,
+        source: null,
+        type: null,
+        brand: null,
+        model: null,
+        year: null,
+        desc: null
+      })
+    },
+    getGoodsCate() {
+      vk.callFunction({
+        url: 'client/process/category/pub/getList',
+        success: (res) => {
+          this.goodsCate = res.data
+        }
+      });
+    },
+    remove(index) {
+      this.form.deviceList.splice(index, 1)
+    },
+    async getUserLevelInfo() {
+      const res = await vk.callFunction({
+        url: "client/userLevel/kh/getInfoByUser",
+      })
+      if (res) {
+        if (!res.data) {
+          this.$message({
+            type: 'error',
+            message: '请先完成认证'
+          })
+          setTimeout(() => {
+            this.$emit('done', 'fadada')
+          }, 1000)
+          return
+        }
+        this.userLevel.factoryPicNum = res.factoryPicNum
+      }
+    },
+    async submit() {
+      if (!this.form.year) return this.$message.error('请输入投产年限')
+      if (!this.form.yearsIncome) return this.$message.error('请输入年收入')
+      if (!this.form.employeeNum) return this.$message.error('请选输入员工人数')
+      if (!this.form.flowNum) return this.$message.error('请输入流水线数量')
+      if (!this.form.blongTo) return this.$message.error('请输入厂房归属')
+      if (!this.form.size) return this.$message.error('请输入厂房面积')
+      if (this.addressRegion.length === 0) return this.$message.error('请选择所在地')
+      if (this.form.deviceList.length === 0) return this.$message.error('请添加设备信息')
+      if (this.form.mainSpotCategory.length === 0) return this.$message.error('请选择主营类别')
+      // if (this.form.album.length === 0) return this.$message.error('请上传工厂实景图')
+      const province = provinces.find(item => item.code === this.addressRegion[0])
+      const city = province.children.find(item => item.code === this.addressRegion[1])
+      const addressRegion = {
+        province: {
+          code: province.code,
+          name: province.name,
+        },
+        city: {
+          code: city.code,
+          name: city.name,
+        }
+      }
+      await vk.callFunction({
+        url: "client/factory/kh/addUpdate",
+        data: {
+          year: this.form.year,
+          yearsIncome: this.form.yearsIncome,
+          employeeNum: this.form.employeeNum,
+          flowNum: this.form.flowNum,
+          blongTo: this.form.blongTo,
+          size: this.form.size,
+          addressRegion,
+          mainProcess: this.form.mainProcess,
+          serviceInfo: this.form.serviceInfo,
+          deviceList: this.form.deviceList,
+          album: this.form.album,
+          video: this.form.video,
+          mainSpotCategory: this.form.mainSpotCategory,
+        }
+      })
+      this.$message.success('提交成功')
+      this.factoryStatus = 0
+    },
+    async getInfo() {
+      const res = await vk.callFunction({
+        url: "client/factory/kh/getInfo",
+      })
+      if (res) {
+        for (let key in this.form) this.form[key] = res[key]
+        this.addressRegion = [res.addressRegion.province.code, res.addressRegion.city.code]
+        if (res.status === 2) this.refuseReason = res.refuseReason
+      }
+    }
+  },
+  mounted() {
+    this.options = provinces.map(item => {
+      item.children = [];
+      return item
+    })
+    this.options.forEach((province, index) => {
+      citys[index].forEach(city => {
+        this.options[index].children.push(city)
+      })
+    })
+    this.getGoodsCate()
+    this.getUserLevelInfo()
+    vk.userCenter.getCurrentUserInfo({
+      success: (data) => {
+        const factoryStatus = parseInt(data.userInfo.factoryStatus)
+        this.factoryStatus = (isNaN(factoryStatus) || factoryStatus === -1) ? -1 : factoryStatus
+        if (this.factoryStatus > -1) this.getInfo()
+      }
+    })
+  },
+  computed: {
+    deviceNum() {
+      let num = 0
+      this.form.deviceList.forEach(item => {
+        if (item.num && !isNaN(parseInt(item.num))) num += parseInt(item.num)
+      })
+      return num
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages/user/components/grade.vue b/pages/user/components/grade.vue
index 5f4fe7d..3904eb5 100644
--- a/pages/user/components/grade.vue
+++ b/pages/user/components/grade.vue
@@ -5,12 +5,13 @@
         </div>
         <div class="grade-list">
             <div class="item pointer" v-for="(item,index) in gradeList" :key="index"
-                 :class="gradeIndex === index ? 'active' : ''" @click="onChange(index)">
+                 :class="[parseInt(gradeIndex) === index ? 'active' : '', item.disabled ? 'disabled' : '']"
+                 @click="onChange(index)">
                 <div class="item-box">
                     <div class="title">{{ item.name }}</div>
                     <div class="title">
                         <span>{{ item.amount }}元/年</span>
-                        <span v-if="parseFloat(item.ensureAmount) > 0">+交易保证金</span>
+                        <span v-if="parseFloat(item.ensureAmount) > 0">+交易保证金({{ item.ensureAmount }}元)</span>
                     </div>
                 </div>
                 <div class="select">
@@ -19,11 +20,46 @@
                     </div>
                 </div>
             </div>
+            <div class="item pointer"
+                 :class="[gradeIndex === -2 ? 'active' : '']" @click="onChange(-2)">
+                <div class="item-box">
+                    <div class="title">交易保证金缴纳</div>
+                    <div class="title">
+                        <el-select v-model="ensureAmount" size="small">
+                            <el-option
+                                v-for="item in ensureList"
+                                :key="item.amount"
+                                :label="`${item.amount.toFixed(2)}元`"
+                                :value="item.amount">
+                            </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="select">
+                    <div class="icon">
+                        <i class="el-icon-check"></i>
+                    </div>
+                </div>
+            </div>
+            <div class="flex justify-start items-center mt-20" v-if="gradeIndex === 2">
+                <div @click="ensureIndex = 0"
+                     :style="{backgroundColor: ensureIndex === 0 ? '#a92924' : '', color: ensureIndex === 0 ? 'white' : ''}"
+                     class="border rounded p-20">50000元保证金
+                </div>
+                <div @click="ensureIndex = 1"
+                     :style="{backgroundColor: ensureIndex === 1 ? '#a92924' : '', color: ensureIndex === 1 ? 'white' : ''}"
+                     class="border rounded p-20 mx-20">100000元保证金
+                </div>
+                <div @click="ensureIndex = 2"
+                     :style="{backgroundColor: ensureIndex === 2 ? '#a92924' : '', color: ensureIndex === 2 ? 'white' : ''}"
+                     class="border rounded p-20">200000元保证金
+                </div>
+            </div>
         </div>
         <div class="bzj-readme">
-            <div class="sub-title">保证金说明</div>
+            <div class="sub-title">保证金协议</div>
             <div class="content">
-                保证金说明内容...
+                {{ desc }}
             </div>
         </div>
         <div class="payment">
@@ -41,7 +77,7 @@
         </div>
         <div class="pay-price" v-if="billQRCode">
             <uv-qrcode ref="qrcode" size="240px" :value="billQRCode"></uv-qrcode>
-            <div class="pay-desc">请打开手机微信，扫一扫完成支付</div>
+            <div class="pay-desc">微信、支付宝、云闪付扫码完成支付</div>
             <el-button type="success" @click="onPayStatus">已完成支付</el-button>
         </div>
         <el-button v-else type="danger" @click="onPay">立即支付</el-button>
@@ -67,80 +103,80 @@ export default {
             payment: ["银联支付"],
             showQrcode: false,
             billQRCode: '',
-            gradeIndex: 1,
-            gradeList: []
+            gradeIndex: null,
+            desc: '',
+            gradeList: [],
+            ensureList: [],
+            ensureAmount: null,
+            ensureIndex: 0
         }
     },
     created() {
         this.getUserLevelList()
+        this.getDesc()
+        this.getEnsureConfig()
     },
     methods: {
         getUserInfo() {
             vk.userCenter.getCurrentUserInfo({
                 success: (data) => {
-                    if (data.userInfo.businessCard) {
-                        this.form1.data = data.userInfo.businessCard
+                    this.gradeList.map(item => {
+                        item.disabled = false
+                        if (data.userInfo.userLevel && parseInt(data.userInfo.userLevel) > -1) {
+                            item.disabled = parseInt(item.level) < parseInt(data.userInfo.userLevel)
+                        }
+                        return item
+                    })
+                    for (let i in this.gradeList) {
+                        if (!this.gradeList[i].disabled) {
+                            this.gradeIndex = i
+                            break
+                        }
                     }
-                    // 成功后的逻辑
-                    console.log('用户信息: ', data);
                 }
             });
 
         },
         onChange(index) {
-            this.gradeIndex = index
+            if (index === -2) this.gradeIndex = index
+            else {
+                if (this.gradeList[index].disabled) return
+                this.gradeIndex = index
+            }
         },
         async onPay() {
-
-            const res = await vk.callFunction({
-                url: 'client/order/kh/add',
-                data: {
-                    goods: {
-                        name: '会员升级',
-                        amount: this.amount,
-                        cover: null
-                    },
-                    type: 3,
-                    goodsId: parseInt(this.gradeList[this.gradeIndex].level),
-                    num: 1,
-                }
-            })
-            const requestTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')
-            const timestamp = dayjs().format('YYYYMMDDHHmmss')
-            let data = {
-                queryUrl: 'https://test-api-open.chinaums.com/v1/netpay/bills/get-qrcode',
-                timestamp,
-                nonce: 'rp84ufhfn20yneo3tp',
-                content: {
-                    billNo: res.data,
-                    requestTimestamp,
-                    mid: '898201612345678',
-                    tid: '88880001',
-                    instMid: 'QRPAYDEFAULT',
-                    totalAmount: 1,
-                    notifyUrl: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/'
-                }
+            let res
+            if (this.gradeIndex === -2) {
+                res = await vk.callFunction({
+                    url: 'client/order/kh/add',
+                    data: {
+                        goods: {
+                            name: `交易保证金-${this.ensureAmount}元`,
+                            amount: this.ensureAmount,
+                            cover: null
+                        },
+                        type: 2,
+                        goodsId: null,
+                        num: 1,
+                    }
+                })
+            } else {
+                res = await vk.callFunction({
+                    url: 'client/order/kh/add',
+                    data: {
+                        goods: {
+                            name: `会员升级-${this.gradeList[this.gradeIndex].name}`,
+                            amount: this.amount,
+                            cover: null
+                        },
+                        type: 3,
+                        goodsId: parseInt(this.gradeList[this.gradeIndex].level),
+                        ensureIndex: this.ensureIndex,
+                        num: 1,
+                    }
+                })
             }
-            /**
-             * 调用函数
-             */
-            sdk.exec(data).then(res => {
-                const h = this.$createElement;
-                const result = JSON.parse(res);
-                if (result.errCode === 'SUCCESS') {
-                    this.showQrcode = true
-                    this.billQRCode = result.billQRCode
-                    // this.$alert('', '请打开手机微信，扫一扫完成支付', {
-                    //   confirmButtonText: '确定',
-                    //   callback: action => {
-                    //     this.$message({
-                    //       type: 'success',
-                    //       message: `已完成支付`
-                    //     });
-                    //   }
-                    // });
-                }
-            })
+            vk.redirectTo({url: `/pages/index/shop/pay?id=${res.data}`})
         },
         getUserLevelList() {
             vk.callFunction({
@@ -151,13 +187,33 @@ export default {
                 },
                 success: (data) => {
                     this.gradeList = data.rows.filter(item => parseFloat(item.amount) > 0)
+                    this.getUserInfo()
                 }
             });
-        }
+        },
+        async getDesc() {
+            const res = await vk.callFunction({
+                url: 'client/dict/pub/getDetail',
+                data: {
+                    id: '880c33886636217300376edd5a56e1e6'
+                },
+            })
+            this.desc = res.content
+        },
+        async getEnsureConfig() {
+            const {rows} = await vk.callFunction({
+                url: 'client/ensureConfig/pub/getList',
+            })
+            this.ensureList = rows
+            this.ensureAmount = this.ensureList[0].amount
+        },
+
     },
     computed: {
         amount() {
-            return parseFloat(this.gradeList[this.gradeIndex].amount) + parseFloat(this.gradeList[this.gradeIndex].ensureAmount)
+            if (this.gradeIndex === -2) return this.ensureAmount
+            else if (this.gradeIndex === 2) return parseFloat(this.gradeList[this.gradeIndex].amount) + [50000, 100000, 200000][this.ensureIndex]
+            else return parseFloat(this.gradeList[this.gradeIndex].amount) + parseFloat(this.gradeList[this.gradeIndex].ensureAmount)
         }
     },
 }
@@ -288,4 +344,9 @@ export default {
     font-size: 16px;
     line-height: 2em;
 }
+
+.disabled {
+    cursor: not-allowed;
+    background-color: #F0F0F0;
+}
 </style>
diff --git a/pages/user/components/manageList.vue b/pages/user/components/manageList.vue
index 1db241f..460863d 100644
--- a/pages/user/components/manageList.vue
+++ b/pages/user/components/manageList.vue
@@ -77,13 +77,13 @@ export default {
                         },
                         {
                             key: "headPhotoPath",
-                            title: "身份证正面",
+                            title: "身份证头像面",
                             type: "image",
                             limit: 1
                         },
                         {
                             key: "backgroundIdCardPath",
-                            title: "身份证反面",
+                            title: "身份证国徽面",
                             type: "image",
                             limit: 1
                         },
diff --git a/pages/user/components/news.vue b/pages/user/components/news.vue
new file mode 100644
index 0000000..2a8d8ad
--- /dev/null
+++ b/pages/user/components/news.vue
@@ -0,0 +1,114 @@
+<template>
+    <el-card>
+        <view class="flex justify-end items-center">
+            <el-button type="primary" @click="showAdd" v-if="!isAdd">新增新闻动态</el-button>
+        </view>
+        <view class="mt-20" v-if="isAdd">
+            <el-form ref="form" :model="form" label-width="120px">
+                <el-form-item label="标题" required>
+                    <el-input v-model="form.title" placeholder="请输入标题"/>
+                </el-form-item>
+                <el-form-item label="内容">
+                    <vk-data-input-editor v-model="form.content"  width="750px"></vk-data-input-editor>
+                </el-form-item>
+            </el-form>
+            <view class="mt-30 flex justify-center items-center">
+                <el-button plain @click="cancel">取消</el-button>
+                <el-button type="primary" @click="addArticle">确定</el-button>
+            </view>
+        </view>
+        <view v-else>
+            <view class="py-20 border-bottom flex justify-between items-center" v-for="(item, index) in list"
+                  :key="index">
+                <view class="flex flex-col justify-start items-start">
+                    <text>{{ item.title }}</text>
+                    <text class="mt-20 text-gray text-28">{{ item._add_time_str }}</text>
+                </view>
+                <view class="flex flex-col justify-end">
+                    <el-button type="primary" size="small" @click="edit(item)">编辑</el-button>
+                    <view class="mt-20">
+                        <el-button type="primary" size="small" @click="del(item._id)" plain>删除</el-button>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </el-card>
+</template>
+
+<script>
+export default {
+    name: "news",
+    data() {
+        return {
+            isAdd: false,
+            form: {
+                _id: null,
+                title: '',
+                content: '',
+            },
+            list: []
+        }
+    },
+    methods: {
+        async addArticle() {
+            if (!this.form.title) {
+                this.$message.error('请输入标题')
+                return
+            }
+            if (!this.form.content) {
+                this.$message.error('请输入内容')
+                return
+            }
+            await vk.callFunction({
+                url: 'client/userArticle/kh/action',
+                data: this.form
+            })
+            this.$message.success(this.form._id ? '修改成功' : '新增成功')
+            await this.getList()
+            this.isAdd = false
+            this.form = {
+                _id: null,
+                title: '',
+                content: '',
+            }
+        },
+        async getList() {
+            const {rows} = await vk.callFunction({
+                url: 'client/userArticle/kh/getList',
+            })
+            this.list = rows
+        },
+        del(_id) {
+            this.$confirm('确认删除该新闻动态吗?', '提示', {
+                confirmButtonText: '确定',
+                showCancelButton: false,
+                type: 'warning'
+            }).then(async () => {
+                await vk.callFunction({
+                    url: 'client/userArticle/kh/delete',
+                    data: {_id}
+                })
+                await this.getList()
+            })
+        },
+        edit(item) {
+            for (let key in this.form) this.form[key] = item[key]
+            this.isAdd = true
+        },
+        showAdd() {
+            this.isAdd = true
+        },
+        cancel(){
+            this.isAdd = !this.isAdd
+            this.form = {
+                _id: null,
+                title: '',
+                content: '',
+            }
+        }
+    },
+    mounted() {
+        this.getList()
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/user/components/notice.vue b/pages/user/components/notice.vue
index 875e214..4bf2764 100644
--- a/pages/user/components/notice.vue
+++ b/pages/user/components/notice.vue
@@ -1,7 +1,12 @@
 <template>
     <el-card class="box-card">
-        <div slot="header" class="clearfix">
-            <span>您有<em style="color: #bf2b28;padding: 0 3px;font-weight: 500">{{ unreadNum }}</em>条未读消息</span>
+        <div slot="header" class="flex justify-between items-start">
+            <div class="flex flex-col justify-start items-start">
+                <span>您有<em style="color: #bf2b28;padding: 0 3px;font-weight: 500">{{
+                        unreadNum
+                    }}</em>条未读消息</span>
+                <span class="text-main pointer" @click="allRead">全部已读</span>
+            </div>
             <el-button style="float: right; padding: 3px 0; color: #666" type="text" @click="onSetting"
                        v-if="parseInt(vk.getVuex('$user.userInfo.userLevel')) > 0"><i
                 class="el-icon-setting"></i> 消息推送设置
@@ -25,7 +30,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="desc">
+                <div class="desc pointer" @click="toDetail(item, index)">
                     {{ item.content }}
                 </div>
             </div>
@@ -35,7 +40,24 @@
             </div>
         </div>
 
-        <!-- 添加或编辑的弹窗结束 -->
+        <el-dialog title="提示" :visible.sync="dialogVisible" width="70%">
+            <el-descriptions title="报价详情" v-if="sheet && dialogVisible" border :column="1">
+                <el-descriptions-item label="公司">{{ sheet.user.company.companyName }}</el-descriptions-item>
+                <el-descriptions-item label="联系人">{{ sheet.user.manager.personName }}</el-descriptions-item>
+                <el-descriptions-item label="联系方式">{{ sheet.user.businessCard.companyMobile }}</el-descriptions-item>
+                <el-descriptions-item label="价格">{{ sheet.amount }}元</el-descriptions-item>
+                <el-descriptions-item label="附件">
+                    <p v-for="(item, index) in sheet.files" :key="index">
+                        <a :href="item" target="_blank">预览:文件{{ index + 1 }}</a>
+                    </p>
+                </el-descriptions-item>
+                <el-descriptions-item label="备注">{{ sheet.remark }}</el-descriptions-item>
+            </el-descriptions>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="toContact" type="primary">去签合同</el-button>
+                <el-button @click="dialogVisible = false">关闭</el-button>
+            </div>
+        </el-dialog>
     </el-card>
 </template>
 
@@ -46,27 +68,33 @@ export default {
         return {
             unreadNum: 0,
             noticeList: [],
-            pageSize: 20,
-            total: 0
+            pageSize: 10,
+            total: 0,
+            dialogVisible: false,
+            sheet: null,
         }
     },
     created() {
         this.getList()
+        this.getUnreadNum()
     },
     methods: {
         async getList(pageIndex = 1) {
-            const {rows} = await vk.callFunction({
+            const {rows, total} = await vk.callFunction({
                 url: 'client/message/kh/getList',
                 data: {
                     pageIndex,
                     pageSize: this.pageSize,
                 }
             })
-            this.unreadNum = 0
+            this.total = total
             this.noticeList = rows
-            this.noticeList.forEach(item => {
-                if (!item.hasRead) this.unreadNum++
-            })
+        },
+        async getUnreadNum() {
+            const {data} = await vk.callFunction({
+                url: 'client/message/kh/getUnreadCount',
+            });
+            this.unreadNum = data
         },
         async setRead(index) {
             this.noticeList[index].hasRead = true
@@ -77,29 +105,66 @@ export default {
                 }
             })
         },
-        async del(index) {
-            await vk.callFunction({
-                url: 'client/message/kh/delete',
-                data: {
-                    id: this.noticeList[index]._id
-                }
+        del(index) {
+            this.$confirm('确认删除吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
+                await vk.callFunction({
+                    url: 'client/message/kh/delete',
+                    data: {
+                        id: this.noticeList[index]._id
+                    }
+                })
+                this.$message({
+                    type: 'success',
+                    message: '删除成功'
+                })
+                await this.getList()
+                await this.getUnreadNum()
             })
-            this.$message({
-                type: 'success',
-                message: '删除成功'
-            })
-            await this.getList()
+
         },
         onSetting() {
             this.$emit('done', 'setting')
         },
         toDetail(item, index) {
-            this.setRead(index)
+            if (!item.hasRead) this.setRead(index)
             let url = null
             if (item.type === 'old') url = `/pages/index/old/detail?id=${item.pk}`
             else if (item.type === 'enquiry') url = `/pages/enquiry/detail?id=${item.pk}`
             else if (item.type === 'process') url = `/pages/process/detail?id=${item.pk}`
+            else if (item.type === 'contract') url = `/pages/contract/index?tab=1`
+            else if (item.type === 'self-support') url = `/pages/index/self-support/quote?id=${item.pk}`
+            else if (item.type === 'self-product') url = `/pages/order/order`
+            else if (item.type === 'self-support-quote') {
+                this.getQuoteDetail(item.pk)
+            }
             if (url) vk.navigateTo({url})
+        },
+        async allRead() {
+            await vk.callFunction({
+                url: 'client/message/kh/setAllRead'
+            })
+            await this.getList(1)
+            await this.getUnreadNum()
+        },
+        async getQuoteDetail(_id){
+            await vk.callFunction({
+                url: 'client/selfSupport/kh/getQuoteDetail',
+                data: {
+                    _id
+                },
+                success: ({rows}) => {
+                    this.sheet = rows
+                    this.dialogVisible = true
+                }
+            });
+        },
+        toContact(){
+            this.dialogVisible = false
+            vk.navigateTo({url: '/pages/contract/index?tab=1'})
         }
     }
 }
@@ -114,6 +179,8 @@ export default {
     .item {
         display: flex;
         flex-direction: column;
+        padding: 10px 0;
+        border-bottom: 1px solid #ddd;
 
         .title-box {
             display: flex;
diff --git a/pages/user/components/payment.vue b/pages/user/components/payment.vue
index 56fd3eb..52dab68 100644
--- a/pages/user/components/payment.vue
+++ b/pages/user/components/payment.vue
@@ -68,7 +68,7 @@
         </div>
         <div class="pay-price" v-if="billQRCode">
             <uv-qrcode ref="qrcode" size="240px" :value="billQRCode"></uv-qrcode>
-            <div class="pay-desc">请打开手机微信，扫一扫完成支付</div>
+            <div class="pay-desc">微信、支付宝、云闪付扫码完成支付</div>
             <el-button type="success" @click="onPayStatus">已完成支付</el-button>
         </div>
         <el-button v-else type="danger" @click="onPay">立即支付</el-button>
@@ -142,7 +142,8 @@ export default {
                     tid: '88880001',
                     instMid: 'QRPAYDEFAULT',
                     totalAmount: 1,
-                    notifyUrl: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/'
+                    // notifyUrl: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/'
+                    notifyUrl: 'https://tcb-n44byxi8bmrfrki-d4bn1c4a206d.service.tcloudbase.com/pay_notify'
                 }
             }
             /**
@@ -154,7 +155,7 @@ export default {
                 if (result.errCode === 'SUCCESS') {
                     this.showQrcode = true
                     this.billQRCode = result.billQRCode
-                    // this.$alert('', '请打开手机微信，扫一扫完成支付', {
+                    // this.$alert('', '微信、支付宝、云闪付扫码完成支付', {
                     //   confirmButtonText: '确定',
                     //   callback: action => {
                     //     this.$message({
diff --git a/pages/user/components/personal.vue b/pages/user/components/personal.vue
index e4d8749..ee05701 100644
--- a/pages/user/components/personal.vue
+++ b/pages/user/components/personal.vue
@@ -1,293 +1,326 @@
 <template>
-    <view>
-        <el-card>
-            <div slot="header" class="clearfix">
-                <div class="flex justify-between items-center text-main">
-                    <div class="flex justify-start items-center">
-                        <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square" style="height: 24px"/>
-                        <span class="text-40" v-if="vk.getVuex('$user.userInfo.accountType') === 1">个人认证</span>
-                        <span class="text-40" v-if="vk.getVuex('$user.userInfo.accountType') === 2">企业认证</span>
-                        <div class="ml-20 flex justify-start items-center" v-if="!userInfo.fadadaConfirm">
-                            <info theme="outline" size="18" fill="#a92924" strokeLinecap="square"
-                                  style="height: 18px"/>
-                            <template v-if="userInfo.authStatus === null || userInfo.authStatus === -1">
+  <view>
+    <el-card>
+      <div slot="header" class="clearfix">
+        <div class="flex justify-between items-center text-main">
+          <div class="flex justify-start items-center">
+            <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square" style="height: 24px"/>
+            <span class="text-40" v-if="vk.getVuex('$user.userInfo.accountType') === 1">个人认证</span>
+            <span class="text-40" v-if="vk.getVuex('$user.userInfo.accountType') === 2">企业认证</span>
+            <div class="ml-20 flex justify-start items-center">
+              <info theme="outline" size="18" fill="#a92924" strokeLinecap="square"
+                    style="height: 18px"/>
+              <template
+                v-if="userInfo.fadadaConfirm && (userInfo.authStatus === null || userInfo.authStatus === -1)">
                                 <span
-                                    v-if="vk.getVuex('$user.userInfo.accountType') === 1">您还未提交您的个人资料</span>
-                                <span
-                                    v-if="vk.getVuex('$user.userInfo.accountType') === 2">您还未提交您的企业资料</span>
-                            </template>
-                            <template v-else-if="userInfo.authStatus === 0">
-                                <span>审核中</span>
-                            </template>
-                            <template v-else-if="userInfo.authStatus === 1">
-                                <span>审核通过</span>
-                            </template>
-                            <template v-else-if="userInfo.authStatus === 2">
-                                <span>审核不通过:{{ userInfo.refuseReason }}</span>
-                            </template>
-                        </div>
-                        <span class="ml-20" v-else>认证成功</span>
-                    </div>
-                    <el-button type="primary" plain class="empty-bg-plain-btn" size="small" @click.native="makeCard">
-                        制作我的名片
-                    </el-button>
-                </div>
+                                  v-if="vk.getVuex('$user.userInfo.accountType') === 1">您已完成法大大认证，请在下方完善资料提交平台审核</span>
+                <span
+                  v-if="vk.getVuex('$user.userInfo.accountType') === 2">您已完成法大大认证，请在下方完善资料提交平台审核</span>
+              </template>
+              <template v-else-if="userInfo.authStatus === 0">
+                <span>平台审核中,请勿再次认证</span>
+              </template>
+              <template v-else-if="userInfo.authStatus === 1">
+                <span class="ml-20">恭喜您已通过已通过金久信平台认证</span>
+              </template>
+              <template v-else-if="userInfo.authStatus === 2">
+                <span>审核不通过:{{ userInfo.refuseReason }}</span>
+              </template>
             </div>
-            <el-form ref="form" :model="form" label-width="120px">
-                <el-form-item label="认证方式">
-                    <el-radio-group v-model="form.authType" :disabled="[0].includes(userInfo.authStatus)">
-                        <el-radio :label="1">法大大接口认证</el-radio>
-                        <el-radio :label="2">金九信平台审核</el-radio>
+          </div>
+          <el-button type="primary" plain class="empty-bg-plain-btn" size="small" @click.native="makeCard" v-if="!userType">
+            制作我的名片
+          </el-button>
+        </div>
+        <div style="margin: 30rpx 0">
+          <el-radio-group v-model="userType" @change="changeUserType">
+<!--            <el-radio :label="0">平台交易功能用户注册</el-radio>-->
+            <el-radio :label="1">金久信签约宝用户</el-radio>
+          </el-radio-group>
+        </div>
+<!--        <p class="text-main text-25 font-bold">温馨提示:平台交易功能用户注册后无需再进行签约宝和特产商城用户注册</p>-->
+      </div>
+      <el-form ref="form" :model="form" label-width="140px">
+        <el-button @click="getCertUrl()" type="primary" size="small" v-if="!userInfo.fadadaConfirm">去认证
+        </el-button>
+<!--        <el-button @click="getCertUrl()" type="primary" size="small" v-if="userInfo.authStatus > -1">-->
+<!--          获取认证结果-->
+<!--        </el-button>-->
+        <el-button @click="getCertUrl(true)" plain type="primary" size="small" v-if="userInfo.authStatus > -1">
+          信息变更
+        </el-button>
+        <!--                    <el-button @click="getCertRes" type="primary" size="small" v-if="userInfo.authStatus > -1">-->
+        <!--                        去填写打款信息-->
+        <!--                    </el-button>-->
+        <!--                <el-form-item label="认证方式"-->
+        <!--                              v-if="!userInfo.hasOwnProperty('fadadaConfirm') || !userInfo.fadadaConfirm">-->
+        <!--                    <el-radio-group v-model="form.authType">-->
+        <!--                        <el-radio :label="1">法大大认证</el-radio>-->
+        <!--                        <el-radio :label="2">金久信平台审核</el-radio>-->
+        <!--                    </el-radio-group>-->
+        <!--                </el-form-item>-->
+        <template v-if="userType === 0">
+          <template v-if="userInfo.authStatus > -1 || userInfo.fadadaConfirm">
+            <template v-if="parseInt(userInfo.accountType) === 2">
+              <el-row :gutter="10">
+                <el-col :span="12">
+                  <el-form-item label="企业名称">
+                    {{ userInfo.company.companyName }}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="信用代码" required>
+                    <el-input v-model="form.company.organization"
+                              v-if="isEdit && userInfo.authStatus !== 1"/>
+                    <text v-else>{{ userInfo.company.organization }}</text>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item label="公司所在地" required>
+                <el-row :gutter="10" class="border-bottom pb-20" v-if="isEdit">
+                  <el-col :span="4">
+                    <el-select v-model="addressIndex[0]" placeholder="请选择省">
+                      <el-option v-for="(item, index) in provinceData" :key="index"
+                                 :label="item.name"
+                                 :value="index">
+                      </el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-select v-model="addressIndex[1]" placeholder="请选择市"
+                               :readonly="addressIndex.length === 0 || [0, 1].includes(userInfo.authStatus)">
+                      <template v-if="addressIndex[0] !== null">
+                        <el-option v-for="(item, index) in cityData[addressIndex[0]]" :key="index"
+                                   :label="item.name"
+                                   :value="index">
+                        </el-option>
+                      </template>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-select v-model="addressIndex[2]" placeholder="请选择区">
+                      <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
+                        <el-option
+                          v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
+                          :key="index" :label="item.name" :value="index">
+                        </el-option>
+                      </template>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input v-model="form.company.addressDetail" placeholder="请输入详细地址"/>
+                  </el-col>
+                </el-row>
+                <view v-else-if="!isEdit && userInfo.company.addressRegion">
+                  <text>{{
+                      userInfo.company.addressRegion.province ? userInfo.company.addressRegion.province.name : ''
+                    }}
+                  </text>
+                  <text>{{
+                      userInfo.company.addressRegion.city ? userInfo.company.addressRegion.city.name : ''
+                    }}
+                  </text>
+                  <text>{{
+                      userInfo.company.addressRegion.area ? userInfo.company.addressRegion.area.name : ''
+                    }}
+                  </text>
+                  <text>{{ userInfo.company.addressDetail ? userInfo.company.addressDetail : '' }}</text>
+                </view>
+              </el-form-item>
+              <el-form-item label="法定代表人" required>
+                <el-input v-model="form.company.legalName" v-if="isEdit"/>
+                <text v-else>{{ userInfo.company.legalName }}</text>
+              </el-form-item>
+              <el-form-item label="公司电话" required>
+                <el-input v-model="form.company.mobile" v-if="isEdit"/>
+                <text v-else>{{ userInfo.company.mobile }}</text>
+              </el-form-item>
+              <el-row :gutter="10">
+                <el-col :span="12">
+                  <el-form-item label="有效通信地址" required>
+                    <el-input v-model="form.company.mailAddress" v-if="isEdit"/>
+                    <text v-else>{{ userInfo.company.mailAddress }}</text>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="有效邮箱地址" required>
+                    <el-input v-model="form.company.contactEmail" v-if="isEdit"/>
+                    <text v-else>{{ userInfo.company.contactEmail }}</text>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10">
+                <el-col :span="12">
+                  <el-form-item label="对公账号" required>
+                    <el-input v-model="form.company.companyAccount" v-if="isEdit"/>
+                    <text v-else>{{ userInfo.company.companyAccount }}</text>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="开户行" required>
+                    <el-input v-model="form.company.companyBankName" v-if="isEdit"/>
+                    <text v-else>{{ userInfo.company.companyBankName }}</text>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <view class="text-red text-25 my-20">
+                温馨提示:请确认账号信息填写正确,账户信息在合同签约时直接写入合同,以免造成不必要的损失。
+              </view>
+              <!--                        <el-row :gutter="10">-->
+              <!--                            <el-col :span="8">-->
+              <!--                                <el-form-item label="个人账号">-->
+              <!--                                    <el-input v-model="form.company.personAccount" v-if="isEdit"/>-->
+              <!--                                    <text v-else>{{ userInfo.company.personAccount }}</text>-->
+              <!--                                </el-form-item>-->
+              <!--                            </el-col>-->
+              <!--                            <el-col :span="8">-->
+              <!--                                <el-form-item label="个人开户行">-->
+              <!--                                    <el-input v-model="form.company.personBankName" v-if="isEdit"/>-->
+              <!--                                    <text v-else>{{ userInfo.company.personBankName }}</text>-->
+              <!--                                </el-form-item>-->
+              <!--                            </el-col>-->
+              <!--                            <el-col :span="8">-->
+              <!--                                <el-form-item label="个人账户名">-->
+              <!--                                    <el-input v-model="form.company.accountName" v-if="isEdit"/>-->
+              <!--                                    <text v-else>{{ userInfo.company.accountName }}</text>-->
+              <!--                                </el-form-item>-->
+              <!--                            </el-col>-->
+              <!--                        </el-row>-->
+              <el-form-item label="行业分类" required>
+                <el-select v-model="form.company.businessType" placeholder="请选择行业分类" v-if="isEdit">
+                  <el-option
+                    v-for="(item, index) in industryList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
+                  </el-option>
+                </el-select>
+                <!--                            <el-input v-model="form.company.businessType" v-if="isEdit"/>-->
+                <text v-else>{{ userInfo.company.businessType }}</text>
+              </el-form-item>
+              <text class="text-main text-25 my-20">如您是采购用户可忽略此项，如您是销售用户请选择您的主营商品。</text>
+              <el-form-item label="主营商品">
+                <el-checkbox-group v-model="form.company.mainSpotCategoryIds" v-if="isEdit">
+                  <el-checkbox v-for="(item, index) in goodsCate" :key="index" :label="item._id">
+                    {{ item.name }}
+                  </el-checkbox>
+                </el-checkbox-group>
+                <text v-else>{{
+                    userInfo.company.mainSpotCategoryIds.length ? userInfo.company.mainSpotCategoryIds.map(item => goodsCate.find(i => i._id === item) ? goodsCate.find(i => i._id === item).name : '').join('、') : ''
+                  }}
+                </text>
+              </el-form-item>
+              <el-form-item :label="isEdit ? '上传营业执照' : '营业执照'" required>
+                <view class="flex justify-start items-center" v-if="isEdit">
+                  <vk-data-upload :limit="1" v-model="form.company.organizationPath"></vk-data-upload>
+                  <text class="text-main ml-20">请您上传盖章的扫描件或者复印件</text>
+                </view>
+                <el-image :src="userInfo.company.organizationPath" style="width: 100px;height: 100px"
+                          fit="cover"
+                          v-else-if="!isEdit && userInfo.company.organizationPath && userInfo.company.organizationPath.includes('.')"/>
+              </el-form-item>
+              <el-form-item :label="isEdit ? '上传开票资料' : '开票资料'">
+                <view class="flex justify-start items-center" v-if="isEdit">
+                  <vk-data-upload :limit="1" v-model="form.company.invoiceInfo"
+                                  v-if="isEdit"></vk-data-upload>
+                  <text class="text-main ml-20">加盖公章</text>
+                  <view class="ml-35">
+                    <el-radio-group v-model="form.company.taxType">
+                      <el-radio label="一般纳税人">一般纳税人</el-radio>
+                      <el-radio label="小规模纳税人">小规模纳税人</el-radio>
+                      <el-radio label="其他">其他</el-radio>
                     </el-radio-group>
-                </el-form-item>
-                <template v-if="form.authType === 2 || (userInfo.hasOwnProperty('fadadaConfirm') && userInfo.fadadaConfirm)">
-                    <el-row :gutter="10">
-                        <el-col :span="12">
-                            <el-form-item label="企业名称">
-                                <el-input v-model="userInfo.company.companyName" disabled/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="信用代码" required>
-                                <el-input v-model="form.company.organization"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-form-item label="公司所在地" required>
-                        <el-row :gutter="10" class="border-bottom pb-20">
-                            <el-col :span="4">
-                                <el-select v-model="addressIndex[0]" placeholder="请选择省"
-                                           :disabled="[0, 1].includes(userInfo.authStatus)">
-                                    <el-option v-for="(item, index) in provinceData" :key="index"
-                                               :label="item.name"
-                                               :value="index">
-                                    </el-option>
-                                </el-select>
-                            </el-col>
-                            <el-col :span="4">
-                                <el-select v-model="addressIndex[1]" placeholder="请选择市"
-                                           :disabled="addressIndex.length === 0 || [0, 1].includes(userInfo.authStatus)">
-                                    <template v-if="addressIndex[0] !== null">
-                                        <el-option v-for="(item, index) in cityData[addressIndex[0]]" :key="index"
-                                                   :label="item.name"
-                                                   :value="index">
-                                        </el-option>
-                                    </template>
-                                </el-select>
-                            </el-col>
-                            <el-col :span="4">
-                                <el-select v-model="addressIndex[2]" placeholder="请选择区"
-                                           :disabled="addressIndex.length === 1 || [0, 1].includes(userInfo.authStatus)">
-                                    <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
-                                        <el-option v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
-                                                   :key="index"
-                                                   :label="item.name"
-                                                   :value="index">
-                                        </el-option>
-                                    </template>
-                                </el-select>
-                            </el-col>
-                            <el-col :span="11">
-                                <el-input v-model="form.company.addressDetail" placeholder="请输入详细地址"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-col>
-                        </el-row>
-                    </el-form-item>
-                    <el-form-item label="联系方式" required>
-                        <el-input v-model="form.company.mobile" :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                    </el-form-item>
-                    <el-row :gutter="10">
-                        <el-col :span="12">
-                            <el-form-item label="有效通信地址">
-                                <el-input v-model="form.company.mailAddress"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="有效邮箱地址">
-                                <el-input v-model="form.company.contactEmail"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="10">
-                        <el-col :span="12">
-                            <el-form-item label="对公账号" required>
-                                <el-input v-model="form.company.companyAccount"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="开户行" required>
-                                <el-input v-model="form.company.companyBankName"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="10">
-                        <el-col :span="8">
-                            <el-form-item label="个人账号">
-                                <el-input v-model="form.company.personAccount"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="个人开户行">
-                                <el-input v-model="form.company.personBankName"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="个人账户名">
-                                <el-input v-model="form.company.accountName"
-                                          :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-form-item label="经营类目" required>
-                        <el-input v-model="form.company.businessType" :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                    </el-form-item>
-                    <el-form-item label="主营商品" required>
-                        <el-checkbox-group v-model="form.company.mainSpotCategoryIds"
-                                           :disabled="[0, 1].includes(userInfo.authStatus)">
-                            <el-checkbox v-for="(item, index) in goodsCate" :key="index" :label="item._id">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                    <el-form-item label="上传营业执照" required>
-                        <view class="flex justify-start items-center">
-                            <vk-data-upload :limit="1" v-model="form.company.organizationPath"
-                                            :disabled="[0, 1].includes(userInfo.authStatus)"></vk-data-upload>
-                            <text class="text-main ml-20">请您上传盖章的扫描件或者复印件</text>
-                        </view>
-                    </el-form-item>
-                    <el-form-item label="上传开票资料" required>
-                        <view class="flex justify-start items-center">
-                            <vk-data-upload :limit="1" v-model="form.company.invoiceInfo"
-                                            :disabled="[0, 1].includes(userInfo.authStatus)"></vk-data-upload>
-                            <text class="text-main ml-20">加盖公章</text>
-                            <view class="ml-35">
-                                <el-radio-group v-model="form.company.taxType"
-                                                :disabled="[0, 1].includes(userInfo.authStatus)">
-                                    <el-radio label="一般纳税人">一般纳税人</el-radio>
-                                    <el-radio label="小规模纳税人">小规模纳税人</el-radio>
-                                    <el-radio label="其他">其他</el-radio>
-                                </el-radio-group>
-                            </view>
-                        </view>
-                    </el-form-item>
-                    <el-form-item label="纳税人资格">
-                        <view class="flex justify-start items-center">
-                            <vk-data-upload :limit="1" v-model="form.company.taxImage"
-                                            :disabled="[0, 1].includes(userInfo.authStatus)"></vk-data-upload>
-                            <text class="text-main ml-20">加盖公章</text>
-                        </view>
-                    </el-form-item>
-                    <el-form-item label="平台交易账号认证" required>
-                        <div>
-                            <p>请用个人账户向以下账户转账0.10元。请备注：账号认证，平台将7个工作日内退回原账户。</p>
-                            <div>
-                                <span>户名：金久信</span>
-                                <span class="ml-35">开户行：中国广发银行南宁支行</span>
-                                <span class="ml-35">账号：6222XXXXX</span>
-                            </div>
-                        </div>
-                    </el-form-item>
-                    <div class="flex justify-start items-center">
-                        <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square" style="height: 24px"/>
-                        <span class="text-40 mr-35">企业授权人信息</span>
-                    </div>
-                    <el-form-item label="代理人类型" required>
-                        <el-radio-group v-model="form.manager.type" :disabled="[0, 1].includes(userInfo.authStatus)">
-                            <el-radio :label="1">法人</el-radio>
-                            <el-radio :label="2">代理人</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="代理人姓名" required>
-                        <el-input v-model="form.manager.personName" :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                    </el-form-item>
-                    <el-form-item label="证件类型" required>
-                        <el-radio-group v-model="form.manager.certType"
-                                        :disabled="[0, 1].includes(userInfo.authStatus)">
-                            <el-radio :label="0">身份证</el-radio>
-                            <el-radio :label="1">护照</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="代理人证件号" required>
-                        <el-input v-model="form.manager.idCard" :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                    </el-form-item>
-                    <el-form-item label="代理人电话" required>
-                        <el-input v-model="form.manager.mobile" :disabled="[0, 1].includes(userInfo.authStatus)"/>
-                    </el-form-item>
-                    <el-form-item label="身份证正面" required>
-                        <vk-data-upload :limit="1" v-model="form.manager.headPhotoPath"
-                                        :disabled="[0, 1].includes(userInfo.authStatus)"></vk-data-upload>
-                    </el-form-item>
-                    <el-form-item label="身份证反面" required>
-                        <vk-data-upload :limit="1" v-model="form.manager.backgroundIdCardPath"
-                                        :disabled="[0, 1].includes(userInfo.authStatus)"></vk-data-upload>
-                    </el-form-item>
-                    <el-button type="primary" @click.native="submitAuth"
-                               v-if="form.authType === 2 && (userInfo.authStatus === null || [-1, 2].includes(userInfo.authStatus))">
-                        {{
-                            vk.getVuex('$user.userInfo.accountType') === 2 ? '提交企业认证' : '提交个人认证'
-                        }}
-                    </el-button>
-                </template>
-                <template v-else>
-                    <el-button @click="getCertUrl" type="primary" size="small">去认证</el-button>
-                    <el-button @click="getCertRes" type="primary" size="small">获取认证结果</el-button>
-                </template>
-            </el-form>
-
-            <!--            <vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"-->
-            <!--                          :footer-show="false"-->
-            <!--                          :before-action="form1.props.beforeAction" :rules="form1.props.rules"-->
-            <!--                          :form-type="form1.props.formType"-->
-            <!--                          :loading.sync="form1.props.loading" :auto-close="true" label-width="140px"-->
-            <!--                          @success="onFormSuccess1">-->
-            <!--                <template v-slot:toFadada="{form, keyName}">-->
-            <!--                    <el-button @click="getCertUrl" type="primary" size="small">去认证</el-button>-->
-            <!--                    <el-button @click="getCertRes" type="primary" size="small">获取认证结果</el-button>-->
-            <!--                </template>-->
-            <!--                <template v-slot:company.organizationPath="{form, keyName}">-->
-            <!--                    <vk-data-upload v-model="form1.data.organizationPath" limit="1"></vk-data-upload>-->
-            <!--                    <text class="text-main">请您上传盖章的扫描件或者复印件</text>-->
-            <!--                </template>-->
-            <!--                <template v-slot:accountAuth="{form, keyName}">-->
-            <!--                    <div>-->
-            <!--                        <p>请用个人账户向以下账户转账0.10元。请备注：账号认证，平台将7个工作日内退回原账户。</p>-->
-            <!--                        <div>-->
-            <!--                            <span>户名：金久信</span>-->
-            <!--                            <span class="ml-35">开户行：中国广发银行南宁支行</span>-->
-            <!--                            <span class="ml-35">账号：6222XXXXX</span>-->
-            <!--                        </div>-->
-            <!--                    </div>-->
-            <!--                </template>-->
-            <!--                <template v-slot:manageList="{form, keyName}">-->
-            <!--                    <div class="flex justify-start items-center">-->
-            <!--                        <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square" style="height: 24px"/>-->
-            <!--                        <span class="text-40 mr-35">企业授权人信息</span>-->
-            <!--                        <el-button type="primary" size="small" @click.native="addManage"-->
-            <!--                                   v-if="manageList.length === 0 && (JSON.stringify(form.manager) === '{}' || !form.manager)">-->
-            <!--                            添加授权人-->
-            <!--                        </el-button>-->
-            <!--                    </div>-->
-            <!--                </template>-->
-            <!--            </vk-data-form>-->
-            <!--            <view v-for="(item, index) in manageList" :key="index">-->
-            <!--                <manage-list v-model="manageList[index]"/>-->
-            <!--            </view>-->
-            <!--            <el-button type="primary" @click.native="allSubmit"-->
-            <!--                       v-if="form1.data.authType === 2 && (form1.data.authStatus === null || [-1, 2].includes(form1.data.authStatus))">-->
-            <!--                {{-->
-            <!--                    vk.getVuex('$user.userInfo.accountType') === 2 ? '提交企业认证' : '提交个人认证'-->
-            <!--                }}-->
-            <!--            </el-button>-->
-        </el-card>
-    </view>
+                  </view>
+                </view>
+                <el-image :src="userInfo.company.invoiceInfo" style="width: 100px;height: 100px" fit="cover"
+                          v-else-if="!isEdit && userInfo.company.invoiceInfo && userInfo.company.invoiceInfo.includes('.')"/>
+              </el-form-item>
+              <el-form-item label="管理员授权委托书">
+                <view class="flex justify-start items-center" v-if="isEdit">
+                  <vk-data-upload v-model="form.company.taxImage"></vk-data-upload>
+                  <text class="text-main ml-20">加盖公章</text>
+                </view>
+                <el-image v-for="(item, index) in userInfo.company.taxImage" :key="index" :src="item"
+                          style="width: 100px;height: 100px" fit="cover"
+                          v-else-if="!isEdit && userInfo.company.taxImage && userInfo.company.taxImage.length > 0"/>
+              </el-form-item>
+              <!--            <el-form-item label="平台交易账号认证" required v-if="isEdit">-->
+              <!--              <div>-->
+              <!--                <p>请用个人账户向以下账户转账0.10元。请备注：账号认证，平台将7个工作日内退回原账户。</p>-->
+              <!--                <div>-->
+              <!--                  <span>户名：金久信</span>-->
+              <!--                  <span class="ml-35">开户行：中国广发银行南宁支行</span>-->
+              <!--                  <span class="ml-35">账号：6222XXXXX</span>-->
+              <!--                </div>-->
+              <!--              </div>-->
+              <!--            </el-form-item>-->
+              <div class="flex justify-start items-center">
+                <id-card theme="outline" size="24" fill="#a92924" strokeLinecap="square"
+                         style="height: 24px"/>
+                <span class="text-40 mr-35">企业授权人信息</span>
+              </div>
+              <el-form-item label="授权人类型" required>
+                <el-radio-group v-model="form.manager.type" v-if="isEdit">
+                  <el-radio :label="1">法人</el-radio>
+                  <el-radio :label="2">授权人</el-radio>
+                </el-radio-group>
+                <text v-else>{{ parseInt(userInfo.manager.type) === 1 ? '法人' : '授权人' }}</text>
+              </el-form-item>
+              <el-form-item :label="`${form.manager.type === 1 ? '法人' : '授权人'}姓名`" required>
+                <el-input v-model="form.manager.personName" v-if="isEdit"/>
+                <text v-else>{{ userInfo.manager.personName }}</text>
+              </el-form-item>
+              <el-form-item label="证件类型" required>
+                <el-radio-group v-model="form.manager.certType" v-if="isEdit">
+                  <el-radio :label="0">身份证</el-radio>
+                  <el-radio :label="1">护照</el-radio>
+                </el-radio-group>
+                <text v-else>{{ userInfo.manager.certType === 0 ? '身份证' : '护照' }}</text>
+              </el-form-item>
+              <el-form-item :label="`${form.manager.type === 1 ? '法人' : '授权人'}证件号`" required>
+                <el-input v-model="form.manager.idCard" v-if="isEdit"/>
+                <text v-else>{{ userInfo.manager.idCard }}</text>
+              </el-form-item>
+              <el-form-item :label="`${form.manager.type === 1 ? '法人' : '授权人'}电话`" required>
+                <el-input v-model="form.manager.mobile" v-if="isEdit"/>
+                <text v-else>{{ userInfo.manager.mobile }}</text>
+              </el-form-item>
+              <el-form-item label="身份证头像面" required>
+                <vk-data-upload :limit="1" v-model="form.manager.headPhotoPath"
+                                v-if="isEdit"></vk-data-upload>
+                <el-image :src="userInfo.manager.headPhotoPath" style="width: 100px;height: 100px"
+                          fit="cover"
+                          v-else-if="!isEdit && userInfo.manager.headPhotoPath && userInfo.manager.headPhotoPath.includes('.')"/>
+              </el-form-item>
+              <el-form-item label="身份证国徽面" required>
+                <vk-data-upload :limit="1" v-model="form.manager.backgroundIdCardPath"
+                                v-if="isEdit"></vk-data-upload>
+                <el-image :src="userInfo.manager.backgroundIdCardPath" style="width: 100px;height: 100px"
+                          fit="cover"
+                          v-else-if="!isEdit && userInfo.manager.backgroundIdCardPath && userInfo.manager.backgroundIdCardPath.includes('.')"/>
+              </el-form-item>
+              <div class="flex justify-start items-center mt-20">
+                <el-button class="mx-20" type="primary" plain v-if="userInfo.authStatus !== 0"
+                           @click.native="isEdit = !isEdit">{{
+                    isEdit ? '取消' : '编辑'
+                  }}
+                </el-button>
+                <el-button class="mx-20" type="primary" @click.native="submitAuth()"
+                           v-if="userInfo.authStatus === null || [-1, 2].includes(userInfo.authStatus)">
+                  提交企业认证
+                </el-button>
+                <view class="mx-20" v-if="userInfo.authStatus === 1">
+                  <el-button type="primary" @click.native="submitAuth()" :disabled="!isEdit">提交企业认证
+                  </el-button>
+                </view>
+              </div>
+            </template>
+            <personal-auth v-else/>
+          </template>
+        </template>
+      </el-form>
+    </el-card>
+  </view>
 </template>
 
 <script>
@@ -297,483 +330,299 @@ import form from "@icon-park/vue/lib/icons/Form";
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import PersonalAuth from "./personalAuth.vue";
 
 var _ = require('lodash');
 export default {
-    components: {ManageList, IdCard, Info},
-    data() {
-        // 页面数据变量
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            addressIndex: [null, null, null],
-            manageList: [],
-            goodsCate: [],
-            form: {
-                authType: null,
-                company: {
-                    organization: '',
-                    addressRegion: {},
-                    addressDetail: '',
-                    mobile: '',
-                    mailAddress: '',
-                    contactEmail: '',
-                    companyAccount: '',
-                    companyBankName: '',
-                    personAccount: '',
-                    personBankName: '',
-                    accountName: '',
-                    businessType: '',
-                    invoiceInfo: '',
-                    taxType: '',
-                    taxImage: '',
-                    mainSpotCategoryIds: [],
-                },
-                manager: {
-                    type: null,
-                    personName: '',
-                    certType: '',
-                    idCard: '',
-                    mobile: '',
-                    headPhotoPath: '',
-                    backgroundIdCardPath: '',
-                },
+  components: {PersonalAuth, ManageList, IdCard, Info},
+  data() {
+    // 页面数据变量
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      addressIndex: [null, null, null],
+      manageList: [],
+      goodsCate: [],
+      isEdit: true,
+      form: {
+        authType: 1,
+        company: {
+          organization: '',
+          addressRegion: {},
+          addressDetail: '',
+          mobile: '',
+          legalName: '',
+          mailAddress: '',
+          contactEmail: '',
+          companyAccount: '',
+          companyBankName: '',
+          personAccount: '',
+          personBankName: '',
+          accountName: '',
+          businessType: '',
+          invoiceInfo: '',
+          taxType: '',
+          taxImage: [],
+          mainSpotCategoryIds: [],
+        },
+        manager: {
+          type: null,
+          personName: '',
+          certType: '',
+          idCard: '',
+          mobile: '',
+          headPhotoPath: '',
+          backgroundIdCardPath: '',
+        },
 
-            },
-            userInfo: {},
-            // 表单相关开始-----------------------------------------------------------
-            form1: {
-                // 表单请求数据，此处可以设置默认值
-                data: {
-                    person: {},
-                    company: {},
-                    manager: null,
-                    fadadaConfirm: false,
-                    authType: 1,
-                    authStatus: null,
-                    refuseReason: '',
-                    organizationPath: '',
-                },
-                // 表单属性
-                props: {
-                    // 表单请求地址
-                    action: "client/user/kh/addAuth",
-                    // 表单字段显示规则
-                    columns: [
-                        {
-                            key: "authType", title: "认证方式", type: "radio",
-                            data: [
-                                {value: 1, label: "法大大接口认证"},
-                                {value: 2, label: "金九信平台审核"},
-                            ],
-                            showRule: ({authStatus}) => {
-                                return authStatus === null || [-1, 2].includes(authStatus)
-                            },
-                        },
-                        {
-                            key: "toFadada", title: "认证方式", type: "html",
-                            showLabel: false,
-                            showRule: (formData) => {
-                                return formData.authType === 1 && (!formData.hasOwnProperty('fadadaConfirm') || !formData.fadadaConfirm) && (formData.authStatus === null || [-1, 2].includes(formData.authStatus))
-                            },
-                        },
-                        {
-                            key: "person",
-                            title: "个人",
-                            type: "object",
-                            showLabel: false,
-                            showRule: (formData) => {
-                                return vk.getVuex('$user.userInfo.accountType') === 1
-                            },
-                            columns: [{
-                                key: "personName",
-                                title: "姓名",
-                                type: "text",
-                                readonly: true,
-                                disabled: true
-                            },
-                                {
-                                    key: "idCard",
-                                    title: "身份证号",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-                                {
-                                    key: "bankCardNo",
-                                    title: "银行卡号",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-                                {
-                                    key: "mobile",
-                                    title: "手机号",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-
-                            ]
-                        },
-                        {
-                            key: "company",
-                            title: "企业信息",
-                            type: "object",
-                            showLabel: false,
-                            showRule: (formData) => {
-                                return vk.getVuex('$user.userInfo.accountType') === 2
-                                    && (formData.authType === 2 || (formData.hasOwnProperty('fadadaConfirm') && formData.fadadaConfirm))
-                            },
-                            columns: [
-                                {
-                                    key: "", title: "", type: "group", justify: "start",
-                                    columns: [
-                                        {
-                                            key: "companyName",
-                                            title: "企业名称",
-                                            type: "text",
-                                            readonly: true,
-                                            disabled: true
-                                        },
-                                        {
-                                            key: "organization",
-                                            title: "统一社会信用代码",
-                                            type: "text",
-                                        },
-                                    ]
-                                },
-                                {
-                                    key: "address", title: "", type: "group", justify: "start",
-                                    columns: [
-                                        {key: "addressRegion", title: "公司所在地", type: "address"},
-                                        {
-                                            key: "addressDetail",
-                                            title: "详细地址",
-                                            type: "text",
-                                            showLabel: false,
-                                            placeholder: "详细地址",
-                                        },
-                                    ]
-                                },
-                                {
-                                    key: "mobile",
-                                    title: "联系方式",
-                                    type: "text",
-                                    placeholder: "请输入您的联系方式",
-                                },
-                                {
-                                    key: "mailAddress",
-                                    title: "有效通信地址",
-                                    type: "text",
-                                    placeholder: "请输入您的通信地址",
-                                },
-                                {
-                                    key: "contactEmail",
-                                    title: "有效邮箱地址",
-                                    type: "text",
-                                    placeholder: "请输入您的邮箱地址",
-                                },
-                                {
-                                    key: "", title: "", type: "group", justify: "start",
-                                    columns: [
-                                        {
-                                            key: "companyAccount",
-                                            title: "对公账号",
-                                            type: "text",
-                                            placeholder: "请输入对公账号",
-                                        },
-                                        {
-                                            key: "companyBankName",
-                                            title: "开户行",
-                                            type: "text",
-                                            placeholder: "请输入开户行",
-                                        },
-                                    ]
-                                },
-                                {
-                                    key: "", title: "", type: "group", justify: "start",
-                                    columns: [
-                                        {
-                                            key: "personAccount",
-                                            title: "个人账号",
-                                            type: "text",
-                                            placeholder: "请输入个人账号",
-                                        },
-                                        {
-                                            key: "personBankName",
-                                            title: "个人开户行",
-                                            type: "text",
-                                            placeholder: "请输入个人开户行",
-                                        },
-                                    ]
-                                },
-                                {
-                                    key: "accountName",
-                                    title: "个人账户名",
-                                    type: "text",
-                                    placeholder: "请输入个人账户名",
-                                },
-                                {
-                                    key: "", title: "", type: "group", justify: "start",
-                                    columns: [
-                                        {key: "organizationPath", title: "上传营业执照", type: "html"},
-                                        {key: "businessType", title: "经营类目", type: "text"},
-                                    ]
-                                },
-                                {
-                                    key: "", title: "", type: "group", justify: "start",
-                                    columns: [
-                                        {key: "invoiceInfo", title: "上传开票资料", type: "image", limit: 1},
-                                        {
-                                            key: "taxType", title: "", type: "radio", showLabel: false,
-                                            data: [
-                                                {value: "一般纳税人", label: "一般纳税人"},
-                                                {value: "小规模纳税人", label: "小规模纳税人"},
-                                                {value: "其他", label: "其他"},
-                                            ],
-                                        },
-                                    ]
-                                },
-                                {key: "taxImage", title: "纳税人资格", type: "image", limit: 1},
-                            ],
-                        },
-                        {
-                            key: "accountAuth", title: "平台交易账号认证", type: "html", showRule: (formData) => {
-                                return vk.getVuex('$user.userInfo.accountType') === 2
-                                    && (formData.authType === 2 || (formData.hasOwnProperty('fadadaConfirm') && formData.fadadaConfirm))
-                            },
-                        },
-                        {
-                            key: "manageList", title: "", type: "html", showLabel: false, showRule: (formData) => {
-                                return vk.getVuex('$user.userInfo.accountType') === 2
-                                    && (formData.authType === 2 || (formData.hasOwnProperty('fadadaConfirm') && formData.fadadaConfirm))
-                            },
-                        },
-                        {
-                            key: "manager",
-                            title: "代理人",
-                            type: "object",
-                            showLabel: false,
-                            showRule: (formData) => {
-                                return formData.manager.personName != null
-                            },
-                            columns: [{
-                                key: "personName",
-                                title: "代理人",
-                                type: "text",
-                                readonly: true,
-                                disabled: true
-                            },
-                                {
-                                    key: "idCard",
-                                    title: "代理人身份证号",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-                                {
-                                    key: "mobile",
-                                    title: "代理人电话",
-                                    type: "text",
-                                    readonly: true,
-                                    disabled: true
-                                },
-
-                            ]
-                        },
-                    ],
-                    // 表单验证规则
-                    rules: {
-                        'company.organization': [
-                            {
-                                required: true,
-                                message: "统一社会信用代码不能为空",
-                                trigger: ['blur', 'change']
-                            }
-                        ],
-                        'company.address.addressRegion': [
-                            {
-                                required: true,
-                                message: "公司所在地不能为空",
-                                trigger: ['blur', 'change']
-                            }
-                        ],
-                        'company.mobile': [
-                            {
-                                required: true,
-                                message: "公司联系方式不能为空",
-                                trigger: ['blur', 'change']
-                            }
-                        ],
-                        'company.companyAccount': [
-                            {
-                                required: true,
-                                message: "公司对公账号不能为空",
-                                trigger: ['blur', 'change']
-                            }
-                        ],
-                        'company.companyBankName': [
-                            {
-                                required: true,
-                                message: "公司对公账号开户行不能为空",
-                                trigger: ['blur', 'change']
-                            }
-                        ],
-                        mailAddress: [
-                            {
-                                required: true,
-                                message: "通讯地址不能为空",
-                                trigger: ['blur', 'change']
-                            }
-                        ],
-                        contactQq: [{
-                            required: true,
-                            message: "QQ号码不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        contactWechat: [{
-                            required: true,
-                            message: "微信不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        contactWechatImage: [{
-                            required: true,
-                            message: "微信二维码不能为空",
-                            trigger: ['blur', 'change']
-                        }],
-                        contactEmail: [
-                            {
-                                required: true,
-                                message: "邮箱不能为空",
-                                trigger: ['blur', 'change']
-                            }, {
-                                validator: vk.pubfn.validator("email"),
-                                message: '邮箱格式错误',
-                                trigger: 'blur'
-                            }
-                        ],
-
-                    },
-                    // add 代表添加 update 代表修改
-                    formType: "",
-                    // 表单是否在请求中
-                    loading: false,
-                    // 是否显示表单1 的弹窗
-                    show: false,
-                }
-            },
-            // 表单相关结束-----------------------------------------------------------
-
-        };
+      },
+      userInfo: {},
+      // 表单相关开始-----------------------------------------------------------
+      form1: {
+        // 表单请求数据，此处可以设置默认值
+        data: {
+          person: {},
+          company: {},
+          manager: null,
+          fadadaConfirm: false,
+          authType: 1,
+          authStatus: null,
+          refuseReason: '',
+          organizationPath: '',
+        },
+      },
+      // 表单相关结束-----------------------------------------------------------
+      industryList: [],
+      userType: 1
+    };
+  },
+  created() {
+    this.getIndustryList()
+    this.getGoodsCate()
+    this.getUserInfo()
+  },
+  methods: {
+    async getIndustryList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/industry/pub/getList'
+      })
+      this.industryList = rows
     },
-    created() {
-        this.getUserInfo()
-        this.getGoodsCate()
-    },
-    methods: {
-        getUserInfo() {
-            vk.userCenter.getCurrentUserInfo({
-                success: (data) => {
-                    this.userInfo = data.userInfo
-                    for (let key in this.form) this.form[key] = data.userInfo[key]
-                    if (JSON.stringify(data.userInfo.addressRegion) !== "{}") {
-                        this.addressIndex[0] = this.provinceData.findIndex(item => item.code === data.userInfo.addressRegion.province.code)
-                        if (this.addressIndex[0] !== -1) {
-                            this.addressIndex[1] = this.cityData[this.addressIndex[0]].findIndex(item => item.code === data.userInfo.addressRegion.city.code)
-                            if (this.addressIndex[1] !== -1) {
-                                this.addressIndex[2] = this.areaData[this.addressIndex[0]][this.addressIndex[1]].findIndex(item => item.code === data.userInfo.addressRegion.area.code)
-                                console.log(this.addressIndex[2], this.areaData[this.addressIndex[0]][this.addressIndex[1]], data.userInfo.addressRegion.area.code)
-                            }
-                        }
-                    }
-                    this.form1.data = _.pick(data.userInfo, [
-                        'fadadaConfirm', 'person', 'company', 'manager', 'contactWechat',
-                        'contactEmail', 'contactWechatImage', 'contactQq', 'mailAddress',
-                        'authStatus', 'authType', 'refuseReason'
-                    ])
-                    // if (!this.form1.data.hasOwnProperty('fadadaConfirm') || !this.form1.data.fadadaConfirm) this.form1.data.authType = 1
-                    // this.form1.data.authType = 2
-                    if (data.userInfo.fadadaConfirm && data.userInfo.businessCard == null) {
-                        this.$confirm('请完善名片信息', '提示', {
-                            confirmButtonText: '确定',
-                            cancelButtonText: '取消',
-                            type: 'warning'
-                        }).then(() => {
-                            vk.navigateTo('/pages/user/user?menu=business-card');
-                        })
-                    }
-                }
-            });
-        },
-        getGoodsCate() {
-            vk.callFunction({
-                url: 'client/spot/category/pub/getList',
-                data: {
-                    level: 2
-                },
-                success: (res) => {
-                    this.goodsCate = res.data
-                }
-            });
-        },
-        onFormSuccess1() {
-            window.location.reload()
-        },
-        getCertUrl() {
-            vk.callFunction({
-                url: 'client/fadada.getVerifyUrl',
-                success: (res) => {
-                    location.href = res.data.url
-                }
-            });
-        },
-        addManage() {
-            this.manageList.push({})
-        },
-        allSubmit() {
-            this.form1.data.authStatus = 0
-            this.form1.data.refuseReason = null
-            this.form1.data.manager = this.manageList[0]
-            this.$refs.form1.submitForm()
-        },
-        async submitAuth() {
-            if (this.addressIndex[2] === null || !this.form.company.addressDetail) return this.$message({
-                type: 'error',
-                message: '请完善公司所在地'
+    getUserInfo() {
+      vk.userCenter.getCurrentUserInfo({
+        success: (data) => {
+          this.userInfo = data.userInfo
+          for (let key in this.form) this.form[key] = data.userInfo[key]
+
+          if (!this.userInfo.userType) this.userType = 0
+          else this.userType = parseInt(this.userInfo.userType)
+
+          if (!this.userInfo.company.mailAddress && this.userInfo.company.address)
+            this.form.company.mailAddress = this.userInfo.company.address
+          if (JSON.stringify(data.userInfo.company.addressRegion) !== "{}" && data.userInfo.company.addressRegion && data.userInfo.company.addressRegion.province) {
+            this.addressIndex[0] = this.provinceData.findIndex(item => parseInt(item.code) === parseInt(data.userInfo.company.addressRegion.province.code))
+            if (this.addressIndex[0] !== -1) {
+              this.addressIndex[1] = this.cityData[this.addressIndex[0]].findIndex(item => parseInt(item.code) === parseInt(data.userInfo.company.addressRegion.city.code))
+              if (this.addressIndex[1] !== -1) {
+                this.addressIndex[2] = this.areaData[this.addressIndex[0]][this.addressIndex[1]].findIndex(item => parseInt(item.code) === parseInt(data.userInfo.company.addressRegion.area.code))
+              }
+            }
+          }
+          this.form1.data = _.pick(data.userInfo, [
+            'fadadaConfirm', 'person', 'company', 'manager', 'contactWechat',
+            'contactEmail', 'contactWechatImage', 'contactQq', 'mailAddress',
+            'authStatus', 'authType', 'refuseReason',
+          ])
+          this.isEdit = this.userInfo.authStatus === -1
+          if (!this.form.manager) {
+            this.form.manager = {
+              type: null,
+              personName: '',
+              certType: null,
+              idCard: '',
+              mobile: '',
+              headPhotoPath: '',
+              backgroundIdCardPath: '',
+            }
+            this.userInfo.manager = {
+              type: null,
+              personName: '',
+              certType: null,
+              idCard: '',
+              mobile: '',
+              headPhotoPath: '',
+              backgroundIdCardPath: '',
+            }
+          } else {
+            this.form.manager.type = parseInt(this.form.manager.type)
+            this.form.manager.certType = parseInt(this.form.manager.certType)
+            if (this.userInfo.authStatus === -1) this.form.manager.headPhotoPath = ''
+          }
+          if (this.userInfo.authStatus !== -1) {
+            if (this.userInfo.fadadaConfirm || (this.userInfo.hasOwnProperty('authType') && this.userInfo.authType && parseInt(this.userInfo.authType) === 2)) this.form.authType = 2
+            if (!this.userInfo.company.mainSpotCategoryIds) {
+              this.form.company.mainSpotCategoryIds = []
+              this.userInfo.company.mainSpotCategoryIds = []
+            }
+          } else {
+            // this.form.company = {
+            //     // organization: '',
+            //     addressRegion: {},
+            //     addressDetail: '',
+            //     mobile: '',
+            //     mailAddress: '',
+            //     contactEmail: '',
+            //     companyAccount: '',
+            //     companyBankName: '',
+            //     personAccount: '',
+            //     personBankName: '',
+            //     accountName: '',
+            //     businessType: '',
+            //     invoiceInfo: '',
+            //     taxType: '',
+            //     taxImage: '',
+            //     mainSpotCategoryIds: [],
+            // }
+            this.form.company.organizationPath = ''
+            // this.form.company.addressRegion = {}
+            // this.form.company.mobile = ''
+            // this.form.company.mailAddress = ''
+            // this.form.company.contactEmail = ''
+            // this.form.company.companyAccount = ''
+            // this.form.company.companyBankName = ''
+            // this.form.company.personAccount = ''
+            // this.form.company.personBankName = ''
+            // this.form.company.accountName = ''
+            // this.form.company.businessType = ''
+            // this.form.company.invoiceInfo = ''
+            // this.form.company.taxType = ''
+            // this.form.company.taxImage = ''
+          }
+          if (data.userInfo.fadadaConfirm && data.userInfo.authStatus === 1 && data.userInfo.businessCard == null) {
+            this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              vk.navigateTo('/pages/user/user?menu=fadada');
             })
-            if (this.form.company.mainSpotCategoryIds.length === 0) return this.$message({
-                type: 'error',
-                message: '请选择主营商品'
-            })
-            this.form.company.addressRegion.province = this.provinceData[this.addressIndex[0]]
-            this.form.company.addressRegion.city = this.cityData[this.addressIndex[0]][this.addressIndex[1]]
-            this.form.company.addressRegion.area = this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]
-            await vk.callFunction({
-                url: 'client/user/kh/addAuth',
-                data: {...this.form, ...{authStatus: 0}},
-            })
-            this.$message({
-                type: 'success',
-                message: '提交成功'
-            })
-            setTimeout(() => {
-                window.location.reload()
-            }, 1500)
-        },
-        makeCard() {
-            this.$emit('makeCard')
-        },
-        getCertRes() {
-            vk.callFunction({
-                url: 'client/user/kh/getFadadaRes',
-                success: (res) => {
-                    console.log(res)
-                }
+          }
+          if (data.userInfo.fadadaConfirm && this.userType === 0 && data.userInfo.authStatus === -1) {
+            this.$confirm('请完善以下信息,完成审核', '提示', {
+              confirmButtonText: '确定',
+              showCancelButton: false,
             })
+          }
+          if (this.userInfo.company.taxImage && !Array.isArray(this.userInfo.company.taxImage)) {
+            this.userInfo.company.taxImage = [this.userInfo.company.taxImage]
+          }
+          // this.getFile(data.userInfo.company.organizationPath)
         }
+      });
+    },
+    getGoodsCate() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getList',
+        data: {
+          whereJson: {
+            level: 2
+          }
+        },
+        success: (res) => {
+          this.goodsCate = res.data
+        }
+      });
+    },
+    onFormSuccess1() {
+      window.location.reload()
+    },
+    getCertUrl(reset = false) {
+      vk.callFunction({
+        url: 'client/fadada.getVerifyUrl',
+        data: {reset, isSignOnly: true},
+        success: (res) => {
+          window.open(res.data.url)
+        }
+      });
+    },
+    getFile(uuid) {
+      vk.callFunction({
+        url: 'client/fadada.getFile',
+        data: {uuid},
+        success: (res) => {
+          console.log(res)
+        }
+      });
+    },
+    addManage() {
+      this.manageList.push({})
+    },
+    allSubmit() {
+      this.form1.data.authStatus = 0
+      this.form1.data.refuseReason = null
+      this.form1.data.manager = this.manageList[0]
+      this.$refs.form1.submitForm()
+    },
+    async submitAuth(authStatus = 0) {
+      if (this.addressIndex[2] === null || !this.form.company.addressDetail) return this.$message({
+        type: 'error',
+        message: '请完善公司所在地'
+      })
+      // if (this.form.company.mainSpotCategoryIds.length === 0) return this.$message({
+      //   type: 'error',
+      //   message: '请选择主营商品'
+      // })
+      if (!this.form.company.mailAddress) return this.$message({
+        type: 'error',
+        message: '请完善有效通信地址'
+      })
+      if (!this.form.company.contactEmail) return this.$message({
+        type: 'error',
+        message: '请完善联系邮箱'
+      })
+      if (!this.form.company.legalName) return this.$message({
+        type: 'error',
+        message: '请完善法人姓名'
+      })
+      if (!this.form.company.addressRegion) this.form.company.addressRegion = {}
+      this.form.company.addressRegion.province = this.provinceData[this.addressIndex[0]]
+      this.form.company.addressRegion.city = this.cityData[this.addressIndex[0]][this.addressIndex[1]]
+      this.form.company.addressRegion.area = this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]
+
+      await vk.callFunction({
+        url: 'client/user/kh/addAuth',
+        title: '提交中...',
+        data: {...this.form, ...{authStatus}},
+      })
+      this.$message({
+        type: 'success',
+        message: '提交成功'
+      })
+      setTimeout(() => {
+        window.location.reload()
+      }, 1500)
+    },
+    makeCard() {
+      this.$emit('done', 'business-card')
+    },
+    getCertRes() {
+      vk.callFunction({
+        url: 'client/user/kh/getFadadaRes',
+        success: (res) => {
+          console.log(res)
+        }
+      })
+    },
+    changeUserType() {
+      vk.callFunction({
+        url: 'client/user/kh/changeUserType',
+        data: {
+          userType: this.userType
+        }
+      })
     }
+  }
 }
 </script>
 
diff --git a/pages/user/components/personalAuth.vue b/pages/user/components/personalAuth.vue
new file mode 100644
index 0000000..bcf5134
--- /dev/null
+++ b/pages/user/components/personalAuth.vue
@@ -0,0 +1,431 @@
+<template>
+  <view v-if="userInfo && userInfo.person">
+    <el-row :gutter="10">
+      <el-col :span="12">
+        <el-form-item label="真实姓名" required>
+          <el-input v-model="form.person.personName" v-if="isEdit"/>
+          <text v-else>{{ userInfo.person.personName }}</text>
+        </el-form-item>
+      </el-col>
+      <!--            <el-col :span="12">-->
+      <!--                <el-form-item label="主营类目" required>-->
+      <!--                    <el-input v-model="form.person.businessType" v-if="isEdit"/>-->
+      <!--                    <text v-else>{{ userInfo.person.businessType }}</text>-->
+      <!--                </el-form-item>-->
+      <!--            </el-col>-->
+    </el-row>
+    <!--        <el-form-item label="主营商品" required>-->
+    <!--            <el-checkbox-group v-model="form.person.mainSpotCategoryIds" v-if="isEdit">-->
+    <!--                <el-checkbox v-for="(item, index) in goodsCate" :key="index" :label="item._id">-->
+    <!--                    {{ item.name }}-->
+    <!--                </el-checkbox>-->
+    <!--            </el-checkbox-group>-->
+    <!--            <template v-else>-->
+    <!--                <text v-if="userInfo.person.mainSpotCategoryIds">-->
+    <!--                    {{-->
+    <!--                        userInfo.person.mainSpotCategoryIds.length ? userInfo.person.mainSpotCategoryIds.map(item => goodsCate.find(i => i._id === item) ? goodsCate.find(i => i._id === item).name : '').join('、') : ''-->
+    <!--                    }}-->
+    <!--                </text>-->
+    <!--            </template>-->
+    <!--        </el-form-item>-->
+    <el-form-item label="行业分类">
+      <el-select v-model="form.person.businessType" placeholder="请选择行业分类" v-if="isEdit">
+        <el-option
+          v-for="(item, index) in industryList"
+          :key="index"
+          :label="item.name"
+          :value="item.name">
+        </el-option>
+      </el-select>
+      <!--                            <el-input v-model="form.company.businessType" v-if="isEdit"/>-->
+      <text v-else>{{ userInfo.person.businessType }}</text>
+    </el-form-item>
+    <el-form-item label="现居住所在地" required>
+      <el-row :gutter="10" v-if="isEdit">
+        <el-col :span="8">
+          <el-select v-model="addressIndex[0]" placeholder="请选择省" class="w-100p">
+            <el-option v-for="(item, index) in provinceData" :key="index"
+                       :label="item.name"
+                       :value="index">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="7">
+          <el-select v-model="addressIndex[1]" placeholder="请选择市" class="w-100p"
+                     :readonly="addressIndex.length === 0 || [0, 1].includes(userInfo.authStatus)">
+            <template v-if="addressIndex[0] !== null">
+              <el-option v-for="(item, index) in cityData[addressIndex[0]]" :key="index"
+                         :label="item.name"
+                         :value="index">
+              </el-option>
+            </template>
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="addressIndex[2]" placeholder="请选择区" class="w-100p">
+            <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
+              <el-option
+                v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
+                :key="index" :label="item.name" :value="index">
+              </el-option>
+            </template>
+          </el-select>
+        </el-col>
+      </el-row>
+      <view v-else-if="!isEdit && userInfo.person.addressRegion">
+        <text>{{
+            userInfo.person.addressRegion.province ? userInfo.person.addressRegion.province.name : ''
+          }}
+        </text>
+        <text>{{
+            userInfo.person.addressRegion.city ? userInfo.person.addressRegion.city.name : ''
+          }}
+        </text>
+        <text>{{
+            userInfo.person.addressRegion.area ? userInfo.person.addressRegion.area.name : ''
+          }}
+        </text>
+        <text>{{ userInfo.person.addressDetail ? userInfo.person.addressDetail : '' }}</text>
+      </view>
+      <el-input v-model="form.person.addressDetail" placeholder="请输入详细地址" v-if="isEdit"/>
+    </el-form-item>
+    <el-form-item label="有效通信地址">
+      <text>{{ form.person.address }}</text>
+    </el-form-item>
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <el-form-item label="个人账号" required>
+          <el-input v-model="form.person.personAccount" v-if="isEdit"/>
+          <text v-else>{{ userInfo.person.personAccount }}</text>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="个人开户行" required>
+          <el-input v-model="form.person.personBankName" v-if="isEdit"/>
+          <text v-else>{{ userInfo.person.personBankName }}</text>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="个人账户名" required>
+          <el-input v-model="form.person.accountName" v-if="isEdit"/>
+          <text v-else>{{ userInfo.person.accountName }}</text>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-form-item label="联系方式" required>
+        <el-col :span="8">
+          <el-input v-model="form.person.mobile" v-if="isEdit" placeholder="请输入手机号码"/>
+          <text v-else>{{ userInfo.person.mobile }}</text>
+        </el-col>
+        <el-col :span="8">
+          <el-input v-model="form.person.qq" v-if="isEdit" placeholder="请输入QQ号码"/>
+          <text v-else>{{ userInfo.person.qq }}</text>
+        </el-col>
+        <el-col :span="8">
+          <el-input v-model="form.person.contactEmail" v-if="isEdit" placeholder="请输入邮箱地址"/>
+          <text v-else>{{ userInfo.person.contactEmail }}</text>
+        </el-col>
+      </el-form-item>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <el-form-item label="短信验证码" required>
+          <el-input v-model="form.smsCode" :disabled="!form.person.mobile" v-if="isEdit"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <el-button type="primary" :disabled="!form.person.mobile || codeDisabled" @click="sendSmsCode">
+          {{ smsTips }}
+        </el-button>
+      </el-col>
+      <el-col :span="6">
+        <text>(请勿告知他人相关信息)</text>
+      </el-col>
+    </el-row>
+
+    <!--        <el-form-item label="平台交易账号认证" required v-if="isEdit">-->
+    <!--            <div v-html="authBankInfo"></div>-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="金久信平台幕布照" required>-->
+    <!--            <view class="flex justify-start items-center" v-if="isEdit">-->
+    <!--                <vk-data-upload :limit="1" v-model="form.person.photo"></vk-data-upload>-->
+    <!--                <text class="text-main ml-20 pointer" @click="openDownload">电子版文件下载</text>-->
+    <!--            </view>-->
+    <!--            <el-image :src="userInfo.person.photo" style="width: 100px;height: 100px" fit="cover"-->
+    <!--                      v-else-if="!isEdit && userInfo.person.photo && userInfo.person.photo.includes('.')"/>-->
+    <!--        </el-form-item>-->
+    <view class="flex justify-start items-center">
+      <view class="flex justify-start items-center" v-if="[1, 2].includes(userInfo.authStatus)">
+        <view class="mr-15">
+          <el-button type="primary" plain @click.native="changeEdit">{{
+              isEdit ? '取消' : '编辑'
+            }}
+          </el-button>
+        </view>
+        <el-button v-if="userInfo.authStatus === 1" type="primary" @click.native="submit(0)"
+                   :disabled="!isEdit">提交个人认证
+        </el-button>
+      </view>
+      <el-button type="primary" @click.native="submit()"
+                 v-if="userInfo.authStatus === null || [-1, 2].includes(userInfo.authStatus)">提交个人认证
+      </el-button>
+    </view>
+  </view>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import key from "@icon-park/vue/lib/icons/Key";
+
+let timer = null
+let timeS = 60
+
+export default {
+  name: "personalAuth",
+  data() {
+    return {
+      isEdit: false,
+      authBankInfo: '',
+      authPhotoBack: '',
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      addressIndex: [null, null, null],
+      form: {
+        person: {
+          personName: '',
+          address: '',
+          businessType: '',
+          addressRegion: {},
+          addressDetail: '',
+          mobile: '',
+          qq: '',
+          contactEmail: '',
+          personAccount: '',
+          personBankName: '',
+          accountName: '',
+          photo: '',
+          mainSpotCategoryIds: []
+        },
+        smsCode: '',
+      },
+      smsTips: '点击获取',
+      codeDisabled: false,
+      goodsCate: [],
+      industryList: [],
+      userInfo: {}
+    }
+  },
+  methods: {
+    async getIndustryList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/industry/pub/getList'
+      })
+      this.industryList = rows
+    },
+    getGoodsCate() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getList',
+        data: {
+          whereJson: {
+            level: 2
+          }
+        },
+        success: (res) => {
+          this.goodsCate = res.data
+        }
+      });
+    },
+    getAuthBankInfo() {
+      vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d38a8337a9f0756cb3b22'
+        },
+        success: res => {
+          this.authBankInfo = res.content
+        }
+      });
+    },
+    getAuthPhoto() {
+      vk.callFunction({
+        url: 'client/dict/pub/getDetail',
+        data: {
+          id: '657d3a178b0da41d31112468'
+        },
+        success: res => {
+          this.authPhotoBack = res.content
+        }
+      });
+    },
+    openDownload() {
+      window.open(this.authPhotoBack)
+    },
+    async submit(authStatus = 0) {
+      if (!this.form.person.personName) return this.$message({
+        type: 'error',
+        message: '请输入真实姓名'
+      })
+      // if (!this.form.person.businessType) return this.$message({
+      //     type: 'error',
+      //     message: '请选择行业分类'
+      // })
+      // if (this.form.person.mainSpotCategoryIds.length === 0) return this.$message({
+      //     type: 'error',
+      //     message: '请选择主营商品'
+      // })
+      if (!this.form.person.mobile) return this.$message({
+        type: 'error',
+        message: '请输入联系方式'
+      })
+      if (!this.form.person.personAccount) return this.$message({
+        type: 'error',
+        message: '请填写个人账号'
+      })
+      if (!this.form.person.personBankName) return this.$message({
+        type: 'error',
+        message: '请选择个人开户行'
+      })
+      if (!this.form.person.accountName) return this.$message({
+        type: 'error',
+        message: '请选择个人账户名'
+      })
+      // if (!this.form.person.photo) return this.$message({
+      //     type: 'error',
+      //     message: '请上传平台幕布照'
+      // })
+      if (!this.form.smsCode) return this.$message({
+        type: 'error',
+        message: '请输入短信验证码'
+      })
+      if (this.addressIndex[2] === null) return this.$message({
+        type: 'error',
+        message: '请完善居住所在地'
+      })
+
+      // this.form.person.addressRegion.province = this.provinceData[this.addressIndex[0]]
+      // this.form.person.addressRegion.city = this.cityData[this.addressIndex[0]][this.addressIndex[1]]
+      // this.form.person.addressRegion.area = this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]
+      const data = {...this.form, ...{authStatus}}
+      if (authStatus === 0) data.authType = 2
+      await vk.callFunction({
+        url: 'client/user/kh/addAuth',
+        title: '提交中...',
+        data
+      })
+      this.$message({
+        type: 'success',
+        message: '提交成功'
+      })
+      setTimeout(() => {
+        window.location.reload()
+      }, 1500)
+    },
+    sendSmsCode() {
+      if (timer != null) return
+      this.codeDisabled = true
+      vk.userCenter.sendSmsCode({
+        loading: true,
+        data: {
+          mobile: this.form.person.mobile,
+          type: 'verify',
+        },
+        success: (data) => {
+          this.codeDisabled = false
+          this.$message({
+            message: "验证码已发送",
+            type: 'success'
+          })
+          timeS = 60
+          timer = setInterval(() => {
+            timeS--
+            if (timeS <= 0) {
+              this.smsTips = "重新发送"
+              this.stopTimer()
+            } else {
+              this.smsTips = timeS + "秒"
+            }
+
+          }, 1000)
+        }
+      })
+    },
+    stopTimer() {
+      if (timer != null) {
+        clearInterval(timer)
+        timer = null
+      }
+    },
+    selectRegion() {
+      this.form.person.address = ''
+      if (this.addressIndex[0] !== null) {
+        this.form.person.address = this.provinceData[this.addressIndex[0]].name
+        this.form.person.addressRegion.province = this.provinceData[this.addressIndex[0]]
+        if (this.addressIndex[1] !== null) {
+          this.form.person.address += this.cityData[this.addressIndex[0]][this.addressIndex[1]].name
+          this.form.person.addressRegion.city = this.cityData[this.addressIndex[0]][this.addressIndex[1]]
+          if (this.addressIndex[2] !== null) {
+            this.form.person.address += this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]].name
+            this.form.person.addressRegion.area = this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]
+          }
+        }
+      }
+      if (this.form.person.addressDetail) this.form.person.address += this.form.person.addressDetail
+    },
+    changeEdit() {
+      this.isEdit = !this.isEdit
+      this.codeDisabled = !this.isEdit
+    }
+  },
+  mounted() {
+    this.getGoodsCate()
+    this.getIndustryList()
+    vk.userCenter.getCurrentUserInfo({
+      success: (data) => {
+        this.userInfo = data.userInfo
+
+        this.isEdit = this.userInfo.authStatus === -1
+        this.codeDisabled = !this.isEdit
+        if (this.userInfo.person) for (let key in this.form.person) this.form.person[key] = this.userInfo.person[key]
+        if (JSON.stringify(this.userInfo.person.addressRegion) !== "{}" && this.userInfo.person.addressRegion && this.userInfo.person.addressRegion.province) {
+          this.addressIndex[0] = this.provinceData.findIndex(item => parseInt(item.code) === parseInt(this.userInfo.person.addressRegion.province.code))
+          if (this.addressIndex[0] !== -1) {
+            this.addressIndex[1] = this.cityData[this.addressIndex[0]].findIndex(item => parseInt(item.code) === parseInt(this.userInfo.person.addressRegion.city.code))
+            if (this.addressIndex[1] !== -1) {
+              this.addressIndex[2] = this.areaData[this.addressIndex[0]][this.addressIndex[1]].findIndex(item => parseInt(item.code) === parseInt(this.userInfo.person.addressRegion.area.code))
+            }
+          }
+        } else {
+          this.form.person.addressRegion = {
+            province: {
+              code: '',
+              name: ''
+            },
+            city: {
+              code: '',
+              name: ''
+            },
+            area: {
+              code: '',
+              name: ''
+            }
+          }
+        }
+        if (!this.userInfo.person.mainSpotCategoryIds) {
+          this.userInfo.person.mainSpotCategoryIds = []
+          this.form.person.mainSpotCategoryIds = []
+        }
+        if (!this.userInfo.person.personAccount && this.userInfo.person.bankCardNo)
+          this.form.person.personAccount = this.userInfo.person.bankCardNo
+        if (!this.userInfo.person.accountName && this.userInfo.person.personName)
+          this.form.person.accountName = this.userInfo.person.personName
+        // this.getAuthBankInfo()
+        // this.getAuthPhoto()
+      }
+    })
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages/user/components/pwd.vue b/pages/user/components/pwd.vue
new file mode 100644
index 0000000..e01f680
--- /dev/null
+++ b/pages/user/components/pwd.vue
@@ -0,0 +1,79 @@
+<template>
+    <el-card shadow="never">
+        <el-form ref="resetForm" :model="formData" label-width="100px" :rules="rules">
+            <el-form-item label="原密码" prop="oldPassword">
+                <el-input type="password" v-model="formData.oldPassword" clearable
+                          placeholder="请输入原密码"/>
+            </el-form-item>
+            <el-form-item label="新密码" prop="newPassword">
+                <el-input type="password" v-model="formData.newPassword" clearable
+                          placeholder="请输入新密码"/>
+            </el-form-item>
+            <el-form-item label="确认密码" prop="passwordConfirmation">
+                <el-input type="password" v-model="formData.passwordConfirmation" clearable
+                          placeholder="请再次输入新密码"/>
+            </el-form-item>
+        </el-form>
+        <el-button type="primary" @click.native="submit">确定</el-button>
+    </el-card>
+</template>
+
+<script>
+export default {
+    name: "pwd",
+    data() {
+        return {
+            formData: {
+                oldPassword: null,
+                newPassword: null,
+                passwordConfirmation: null,
+            },
+            rules: {
+                oldPassword: [
+                    {required: true, message: '请输入原密码', trigger: 'blur'},
+                ],
+                newPassword: [
+                    {required: true, message: '请输入新密码', trigger: 'blur'},
+                    {min: 6, max: 16, message: '密码长度在 6 到 16 个字符', trigger: 'blur'},
+                ],
+                passwordConfirmation: [
+                    {required: true, message: '请再次输入新密码', trigger: 'blur'},
+                    {validator: this.checkPassword, trigger: 'blur'},
+                ],
+            },
+        }
+    },
+    methods: {
+        submit() {
+            if (!this.formData.oldPassword) return this.$message.error('请输入原密码');
+            if (!this.formData.newPassword) return this.$message.error('请输入原密码');
+            if (!this.formData.passwordConfirmation) return this.$message.error('请输入原密码');
+            if (this.formData.newPassword !== this.formData.passwordConfirmation) return this.$message.error('两次输入的密码不一致!');
+            if (this.formData.newPassword === this.formData.oldPassword) return this.$message.error('新密码不能与原密码相同!');
+            if (this.formData.newPassword.length < 6) return this.$message.error('密码长度在 6 到 16 个字符');
+            const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]+$/
+            if (!reg.test(this.formData.newPassword)) {
+                return this.$message({
+                    message: '密码必须由数字和字母组成',
+                    type: 'error'
+                })
+            }
+            vk.callFunction({
+                url: 'user/kh/updatePwd',
+                data: this.formData
+            }).then(res => {
+                this.$message({
+                    type: 'success',
+                    message: '修改成功'
+                })
+                this.$refs.resetForm.resetFields();
+            })
+        },
+        checkPassword(rule, value, callback) {
+            if (value !== this.formData.newPassword) {
+                callback(new Error('两次输入的密码不一致!'));
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/user/components/seal.vue b/pages/user/components/seal.vue
index 285e8ea..ca2e6f6 100644
--- a/pages/user/components/seal.vue
+++ b/pages/user/components/seal.vue
@@ -64,7 +64,7 @@
 							type: "text",
 						},
 						{
-							key: "_add_time_srt",
+							key: "_add_time_str",
 							title: "添加时间",
 							type: "time",
 							width: 160
diff --git a/pages/user/components/setting.vue b/pages/user/components/setting.vue
index 51f130f..db26319 100644
--- a/pages/user/components/setting.vue
+++ b/pages/user/components/setting.vue
@@ -1,220 +1,389 @@
 <template>
-    <el-card class="box-card">
-        <div slot="header" class="clearfix" style="text-align: center">
-            <span style="font-size: 20px;line-height: 2em;">消息推送设置</span>
-            <div style="color: #999999">我们将针对您的选择，为您精准推送询价信息</div>
+  <el-card class="box-card">
+    <div slot="header" class="clearfix" style="text-align: center">
+      <span style="font-size: 20px;line-height: 2em;">消息推送设置</span>
+      <div style="color: #999999">我们将针对您的选择，为您精准推送询价信息</div>
+    </div>
+    <el-row class="setting-list" :gutter="50">
+      <el-col :span="12" v-for="(item,index) in settingList" :key="index">
+        <div class="item">
+          <div class="title">
+            <el-badge is-dot class="badge"></el-badge>
+            {{ item.title }}
+          </div>
+          <div class="btn">
+            <el-switch active-text="开启"
+                       v-model="item.status">
+            </el-switch>
+          </div>
         </div>
-        <el-row class="setting-list" :gutter="50">
-            <el-col :span="12" v-for="(item,index) in settingList" :key="index">
-                <div class="item">
-                    <div class="title">
-                        <el-badge is-dot class="badge"></el-badge>
-                        {{ item.title }}
-                    </div>
-                    <div class="btn">
-                        <el-switch
-                            v-model="item.status">
-                        </el-switch>
-                    </div>
-                </div>
-            </el-col>
-        </el-row>
-        <el-divider></el-divider>
-        <div class="form">
-            <div class="form-title">
-                * 请选择产品：
-            </div>
-            <el-form ref="form" :model="form" label-position="left" label-width="120px">
-                <el-form-item :label="item.name" v-for="(item, index) in productList" :key="index">
-                    <el-checkbox-group v-model="productList[index].idList" size="small">
-                        <el-checkbox v-for="(productItem, productIndex) in item.children" :key="productIndex"
-                                     :label="productItem._id" border
-                                     :checked="productList[index].idList.includes(item._id)">
-                            {{ item.name }}
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </el-form-item>
-            </el-form>
+      </el-col>
+    </el-row>
+    <el-divider></el-divider>
+    <div class="form">
+      <div class="form-title">
+        * 请选择产品：
+      </div>
+      <!--            <el-form ref="form" :model="form" label-position="left" label-width="120px">-->
+      <!--                <el-form-item :label="item.name" v-for="(item, index) in productList" :key="index">-->
+      <!--                    <el-checkbox-group v-model="productList[index].idList" size="small" class="flex justify-start items-start flex-wrap">-->
+      <!--                        <el-checkbox v-for="(productItem, productIndex) in item.children" :key="productIndex"-->
+      <!--                                     :label="productItem.name" border style="margin: 10px 10px 0 0"-->
+      <!--                                     :checked="productList[index].idList.includes(productItem.name)">-->
+      <!--                            {{ productItem.name }}-->
+      <!--                        </el-checkbox>-->
+      <!--                    </el-checkbox-group>-->
+      <!--                </el-form-item>-->
+      <!--            </el-form>-->
+      <div class="flex justify-center items-start">
+        <div v-for="(item, index) in productList" class="flex-1 mx-15" :key="index">
+          <div class="flex justify-start items-center">
+            <image :src="item.icon" style="width: 15px; height: 15px"/>
+            <span class="ml-10">{{ item.name }}</span>
+          </div>
+          <div class="ml-25 flex flex-wrap justify-start items-start">
+                        <span class="mr-25 mt-20 pointer" @click="changeCheck(productItem)"
+                              :class="[allSelectedProductList.includes(productItem.name) ? 'text-main' : '']"
+                              v-for="(productItem, productIndex) in item.children"
+                              :key="productIndex"> {{ productItem.name }}</span>
+          </div>
         </div>
-        <el-divider></el-divider>
-        <div class="form">
-            <div class="form-title">
-                * 请选择服务地区：
-            </div>
-            <el-row :gutter="10">
-                <el-col :span="4">
-                    <el-select v-model="addressIndex[0]" placeholder="请选择省">
-                        <el-option v-for="(item, index) in provinceData" :key="index"
-                                   :label="item.name"
-                                   :value="index">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="addressIndex[1]" placeholder="请选择市"
-                               :disabled="addressIndex.length === 0">
-                        <template v-if="addressIndex[0] !== null">
-                            <el-option v-for="(item, index) in cityData[addressIndex[0]]"
-                                       :key="index"
-                                       :label="item.name"
-                                       :value="index">
-                            </el-option>
-                        </template>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="addressIndex[2]" placeholder="请选择区"
-                               :disabled="addressIndex.length === 1">
-                        <template
-                            v-if="addressIndex[0] !== null && addressIndex[1] !== null">
-                            <el-option
-                                v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
-                                :key="index"
-                                :label="item.name"
-                                :value="index">
-                            </el-option>
-                        </template>
-                    </el-select>
-                </el-col>
-            </el-row>
+      </div>
+      <div class="flex justify-start items-center flex-wrap mt-20">
+        <span style="margin: 10px 10px 0 0">已选:</span>
+        <div class="flex justify-start items-center pointer" @click="changeCheck(productItem)"
+             v-for="(productItem, productIndex) in allProductList.filter(all => allSelectedProductList.includes(all.name))"
+             :key="productIndex" style="margin: 10px 10px 0 0">
+          <image src="/static/images/check.png" style="width: 12px; height: 12px; margin-right: 5px"/>
+          <span style="line-height: 18px">{{ productItem.parentName }}-{{ productItem.name }}</span>
         </div>
-        <el-divider></el-divider>
-        <el-button type="danger" round @click.native="save">保存设置</el-button>
-    </el-card>
+      </div>
+    </div>
+    <el-divider></el-divider>
+    <div class="form">
+      <div class="form-title">
+        * 请选择服务地区：
+      </div>
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-select size="small" v-model="addressIndex[0]" placeholder="请选择省">
+            <el-option v-for="(item, index) in provinceData" :key="index"
+                       :label="item.name"
+                       :value="index">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <el-select size="small" v-model="addressIndex[1]" placeholder="请选择市"
+                     :disabled="addressIndex[0] === null">
+            <template v-if="addressIndex[0] !== null">
+              <el-option v-for="(item, index) in cityData[addressIndex[0]]"
+                         :key="index"
+                         :label="item.name"
+                         :value="index">
+              </el-option>
+            </template>
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <el-select size="small" v-model="addressIndex[2]" placeholder="请选择区"
+                     :disabled="addressIndex[1] === null">
+            <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
+              <el-option
+                v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]"
+                :key="index"
+                :label="item.name"
+                :value="index">
+              </el-option>
+            </template>
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <div class="flex justify-start items-center">
+            <el-button type="primary" size="mini" @click="addAddress">添加</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="flex justify-start items-start flex-wrap mt-20">
+      <div class="flex justify-start items-center pointer" @click="deleteAddress(item)"
+           v-for="(item, index) in addressList"
+           :key="index" style="margin: 10px 10px 0 0">
+        <image src="/static/images/check.png" style="width: 12px; height: 12px; margin-right: 5px"/>
+        <span style="line-height: 18px">{{ item.province.name }}-{{
+            item.city ? item.city.name : '不限'
+          }}-{{ item.area ? item.area.name : '不限' }}</span>
+      </div>
+    </div>
+    <el-divider></el-divider>
+    <div class="form">
+      <div class="form-title">
+        * 请选择单笔交易额：
+      </div>
+      <div class="flex justify-start items-center">
+        <el-input size="small" v-model="tradeAmount[0]" placeholder="请输入金额" style="width: 200px">
+          <template #suffix>元</template>
+        </el-input>
+        <span class="mx-20">~</span>
+        <el-input size="small" v-model="tradeAmount[1]" placeholder="请输入金额" style="width: 200px">
+          <template #suffix>元</template>
+        </el-input>
+      </div>
+    </div>
+    <el-divider></el-divider>
+    <div class="form">
+      <div class="form-title">
+        * 请选择交易方式：
+      </div>
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <div class="flex justify-start items-center pointer" @click="changeItemCheck('tradeSelf')"
+               style="margin: 10px 10px 0 0">
+            <image :src="tradeSelf ? '/static/images/check.png' : '/static/images/uncheck.png'"
+                   style="width: 12px; height: 12px; margin-right: 5px"/>
+            <span style="line-height: 18px">自主交易</span>
+          </div>
+        </el-col>
+        <el-col :span="4">
+          <div class="flex justify-start items-center pointer" @click="changeItemCheck('tradePlatform')"
+               style="margin: 10px 10px 0 0">
+            <image :src="tradePlatform ? '/static/images/check.png' : '/static/images/uncheck.png'"
+                   style="width: 12px; height: 12px; margin-right: 5px"/>
+            <span style="line-height: 18px">金久信公证</span>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <el-divider></el-divider>
+    <div class="form">
+      <div class="form-title">
+        * 请设置免打扰时间段：
+      </div>
+      <div class="flex justify-start items-center">
+        <!--                <el-time-picker v-model="doNotDisturbRange" range-separator="~" is-range style="width: 200px"/>-->
+        <el-cascader v-model="settingList.doNotDisturbStart" :options="timeList"/>
+        <span class="mx-15">至</span>
+        <el-cascader v-model="settingList.doNotDisturbEnd" :options="timeList"/>
+      </div>
+    </div>
+    <el-button type="danger" round @click.native="save">保存设置</el-button>
+  </el-card>
 </template>
 
 <script>
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import {CheckCorrect} from '@icon-park/vue'
+import dayjs from "dayjs";
 
 export default {
-    data() {
-        return {
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            addressIndex: [null, null, null],
-            settingList: {
-                article: {
-                    title: '行情信息推送服务',
-                    status: false
-                },
-                process: {
-                    title: '找加工信息推送服务',
-                    status: false
-                },
-                old: {
-                    title: '旧货交易信息推送服务',
-                    status: false
-                },
-                enquiry: {
-                    title: '询价单和选项推送服务',
-                    status: false
-                },
-            },
-            form: {},
-            group1: [],
-            productList: [],
-            addressRegion: {}
-        }
-    },
-    async created() {
-        await this.getCate()
-        await this.getConfig()
-    },
-    methods: {
-        async getConfig() {
-            const res = await vk.callFunction({
-                url: 'client/message/config/kh/getConfig'
-            })
-            for (let key in this.settingList) this.settingList[key].status = res[key]
-            this.productList.forEach((item, index) => {
-                item.children.forEach(productItem => {
-                    if (res.productList.includes(productItem._id)) {
-                        this.productList[index].idList.push(productItem._id)
-                    }
-                })
-            })
-            if (res.addressRegion.province) {
-                this.addressIndex[0] = this.provinceData.findIndex(item => item.code === res.addressRegion.province.code)
-                if (this.addressIndex[0] !== -1) {
-                    this.addressIndex[1] = this.cityData[this.addressIndex[0]].findIndex(item => item.code === res.addressRegion.city.code)
-                    if (this.addressIndex[1] !== -1) {
-                        this.addressIndex[2] = this.areaData[this.addressIndex[0]][this.addressIndex[1]].findIndex(item => item.code === res.addressRegion.area.code)
-                    }
-                }
-            }
+  components: {CheckCorrect},
+  data() {
+    return {
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      addressIndex: [null, null, null],
+      addressList: [],
+      settingList: {
+        article: {
+          title: '现货推送服务',
+          status: false
         },
-        async getCate() {
-            const {rows} = await vk.callFunction({
-                url: 'client/spot/category/pub/getTree',
-                title: '请求中...',
-            });
-            this.productList = rows.map(item => {
-                item.idList = []
-                return item
-            })
+        process: {
+          title: '找加工信息推送服务',
+          status: false
         },
-        async save() {
-            let productList = []
-            this.productList.forEach(item => {
-                productList = [...productList, ...item.idList]
-            })
-            await vk.callFunction({
-                url: 'client/message/config/kh/update',
-                data: {
-                    article: this.settingList.article.status,
-                    process: this.settingList.process.status,
-                    old: this.settingList.old.status,
-                    enquiry: this.settingList.enquiry.status,
-                    productList,
-                    addressRegion: {
-                        province: this.provinceData[this.addressIndex[0]],
-                        city: this.cityData[this.addressIndex[0]][this.addressIndex[1]],
-                        area: this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]],
-                    }
-                }
-            })
-            this.$message({
-                type: 'success',
-                message: '保存成功'
-            })
-        }
+        old: {
+          title: '旧货交易信息推送服务',
+          status: false
+        },
+        enquiry: {
+          title: '询价单和选项推送服务',
+          status: false
+        },
+        doNotDisturbStart: [],
+        doNotDisturbEnd: [],
+      },
+      form: {},
+      group1: [],
+      productList: [],
+      allProductList: [],
+      allSelectedProductList: [],
+      addressRegion: {},
+      tradeSelf: false,
+      tradePlatform: false,
+      doNotDisturbRange: [new Date(2024, 1, 1, 0, 0), new Date(2024, 1, 1, 0, 0)],
+      tradeAmount: [],
+      timeList: []
     }
+  },
+  async created() {
+    await this.getCate()
+    await this.getConfig()
+    this.timeList = []
+    for (let i = 0; i < 24; i++) {
+      const minuteList = []
+      const secondList = []
+      for (let j = 0; j < 60; j++) {
+        secondList.push({
+          label: j.toString().padStart(2, '0') + '秒',
+          value: j
+        })
+      }
+      for (let j = 0; j < 60; j++) {
+        minuteList.push({
+          label: j.toString().padStart(2, '0') + '分',
+          value: j,
+          children: secondList
+        })
+      }
+      this.timeList.push({
+        label: i.toString().padStart(2, '0') + '时',
+        value: i,
+        children: minuteList
+      })
+    }
+  },
+  methods: {
+    async getConfig() {
+      const res = await vk.callFunction({
+        url: 'client/message/config/kh/getConfig'
+      })
+      this.allProductList = []
+      this.allSelectedProductList = []
+      for (let key in this.settingList) this.settingList[key].status = res[key]
+      this.productList.forEach((item, index) => {
+        item.children.forEach(productItem => {
+          if (res.productList.includes(productItem.name)) {
+            this.productList[index].idList.push(productItem.name)
+            this.allSelectedProductList.push(productItem.name)
+          }
+          this.allProductList.push({
+            ...productItem,
+            parentName: item.name
+          })
+        })
+      })
+      this.tradeSelf = res.tradeSelf ?? false
+      this.tradePlatform = res.tradePlatform ?? false
+      if (res.addressList) this.addressList = res.addressList
+      else {
+        this.addressList = []
+      }
+      this.settingList.doNotDisturbStart = res.doNotDisturbStart ?? []
+      this.settingList.doNotDisturbEnd = res.doNotDisturbEnd ?? []
+      const today = dayjs().format('YYYY-MM-DD')
+      this.tradeAmount = res.tradeAmount ?? []
+    },
+    async getCate() {
+      const {rows} = await vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+      });
+      this.productList = rows.map(item => {
+        item.idList = []
+        return item
+      })
+    },
+    async save() {
+      // let productList = []
+      // console.log(this.allSelectedProductList)
+      // this.productList.forEach(item => {
+      //   productList = [...productList, ...item.idList]
+      // })
+      await vk.callFunction({
+        url: 'client/message/config/kh/update',
+        data: {
+          article: this.settingList.article.status,
+          process: this.settingList.process.status,
+          old: this.settingList.old.status,
+          enquiry: this.settingList.enquiry.status,
+          productList: this.allSelectedProductList,
+          addressList: this.addressList,
+          tradeSelf: this.tradeSelf,
+          tradePlatform: this.tradePlatform,
+          doNotDisturbRange: this.doNotDisturbRange,
+          tradeAmount: this.tradeAmount,
+          doNotDisturbStart: this.settingList.doNotDisturbStart,
+          doNotDisturbEnd: this.settingList.doNotDisturbEnd,
+        }
+      })
+      this.$message({
+        type: 'success',
+        message: '保存成功'
+      })
+    },
+    changeCheck(product) {
+      const index = this.allSelectedProductList.findIndex(item => item === product.name)
+      if (index > -1) {
+        this.allSelectedProductList.splice(index, 1)
+      } else {
+        this.allSelectedProductList.push(product.name)
+      }
+    },
+    addAddress() {
+      if (!this.addressIndex[0]) return
+      this.addressList.push({
+        province: this.provinceData[this.addressIndex[0]],
+        city: this.addressIndex[1] != null ? this.cityData[this.addressIndex[0]][this.addressIndex[1]] : null,
+        area: this.addressIndex[2] != null ? this.areaData[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]] : null
+      })
+      this.addressIndex = [null, null, null]
+    },
+    deleteAddress(index) {
+      this.addressList.splice(index, 1)
+    },
+    changeItemCheck(field) {
+      this[field] = !this[field]
+    }
+  }
 }
 </script>
 
 <style lang="less">
 .setting-list {
-    .item {
+  .item {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    margin: 5px auto;
+
+    .title {
+      display: flex;
+      align-items: center;
+
+      .badge {
         display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        margin: 5px auto;
-
-        .title {
-            display: flex;
-            align-items: center;
-
-            .badge {
-                display: flex;
-                align-items: center;
-                padding: 0 5px;
-            }
-        }
+        align-items: center;
+        padding: 0 5px;
+      }
     }
+  }
 }
 
 .form-title {
-    color: #bf2b28;
-    font-size: 16px;
-    font-weight: 500;
-    line-height: 2em;
-    margin-bottom: 10px;
+  color: #bf2b28;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 2em;
+  margin-bottom: 10px;
 }
 
 .form {
-    padding: 10px;
+  padding: 10px;
+}
+
+/deep/ .i-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/deep/ .el-input__suffix {
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 </style>
diff --git a/pages/user/components/yaoqing.vue b/pages/user/components/yaoqing.vue
index f4d7e65..44fc100 100644
--- a/pages/user/components/yaoqing.vue
+++ b/pages/user/components/yaoqing.vue
@@ -40,7 +40,7 @@
             :before-close="handleClose">
             <view class="p3">
                 <view v-for="(item, index) in userLevelList" :key="index">
-                    <view class="item pointer"
+                    <view class="item pointer p-20"
                           v-if="item.recommendUpgrade && parseInt(item.recommendUpgrade) > 0"
                           :class="index == current ? 'active' : ''" @click="onSelect(item, index)">
                         <view class="t">{{ item.name }}</view>
@@ -50,7 +50,7 @@
             </view>
             <span slot="footer" class="dialog-footer">
 		    <el-button @click="dialogVisible = false">取 消</el-button>
-		    <el-button type="primary" @click="exchangeUpgrade">确定兑换</el-button>
+		    <el-button type="primary" @click="exchangeUpgrade" :disabled="current == null">确定兑换</el-button>
 		  </span>
         </el-dialog>
     </view>
@@ -61,7 +61,7 @@ export default {
     data() {
         return {
             progress: 0,
-            current: 0,
+            current: null,
             dialogVisible: false,
             user: this.vk.getVuex('$user.userInfo'),
             userLevelList: [],
@@ -77,9 +77,14 @@ export default {
         },
         onSelect(item, index) {
             if (parseInt(this.user.inviteNum) >= item.recommendUpgrade && item.level > parseInt(this.user.userLevel)) this.current = index
+            else this.$message({
+                type: 'error',
+                message: '您的邀请人数不足'
+            })
         },
         copy() {
-            const url = window.location.origin + `/#/pages/auth/register/register?code=${this.user.my_invite_code}`
+            // const url = window.location.origin + `/#/pages/auth/register/register?code=${this.user.my_invite_code}`
+            const url = this.user.my_invite_code
             document.oncopy = function (e) {
                 e.clipboardData.setData('text', url);
                 e.preventDefault();
@@ -172,7 +177,7 @@ export default {
 
         .item {
             width: 250upx;
-            height: 180upx;
+            min-height: 240upx;
             border-radius: 10upx;
             box-shadow: 1px 1px 5px 1px #A92924;
             display: flex;
@@ -181,6 +186,7 @@ export default {
             justify-content: center;
             font-size: 24upx;
             color: #A92924;
+            padding: 10upx 20upx;
 
             .t {
                 font-size: 30upx;
diff --git a/pages/user/order.vue b/pages/user/order.vue
deleted file mode 100644
index 5bb8ada..0000000
--- a/pages/user/order.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
-        <view class="flex justify-center items-start main-wrap">
-            <view class="flex-col flex-col justify-center items-center bg-white text-40 left-wrap pointer">
-                <view class="flex justify-center items-center" :class="[activeIndex === 0 ? 'active' : '' ]"
-                      @click="changeActive(0)">
-                    <text>询价管理</text>
-                </view>
-                <view class="flex justify-center items-center" :class="[activeIndex === 1 ? 'active' : '' ]"
-                      @click="changeActive(1)">
-                    <text>订单管理</text>
-                </view>
-                <view class="flex justify-center items-center" :class="[activeIndex === 2 ? 'active' : '' ]"
-                      @click="changeActive(2)">
-                    <text>合同管理</text>
-                </view>
-            </view>
-            <view class="w-1200 m-a bg-white p-40">
-                <el-table :data="tableData" style="width: 100%" border stripe>
-                    <el-table-column prop="orderNo" label="订单号" width="200"/>
-                    <el-table-column label="订单类型">
-                        <template v-slot="{ row }">
-                            <span>{{ row.type === 0 ? '普通订单' : '金久信自营订单' }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品列表" width="250">
-                        <template v-slot="{ row }">
-                            <view class="flex flex-col justify-start items-start">
-                                <view v-for="(item, index) in row.goods" :key="index"
-                                      class="flex justify-start items-start">
-                                    <image :src="item.goodsCover" class="goods-cover" v-if="row.type === 0"/>
-                                    <view class="ml-20 flex flex-col justify-start items-start">
-                                        <text class="text-main font-bold">{{ item.goodsName }}</text>
-                                        <text class="mt-20">￥{{ item.goodsPrice }}</text>
-                                        <text class="mt-20">x{{ item.num }}</text>
-                                    </view>
-                                </view>
-                            </view>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="amount" label="订单金额"/>
-                    <el-table-column prop="payAmount" label="支付金额"/>
-                    <el-table-column label="订单状态">
-                        <template v-slot="{ row }">
-                            <span v-if="row.orderStatus === 0">待支付</span>
-                            <span v-if="row.orderStatus === 1">已支付</span>
-                            <span v-if="row.orderStatus === 2">待收货</span>
-                            <span v-if="row.orderStatus === 3">已完成</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="_add_time_str" label="下单时间"/>
-                    <el-table-column label="操作">
-                        <template v-slot="{ row }">
-                            <text v-if="row.orderStatus === 0" class="text-main pointer" @click="repay(row)">去支付</text>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <view class="text-center mt-20">
-                    <el-pagination
-                        :page-size="pageSize"
-                        @current-change="getOrderList"
-                        background
-                        layout="prev, pager, next"
-                        :total="total">
-                    </el-pagination>
-                </view>
-            </view>
-        </view>
-        <gap height="50"/>
-        <common-footer></common-footer>
-        <right-bar></right-bar>
-    </view>
-</template>
-
-<script>
-import pay from "../index/shop/pay.vue";
-
-export default {
-    name: "order",
-    computed: {
-        pay() {
-            return pay
-        }
-    },
-    data() {
-        return {
-            tableData: [],
-            activeIndex: 0,
-            pageSize: 20,
-            total: 0,
-        }
-    },
-    methods: {
-        changeActive(index) {
-            this.list = []
-            this.mode = 'list'
-            if (index !== 2) this.activeIndex = index
-            if (index === 0) {
-            } else if (index === 1) this.getOrderList()
-            else if (index === 2) {
-                vk.navigateTo({
-                    url: '/pages/contract/index'
-                })
-            }
-        },
-        async getOrderList(pageIndex = 1) {
-            const {rows} = await vk.callFunction({
-                url: 'client/order/kh/getList',
-                data: {
-                    pageIndex,
-                    pageSize: this.pageSize,
-                }
-            })
-            this.tableData = rows
-            console.log(this.tableData)
-        },
-        async repay(row) {
-            await vk.callFunction({
-                url: 'client/order/kh/resetOrderNo',
-                data: {
-                    id: row._id,
-                }
-            })
-            vk.navigateTo({
-                url: `/pages/index/shop/pay?id=${row._id}`
-            })
-        }
-    },
-    onLoad(options) {
-        if (options && options.tab) {
-            this.changeActive(parseInt(options.tab))
-        } else {
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-
-.main-wrap {
-    width: 1200px;
-    margin: 20px auto;
-    position: relative;
-
-    .left-wrap {
-        position: absolute;
-        width: 220px;
-        left: -240px;
-        top: 0;
-
-        view {
-            padding: 20px;
-        }
-
-        .active {
-            background-color: #a92924;
-            color: white;
-        }
-    }
-}
-
-.goods-cover {
-    width: 80px;
-    height: 80px;
-}
-</style>
\ No newline at end of file
diff --git a/pages/user/school.vue b/pages/user/school.vue
index e2a45d8..f7869bf 100644
--- a/pages/user/school.vue
+++ b/pages/user/school.vue
@@ -1,8 +1,7 @@
 <template>
     <view>
         <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+        <common-nav></common-nav>
         <view class="w-1200 flex justify-start items-start my-25 m-a">
             <view class="flex-col flex-col justify-center items-center bg-white text-40 left-wrap pointer">
                 <view class="flex justify-center items-center" :class="[activeIndex === 0 ? 'active' : '' ]"
@@ -12,12 +11,12 @@
                 </view>
                 <view class="flex justify-center items-center" :class="[activeIndex === 1 ? 'active' : '' ]"
                       @click="changeActive(1)">
-                    <i class="el-icon-download"/>
+                    <i class="el-icon-star-off"/>
                     <text class="ml-20">我的收藏</text>
                 </view>
                 <view class="flex justify-center items-center" :class="[activeIndex === 2 ? 'active' : '' ]"
                       @click="changeActive(2)">
-                    <i class="el-icon-star-off"/>
+                    <i class="el-icon-download"/>
                     <text class="ml-20">我的下载</text>
                 </view>
             </view>
@@ -46,43 +45,81 @@
                         </view>
                         <el-button type="primary" @click="showAction">我要上传</el-button>
                     </view>
-                    <view class="flex flex-col justify-start items-start pointer w-100p">
-                        <view v-for="(item, index) in list" :key="index" class="content-item-wrap">
-                            <file-word theme="outline" size="80" fill="#4a90e2" strokeLinecap="square"/>
+                    <view class="flex flex-col justify-start items-start  w-100p">
+                        <view v-for="(item, index) in list" :key="index" class="content-item-wrap pointer"
+                              @click="navTo(`/pages/article/detail?id=${item._id}`)">
+                            <template v-if="item.files && item.files.length > 0">
+                                <template v-if="['doc', 'docx'].includes(item.files[0].split('.').pop())">
+                                    <file-word theme="outline" class="pointer" size="80" fill="#4a90e2" strokeLinecap="square"/>
+                                </template>
+                                <template v-else-if="['xls', 'xlsx'].includes(item.files[0].split('.').pop())">
+                                    <file-excel theme="outline" class="pointer" size="80" fill="#417505" strokeLinecap="square"/>
+                                </template>
+                                <template v-else-if="['pdf'].includes(item.files[0].split('.').pop())">
+                                    <file-pdf-one theme="outline" class="pointer" size="80" fill="#f5a623" strokeLinecap="square"/>
+                                </template>
+                                <template v-else>
+                                    <el-image :src="item.files[0]" style="width: 100px; height: 100px" fit="cover"
+                                              :preview-src-list="[item.files]"/>
+                                </template>
+                            </template>
                             <view class="content">
                                 <text class="title">{{ item.name }}</text>
                                 <view class="desc">
                                     <text class="item">{{ item._add_time_str }}</text>
                                     <text class="item">{{ item.viewNum }}人浏览</text>
                                     <text class="item">{{ item.downloadNum }}次下载</text>
-                                    <text class="item">{{
-                                            item.amount === 0 ? '免费下载' : `${item.amount}元下载`
-                                        }}
-                                    </text>
-                                    <!--                            <text class="item">{{ item._add_time_str }}</text>-->
                                 </view>
                             </view>
                         </view>
                     </view>
                 </template>
                 <template v-else>
-                    <view class="flex justify-start items-center">
-                        <text class="text-50">上传文档</text>
-                        <vk-data-upload v-model="form1.data.files" accept="image/*,application/pdf,application/msword,application/vnd.ms-excel,application/vnd.ms-powerpoint">
-                            <template>
-                                <el-button type="primary">点击上传</el-button>
-                            </template>
-                        </vk-data-upload>
-                        <!--                        <u-upload :custom-btn="true" :show-upload-list="false" :action="">-->
-                        <!--                            <template v-slot:addBtn>-->
-                        <!--                                <el-button type="primary">点击上传</el-button>-->
-                        <!--                            </template>-->
-                        <!--                        </u-upload>-->
-                    </view>
+                    <!--                    <view class="flex justify-start items-center">-->
+                    <!--                        <text class="text-50">上传文档</text>-->
+                    <!--                        <vk-data-upload v-model="form1.data.files" accept="image/*,application/pdf,application/msword,application/vnd.ms-excel,application/vnd.ms-powerpoint">-->
+                    <!--                            <template>-->
+                    <!--                                <el-button type="primary">点击上传</el-button>-->
+                    <!--                            </template>-->
+                    <!--                        </vk-data-upload>-->
+                    <!--                        <u-upload :custom-btn="true" :show-upload-list="false" :action="">-->
+                    <!--                            <template v-slot:addBtn>-->
+                    <!--                                <el-button type="primary">点击上传</el-button>-->
+                    <!--                            </template>-->
+                    <!--                        </u-upload>-->
+                    <!--                    </view>-->
                     <vk-data-form v-model="form1.data" :rules="form1.props.rules" :action="form1.props.action"
                                   :form-type="form1.props.formType" :columns='form1.props.columns' label-width="120px"
-                                  @success="addSuccess"></vk-data-form>
+                                  @success="addSuccess" :show-cancel="false">
+                        <!--                        <template v-slot:content="{ form, keyName }">-->
+                        <!--                            <div style="border: 1px solid #ccc;">-->
+                        <!--                                <Toolbar-->
+                        <!--                                    style="border-bottom: 1px solid #ccc"-->
+                        <!--                                    :editor="editor"-->
+                        <!--                                    :defaultConfig="toolbarConfig"-->
+                        <!--                                    mode="simple"-->
+                        <!--                                />-->
+                        <!--                                <Editor-->
+                        <!--                                    style="height: 500px; overflow-y: hidden;"-->
+                        <!--                                    v-model="form1.data.content"-->
+                        <!--                                    :defaultConfig="editorConfig"-->
+                        <!--                                    mode="simple"-->
+                        <!--                                    @onCreated="onCreated"-->
+                        <!--                                />-->
+                        <!--                            </div>-->
+                        <!--                        </template>-->
+                    </vk-data-form>
                 </template>
+                <div class="text-center">
+                    <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :total="total"
+                        :page-size="pageSize"
+                        @click="changePage"
+                    >
+                    </el-pagination>
+                </div>
             </view>
         </view>
         <common-footer></common-footer>
@@ -90,22 +127,29 @@
 </template>
 
 <script>
-import {FileWord} from "@icon-park/vue";
+import {FileExcel, FilePdfOne, FileWord} from "@icon-park/vue";
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue'
 
 export default {
     name: "school",
-    components: {FileWord},
+    components: {FilePdfOne, FileExcel, FileWord, Editor, Toolbar},
     data() {
         return {
+            total: 0,
+            pageSize: 5,
             activeIndex: 0,
             mode: 'list',
             list: [],
             cateList: [],
             uploadFile: null,
+            editor: null,
+            toolbarConfig: {},
+            editorConfig: {placeholder: '请输入内容...'},
             form1: {
                 // 表单请求数据，此处可以设置默认值
                 data: {
                     amount: 0,
+                    content: ''
                 },
                 // 表单属性
                 props: {
@@ -119,6 +163,12 @@ export default {
                             type: "text",
                             placeholder: "请输入标题"
                         },
+                        {
+                            key: "files",
+                            title: "附件",
+                            type: "file",
+                            accept: '.xls,.xlsx,.doc,.docx,.ppt,.pptx,.pdf,.png,.jpg,.jpeg'
+                        },
                         {
                             key: "parentId",
                             title: "分类",
@@ -132,24 +182,30 @@ export default {
                                 label: "name",
                             },
                         },
-                        {
-                            key: "content",
-                            title: "内容",
-                            type: "editor",
-                            placeholder: "请输入内容"
-                        },
-                        {
-                            key: "amount",
-                            title: "金额",
-                            type: "text",
-                            placeholder: "请输入内容",
-                        },
+                        {key: "content", title: "内容", type: "editor"},
+                        // {
+                        //     key: "content",
+                        //     title: "内容",
+                        //     type: "html",
+                        // },
+                        // {
+                        //     key: "amount",
+                        //     title: "金额",
+                        //     type: "text",
+                        //     placeholder: "请输入内容",
+                        // },
                     ],
                     // 表单验证规则
                     rules: {
                         name: [
                             {required: true, message: '名称不能为空', trigger: 'blur'},
                         ],
+                        parentId: [
+                            {required: true, message: '请选择分类', trigger: 'blur'},
+                        ],
+                        content: [
+                            {required: true, message: '请输入内容', trigger: 'blur'},
+                        ],
                     },
                     // add 代表添加 update 代表修改
                     formType: "",
@@ -160,17 +216,55 @@ export default {
         }
     },
     methods: {
-        async getList() {
+        onCreated(editor) {
+            this.editor = Object.seal(editor)
+        },
+        async getList(pageIndex = 1) {
             const {rows} = await vk.callFunction({
-                url: 'client/article/list/kh/getUserList'
+                url: 'client/article/list/kh/getUserList',
+                pageIndex,
+                pageSize: this.pageSize
             })
             this.list = rows
         },
-        async getCollectList() {
+        async getCollectList(pageIndex = 1) {
             const {rows} = await vk.callFunction({
-                url: 'client/article/collect/kh/getList'
+                url: 'client/article/collect/kh/getList',
+                pageIndex,
+                pageSize: this.pageSize
             })
-            this.list = rows
+            this.list = rows.map(item => {
+                if (item.article) {
+                    item._id = item.article._id
+                    item.name = item.article.name
+                    item._add_time_str = item.article._add_time_str
+                    item.viewNum = item.article.viewNum
+                    item.downloadNum = item.article.downloadNum
+                }
+                return item
+            })
+        },
+        async getDownloadList(pageIndex = 1) {
+            const {rows} = await vk.callFunction({
+                url: 'client/article/list/kh/getDownloadList',
+                pageIndex,
+                pageSize: this.pageSize
+            })
+            this.list = rows.map(item => {
+                if (item.article) {
+                    item._id = item.article._id
+                    item.name = item.article.name
+                    item._add_time_str = item.article._add_time_str
+                    item.viewNum = item.article.viewNum
+                    item.downloadNum = item.article.downloadNum
+                }
+                return item
+            })
+        },
+        changePage(page) {
+            if (this.activeIndex === 0) this.getList(page)
+            else if (this.activeIndex === 1) this.getCollectList(page)
+            else if (this.activeIndex === 2) this.getDownloadList(page)
         },
         changeActive(index) {
             this.list = []
@@ -178,6 +272,7 @@ export default {
             this.activeIndex = index
             if (index === 0) this.getList()
             else if (index === 1) this.getCollectList()
+            else if (index === 2) this.getDownloadList()
         },
         showAction() {
             this.mode = 'action'
@@ -187,6 +282,9 @@ export default {
             this.mode = 'list'
             this.activeIndex = 0
             this.getList()
+        },
+        navTo(url) {
+            vk.navigateTo({url})
         }
         // beforeUpload(file) {
         //     this.uploadFile = file
@@ -203,10 +301,23 @@ export default {
         // }
     },
     onLoad() {
+        if (!vk.getVuex('$user.userInfo.mobile')) {
+            this.$confirm('请先绑定手机号', '提示', {
+                confirmButtonText: '确定',
+                showCancelButton: false,
+                type: 'warning'
+            }).then(() => {
+                vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+            }).catch(() => {
+                vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+            })
+            return
+        }
         this.getList()
     }
 }
 </script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
 
 <style lang="scss" scoped>
 .left-wrap {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index ca33f91..8b6b1f6 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,117 +1,169 @@
 <template>
-	<view>
-		<top-bar></top-bar>
-        <common-nav></common-nav>
+  <view>
+    <top-bar></top-bar>
+    <common-nav></common-nav>
 
-		<view class="w-1200">
-			<el-row :gutter="20">
-				<el-col :span="6">
-					<el-menu @select="menuSelect" :default-active="currMenu" class="el-menu-vertical-demo">
-						<el-menu-item index="fadada">
-							<i class="el-icon-menu"></i>
-							<span slot="title">实名认证</span>
-						</el-menu-item>
-						<el-menu-item index="business-card">
-							<i class="el-icon-setting"></i>
-							<span slot="title">我的名片</span>
-						</el-menu-item>
-						<!-- <el-menu-item index="seal">
-                            <i class="el-icon-s-check"></i>
-                            <span slot="title">我的印章</span>
-                        </el-menu-item> -->
-						<el-menu-item index="notice">
-							<i class="el-icon-bell"></i>
-							<span slot="title">我的消息</span>
-						</el-menu-item>
-						<el-menu-item index="equity">
-							<i class="el-icon-wallet"></i>
-							<span slot="title">平台权益</span>
-						</el-menu-item>
-						<el-menu-item index="yaoqing">
-							<i class="el-icon-user"></i>
-							<span slot="title">我的邀请</span>
-						</el-menu-item>
-						<!--                        <el-menu-item index="grade">-->
-						<!--                            <i class="el-icon-user"></i>-->
-						<!--                            <span slot="title">会员等级(临时)</span>-->
-						<!--                        </el-menu-item>-->
-						<!--                        <el-menu-item index="added">-->
-						<!--                            <i class="el-icon-medal"></i>-->
-						<!--                            <span slot="title">购买增值服务(临时)</span>-->
-						<!--                        </el-menu-item>-->
-					</el-menu>
-				</el-col>
-				<el-col :span="18">
-					<personal v-if="currMenu === 'fadada'"></personal>
-					<business-card v-else-if="currMenu === 'business-card'"></business-card>
-					<seal v-else-if="currMenu === 'seal'"></seal>
-					<notice v-else-if="currMenu === 'notice'" @done="onDone"></notice>
-					<setting v-else-if="currMenu === 'setting'" @done="onDone"></setting>
-					<equity v-else-if="currMenu === 'equity'" @done="onDone"></equity>
-					<payment v-else-if="currMenu === 'payment'" @done="onDone"></payment>
-					<grade v-else-if="currMenu === 'grade'" @done="onDone"></grade>
-					<Added v-else-if="currMenu === 'added'" @done="onDone"></Added>
-					<Yaoqing v-else-if="currMenu === 'yaoqing'" @done="onDone"></Yaoqing>
-				</el-col>
-			</el-row>
+    <view class="w-1200">
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-menu @select="menuSelect" :default-active="currMenu" class="el-menu-vertical-demo">
+            <el-menu-item index="fadada">
+              <i class="el-icon-menu"></i>
+              <span slot="title">实名认证</span>
+            </el-menu-item>
+            <!--                        <el-menu-item index="business-card">-->
+            <!--                            <i class="el-icon-setting"></i>-->
+            <!--                            <span slot="title">我的名片</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="business-contact">-->
+            <!--                            <i class="el-icon-phone"></i>-->
+            <!--                            <span slot="title">业务联系人</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="notice">-->
+            <!--                            <i class="el-icon-bell"></i>-->
+            <!--                            <span slot="title">我的消息</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="equity">-->
+            <!--                            <i class="el-icon-s-cooperation"></i>-->
+            <!--                            <span slot="title">平台权益</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="yaoqing">-->
+            <!--                            <i class="el-icon-user"></i>-->
+            <!--                            <span slot="title">我的邀请</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="factory">-->
+            <!--                            <i class="el-icon-office-building"></i>-->
+            <!--                            <span slot="title">我的加工厂</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="account">-->
+            <!--                            <i class="el-icon-wallet"></i>-->
+            <!--                            <span slot="title">收款账户</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="news" v-if="userInfo.userLevel > 1">-->
+            <!--                            <i class="el-icon-s-order"></i>-->
+            <!--                            <span slot="title">新闻动态</span>-->
+            <!--                        </el-menu-item>-->
+            <el-menu-item index="pwd">
+              <i class="el-icon-lock"></i>
+              <span slot="title">修改密码</span>
+            </el-menu-item>
+            <!--                        <el-menu-item index="grade">-->
+            <!--                            <i class="el-icon-user"></i>-->
+            <!--                            <span slot="title">会员等级(临时)</span>-->
+            <!--                        </el-menu-item>-->
+            <!--                        <el-menu-item index="added">-->
+            <!--                            <i class="el-icon-medal"></i>-->
+            <!--                            <span slot="title">购买增值服务(临时)</span>-->
+            <!--                        </el-menu-item>-->
+          </el-menu>
+        </el-col>
+        <el-col :span="20">
+          <personal v-if="currMenu === 'fadada'" @done="onDone"></personal>
+          <business-card v-else-if="currMenu === 'business-card'"></business-card>
+          <business-contact v-else-if="currMenu === 'business-contact'"></business-contact>
+          <seal v-else-if="currMenu === 'seal'"></seal>
+          <notice v-else-if="currMenu === 'notice'" @done="onDone"></notice>
+          <setting v-else-if="currMenu === 'setting'" @done="onDone"></setting>
+          <equity v-else-if="currMenu === 'equity'" @done="onDone"></equity>
+          <payment v-else-if="currMenu === 'payment'" @done="onDone"></payment>
+          <grade v-else-if="currMenu === 'grade'" @done="onDone"></grade>
+          <Added v-else-if="currMenu === 'added'" @done="onDone"></Added>
+          <Yaoqing v-else-if="currMenu === 'yaoqing'" @done="onDone"></Yaoqing>
+          <factory v-else-if="currMenu === 'factory'" @done="onDone"></factory>
+          <pwd v-else-if="currMenu === 'pwd'" @done="onDone"></pwd>
+          <account v-else-if="currMenu === 'account'" @done="onDone"></account>
+          <news v-else-if="currMenu === 'news'" @done="onDone"></news>
+        </el-col>
+      </el-row>
 
-		</view>
-		<!-- 现货市场 end -->
-		<gap height="100" />
-		<common-footer></common-footer>
-		<right-bar></right-bar>
-	</view>
+    </view>
+    <!-- 现货市场 end -->
+    <gap height="100"/>
+    <common-footer></common-footer>
+<!--    <right-bar></right-bar>-->
+  </view>
 </template>
 
 <script>
-	import Personal from './components/personal'
-	import BusinessCard from './components/business-card'
-	import Seal from './components/seal'
-	import Notice from './components/notice'
-	import Setting from './components/setting'
-	import Equity from './components/equity'
-	import Grade from './components/grade'
-	import Added from './components/added'
-	import Payment from './components/payment'
-	import Yaoqing from './components/yaoqing'
+import Personal from './components/personal'
+import BusinessCard from './components/business-card'
+import Seal from './components/seal'
+import Notice from './components/notice'
+import Setting from './components/setting'
+import Equity from './components/equity'
+import Grade from './components/grade'
+import Added from './components/added'
+import Payment from './components/payment'
+import Yaoqing from './components/yaoqing'
+import Factory from "./components/factory.vue";
+import Pwd from "./components/pwd.vue";
+import BusinessContact from "./components/business-contact.vue";
+import Account from "./components/account.vue";
+import News from "./components/news.vue";
 
-	export default {
-		components: {
-			Personal,
-			BusinessCard,
-			Seal,
-			Notice,
-			Equity,
-			Setting,
-			Grade,
-			Added,
-			Payment,
-			Yaoqing
-		},
-		data() {
-			return {
-				currMenu: 'fadada',
-			};
-		},
-		onLoad(options) {
-			if (options && options.menu) {
-				this.currMenu = options.menu
-			}
-		},
-		methods: {
-			menuSelect(e) {
-				this.currMenu = e
-			},
-			onDone(index) {
-				this.currMenu = index
-			}
-		}
-	}
+export default {
+  components: {
+    Account,
+    BusinessContact,
+    Pwd,
+    Factory,
+    Personal,
+    BusinessCard,
+    Seal,
+    Notice,
+    Equity,
+    Setting,
+    Grade,
+    Added,
+    Payment,
+    Yaoqing,
+    News,
+  },
+  data() {
+    return {
+      currMenu: 'fadada',
+      userInfo: null
+    };
+  },
+  onLoad(options) {
+    if (options && options.menu) {
+      this.currMenu = options.menu
+    }
+    this.getUserInfo()
+  },
+  methods: {
+    menuSelect(e) {
+      this.currMenu = e
+    },
+    onDone(index) {
+      this.currMenu = index
+    },
+    getUserInfo() {
+      vk.userCenter.getCurrentUserInfo({
+        success: (data) => {
+          this.userInfo = data.userInfo
+          if (!this.userInfo.mobile) {
+            this.$confirm('请先绑定手机号', '提示', {
+              confirmButtonText: '确定',
+              showCancelButton: false,
+              type: 'warning'
+            }).then(() => {
+              vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+            }).catch(() => {
+              vk.redirectTo(`/pages/auth/login/wechat?state=jjx_` + vk.getVuex('$user.userInfo.accountType'))
+            })
+            return
+          }
+        }
+      });
+    },
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.w-1200 {
-		width: 1200px;
-		margin: 20px auto;
-	}
+.w-1200 {
+  width: 1200px;
+  margin: 20px auto;
+}
 </style>
\ No newline at end of file
diff --git a/pages/yellowPage/components/enquiry.vue b/pages/yellowPage/components/enquiry.vue
new file mode 100644
index 0000000..e7383a9
--- /dev/null
+++ b/pages/yellowPage/components/enquiry.vue
@@ -0,0 +1,49 @@
+<template>
+  <view>
+    <view class="bg-gray-light flex justify-center items-center table-header p-30">
+      <view class="text-gray font-bold text-30 flex-1">品名/材质</view>
+      <view class="text-gray font-bold text-30 flex-1">采购量</view>
+      <view class="text-gray font-bold text-30 flex-2">采购企业</view>
+      <view class="text-gray font-bold text-30 flex-1">报价情况</view>
+      <view class="text-gray font-bold text-30 flex-1">发布时间</view>
+      <view class="text-gray font-bold text-30 flex-1 flex justify-end">操作</view>
+    </view>
+    <view class="flex justify-center items-center w-100p p-30"
+          v-for="(item, index) in info.enquiryList.filter((_, i) => i < limit)" :key="`enquiryList_${index}`">
+      <template
+        v-if="item.productList && item.productList.length > 0 && JSON.stringify(item.productList[0]) !== '{}'">
+        <view class="text-main flex-1 font-bold">{{ item.productList[0].goodsName }}</view>
+        <view class="flex-1">{{ item.productList[0].procureNumber }}{{
+            item.productList[0].procureUnit
+          }}
+        </view>
+        <view class="flex-2">{{ info.company.companyName }}</view>
+        <view class="flex-1">{{ item.answerNumber }}家已报价</view>
+        <view class="flex-1">{{ item._add_time_str }}</view>
+        <view class="flex-1 flex justify-end">
+          <el-button type="primary" plain class="empty-bg-plain-btn"
+                     @click.native="vk.navigateTo('/pages/enquiry/detail?id=' + item._id);">
+            查看详情
+          </el-button>
+        </view>
+      </template>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "enquiry",
+  props: {
+    info: Object,
+    limit: {
+      type: Number,
+      default: 999999
+    },
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
\ No newline at end of file
diff --git a/pages/yellowPage/components/process.vue b/pages/yellowPage/components/process.vue
new file mode 100644
index 0000000..6775fa1
--- /dev/null
+++ b/pages/yellowPage/components/process.vue
@@ -0,0 +1,71 @@
+<template>
+  <view>
+    <view class="bg-gray-light flex justify-center items-center table-header p-30">
+      <view class="text-gray font-bold text-30 flex-1">品名/材质</view>
+      <view class="text-gray font-bold text-30 flex-1">加工量</view>
+      <!--                        <view class="text-gray flex-1">收购地</view>-->
+      <view class="text-gray font-bold text-30 flex-2">采购企业</view>
+      <view class="text-gray font-bold text-30 flex-1">报价情况</view>
+      <view class="text-gray font-bold text-30 flex-1">发布时间</view>
+      <view class="text-gray font-bold text-30 flex-1 flex justify-end">操作</view>
+    </view>
+    <view class="flex justify-center items-center w-100p p-30"
+          v-for="(item, index) in info.processList" :key="`processList_${index}`">
+      <view class="text-main flex-1 font-bold">{{ item.title }}</view>
+      <!--                        <view class="flex-1">{{ item.address  }}</view>-->
+      <view class="flex-1">{{ item.num }}</view>
+      <view class="flex-2">{{ info.company.companyName }}</view>
+      <view class="flex-1">{{ item.answerNumber }}家已报价</view>
+      <view class="flex-1">{{ item._add_time_str }}</view>
+      <view class="flex-1 flex justify-end">
+        <el-button type="primary" plain class="empty-bg-plain-btn"
+                   @click.native="toProcessDetail(item._id)">查看详情
+        </el-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "process",
+  props: {
+    info: Object,
+    limit: {
+      type: Number,
+      default: 999999
+    },
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    async toProcessDetail(id) {
+      const {userInfo} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo('/pages/user/user?menu=fadada');
+        })
+      } else {
+        vk.navigateTo({
+          url: `/pages/process/detail?id=${id}`
+        })
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages/yellowPage/factory.vue b/pages/yellowPage/factory.vue
new file mode 100644
index 0000000..feeab4b
--- /dev/null
+++ b/pages/yellowPage/factory.vue
@@ -0,0 +1,149 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+        <gap/>
+        <view class="m-a w-1200 bg-white p-20 rounded">
+            <el-divider>
+                <span class="text-50 text-main font-bold">工厂信息</span>
+            </el-divider>
+            <el-descriptions border :column="2">
+                <el-descriptions-item label="成立年限">
+                    <p>{{ info.year }}年</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="年产值">
+                    <p>{{ info.yearsIncome }}万元</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="员工人数">
+                    <p>{{ info.employeeNum }}人</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="流水线数量">
+                    <p>{{ info.flowNum }}条</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="厂房归属">
+                    <p>{{ info.blongTo }}</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="厂房面积">
+                    <p>{{ info.size }}平方米</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="所在地">
+                    <p>{{ info.addressRegion.province.name }}{{ info.addressRegion.city.name }}</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="主营工艺和业务范围">
+                    <p>{{ info.mainProcess }}</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="主营类别" v-if="info.mainSpotCategory">
+                    <p>{{ info.mainSpotCategory.join() }}</p>
+                </el-descriptions-item>
+                <el-descriptions-item label="服务信息">
+                    <p>{{ info.serviceInfo }}</p>
+                </el-descriptions-item>
+            </el-descriptions>
+            <template v-if="info.video">
+                <el-divider>
+                    <span class="text-50 text-main font-bold">视频</span>
+                </el-divider>
+                <video :src="info.video" style="width: 100%" controls></video>
+            </template>
+            <el-divider>
+                <span class="text-50 text-main font-bold">设备信息</span>
+            </el-divider>
+            <el-row :gutter="10" class="p-20 bg-gray-light">
+                <el-col :span="3">
+                    <p class="text-center">设备名称</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">设备数量</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">设备来源</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">设备类型</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">品牌</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">型号</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">投产年限</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">特点描述</p>
+                </el-col>
+            </el-row>
+            <el-row :gutter="10" class="p-20" v-for="(item, index) in info.deviceList" :key="index">
+                <el-col :span="3">
+                    <p class="text-center">{{ item.name }}</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.num }}台</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.source }}</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.type }}</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.brand }}</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.model }}</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.year }}年</p>
+                </el-col>
+                <el-col :span="3">
+                    <p class="text-center">{{ item.desc }}</p>
+                </el-col>
+            </el-row>
+            <el-divider>
+                <span class="text-50 text-main font-bold">工厂实景</span>
+            </el-divider>
+            <div class="flex justify-start items-start">
+                <el-image v-for="(item, index) in info.album" :key="index" :src="item" class="mr-25 mb-25"
+                          style="width: 200px; height: 200px;" fit="cover" :preview-src-list="info.album"/>
+            </div>
+        </view>
+        <gap/>
+        <common-footer></common-footer>
+    </view>
+</template>
+
+<script>
+export default {
+    name: "factory",
+    data() {
+        return {
+            info: null
+        }
+    },
+    methods: {
+        async getInfo(userId) {
+            const {data} = await vk.callFunction({
+                url: 'client/factory/pub/getInfo',
+                data: {
+                    userId
+                }
+            })
+            if (!data) {
+                this.$message.error('获取工厂信息失败')
+                setTimeout(() => {
+                    vk.navigationBack()
+                }, 1000)
+            } else {
+                this.info = data
+            }
+        }
+    },
+    onLoad(options) {
+        if (options && options.userId) {
+            this.getInfo(options.userId)
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/yellowPage/info.vue b/pages/yellowPage/info.vue
index b358a80..e8ae308 100644
--- a/pages/yellowPage/info.vue
+++ b/pages/yellowPage/info.vue
@@ -1,169 +1,232 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <view class="w-1200 m-a">
-            <view class="page-nav">
-                <el-breadcrumb separator=">">
-                    <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-                    <el-breadcrumb-item>
-                        <navigator style="display: inline-block;" url="/pages/yellowPage/list">金久信黄页</navigator>
-                    </el-breadcrumb-item>
-                    <el-breadcrumb-item class="text-main">{{ info.company.companyName }}</el-breadcrumb-item>
-                </el-breadcrumb>
-            </view>
-            <view class="mt-40 bg-white company">
-                <view class="p-50 flex justify-between items-center pb-30 border-bottom">
-                    <view class="flex justify-start items-center">
-                        <image class="logo" :src="info.businessCard.logo" v-if="info.businessCard"/>
-                        <view class="ml-35 flex flex-col justify-start items-start">
-                            <text class="text-40 font-bold">{{ info.company.companyName }}</text>
-                            <text class="text-gray text-28 mt-40" v-if="info.businessCard">主营业务:
-                                {{ info.businessCard.mainBusiness }}
-                            </text>
-                        </view>
-                    </view>
-                    <view class="flex justify-end items-center">
-                        <view class="flex flex-col justify-center items-center">
-                            <view class="flex justify-center items-center">
-                                <protect theme="filled" size="24" fill="#d0021b" strokeLinecap="square"/>
-                                <view class="text-gray">平台累计交易</view>
-                            </view>
-                            <text class="text-main font-bold text-50">{{ info.transactionAmount }}</text>
-                        </view>
-                        <view class="flex flex-col justify-center items-center ml-35">
-                            <view class="flex justify-center items-center">
-                                <exchange-three theme="filled" size="24" fill="#d0021b" strokeLinecap="square"/>
-                                <view class="text-gray">已缴纳交易保证金</view>
-                            </view>
-                            <text class="text-main font-bold text-50">{{ info.paidEnsure }}</text>
-                        </view>
+    <view class="w-1200 m-a">
+      <view class="page-nav">
+        <el-breadcrumb separator=">">
+          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+          <el-breadcrumb-item>
+            <navigator style="display: inline-block;" url="/pages/yellowPage/list">金久信黄页</navigator>
+          </el-breadcrumb-item>
+          <el-breadcrumb-item class="text-main">{{ info.company.companyName }}</el-breadcrumb-item>
+        </el-breadcrumb>
+      </view>
+      <view class="mt-40 bg-white company">
+        <view class="p-50 flex justify-between items-center pb-30 border-bottom">
+          <view class="flex justify-start items-center">
+            <image class="logo" :src="info.businessCard.logo" v-if="info.businessCard"/>
+            <view class="ml-35 flex flex-col justify-start items-start ">
+              <view class="flex justify-between items-center w-100p">
+                <text class="text-40 font-bold">{{ info.company.companyName }}</text>
+                <view class="flex justify-end items-start">
+                  <view class="flex justify-center items-center">
+                    <protect theme="filled" size="24" fill="#d0021b" strokeLinecap="square"/>
+                    <view class="text-gray mx-15">平台累计交易</view>
+                  </view>
+                  <text class="text-main font-bold text-50">{{ info.transactionAmount.toFixed(2) }}</text>
+                  <view class="flex justify-end items-start " v-if="info.paidEnsure && info.paidEnsure > 0" style="margin-left: 60rpx">
+                    <view class="flex justify-center items-center">
+                      <exchange-three theme="filled" size="24" fill="#d0021b" strokeLinecap="square"/>
+                      <view class="text-gray mx-15">已缴纳交易保证金</view>
                     </view>
+                    <text class="text-main font-bold text-50">{{ info.paidEnsure.toFixed(2) }}</text>
+                  </view>
                 </view>
-                <view class="mt-30 p-40">
-                    <view class="flex justify-between items-center mb-20">
-                        <view class="title">企业简介</view>
-                        <view class="mt-20" v-html="info.companyIntroduction"></view>
-                    </view>
-                    <view class="flex flex-col justify-start items-start mb-20">
-                        <view class="title">联系我们</view>
-                        <view class="mt-20 flex justify-start items-start flex-wrap w-100p text-30">
-                            <view class="flex justify-start items-center w-33p mb-20">
-                                <i class="el-icon-map-location mr-15"/>
-                                <text v-if="info.manager">地址:{{ info.manager.address }}</text>
-                            </view>
-                            <view class="flex justify-start items-center w-33p mb-20">
-                                <i class="el-icon-phone mr-15"/>
-                                <text v-if="info.businessCard">电话:{{ info.businessCard.phone }}</text>
-                            </view>
-                            <view class="flex justify-start items-center w-33p mb-20">
-                                <i class="el-icon-mobile mr-15"/>
-                                <text v-if="info.businessCard">手机:{{ info.businessCard.mobile }}</text>
-                            </view>
-                            <view class="flex justify-start items-center w-33p">
-                                <i class="el-icon-message mr-15"/>
-                                <text v-if="info.businessCard">邮箱:{{ info.businessCard.email }}</text>
-                            </view>
-                            <view class="flex justify-start items-center w-33p">
-                                <i class="el-icon-data-board mr-15"/>
-                                <text v-if="info.businessCard">网址:{{ info.businessCard.website }}</text>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="flex flex-col justify-start items-start mb-20">
-                        <view class="title">发布的现货</view>
-                        <view class="mt-20 bg-gray w-100p p-40" v-for="(item, index) in info.spotList" :key="index">
-                            <view class="w-100p flex justify-between items-center">
-                                <text class="font-bold text-40">{{ item.name }}</text>
-                                <el-button type="primary" plain class="empty-bg-plain-btn"
-                                           @click.native="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id)">查看详情
-                                </el-button>
-                            </view>
-                            <view class="w-60p flex justify-between items-center text-main my-20">
-                                <text>库存:{{ item.stock }}吨</text>
-                                <text>供货地:{{ item.address.province.name }}-{{
-                                        item.address.city.name
-                                    }}-{{ item.address.area.name }}
-                                </text>
-                            </view>
-                            <view class="w-60p flex justify-between items-center text-gray">
-                                <view class="flex justify-start items-center">
-                                    <i class="el-icon-user"/>
-                                    <text>{{ info.company.companyName }}</text>
-                                </view>
-                                <text class="">{{ item._add_time_str }}发布</text>
-                            </view>
+              </view>
+              <text class="text-gray text-28 mt-40" v-if="info.company.mainSpotCategory">
+                主营业务:{{ info.company.mainSpotCategory.join() }}
+              </text>
+            </view>
+          </view>
 
-                        </view>
-                    </view>
-                    <view class="flex justify-between items-start mb-20">
-                        <view class="title">发布的询价单</view>
-                        <view class="text-main pointer" @click="vk.navigateTo('/pages/spot/goods/goods')">查看更多>
-                        </view>
-                    </view>
-                    <view class="bg-gray-light flex justify-center items-center table-header p-20">
-                        <view class="text-gray flex-1">品名/材质</view>
-                        <view class="text-gray flex-1">采购量</view>
-                        <view class="text-gray flex-1">收购地</view>
-                        <view class="text-gray flex-1">采购企业</view>
-                        <view class="text-gray flex-1">报价情况</view>
-                        <view class="text-gray flex-1">发布时间</view>
-                        <view class="text-gray flex-1">操作</view>
-                    </view>
-                    <view class="flex justify-center items-center mt-20 w-100p p-20"
-                          v-for="(item, index) in info.enquiryList" :key="index">
-                        <template v-if="item.productList && item.productList.length > 0 && JSON.stringify(item.productList[0]) !== '{}'">
-                            <view class="text-main flex-1">{{ item.productList[0].goodsName }}</view>
-                            <view class="flex-1">{{ item.productList[0].procureNumber }}{{
-                                    item.productList[0].procureUnit
-                                }}
-                            </view>
-                            <view class="flex-1">{{ item.address }}</view>
-                            <view class="flex-1">{{ info.company.companyName }}</view>
-                            <view class="flex-1">{{ item.answerNumber }}家已报价</view>
-                            <view class="flex-1">{{ item._add_time_str }}</view>
-                            <view class="flex-1">
-                                <el-button type="primary" plain class="empty-bg-plain-btn"
-                                           @click.native="vk.navigateTo('/pages/enquiry/detail?id=' + item._id);">查看
-                                </el-button>
-                            </view>
-                        </template>
-                    </view>
-                    <view class="flex justify-between items-start mb-20">
-                        <view class="title">发布的加工单</view>
-                        <view class="text-main" @click="vk.navigateTo('/pages/process/list')">查看更多></view>
-                    </view>
-                    <view class="bg-gray-light flex justify-center items-center table-header p-20">
-                        <view class="text-gray flex-1">品名/材质</view>
-                        <view class="text-gray flex-1">加工量</view>
-                        <!--                        <view class="text-gray flex-1">收购地</view>-->
-                        <view class="text-gray flex-1">采购企业</view>
-                        <view class="text-gray flex-1">报价情况</view>
-                        <view class="text-gray flex-1">发布时间</view>
-                        <view class="text-gray flex-1">操作</view>
-                    </view>
-                    <view class="flex justify-center items-center mt-20 w-100p p-20"
-                          v-for="(item, index) in info.processList" :key="index">
-                        <view class="text-main flex-1">{{ item.title }}</view>
-                        <!--                        <view class="flex-1">{{ item.address  }}</view>-->
-                        <view class="flex-1">{{ item.num }}</view>
-                        <view class="flex-1">{{ info.company.companyName }}</view>
-                        <view class="flex-1">{{ item.answerNumber }}家已报价</view>
-                        <view class="flex-1">{{ item._add_time_str }}</view>
-                        <view class="flex-1">
-                            <el-button type="primary" plain class="empty-bg-plain-btn"
-                                       @click.native="toProcessDetail(row._id)">查看
-                            </el-button>
-                        </view>
-                    </view>
-                </view>
-            </view>
         </view>
-        <gap/>
-        <common-footer></common-footer>
+        <view class="mt-30 p-40" v-if="info">
+          <el-carousel height="300px`" :style="{width: '100%'}" class="m-a"
+                       v-if="info.businessCard && info.businessCard.album">
+            <template v-if="Array.isArray(info.businessCard.album)">
+              <el-carousel-item v-for="(item, index) in info.businessCard.album" :key="index"
+                                :style="{width: '100%'}">
+                <el-image :src="item" fit="cover" :style="{width: '100%'}"/>
+              </el-carousel-item>
+            </template>
+            <el-carousel-item v-else :style="{width: '100%'}">
+              <el-image :src="info.businessCard.album" fit="cover" :style="{width: '100%'}"/>
+            </el-carousel-item>
+          </el-carousel>
+          <view class="flex flex-col justify-start items-start mb-20">
+            <view class="title">企业简介</view>
+            <view class="mt-20" v-if="info.businessCard && info.businessCard.companyIntroduction"
+                  v-html="info.businessCard.companyIntroduction"></view>
+            <text v-else>商家暂未填写</text>
+          </view>
+          <view class="flex flex-col justify-start items-start mb-20"
+                v-if="info.businessCard && info.businessCard.video">
+            <view class="title">企业视频</view>
+            <video :src="info.businessCard.video" autoplay controls style="width: 100%"/>
+          </view>
+          <view class="flex flex-col justify-start items-start mb-20"
+                v-if="info.businessCard && info.businessCard.productImageList">
+            <view class="title">产品展示</view>
+            <view class="flex justify-start items-start flex-wrap">
+              <el-image :preview-src-list="info.businessCard.productImageList" :src="item"
+                        v-for="(item, index) in info.businessCard.productImageList"
+                        :key="index" fit="cover"
+                        :style="{margin: (index !== 0 && (index + 1) % 5 === 0) ? '0 0 21px 0' : '0 21px 21px 0'}"
+                        style="width: 215px; height: 215px;"/>
+            </view>
+          </view>
+          <view class="flex flex-col justify-start items-start mb-20"
+                v-if="info.businessCard && info.businessCard.exampleImageList">
+            <view class="title">案例展示</view>
+            <view class="flex justify-start items-start flex-wrap">
+              <el-image :preview-src-list="info.businessCard.exampleImageList" :src="item"
+                        v-for="(item, index) in info.businessCard.exampleImageList"
+                        :style="{margin: (index !== 0 && (index + 1) % 5 === 0) ? '0 0 21px 0' : '0 21px 21px 0'}"
+                        :key="index" fit="cover"
+                        style="width: 215px; height: 215px;"/>
+            </view>
+          </view>
+          <view class="flex flex-col justify-start items-start mb-20"
+                v-if="info.businessCard && info.businessCard.longitude">
+            <view class="title">地图定位</view>
+            <view class="mapDiv">
+              <tdt-map :center="[info.businessCard.longitude, info.businessCard.latitude]" :zoom="12">
+                <tdt-marker :position="[info.businessCard.longitude, info.businessCard.latitude]"
+                            :draggable="false"/>
+              </tdt-map>
+            </view>
+          </view>
+          <view class="flex flex-col justify-start items-start mb-20"
+                v-if="userArticle.length > 0">
+            <view class="title">新闻动态</view>
+            <view class="flex justify-start items-start flex-col w-100p">
+              <view class="flex justify-between items-center pointer w-100p mb-25"
+                    @click="showArticle(index)"
+                    v-for="(item, index) in userArticle" :key="index">
+                <text>{{ item.title }}</text>
+                <text class="text-gray">{{ item._add_time_str }}</text>
+              </view>
+            </view>
+          </view>
+          <view class="flex flex-col justify-start items-start mb-20">
+            <view class="title">联系我们</view>
+            <view class="mt-20 flex justify-start items-start flex-wrap w-100p text-30">
+              <view class="flex justify-start items-center w-50p mb-20">
+                <i class="el-icon-map-location mr-15"/>
+                <text class="content" v-if="info.company.addressRegion">地址:{{
+                    info.company.addressRegion.province.name
+                  }}{{ info.company.addressRegion.city.name }}{{
+                    info.company.addressRegion.area.name
+                  }}{{ info.company.addressDetail }}
+                </text>
+              </view>
+              <view class="flex justify-start items-center w-25p mb-20">
+                <i class="el-icon-phone mr-15"/>
+                <text class="content" v-if="info.businessCard">电话:{{
+                    info.businessCard.companyMobile ? info.businessCard.companyMobile : '商家暂未填写'
+                  }}
+                </text>
+              </view>
+              <view class="flex justify-start items-center w-25p mb-20">
+                <i class="el-icon-mobile mr-15"/>
+                <text class="content" v-if="info.manager">手机:{{
+                    info.manager.mobile ? info.manager.mobile : '商家暂未填写'
+                  }}
+                </text>
+              </view>
+              <view class="flex justify-start items-center w-33p">
+                <i class="el-icon-message mr-15"/>
+                <text class="content" v-if="info.businessCard">邮箱:{{
+                    info.businessCard.email ? info.businessCard.email : '商家暂未填写'
+                  }}
+                </text>
+              </view>
+              <view class="flex justify-start items-center w-33p" v-if="info.userLevel > 1">
+                <i class="el-icon-data-board mr-15"/>
+                <text class="content" v-if="info.businessCard">网址:{{
+                    info.businessCard.website ? info.businessCard.website : '商家暂未填写'
+                  }}
+                </text>
+              </view>
+            </view>
+          </view>
+          <template v-if="parseInt(info.userLevel) > 0">
+            <view class="flex flex-col justify-start items-start mb-20">
+              <view class="title">发布的现货</view>
+              <view class="mt-20 spot-bg w-100p p-40" v-if="info.spotList">
+                <view class="w-100p flex justify-between items-center">
+                  <text class="font-bold text-40">{{ info.spotList.name }}</text>
+                  <el-button type="primary" plain class="empty-bg-plain-btn"
+                             @click.native="vk.navigateTo('/pages/spot/goods/detail?id=' + info.spotList._id)">
+                    查看详情
+                  </el-button>
+                </view>
+                <view class="w-60p flex justify-between items-center text-main my-20">
+                  <text>库存:{{ info.spotList.stock }}吨</text>
+                  <text
+                    v-if="info.spotList.address && info.spotList.address.province  && info.spotList.address.area  && info.spotList.address.area ">
+                    供货地:{{ info.spotList.address.province.name }}-{{
+                      info.spotList.address.city.name
+                    }}-{{ info.spotList.address.area.name }}
+                  </text>
+                </view>
+                <view class="w-60p flex justify-between items-center text-gray">
+                  <view class="flex justify-start items-center">
+                    <i class="el-icon-user"/>
+                    <text>{{ info.company.companyName }}</text>
+                  </view>
+                  <text class="">{{ info.spotList._add_time_str }}发布</text>
+                </view>
+
+              </view>
+            </view>
+            <view class="flex justify-between items-center mb-20">
+              <view class="title">发布的询价单</view>
+              <!--              <view class="text-main pointer" @click="vk.navigateTo('/pages/spot/goods/goods')">查看更多>-->
+              <view class="text-main pointer" v-if="info.enquiryList.length > 5" @click="showAllEnquiry = true">查看更多>
+              </view>
+            </view>
+            <enquiry :info="info" :limit="5"/>
+            <view class="flex justify-between items-center mb-20">
+              <view class="title">发布的加工单</view>
+              <!--              <view class="text-main pointer" @click="vk.navigateTo('/pages/process/list')">查看更多>-->
+              <view class="text-main pointer" v-if="info.processList.length > 5" @click="showAllProcess = true">查看更多>
+              </view>
+            </view>
+            <process :info="info" :limit="5"/>
+          </template>
+        </view>
+      </view>
     </view>
+    <gap/>
+    <common-footer></common-footer>
+    <el-dialog v-if="articleIndex > -1 && dialogVisible"
+               title="新闻动态"
+               :visible.sync="dialogVisible"
+               width="70%">
+      <p class="text-35 font-bold pb-20">{{ userArticle[articleIndex].title }}</p>
+      <p class="text-gray text-28 pb-20 border-bottom">{{ userArticle[articleIndex]._add_time_str }}</p>
+      <div v-html="userArticle[articleIndex].content" class="pt-20"></div>
+      <div slot="footer">
+        <el-button @click="dialogVisible = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-if="showAllEnquiry"
+               title="全部询价单"
+               :visible.sync="showAllEnquiry"
+               width="70%">
+      <enquiry :info="info"/>
+    </el-dialog>
+    <el-dialog v-if="showAllProcess"
+               title="全部加工单"
+               :visible.sync="showAllProcess"
+               width="70%">
+      <process :info="info"/>
+    </el-dialog>
+  </view>
 </template>
 
 <script>
@@ -172,117 +235,176 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
 import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 import Gap from "../../components/gap/gap.vue";
+import Enquiry from "@/pages/yellowPage/components/enquiry.vue";
+import Process from "@/pages/yellowPage/components/process.vue";
 
 export default {
-    name: "info",
-    components: {Gap, Protect, ExchangeThree},
-    data() {
-        return {
-            id: null,
-            provinceData: provinces,
-            cityData: citys,
-            areaData: areas,
-            info: {
-                transactionAmount: 0,
-                paidEnsure: 0,
-                spotList: [],
-                enquiryList: [],
-                processList: [],
-            },
-        }
-    },
-    methods: {
-        getInfo() {
-            vk.callFunction({
-                url: "client/user/pub/getDetail",
-                data: {
-                    _id: this.id
-                },
-                success: (res) => {
-                    this.info = res.data
-                    this.info.enquiryList.map(val => {
-                        let str = ''
-                        if (val.productList.length > 0 && val.productList[0].addressRegion.length > 0) {
-                            let provinceIndex = 0, cityIndex = 0, areaIndex = 0
-                            this.provinceData.forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) {
-                                    provinceIndex = index
-                                    str = item.name
-                                }
-                            })
-                            this.cityData[provinceIndex].forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) {
-                                    cityIndex = index
-                                    str += item.name
-                                }
-                            })
-                            this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
-                                if (parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) {
-                                    areaIndex = index
-                                    str += item.name
-                                }
-                            })
-                            str += val.productList[0].addressDetail
-                        }
-                        val.address = str
-                        return val
-                    })
-                }
-            });
-        },
-        async toProcessDetail(id) {
-            const {userInfo} = await vk.callFunction({
-                url: 'user/kh/getMyUserInfo'
-            })
-            if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
-                this.$confirm('您尚未认证, 是否前往认证?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo({url: '/pages/user/user?menu=fadada'});
-                })
-            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
-                this.$confirm('请完善名片信息', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    vk.navigateTo('/pages/user/user?menu=business-card');
-                })
-            } else {
-                vk.navigateTo({
-                    url: `/pages/process/detail?id=${id}`
-                })
-            }
-        },
-    },
-    onLoad(option) {
-        if (option.id) {
-            this.id = option.id
-            this.getInfo()
+  name: "info",
+  components: {Process, Enquiry, Gap, Protect, ExchangeThree},
+  data() {
+    return {
+      id: null,
+      provinceData: provinces,
+      cityData: citys,
+      areaData: areas,
+      info: {
+        transactionAmount: 0,
+        paidEnsure: 0,
+        spotList: [],
+        enquiryList: [],
+        processList: [],
+        company: {
+          companyName: ''
         }
+      },
+      allChildCate: [],
+      userArticle: [],
+      articleIndex: -1,
+      dialogVisible: false,
+      showAllEnquiry: false,
+      showAllProcess: false,
     }
+  },
+  methods: {
+    getCategoryTreeData() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.allChildCate = []
+          data.rows.forEach(item => {
+            item.children.forEach(child => {
+              this.allChildCate.push(child)
+            })
+          })
+          this.getInfo()
+        }
+      });
+    },
+    getUserArticle() {
+      vk.callFunction({
+        url: 'client/userArticle/pub/getList',
+        title: '请求中...',
+        data: {
+          userId: this.id
+        },
+        success: (data) => {
+          this.userArticle = data.rows
+        }
+      });
+    },
+    getInfo() {
+      vk.callFunction({
+        url: "client/user/pub/getDetail",
+        data: {
+          _id: this.id
+        },
+        success: (res) => {
+          this.info = res.data
+          this.info.company.mainSpotCategory = []
+          if (this.info.company && this.info.company.mainSpotCategoryIds) {
+            this.allChildCate.forEach(child => {
+              if (this.info.company.mainSpotCategoryIds.includes(child._id)) {
+                this.info.company.mainSpotCategory.push(child.name)
+              }
+            })
+          }
+          this.info.enquiryList.map(val => {
+            let str = ''
+            if (val.addressRegion && val.addressRegion.area) {
+              str = val.addressRegion.province.name + val.addressRegion.city.name + val.addressRegion.area.name
+            }
+            if (val.addressDetail) str += val.addressDetail
+            val.address = str
+            return val
+          })
+        }
+      });
+    },
+    async toProcessDetail(id) {
+      const {userInfo} = await vk.callFunction({
+        url: 'user/kh/getMyUserInfo'
+      })
+      if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else if (vk.pubfn.isNull(userInfo.businessCard)) {
+        this.$confirm('您尚未认证和完善名片，是否前往个人中心？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo('/pages/user/user?menu=fadada');
+        })
+      } else {
+        vk.navigateTo({
+          url: `/pages/process/detail?id=${id}`
+        })
+      }
+    },
+    showArticle(index) {
+      this.articleIndex = index
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        // 获取所有的img元素
+        var imgElements = document.getElementsByTagName('img');
+
+        // 遍历img元素数组
+        for (var i = 0; i < imgElements.length; i++) {
+          // 添加style属性，并设置width为100%
+          imgElements[i].style.width = '100%';
+        }
+      })
+    }
+  },
+  onLoad(option) {
+    if (option.id) {
+      this.id = option.id
+      this.getCategoryTreeData()
+      this.getUserArticle()
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .company {
 
-    .logo {
-        width: 100px;
-        height: 100px;
-    }
+  .logo {
+    width: 100px;
+    height: 100px;
+  }
 
-    .title {
-        font-size: 16px;
-        padding-left: 5px;
-        border-left: 3px solid #d0021b;
-        color: #d0021b;
-    }
+  .title {
+    font-weight: bold;
+    font-size: 16px;
+    padding-left: 5px;
+    border-left: 3px solid #d0021b;
+    color: #d0021b;
+    margin: 20px 0;
+  }
 
-    .table-header {
-        border-top: 8px solid #F4F4F4;
-    }
+  .table-header {
+    border-top: 8px solid #F4F4F4;
+  }
+
+  .content {
+    color: #555;
+  }
+}
+
+.spot-bg {
+  background-color: #F9F9F9;
+}
+
+.mapDiv {
+  width: 100%;
+  height: 300px;
 }
 </style>
diff --git a/pages/yellowPage/list.vue b/pages/yellowPage/list.vue
index 52b1e55..69fd574 100644
--- a/pages/yellowPage/list.vue
+++ b/pages/yellowPage/list.vue
@@ -1,171 +1,253 @@
 <template>
-    <view>
-        <top-bar></top-bar>
-        <common-header></common-header>
-        <category-bar></category-bar>
+  <view>
+    <top-bar></top-bar>
+    <common-header></common-header>
+    <category-bar></category-bar>
 
-        <view class="carousel">
-            <el-carousel height="170px">
-                <el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
-                           src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
-                           mode="aspectFill"></image>
-                </el-carousel-item>
-            </el-carousel>
-        </view>
-
-        <view class="filter-outer">
-            <el-form @submit.native.prevent label-width="80px">
-                <el-form-item label="关键词:" class="border-bottom pb-30">
-                    <el-input @keyup.enter.native="getCompany()" clearable placeholder="输入关键字搜索"
-                              v-model="keyword">
-                        <i slot="prefix" class="el-input__icon el-icon-getCompany"></i>
-                        <el-button @click="getCompany()" type="primary" slot="append" style="border-radius: 0">搜索
-                        </el-button>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="行业类型:" class="border-bottom pb-30">
-
-                </el-form-item>
-                <el-form-item label="分类:" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="clickedCateIndex = -1" class="pointer mr-25"
-                              :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
-                        </text>
-                        <view v-for="(item, index) in categoryTreeData" :key="index">
-                            <text @click="clickedCateIndex = index" class="pointer mr-25"
-                                  :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
-                                  v-if="index < 10">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                    </view>
-                    <view class="child-cate flex justify-start items-center flex-wrap" v-if="clickedCateIndex !== null">
-                        <template v-if="clickedCateIndex === -1">
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
-                            </text>
-                        </template>
-                        <template v-else>
-                            <text class="pointer mr-25" @click="selectCate(item._id)"
-                                  :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
-                                  v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
-                                {{ item.name }}
-                            </text>
-                        </template>
-                    </view>
-                </el-form-item>
-                <el-form-item label="城市" class="border-bottom pb-30">
-                    <view class="flex justify-start items-center flex-wrap">
-                        <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
-                              :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
-                        </text>
-                        <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
-                            <text @click="selectProvince(item.code)"
-                                  :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']"
-                                  v-if="index < 10 || showAllProvince">
-                                {{ item.name }}
-                            </text>
-                        </view>
-                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多
-                        </text>
-                    </view>
-                </el-form-item>
-
-                <el-form-item label="已选择">
-                    <view class="tags">
-                        <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
-                    </view>
-                </el-form-item>
-            </el-form>
-        </view>
-
-        <view class="w-1200 flex justify-start items-start flex-wrap m-a">
-            <view v-for="(item, index) in companyList" :key="index" class="w-50p company-item">
-                <view class="p-40">
-                    <view class="rounded shadow p-50 bg-white flex flex-col justify-start items-start">
-                        <view class="flex justify-end w-100p">
-                            <image class="authed" src="/static/images/authed.png" mode="aspectFit"
-                                   v-if="item.authStatus === 1"/>
-                            <gap height="40" v-else/>
-                        </view>
-                        <view class="flex justify-start items-center">
-                            <image :src="item.businessCard.logo" class="logo" v-if="item.businessCard"
-                                   mode="aspectFill"/>
-                            <image v-else src="/static/images/no-logo.jpg" class="logo" mode="aspectFill"/>
-                            <view class="ml-35 flex flex-col justify-start items-start">
-                                <text>{{ item.name }}</text>
-                                <i class="el-icon-star-off text-main my-20"/>
-                                <view class="flex justify-start items-center">
-                                    <i class="el-icon-user"/>
-                                    <text class="ml-10" v-if="item.manager">{{ item.manager.personName }}</text>
-                                    <text class="ml-20 text-28" v-if="item.businessCard">{{
-                                            item.businessCard.position
-                                        }}
-                                    </text>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-center mt-20">
-                            <i class="el-icon-map-location mr-15"/>
-                            <view class="flex-col justify-start items-center">
-                                <text>地址:</text>
-                                <text
-                                    v-if="item.company && item.company.addressRegion && item.company.addressRegion.province && item.company.addressRegion.city && item.company.addressRegion.area">
-                                    {{
-                                        item.company.addressRegion.province.name
-                                    }}{{ item.company.addressRegion.city.name }}{{
-                                        item.company.addressRegion.area.name
-                                    }}{{
-                                        item.company.addressDetail
-                                    }}
-                                </text>
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-center mt-20">
-                            <i class="el-icon-phone mr-15"/>
-                            <view class="flex-col justify-start items-center">
-                                <text>电话:</text>
-                                <text v-if="item.businessCard">{{ item.company.companyMobile }}</text>
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-center mt-20">
-                            <i class="el-icon-mobile mr-15"/>
-                            <view class="flex-col justify-start items-center">
-                                <text>手机:</text>
-                                <text v-if="item.businessCard">{{ item.businessCard.managerMobile }}</text>
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-center mt-20">
-                            <i class="el-icon-message mr-15"/>
-                            <view class="flex-col justify-start items-center">
-                                <text>邮箱:</text>
-                                <text v-if="item.businessCard">{{ item.businessCard.email }}</text>
-                            </view>
-                        </view>
-                        <view class="flex justify-start items-center mt-20">
-                            <i class="el-icon-data-board mr-15"/>
-                            <view class="flex-col justify-start items-center">
-                                <text>网址:</text>
-                                <text v-if="item.businessCard">{{ item.businessCard.website }}</text>
-                            </view>
-                        </view>
-                        <view class="flex justify-between items-center w-100p">
-                            <view class="flex justify-start items-center mt-20">
-                                <text class="text-main">主营业务:</text>
-                                <text v-if="item.businessCard">{{ item.businessCard.mainBusiness }}</text>
-                            </view>
-                            <el-button type="primary" @click="showInfo(item._id)">查看详情</el-button>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <right-bar></right-bar>
-        <common-footer></common-footer>
+    <view class="carousel">
+      <el-carousel height="500px">
+        <common-swiper page="yellowPage"/>
+      </el-carousel>
     </view>
+
+    <view class="filter-outer">
+      <el-form @submit.native.prevent label-width="80px">
+        <el-form-item label="关键词:" class="border-bottom pb-30">
+          <el-input @keyup.enter.native="search()" clearable placeholder="输入关键字搜索"
+                    v-model="keyword">
+            <i slot="prefix" class="el-input__icon el-icon-getCompany"></i>
+            <el-button @click="search()" type="primary" slot="append" style="border-radius: 0">搜索
+            </el-button>
+          </el-input>
+        </el-form-item>
+        <!--                <el-form-item label="行业类型:" class="border-bottom pb-30">-->
+
+        <!--                </el-form-item>-->
+        <el-form-item label="主营类目:" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="clickedCateIndex = -1" class="pointer mr-25"
+                  :class="[clickedCateIndex === -1 ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in categoryTreeData" :key="index">
+              <text @click="clickedCateIndex = index" class="pointer mr-25"
+                    :class="[clickedCateIndex === index ? 'text-main selected-cate' : '']"
+                    v-if="index < 10">
+                {{ item.name }}
+              </text>
+            </view>
+          </view>
+          <view class="child-cate flex justify-start items-center flex-wrap" v-if="clickedCateIndex !== null">
+            <template v-if="clickedCateIndex === -1">
+              <text class="pointer mr-25" @click="selectCate(item._id)"
+                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
+                    v-for="(item, index) in allChildCate" :key="index">{{ item.name }}
+              </text>
+            </template>
+            <template v-else>
+              <text class="pointer mr-25" @click="selectCate(item._id)"
+                    :class="[checkCategoryList.includes(item._id) ? 'text-main' : '']"
+                    v-for="(item, index) in categoryTreeData[clickedCateIndex].children" :key="index">
+                {{ item.name }}
+              </text>
+            </template>
+          </view>
+        </el-form-item>
+        <el-form-item label="行业分类" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectIndustry(-1)" class="pointer mr-25 flex-grow-0"
+                  :class="[selectedIndustryList.length === 0 ? 'text-main selected-cate' : '']">全部
+            </text>
+            <view v-for="(item, index) in industryList" :key="index" class="flex-grow-0 pointer mr-25">
+              <text @click="selectIndustry(item.name)"
+                    :class="[selectedIndustryList.includes(item.name)? 'text-main selected-cate' : '']"
+                    v-if="index < 10 || showAllIndustry">
+                {{ item.name }}
+              </text>
+            </view>
+            <!--                        <text @click="showAllIndustry = !showAllIndustry" class="pointer mr-25">查看更多-->
+            <!--                        </text>-->
+          </view>
+        </el-form-item>
+        <el-form-item label="城市" class="border-bottom pb-30">
+          <view class="flex justify-start items-center flex-wrap">
+            <text @click="selectProvince(-1)" class="pointer mr-25 flex-grow-0"
+                  :class="[checkProvinceList.length === 0 ? 'text-main selected-cate' : '']">全国
+            </text>
+            <view v-for="(item, index) in provinceData" :key="index" class="flex-grow-0 pointer mr-25">
+              <text @click="selectProvince(item.code)"
+                    :class="[checkProvinceList.includes(item.code)? 'text-main selected-cate' : '']"
+                    v-if="index < 10 || showAllProvince">
+                {{ item.name }}
+              </text>
+            </view>
+            <!--                        <text @click="showAllProvince = !showAllProvince" class="pointer mr-25">查看更多-->
+            <!--                        </text>-->
+          </view>
+        </el-form-item>
+        <!--                <el-form-item label="其他" class="border-bottom pb-30">-->
+        <!--                    <el-checkbox v-model="factoryFilter" @change="factoryFilterChange">筛选加工商</el-checkbox>-->
+        <!--                </el-form-item>-->
+        <el-form-item label="已选择">
+          <view class="tags">
+            <el-tag v-for="(item, index) in checkCategoryArr" :key="index">{{ item.name }}</el-tag>
+          </view>
+        </el-form-item>
+      </el-form>
+    </view>
+
+    <view class="w-1200 flex justify-start items-start flex-wrap m-a">
+      <view v-for="(item, index) in companyList.filter((_, i) => hasAuth ? true : i < 6)" :key="index"
+            class="w-50p company-item">
+        <view class="p-40">
+          <view class="rounded shadow p-50 bg-white flex flex-col justify-start items-start"
+                style="height: 900rpx">
+            <view class="flex justify-end w-100p">
+              <image class="authed" src="/static/images/authed.png" mode="aspectFit"
+                     v-if="item.authStatus === 1"/>
+              <gap height="40" v-else/>
+            </view>
+            <view class="flex justify-start items-center">
+              <image :src="item.businessCard.logo" class="logo" v-if="item.businessCard"
+                     mode="aspectFill"/>
+              <image v-else src="/static/images/no-logo.jpg" class="logo" mode="aspectFill"/>
+              <view class="ml-35 flex flex-col justify-start items-start">
+                <div class="flex justify-start items-center font-bold">
+                  <text>{{ item.name }}</text>
+                  <!--                                    <text v-if="item.factoryStatus === 1" class="text-main">[加工商]</text>-->
+                  <i class="el-icon-star-off text-main ml-20"/>
+                </div>
+                <view class="flex justify-start items-center">
+                  <i class="el-icon-user"/>
+                  <text class="ml-10" v-if="item.manager">{{ item.manager.personName }}</text>
+                  <text class="ml-20 text-28" v-if="item.businessCard">{{
+                      item.businessCard.position
+                    }}
+                  </text>
+                </view>
+              </view>
+            </view>
+            <view class="flex justify-start items-center mt-20">
+              <i class="el-icon-map-location mr-15"/>
+              <view class="flex-col justify-start items-center">
+                <text>地址:</text>
+                <text
+                  v-if="item.company && item.company.addressRegion && item.company.addressRegion.province && item.company.addressRegion.city && item.company.addressRegion.area">
+                  {{
+                    item.company.addressRegion.province.name
+                  }}{{ item.company.addressRegion.city.name }}{{
+                    item.company.addressRegion.area.name
+                  }}{{
+                    item.company.addressDetail
+                  }}
+                </text>
+              </view>
+            </view>
+            <view class="flex justify-start items-center mt-20">
+              <view class="flex justify-start items-center ">
+                <i class="el-icon-mobile mr-15"/>
+                <view class="flex-col justify-start items-center">
+                  <text>手机:</text>
+                  <text v-if="item.manager">{{
+                      item.manager.mobile ? item.manager.mobile : '商家暂未填写'
+                    }}
+                  </text>
+                </view>
+              </view>
+              <view class="flex justify-start items-center ml-25">
+                <i class="el-icon-phone mr-15"/>
+                <view class="flex-col justify-start items-center">
+                  <text>电话:</text>
+                  <text v-if="item.businessCard">{{
+                      item.businessCard.companyMobile ? item.businessCard.companyMobile : '商家暂未填写'
+                    }}
+                  </text>
+                </view>
+              </view>
+            </view>
+            <view class="mt-20 flex justify-between items-center w-100p">
+              <view class="flex flex-col justify-start items-start">
+                <view class="flex justify-start items-center ">
+                  <i class="el-icon-message mr-15"/>
+                  <view class="flex-col justify-start items-center">
+                    <text>邮箱:</text>
+                    <text v-if="item.businessCard">
+                      {{ item.businessCard.email ? item.businessCard.email : '商家暂未填写' }}
+                    </text>
+                  </view>
+                </view>
+                <view class="flex justify-start items-center mt-20" v-if="item.userLevel > 1">
+                  <i class="el-icon-data-board mr-15"/>
+                  <view class="flex-col justify-start items-center">
+                    <text>网址:</text>
+                    <text v-if="item.businessCard">
+                      {{ item.businessCard.website ? item.businessCard.website : '商家暂未填写' }}
+                    </text>
+                  </view>
+                </view>
+              </view>
+              <el-image v-if="item.businessCard && item.businessCard.companyWechat"
+                        :src="item.businessCard.companyWechat" class="wechat" fix="cover"/>
+            </view>
+            <view class="flex justify-between items-center w-100p">
+              <view class="flex justify-start items-center mt-20">
+                <text class="text-main" style="width: 140rpx">主营业务:</text>
+                <text class="ml-20 flex-1">{{ item.mainSpotCategory.join() }}</text>
+              </view>
+            </view>
+            <view class="flex justify-end items-center w-100p">
+              <!--                            <el-button type="primary" plain @click="showFactoryInfo(item._id)"-->
+              <!--                                       v-if="item.factoryStatus === 1">查看加工商详情-->
+              <!--                            </el-button>-->
+              <el-button type="primary" @click="showInfo(item._id)">查看详情</el-button>
+            </view>
+
+          </view>
+        </view>
+      </view>
+    </view>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad23.length">
+        <el-carousel :height="`100px`" :style="{width: ad24.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad23" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad24.length">
+        <el-carousel :height="`100px`" :style="{width: ad23.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad24" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <div class="flex justify-between items-center w-1200 m-a">
+      <template v-if="ad25.length">
+        <el-carousel :height="`100px`" :style="{width: ad26.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad25" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+      <template v-if="ad26.length">
+        <el-carousel :height="`100px`" :style="{width: ad25.length ? '50%' : '100%'}" class="m-a">
+          <el-carousel-item v-for="(item, index) in ad26" :key="index" :style="{width: '100%'}">
+            <image @click="vk.navigateTo(`/pages/yellowPage/info?id=${item.companyId}`)"
+                   class="pointer carousel-img" :src="item.swiper" mode="aspectFill"
+                   :style="{width: '100%'}"/>
+          </el-carousel-item>
+        </el-carousel>
+      </template>
+    </div>
+    <right-bar></right-bar>
+    <common-footer></common-footer>
+  </view>
 </template>
 
 <script>
@@ -173,170 +255,367 @@ import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
 import Gap from "../../components/gap/gap.vue";
 
 export default {
-    name: "list",
-    components: {Gap},
-    data() {
-        return {
-            categoryTreeData: [],
-            allChildCate: [],
-            clickedCateIndex: null,
-            checkCategoryList: [],
-            keyword: '',
-            provinceData: provinces,
-            checkProvinceList: [],
-            showAllProvince: false,
-            companyList: []
-        }
-    },
-    methods: {
-        getCategoryTreeData() {
-            vk.callFunction({
-                url: 'client/spot/category/pub/getTree',
-                title: '请求中...',
-                data: {},
-                success: (data) => {
-                    this.categoryTreeData = data.rows
-                    this.allChildCate = []
-                    this.categoryTreeData.forEach(item => {
-                        item.children.forEach(child => {
-                            this.allChildCate.push(child)
-                        })
-                    })
-                }
-            });
-        },
-        selectCate(id) {
-            const index = this.checkCategoryList.indexOf(id)
-            if (index === -1) this.checkCategoryList.push(id)
-            else this.checkCategoryList.splice(index, 1)
-            this.getCompany()
-        },
-        selectProvince(code) {
-            if (code === -1) this.checkProvinceList = []
-            else {
-                const index = this.checkProvinceList.indexOf(code)
-                if (index === -1) this.checkProvinceList.push(code)
-                else this.checkProvinceList.splice(index, 1)
-            }
-            this.getCompany()
-        },
-        getCompany() {
-            vk.callFunction({
-                url: 'client/user/pub/getCompany',
-                title: '请求中...',
-                data: {
-                    province: this.checkProvinceList,
-                    keyword: this.keyword,
-                    mainSpotCategoryIds: this.checkCategoryList,
-                },
-                success: (data) => {
-                    this.companyList = data.rows.map(item => {
-                        item.name = item.company.companyName
-                        return item
-                    })
-                }
-            });
-        },
-        showInfo(id) {
-            vk.navigateTo({
-                url: `/pages/yellowPage/info?id=${id}`
-            })
-        }
-    },
-    onShow() {
-        this.getCategoryTreeData()
-        this.getCompany()
-    },
-    computed: {
-        checkCategoryArr() {
-            const arr = []
-            this.allChildCate.forEach(item => {
-                if (this.checkCategoryList.includes(item._id)) arr.push(item)
-            })
-            this.provinceData.forEach(item => {
-                if (this.checkProvinceList.includes(item.code)) {
-                    arr.push(item)
-                }
-            })
-            return arr
-        }
+  name: "list",
+  components: {Gap},
+  data() {
+    return {
+      categoryTreeData: [],
+      allChildCate: [],
+      clickedCateIndex: -1,
+      checkCategoryList: [],
+      keyword: '',
+      provinceData: provinces,
+      checkProvinceList: [],
+      showAllProvince: true,
+      companyList: [],
+      factoryFilter: false,
+      industryList: [],
+      selectedIndustryList: [],
+      showAllIndustry: true,
+      ad23: [],
+      ad24: [],
+      ad25: [],
+      ad26: [],
+      hasAuth: true
     }
+  },
+  methods: {
+    getCategoryTreeData() {
+      vk.callFunction({
+        url: 'client/spot/category/pub/getTree',
+        title: '请求中...',
+        data: {},
+        success: (data) => {
+          this.categoryTreeData = data.rows
+          this.allChildCate = []
+          this.categoryTreeData.forEach(item => {
+            item.children.forEach(child => {
+              this.allChildCate.push(child)
+            })
+          })
+          this.getCompany()
+        }
+      });
+    },
+    selectCate(id) {
+      const index = this.checkCategoryList.indexOf(id)
+      if (index === -1) this.checkCategoryList = [id]
+      else this.checkCategoryList = []
+      this.getCompany()
+    },
+    selectProvince(code) {
+      if (code === -1) this.checkProvinceList = []
+      else {
+        // const index = this.checkProvinceList.indexOf(code)
+        // if (index === -1) this.checkProvinceList.push(code)
+        // else this.checkProvinceList.splice(index, 1)
+        this.checkProvinceList = [code]
+      }
+      this.getCompany()
+    },
+    selectIndustry(name) {
+      if (name === -1) this.selectedIndustryList = []
+      else {
+        const index = this.selectedIndustryList.indexOf(name)
+        if (index === -1) this.selectedIndustryList = [name]
+        else this.selectedIndustryList = []
+
+      }
+      this.getCompany()
+    },
+    search() {
+      if (!vk.getVuex('$user.userInfo.fadadaConfirm') || [-1, 2].includes(vk.getVuex('$user.userInfo.authStatus'))) {
+        this.$confirm('您尚未认证, 是否前往个人中心认证?', '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          type: 'warning'
+        }).then(() => {
+          vk.navigateTo({url: '/pages/user/user?menu=fadada'});
+        })
+      } else {
+        this.getCompany()
+      }
+    },
+    getCompany() {
+      vk.callFunction({
+        url: 'client/user/pub/getCompany',
+        title: '请求中...',
+        data: {
+          province: this.checkProvinceList,
+          keyword: this.keyword,
+          mainSpotCategoryIds: this.checkCategoryList,
+          showInYellow: 1,
+          // factoryFilter: this.factoryFilter,
+          industryList: this.selectedIndustryList
+        },
+        success: (data) => {
+          this.companyList = data.rows.map(item => {
+            item.name = item.company.companyName
+            item.mainSpotCategory = []
+            if (item.company && item.company.mainSpotCategoryIds) {
+              this.allChildCate.forEach(child => {
+                if (item.company.mainSpotCategoryIds.includes(child._id)) {
+                  item.mainSpotCategory.push(child.name)
+                }
+              })
+            }
+            return item
+          })
+          this.getAd23()
+          this.getAd24()
+          this.getAd25()
+          this.getAd26()
+        }
+      });
+    },
+    showInfo(id) {
+      vk.navigateTo({
+        url: `/pages/yellowPage/info?id=${id}`
+      })
+    },
+    showFactoryInfo(id) {
+      vk.navigateTo({
+        url: `/pages/yellowPage/factory?userId=${id}`
+      })
+    },
+    factoryFilterChange(val) {
+      this.factoryFilter = val
+      this.getCompany()
+    },
+    async getIndustryList() {
+      const {rows} = await vk.callFunction({
+        url: 'client/industry/pub/getList'
+      })
+      this.industryList = rows
+    },
+    async getAd23() {
+      this.ad23 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 23,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad23 = res.data
+      // } else {
+      //     const {rows} = await vk.callFunction({
+      //         url: 'client/user/pub/getCompany',
+      //         data: {
+      //             pageIndex: 1,
+      //             pageSize: 5,
+      //             isCoop: 1,
+      //             province: this.checkProvinceList
+      //         }
+      //     })
+      //     rows.forEach(item => {
+      //         if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //             this.ad23.push({
+      //                 swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //                 companyId: item._id
+      //             })
+      //         }
+      //     })
+      // }
+    },
+    async getAd24() {
+      this.ad24 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 24,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad24 = res.data
+      // } else {
+      //     const {rows} = await vk.callFunction({
+      //         url: 'client/user/pub/getCompany',
+      //         data: {
+      //             pageIndex: 2,
+      //             pageSize: 5,
+      //             isCoop: 1,
+      //             province: this.checkProvinceList
+      //         }
+      //     })
+      //     rows.forEach(item => {
+      //         if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //             this.ad24.push({
+      //                 swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //                 companyId: item._id
+      //             })
+      //         }
+      //     })
+      // }
+    },
+    async getAd25() {
+      this.ad25 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 25,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad25 = res.data
+      // } else {
+      //     const {rows} = await vk.callFunction({
+      //         url: 'client/user/pub/getCompany',
+      //         data: {
+      //             pageIndex: 3,
+      //             pageSize: 5,
+      //             isCoop: 1,
+      //             province: this.checkProvinceList
+      //         }
+      //     })
+      //     rows.forEach(item => {
+      //         if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //             this.ad25.push({
+      //                 swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //                 companyId: item._id
+      //             })
+      //         }
+      //     })
+      // }
+    },
+    async getAd26() {
+      this.ad26 = []
+      // if (this.checkProvinceList.length === 0) {
+      const res = await vk.callFunction({
+        url: 'client/ad/pub/getList',
+        data: {
+          adKey: 26,
+          region: this.checkProvinceList.length > 0 ? this.checkProvinceList[0] : null
+        }
+      })
+      if (res.data) this.ad26 = res.data
+      // } else {
+      //     const {rows} = await vk.callFunction({
+      //         url: 'client/user/pub/getCompany',
+      //         data: {
+      //             pageIndex: 4,
+      //             pageSize: 5,
+      //             isCoop: 1,
+      //             province: this.checkProvinceList
+      //         }
+      //     })
+      //     rows.forEach(item => {
+      //         if (item.businessCard.album && item.businessCard.album.length > 0) {
+      //             this.ad26.push({
+      //                 swiper: Array.isArray(item.businessCard.album) ? item.businessCard.album[0] : item.businessCard.album,
+      //                 companyId: item._id
+      //             })
+      //         }
+      //     })
+      // }
+    },
+  },
+  onShow() {
+    this.getCategoryTreeData()
+    this.getIndustryList()
+    this.hasAuth = (vk.getVuex('$user.userInfo.fadadaConfirm') && vk.getVuex('$user.userInfo.authStatus') === 1)
+  },
+  computed: {
+    checkCategoryArr() {
+      const arr = []
+      this.allChildCate.forEach(item => {
+        if (this.checkCategoryList.includes(item._id)) arr.push(item)
+      })
+      this.provinceData.forEach(item => {
+        if (this.checkProvinceList.includes(item.code)) {
+          arr.push(item)
+        }
+      })
+      this.selectedIndustryList.forEach(item => {
+        arr.push({name: item})
+      })
+      return arr
+    }
+  }
 }
 </script>
 
 
 <style lang="scss" scoped>
 .carousel {
-    width: 1200px;
-    margin: 20px auto;
+  width: 1200px;
+  margin: 20px auto;
 }
 
 .carousel-img {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .goods-options {
-    background-color: #FFFFFF;
-    padding: 20px;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .filter-outer {
-    width: 1200px;
-    margin: 20px auto;
-    background-color: #FFFFFF;
-    padding: 20px;
+  width: 1200px;
+  margin: 20px auto;
+  background-color: #FFFFFF;
+  padding: 20px;
 }
 
 .tags {
-    display: flex;
+  display: flex;
 
-    .el-tag {
-        margin-right: 10px;
-    }
+  .el-tag {
+    margin-right: 10px;
+  }
 }
 
 .paginatio {
-    float: none;
-    width: 1200px;
-    margin: 20px auto;
-    display: flex;
-    justify-content: center;
+  float: none;
+  width: 1200px;
+  margin: 20px auto;
+  display: flex;
+  justify-content: center;
 }
 
 .post-btn {
-    background: none;
+  background: none;
 }
 
 .post-btn:hover {
-    background: #f6eae9;
-    color: #A92924;
+  background: #f6eae9;
+  color: #A92924;
 }
 
 .selected-cate {
-    border-bottom: 2px solid #BD3124;
-    line-height: 40rpx;
+  border-bottom: 2px solid #BD3124;
+  line-height: 40rpx;
 }
 
 .child-cate {
-    background-color: #DB8382;
-    color: white;
-    margin-top: 10rpx;
-    border-radius: 15rpx;
-    padding: 0 20rpx;
+  background-color: #DB8382;
+  color: white;
+  margin-top: 10rpx;
+  border-radius: 15rpx;
+  padding: 0 20rpx;
 }
 
 .company-item {
-    font-size: 16px;
+  font-size: 16px;
 
-    .authed {
-        height: 40px;
-        width: 60px;
-    }
+  .authed {
+    height: 40px;
+    width: 60px;
+  }
 
-    .logo {
-        width: 100px;
-        height: 100px;
-    }
+  .logo {
+    width: 100px;
+    height: 100px;
+  }
+}
+
+.wechat {
+  width: 60px;
+  height: 60px;
 }
 </style>
diff --git a/static/bcc976f4396e437abf19deb11c1f06b4.png b/static/bcc976f4396e437abf19deb11c1f06b4.png
new file mode 100644
index 0000000..3ee0d1e
Binary files /dev/null and b/static/bcc976f4396e437abf19deb11c1f06b4.png differ
diff --git a/static/gangcai-cal/404.html b/static/gangcai-cal/404.html
new file mode 100644
index 0000000..6f17eaf
--- /dev/null
+++ b/static/gangcai-cal/404.html
@@ -0,0 +1,7 @@
+<html>
+<head><title>404 Not Found</title></head>
+<body>
+<center><h1>404 Not Found</h1></center>
+<hr><center>nginx</center>
+</body>
+</html>
\ No newline at end of file
diff --git a/static/gangcai-cal/README.md b/static/gangcai-cal/README.md
new file mode 100644
index 0000000..055d0ff
--- /dev/null
+++ b/static/gangcai-cal/README.md
@@ -0,0 +1,6 @@
+# 钢材理论重量计算器
+
+#### 介绍
+对常用钢材进行理论重量计算、理论长度计算；涉及钢材种类或品种：钢板、螺纹钢、盘条、线材、圆钢、方钢、扁钢、花纹板、六角钢、八角钢、无缝钢管、直缝焊管、螺旋焊管、方形钢管、矩形管、等边角钢、不等边角钢、工字钢、槽钢、L型钢、H型钢、T型钢等
+
+![输入图片说明](https://foruda.gitee.com/images/1699929218233087255/e274bc7e_871567.jpeg "Snipaste_2023-11-14_10-33-09.jpg")
diff --git a/static/gangcai-cal/flexible.js b/static/gangcai-cal/flexible.js
new file mode 100644
index 0000000..6c425fc
--- /dev/null
+++ b/static/gangcai-cal/flexible.js
@@ -0,0 +1,52 @@
+! function(e) {
+	var t, n = window.navigator.appVersion.match(/android/gi),
+		i = window.navigator.appVersion.match(/iphone/gi),
+		r = document,
+		a = r.documentElement,
+		o = r.querySelector('meta[name="viewport"]'),
+		d = e.freeze || o.hasAttribute("freeze"),
+		m = e.baseSize || 750,
+		s = e.baseFontSize || 100,
+		u = function() {
+			var e = document.createElement("div");
+			e.style.width = "1rem", e.style.display = "none", (document.head || document.getElementsByTagName("head")[
+				0]).appendChild(e);
+			var t = parseFloat(window.getComputedStyle(e, null).getPropertyValue("width"));
+			return e.parentNode.removeChild(e), t
+		}(),
+		c = window.devicePixelRatio || 1,
+		c = d ? 1 : c >= 3 ? 3 : c >= 2 ? 2 : 1,
+		l = 1 / c;
+	d || !n && !i || (o.setAttribute("content", "width=device-width,initial-scale=" + l + ",maximum-scale=" + l +
+		", minimum-scale=" + l + ",user-scalable=no"), a.setAttribute("data-dpr", c));
+	var p = function() {
+		var e = a.getBoundingClientRect().width;
+		e = n || i ? e > 540 * c ? 540 * c : e : 375;
+		var t = e / m * s;
+		a.style.fontSize = t / u * 100 + "%", window.rem = t
+	};
+	window.addEventListener("resize", function() {
+		clearTimeout(t), t = setTimeout(p, 300)
+	}, !1), window.addEventListener("pageshow", function(e) {
+		e.persisted && (clearTimeout(t), t = setTimeout(p, 300))
+	}, !1), "complete" === r.readyState ? r.body.style.fontSize = 12 * c + "px" : r.addEventListener(
+		"DOMContentLoaded",
+		function(e) {
+			r.body.style.fontSize = 12 * c + "px"
+		}, !1), p(), window.dpr = c, window.rem2px = function(e) {
+		var t = parseFloat(e) * this.rem;
+		return "string" == typeof e && e.match(/rem$/) && (t += "px")
+	}, window.px2rem = function(e) {
+		var t = parseFloat(e) / this.rem;
+		return "string" == typeof e && e.match(/px$/) && (t += "rem")
+	}
+}(function() {
+	var e = document.getElementsByTagName("script"),
+		t = e[e.length - 1],
+		n = /flexible\.js\?(\d+)\&(\d+)(?:\&([01]))?/.exec(t.src);
+	return {
+		baseSize: n && Number(n[1]),
+		baseFontSize: n && Number(n[2]),
+		freeze: !(!n || !Number(n[3]))
+	}
+}());
\ No newline at end of file
diff --git a/static/gangcai-cal/index.html b/static/gangcai-cal/index.html
new file mode 100644
index 0000000..0f4b15f
--- /dev/null
+++ b/static/gangcai-cal/index.html
@@ -0,0 +1,157 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta psa="M26">
+  <meta lang="zh">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="description" content="对常用钢材进行理论重量计算、理论长度计算；涉及钢材种类或品种：钢板、螺纹钢、盘条、线材、圆钢、方钢、扁钢、花纹板、六角钢、八角钢、无缝钢管、直缝焊管、螺旋焊管、方形钢管、矩形管、等边角钢、不等边角钢、工字钢、槽钢、L型钢、H型钢、T型钢等" />
+  <meta name="keywords" content="钢材理重公式、钢材理论重量、钢材理重、钢材理计、在线理重计算器、在线钢材计算器、钢板理重计算、钢筋理重计算、线材理重计算、圆钢理重计算、方钢理重计算、扁钢理重计算、花纹板理重计算、钢管理重计算、管材理重计算、方管理重计算、矩形管理重计算" />
+  <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
+  <title>羽昌钢材计算器</title>
+ <!-- <link rel="canonical" href="http://yc.sevenit.cn/">-->
+	<!--<script>-->
+	<!--		try {-->
+	<!--			if (!(/wagchat/.test(navigator.userAgent.toLowerCase()))) {-->
+	<!--				if(!(navigator.userAgent.match(/(iPhone|iPad|Android|ios|iPod|Windows Phone)/i))){-->
+	<!--					window.location.href="http://yc.sevenit.cn/"-->
+	<!--				}-->
+	<!--			}-->
+	<!--		} catch (error) {-->
+	<!--			console.log(error)-->
+	<!--		}-->
+	<!--	</script>-->
+  <link rel="stylesheet" href="./jisuan.css">
+  <script src="./flexible.js?750&amp;100&amp;1"></script>
+</head>
+
+<body psa="a535">
+    
+  <div data-v-7ba5bd90="" id="app" class="page-m-calculator">
+    <div data-v-7ba5bd90="" class="view-main">
+      <div data-v-4f37e659="" class="component-tabs">
+        <div data-v-4f37e659="" class="tab-item active">
+          计算重量
+        </div>
+        <div data-v-4f37e659="" class="tab-item">
+          计算长度
+        </div>
+      </div>
+      <div data-v-a639d88e="" class="component-panel component-main">
+        <div class="component-select view-select" data-v-a639d88e="">
+          <div data-v-c4810c7c="" class="component-input icon"><input data-v-c4810c7c="" type="text" readonly="readonly"
+              placeholder="请选择品类" class="input-base default"> <i data-v-c4810c7c="" class="icon-input"></i>
+          </div>
+          <div data-v-3a298670="" class="component-tags" style="display: none;">
+            <div data-v-3a298670="" class="tag-item">
+              钢板
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              螺纹钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              盘条(线材)
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              圆钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              方钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              扁钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              六角钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              八角钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              无缝钢管
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              直缝焊管
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              方形钢管
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              矩形管
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              螺旋管
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              等边角钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              不等边角钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              工字钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              槽钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              L型钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              H型钢
+            </div>
+            <div data-v-3a298670="" class="tag-item">
+              T型钢
+            </div>
+          </div>
+        </div>
+        <div data-v-47c13bfe="" class="view-calculator-form" data-v-a639d88e="">
+          <div data-v-47c13bfe="" class="calculator-field"><span data-v-47c13bfe="" class="required">*</span> <span
+              data-v-47c13bfe="" class="label">
+              厚度
+            </span> <span data-v-47c13bfe="" class="unit">毫米</span>
+            <div data-v-c4810c7c="" data-v-47c13bfe="" class="field component-input"><input data-v-c4810c7c=""
+                type="number" disabled="disabled" class="input-base">
+            </div>
+          </div>
+          <div data-v-47c13bfe="" class="calculator-field"><span data-v-47c13bfe="" class="required">*</span> <span
+              data-v-47c13bfe="" class="label">
+              宽度
+            </span> <span data-v-47c13bfe="" class="unit">毫米</span>
+            <div data-v-c4810c7c="" data-v-47c13bfe="" class="field component-input"><input data-v-c4810c7c=""
+                type="number" disabled="disabled" class="input-base">
+            </div>
+          </div>
+          <div data-v-47c13bfe="" class="calculator-field"><span data-v-47c13bfe="" class="required">*</span> <span
+              data-v-47c13bfe="" class="label">
+              长度
+            </span> <span data-v-47c13bfe="" class="unit">米</span>
+            <div data-v-c4810c7c="" data-v-47c13bfe="" class="field component-input"><input data-v-c4810c7c=""
+                type="number" disabled="disabled" class="input-base">
+            </div>
+          </div>
+        </div>
+        <div data-v-7337339a="" class="view-result" data-v-a639d88e="">
+          <h2 data-v-7337339a="">计算结果：
+            <span data-v-7337339a="">0.0000
+              <span data-v-7337339a="" class="unit">吨</span></span></h2>
+        </div>
+        <div data-v-124bf6fa="" class="view-operation component-operation" data-v-a639d88e="">
+          <div data-v-124bf6fa="" class="operation button">计算结果</div>
+          <div data-v-124bf6fa="" class="operation clear light">清空</div>
+        </div>
+      </div>
+	
+      <div class="tips">本工具计算结果是理论估算值, 与实际测量值存在偏差, 仅供参考</div>
+	  
+    </div>
+
+  </div>
+  <script type="text/javascript" src="./index.js"></script>
+</body>
+<script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
+<script>LA.init({id:"KFijvqP6Uh3MIZOZ",ck:"KFijvqP6Uh3MIZOZ"})</script>
+</html>
\ No newline at end of file
diff --git a/static/gangcai-cal/index.js b/static/gangcai-cal/index.js
new file mode 100644
index 0000000..3222c6b
--- /dev/null
+++ b/static/gangcai-cal/index.js
@@ -0,0 +1,7538 @@
+! function(e) {
+	function t(r) {
+		if (n[r]) return n[r].exports;
+		var i = n[r] = {
+			i: r,
+			l: !1,
+			exports: {}
+		};
+		return e[r].call(i.exports, i, i.exports, t), i.l = !0, i.exports
+	}
+	var n = {};
+	t.m = e, t.c = n, t.d = function(e, n, r) {
+		t.o(e, n) || Object.defineProperty(e, n, {
+			enumerable: !0,
+			get: r
+		})
+	}, t.r = function(e) {
+		"undefined" != typeof Symbol && Symbol.toStringTag && Object.defineProperty(e, Symbol.toStringTag, {
+			value: "Module"
+		}), Object.defineProperty(e, "__esModule", {
+			value: !0
+		})
+	}, t.t = function(e, n) {
+		if (1 & n && (e = t(e)), 8 & n) return e;
+		if (4 & n && "object" == typeof e && e && e.__esModule) return e;
+		var r = Object.create(null);
+		if (t.r(r), Object.defineProperty(r, "default", {
+				enumerable: !0,
+				value: e
+			}), 2 & n && "string" != typeof e)
+			for (var i in e) t.d(r, i, function(t) {
+				return e[t]
+			}.bind(null, i));
+		return r
+	}, t.n = function(e) {
+		var n = e && e.__esModule ? function() {
+			return e.default
+		} : function() {
+			return e
+		};
+		return t.d(n, "a", n), n
+	}, t.o = function(e, t) {
+		return Object.prototype.hasOwnProperty.call(e, t)
+	}, t.p = "", t(t.s = 31)
+}([function(e, t, n) {
+		(function(t, n) {
+			e.exports = function() {
+				"use strict";
+
+				function e(e) {
+					return null == e
+				}
+
+				function r(e) {
+					return null != e
+				}
+
+				function i(e) {
+					return !0 === e
+				}
+
+				function o(e) {
+					return "string" == typeof e || "number" == typeof e || "symbol" == typeof e ||
+						"boolean" == typeof e
+				}
+
+				function a(e) {
+					return null !== e && "object" == typeof e
+				}
+
+				function s(e) {
+					return xr.call(e).slice(8, -1)
+				}
+
+				function c(e) {
+					return "[object Object]" === xr.call(e)
+				}
+
+				function u(e) {
+					return "[object RegExp]" === xr.call(e)
+				}
+
+				function l(e) {
+					var t = parseFloat(String(e));
+					return 0 <= t && Math.floor(t) === t && isFinite(e)
+				}
+
+				function f(e) {
+					return r(e) && "function" == typeof e.then && "function" == typeof e.catch
+				}
+
+				function d(e) {
+					return null == e ? "" : Array.isArray(e) || c(e) && e.toString === xr ? JSON.stringify(
+						e, null, 2) : String(e)
+				}
+
+				function p(e) {
+					var t = parseFloat(e);
+					return isNaN(t) ? e : t
+				}
+
+				function h(e, t) {
+					for (var n = Object.create(null), r = e.split(","), i = 0; i < r.length; i++) n[r[
+						i]] = !0;
+					return t ? function(e) {
+						return n[e.toLowerCase()]
+					} : function(e) {
+						return n[e]
+					}
+				}
+
+				function v(e, t) {
+					if (e.length) {
+						var n = e.indexOf(t);
+						if (-1 < n) return e.splice(n, 1)
+					}
+				}
+
+				function m(e, t) {
+					return Ar.call(e, t)
+				}
+
+				function g(e) {
+					var t = Object.create(null);
+					return function(n) {
+						return t[n] || (t[n] = e(n))
+					}
+				}
+
+				function y(e, t) {
+					t = t || 0;
+					for (var n = e.length - t, r = new Array(n); n--;) r[n] = e[n + t];
+					return r
+				}
+
+				function b(e, t) {
+					for (var n in t) e[n] = t[n];
+					return e
+				}
+
+				function _(e) {
+					for (var t = {}, n = 0; n < e.length; n++) e[n] && b(t, e[n]);
+					return t
+				}
+
+				function w(e, t, n) {}
+
+				function $(e, t) {
+					if (e === t) return !0;
+					var n = a(e),
+						r = a(t);
+					if (!n || !r) return !n && !r && String(e) === String(t);
+					try {
+						var i = Array.isArray(e),
+							o = Array.isArray(t);
+						if (i && o) return e.length === t.length && e.every(function(e, n) {
+							return $(e, t[n])
+						});
+						if (e instanceof Date && t instanceof Date) return e.getTime() === t.getTime();
+						if (i || o) return !1;
+						var s = Object.keys(e),
+							c = Object.keys(t);
+						return s.length === c.length && s.every(function(n) {
+							return $(e[n], t[n])
+						})
+					} catch (n) {
+						return !1
+					}
+				}
+
+				function C(e, t) {
+					for (var n = 0; n < e.length; n++)
+						if ($(e[n], t)) return n;
+					return -1
+				}
+
+				function k(e) {
+					var t = !1;
+					return function() {
+						t || (t = !0, e.apply(this, arguments))
+					}
+				}
+
+				function x(e) {
+					var t = (e + "").charCodeAt(0);
+					return 36 === t || 95 === t
+				}
+
+				function T(e, t, n, r) {
+					Object.defineProperty(e, t, {
+						value: n,
+						enumerable: !!r,
+						writable: !0,
+						configurable: !0
+					})
+				}
+
+				function S(e) {
+					return "function" == typeof e && /native code/.test(e.toString())
+				}
+
+				function A(e) {
+					hi.push(e), pi.target = e
+				}
+
+				function O() {
+					hi.pop(), pi.target = hi[hi.length - 1]
+				}
+
+				function E(e) {
+					return new vi(void 0, void 0, void 0, String(e))
+				}
+
+				function M(e) {
+					var t = new vi(e.tag, e.data, e.children && e.children.slice(), e.text, e.elm, e
+						.context, e.componentOptions, e.asyncFactory);
+					return t.ns = e.ns, t.isStatic = e.isStatic, t.key = e.key, t.isComment = e.isComment, t
+						.fnContext = e.fnContext, t.fnOptions = e.fnOptions, t.fnScopeId = e.fnScopeId, t
+						.asyncMeta = e.asyncMeta, t.isCloned = !0, t
+				}
+
+				function L(e) {
+					wi = e
+				}
+
+				function j(e, t) {
+					var n;
+					if (a(e) && !(e instanceof vi)) return m(e, "__ob__") && e.__ob__ instanceof $i ? n = e
+						.__ob__ : wi && !ri() && (Array.isArray(e) || c(e)) && Object.isExtensible(e) &&
+						!e._isVue && (n = new $i(e)), t && n && n.vmCount++, n
+				}
+
+				function D(e, t, n, r, i) {
+					var o = new pi,
+						a = Object.getOwnPropertyDescriptor(e, t);
+					if (!a || !1 !== a.configurable) {
+						var s = a && a.get,
+							c = a && a.set;
+						s && !c || 2 !== arguments.length || (n = e[t]);
+						var u = !i && j(n);
+						Object.defineProperty(e, t, {
+							enumerable: !0,
+							configurable: !0,
+							get: function() {
+								var t = s ? s.call(e) : n;
+								return pi.target && (o.depend(), u && (u.dep.depend(), Array
+									.isArray(t) && function e(t) {
+										for (var n = void 0, r = 0, i = t.length; r <
+											i; r++)(n = t[r]) && n.__ob__ && n.__ob__
+											.dep.depend(), Array.isArray(n) && e(n)
+									}(t))), t
+							},
+							set: function(t) {
+								var a = s ? s.call(e) : n;
+								t === a || t != t && a != a || (r && r(), s && !c || (c ? c
+									.call(e, t) : n = t, u = !i && j(t), o.notify()))
+							}
+						})
+					}
+				}
+
+				function I(t, n, r) {
+					if ((e(t) || o(t)) && ai(
+							"Cannot set reactive property on undefined, null, or primitive value: " + t),
+						Array.isArray(t) && l(n)) return t.length = Math.max(t.length, n), t.splice(n, 1,
+						r), r;
+					if (n in t && !(n in Object.prototype)) return t[n] = r;
+					var i = t.__ob__;
+					return t._isVue || i && i.vmCount ? (ai(
+						"Avoid adding reactive properties to a Vue instance or its root $data at runtime - declare it upfront in the data option."
+						), r) : i ? (D(i.value, n, r), i.dep.notify(), r) : t[n] = r
+				}
+
+				function N(t, n) {
+					if ((e(t) || o(t)) && ai(
+							"Cannot delete reactive property on undefined, null, or primitive value: " + t),
+						Array.isArray(t) && l(n)) t.splice(n, 1);
+					else {
+						var r = t.__ob__;
+						t._isVue || r && r.vmCount ? ai(
+							"Avoid deleting properties on a Vue instance or its root $data - just set it to null."
+							) : m(t, n) && (delete t[n], r && r.dep.notify())
+					}
+				}
+
+				function R(e, t) {
+					if (!t) return e;
+					for (var n, r, i, o = oi ? Reflect.ownKeys(t) : Object.keys(t), a = 0; a < o
+						.length; a++) "__ob__" !== (n = o[a]) && (r = e[n], i = t[n], m(e, n) ? r !== i &&
+						c(r) && c(i) && R(r, i) : I(e, n, i));
+					return e
+				}
+
+				function F(e, t, n) {
+					return n ? function() {
+						var r = "function" == typeof t ? t.call(n, n) : t,
+							i = "function" == typeof e ? e.call(n, n) : e;
+						return r ? R(r, i) : i
+					} : t ? e ? function() {
+						return R("function" == typeof t ? t.call(this, this) : t, "function" ==
+							typeof e ? e.call(this, this) : e)
+					} : t : e
+				}
+
+				function P(e, t) {
+					var n = t ? e ? e.concat(t) : Array.isArray(t) ? t : [t] : e;
+					return n ? function(e) {
+						for (var t = [], n = 0; n < e.length; n++) - 1 === t.indexOf(e[n]) && t.push(e[
+							n]);
+						return t
+					}(n) : n
+				}
+
+				function H(e, t, n, r) {
+					var i = Object.create(e || null);
+					return t ? (B(r, t, n), b(i, t)) : i
+				}
+
+				function W(e) {
+					new RegExp("^[a-zA-Z][\\-\\.0-9_" + Wr.source + "]*$").test(e) || ai(
+						'Invalid component name: "' + e +
+						'". Component names should conform to valid custom element name in html5 specification.'
+						), (Tr(e) || Hr.isReservedTag(e)) && ai(
+						"Do not use built-in or reserved HTML elements as component id: " + e)
+				}
+
+				function B(e, t, n) {
+					c(t) || ai('Invalid value for option "' + e + '": expected an Object, but got ' + s(t) +
+						".", n)
+				}
+
+				function V(e, t, n) {
+					function r(r) {
+						var i = Ci[r] || Si;
+						u[r] = i(e[r], t[r], n, r)
+					}
+					if (function(e) {
+							for (var t in e.components) W(t)
+						}(t), "function" == typeof t && (t = t.options), function(e, t) {
+							var n = e.props;
+							if (n) {
+								var r, i, o, a = {};
+								if (Array.isArray(n))
+									for (r = n.length; r--;) "string" == typeof(i = n[r]) ? (o = Er(i), a[
+										o] = {
+											type: null
+										}) : ai("props must be strings when using array syntax.");
+								else if (c(n))
+									for (var u in n) i = n[u], o = Er(u), a[o] = c(i) ? i : {
+										type: i
+									};
+								else ai('Invalid value for option "props": expected an Array or an Object, but got ' +
+									s(n) + ".", t);
+								e.props = a
+							}
+						}(t, n), function(e, t) {
+							var n = e.inject;
+							if (n) {
+								var r = e.inject = {};
+								if (Array.isArray(n))
+									for (var i = 0; i < n.length; i++) r[n[i]] = {
+										from: n[i]
+									};
+								else if (c(n))
+									for (var o in n) {
+										var a = n[o];
+										r[o] = c(a) ? b({
+											from: o
+										}, a) : {
+											from: a
+										}
+									} else ai(
+										'Invalid value for option "inject": expected an Array or an Object, but got ' +
+										s(n) + ".", t)
+							}
+						}(t, n), function(e) {
+							var t = e.directives;
+							if (t)
+								for (var n in t) {
+									var r = t[n];
+									"function" == typeof r && (t[n] = {
+										bind: r,
+										update: r
+									})
+								}
+						}(t), !t._base && (t.extends && (e = V(e, t.extends, n)), t.mixins))
+						for (var i = 0, o = t.mixins.length; i < o; i++) e = V(e, t.mixins[i], n);
+					var a, u = {};
+					for (a in e) r(a);
+					for (a in t) m(e, a) || r(a);
+					return u
+				}
+
+				function q(e, t, n, r) {
+					if ("string" == typeof n) {
+						var i = e[t];
+						if (m(i, n)) return i[n];
+						var o = Er(n);
+						if (m(i, o)) return i[o];
+						var a = Mr(o);
+						if (m(i, a)) return i[a];
+						var s = i[n] || i[o] || i[a];
+						return r && !s && ai("Failed to resolve " + t.slice(0, -1) + ": " + n, e), s
+					}
+				}
+
+				function U(e, t, n, r) {
+					var i = t[e],
+						o = !m(n, e),
+						c = n[e],
+						u = G(Boolean, i.type);
+					if (-1 < u)
+						if (o && !m(i, "default")) c = !1;
+						else if ("" === c || c === jr(e)) {
+						var l = G(String, i.type);
+						(l < 0 || u < l) && (c = !0)
+					}
+					if (void 0 === c) {
+						c = function(e, t, n) {
+							if (m(t, "default")) {
+								var r = t.default;
+								return a(r) && ai('Invalid default value for prop "' + n +
+										'": Props with type Object/Array must use a factory function to return the default value.',
+										e), e && e.$options.propsData && void 0 === e.$options
+									.propsData[n] && void 0 !== e._props[n] ? e._props[n] :
+									"function" == typeof r && "Function" !== J(t.type) ? r.call(e) : r
+							}
+						}(r, i, e);
+						var f = wi;
+						L(!0), j(c), L(f)
+					}
+					return function(e, t, n, r, i) {
+						if (e.required && i) return ai('Missing required prop: "' + t + '"', r);
+						if (null != n || e.required) {
+							var o = e.type,
+								a = !o || !0 === o,
+								c = [];
+							if (o) {
+								Array.isArray(o) || (o = [o]);
+								for (var u = 0; u < o.length && !a; u++) {
+									var l = z(n, o[u]);
+									c.push(l.expectedType || ""), a = l.valid
+								}
+							}
+							if (!a) return ai(function(e, t, n) {
+								var r = 'Invalid prop: type check failed for prop "' + e +
+									'". Expected ' + n.map(Mr).join(", "),
+									i = n[0],
+									o = s(t),
+									a = Z(t, i),
+									c = Z(t, o);
+								return 1 === n.length && X(i) && ! function() {
+										for (var e = [], t = arguments.length; t--;) e[t] =
+											arguments[t];
+										return e.some(function(e) {
+											return "boolean" === e.toLowerCase()
+										})
+									}(i, o) && (r += " with value " + a), r += ", got " +
+									o + " ", X(o) && (r += "with value " + c + "."), r
+							}(t, n, c), r);
+							var f = e.validator;
+							f && (f(n) || ai('Invalid prop: custom validator check failed for prop "' +
+								t + '".', r))
+						}
+					}(i, e, c, r, o), c
+				}
+
+				function z(e, t) {
+					var n, r = J(t);
+					if (Ai.test(r)) {
+						var i = typeof e;
+						(n = i === r.toLowerCase()) || "object" != i || (n = e instanceof t)
+					} else n = "Object" === r ? c(e) : "Array" === r ? Array.isArray(e) : e instanceof t;
+					return {
+						valid: n,
+						expectedType: r
+					}
+				}
+
+				function J(e) {
+					var t = e && e.toString().match(/^\s*function (\w+)/);
+					return t ? t[1] : ""
+				}
+
+				function K(e, t) {
+					return J(e) === J(t)
+				}
+
+				function G(e, t) {
+					if (!Array.isArray(t)) return K(t, e) ? 0 : -1;
+					for (var n = 0, r = t.length; n < r; n++)
+						if (K(t[n], e)) return n;
+					return -1
+				}
+
+				function Z(e, t) {
+					return "String" === t ? '"' + e + '"' : "Number" === t ? "" + Number(e) : "" + e
+				}
+
+				function X(e) {
+					return ["string", "number", "boolean"].some(function(t) {
+						return e.toLowerCase() === t
+					})
+				}
+
+				function Y(e, t, n) {
+					A();
+					try {
+						if (t)
+							for (var r = t; r = r.$parent;) {
+								var i = r.$options.errorCaptured;
+								if (i)
+									for (var o = 0; o < i.length; o++) try {
+										var a = !1 === i[o].call(r, e, t, n);
+										if (a) return
+									} catch (e) {
+										ee(e, r, "errorCaptured hook")
+									}
+							}
+						ee(e, t, n)
+					} finally {
+						O()
+					}
+				}
+
+				function Q(e, t, n, r, i) {
+					var o;
+					try {
+						(o = n ? e.apply(t, n) : e.call(t)) && !o._isVue && f(o) && !o._handled && (o.catch(
+							function(e) {
+								return Y(e, r, i + " (Promise/async)")
+							}), o._handled = !0)
+					} catch (e) {
+						Y(e, r, i)
+					}
+					return o
+				}
+
+				function ee(e, t, n) {
+					if (Hr.errorHandler) try {
+						return Hr.errorHandler.call(null, e, t, n)
+					} catch (t) {
+						t !== e && te(t, null, "config.errorHandler")
+					}
+					te(e, t, n)
+				}
+
+				function te(e, t, n) {
+					if (ai("Error in " + n + ': "' + e.toString() + '"', t), !qr && !Ur || "undefined" ==
+						typeof console) throw e
+				}
+
+				function ne() {
+					Mi = !1;
+					for (var e = Ei.slice(0), t = Ei.length = 0; t < e.length; t++) e[t]()
+				}
+
+				function re(e, t) {
+					var n;
+					if (Ei.push(function() {
+							if (e) try {
+								e.call(t)
+							} catch (e) {
+								Y(e, t, "nextTick")
+							} else n && n(t)
+						}), Mi || (Mi = !0, ki()), !e && "undefined" != typeof Promise) return new Promise(
+						function(e) {
+							n = e
+						})
+				}
+
+				function ie(e) {
+					! function e(t, n) {
+						var r, i, o = Array.isArray(t);
+						if (!(!o && !a(t) || Object.isFrozen(t) || t instanceof vi)) {
+							if (t.__ob__) {
+								var s = t.__ob__.dep.id;
+								if (n.has(s)) return;
+								n.add(s)
+							}
+							if (o)
+								for (r = t.length; r--;) e(t[r], n);
+							else
+								for (i = Object.keys(t), r = i.length; r--;) e(t[i[r]], n)
+						}
+					}(e, Ui), Ui.clear()
+				}
+
+				function oe(e, t) {
+					function n() {
+						var e = arguments,
+							r = n.fns;
+						if (!Array.isArray(r)) return Q(r, null, arguments, t, "v-on handler");
+						for (var i = r.slice(), o = 0; o < i.length; o++) Q(i[o], null, e, t,
+							"v-on handler")
+					}
+					return n.fns = e, n
+				}
+
+				function ae(t, n, r, o, a, s) {
+					var c, u, l, f;
+					for (c in t) u = t[c], l = n[c], f = zi(c), e(u) ? ai('Invalid handler for event "' + f
+						.name + '": got ' + String(u), s) : e(l) ? (e(u.fns) && (u = t[c] = oe(u, s)),
+						i(f.once) && (u = t[c] = a(f.name, u, f.capture)), r(f.name, u, f.capture, f
+							.passive, f.params)) : u !== l && (l.fns = u, t[c] = l);
+					for (c in n) e(t[c]) && (f = zi(c), o(f.name, n[c], f.capture))
+				}
+
+				function se(t, n, o) {
+					function a() {
+						o.apply(this, arguments), v(s.fns, a)
+					}
+					var s;
+					t instanceof vi && (t = t.data.hook || (t.data.hook = {}));
+					var c = t[n];
+					e(c) ? s = oe([a]) : r(c.fns) && i(c.merged) ? (s = c).fns.push(a) : s = oe([c, a]), s
+						.merged = !0, t[n] = s
+				}
+
+				function ce(e, t, n, i, o) {
+					if (r(t)) {
+						if (m(t, n)) return e[n] = t[n], o || delete t[n], !0;
+						if (m(t, i)) return e[n] = t[i], o || delete t[i], !0
+					}
+					return !1
+				}
+
+				function ue(t) {
+					return o(t) ? [E(t)] : Array.isArray(t) ? function t(n, a) {
+						var s, c, u, l, f = [];
+						for (s = 0; s < n.length; s++) e(c = n[s]) || "boolean" == typeof c || (u = f
+							.length - 1, l = f[u], Array.isArray(c) ? 0 < c.length && (le((c = t(c,
+								(a || "") + "_" + s))[0]) && le(l) && (f[u] = E(l.text + c[0]
+								.text), c.shift()), f.push.apply(f, c)) : o(c) ? le(l) ? f[u] = E(l
+								.text + c) : "" !== c && f.push(E(c)) : le(c) && le(l) ? f[u] = E(l
+								.text + c.text) : (i(n._isVList) && r(c.tag) && e(c.key) && r(a) &&
+								(c.key = "__vlist" + a + "_" + s + "__"), f.push(c)));
+						return f
+					}(t) : void 0
+				}
+
+				function le(e) {
+					return r(e) && r(e.text) && function(e) {
+						return !1 === e
+					}(e.isComment)
+				}
+
+				function fe(e) {
+					var t = e.$options.provide;
+					t && (e._provided = "function" == typeof t ? t.call(e) : t)
+				}
+
+				function de(e) {
+					var t = pe(e.$options.inject, e);
+					t && (L(!1), Object.keys(t).forEach(function(n) {
+						D(e, n, t[n], function() {
+							ai('Avoid mutating an injected value directly since the changes will be overwritten whenever the provided component re-renders. injection being mutated: "' +
+								n + '"', e)
+						})
+					}), L(!0))
+				}
+
+				function pe(e, t) {
+					if (e) {
+						for (var n = Object.create(null), r = oi ? Reflect.ownKeys(e) : Object.keys(e), i =
+								0; i < r.length; i++) {
+							var o = r[i];
+							if ("__ob__" !== o) {
+								for (var a = e[o].from, s = t; s;) {
+									if (s._provided && m(s._provided, a)) {
+										n[o] = s._provided[a];
+										break
+									}
+									s = s.$parent
+								}
+								if (!s)
+									if ("default" in e[o]) {
+										var c = e[o].default;
+										n[o] = "function" == typeof c ? c.call(t) : c
+									} else ai('Injection "' + o + '" not found', t)
+							}
+						}
+						return n
+					}
+				}
+
+				function he(e, t) {
+					if (!e || !e.length) return {};
+					for (var n = {}, r = 0, i = e.length; r < i; r++) {
+						var o = e[r],
+							a = o.data;
+						if (a && a.attrs && a.attrs.slot && delete a.attrs.slot, o.context !== t && o
+							.fnContext !== t || !a || null == a.slot)(n.default || (n.default = [])).push(
+						o);
+						else {
+							var s = a.slot,
+								c = n[s] || (n[s] = []);
+							"template" === o.tag ? c.push.apply(c, o.children || []) : c.push(o)
+						}
+					}
+					for (var u in n) n[u].every(ve) && delete n[u];
+					return n
+				}
+
+				function ve(e) {
+					return e.isComment && !e.asyncFactory || " " === e.text
+				}
+
+				function me(e, t, n) {
+					var r, i = 0 < Object.keys(t).length,
+						o = e ? !!e.$stable : !i,
+						a = e && e.$key;
+					if (e) {
+						if (e._normalized) return e._normalized;
+						if (o && n && n !== kr && a === n.$key && !i && !n.$hasNormal) return n;
+						for (var s in r = {}, e) e[s] && "$" !== s[0] && (r[s] = ge(t, s, e[s]))
+					} else r = {};
+					for (var c in t) c in r || (r[c] = ye(t, c));
+					return e && Object.isExtensible(e) && (e._normalized = r), T(r, "$stable", o), T(r,
+						"$key", a), T(r, "$hasNormal", i), r
+				}
+
+				function ge(e, t, n) {
+					var r = function() {
+						var e = arguments.length ? n.apply(null, arguments) : n({});
+						return (e = e && "object" == typeof e && !Array.isArray(e) ? [e] : ue(e)) && (
+							0 === e.length || 1 === e.length && e[0].isComment) ? void 0 : e
+					};
+					return n.proxy && Object.defineProperty(e, t, {
+						get: r,
+						enumerable: !0,
+						configurable: !0
+					}), r
+				}
+
+				function ye(e, t) {
+					return function() {
+						return e[t]
+					}
+				}
+
+				function be(e, t) {
+					var n, i, o, s, c;
+					if (Array.isArray(e) || "string" == typeof e)
+						for (n = new Array(e.length), i = 0, o = e.length; i < o; i++) n[i] = t(e[i], i);
+					else if ("number" == typeof e)
+						for (n = new Array(e), i = 0; i < e; i++) n[i] = t(i + 1, i);
+					else if (a(e))
+						if (oi && e[Symbol.iterator]) {
+							n = [];
+							for (var u = e[Symbol.iterator](), l = u.next(); !l.done;) n.push(t(l.value, n
+								.length)), l = u.next()
+						} else
+							for (s = Object.keys(e), n = new Array(s.length), i = 0, o = s.length; i <
+								o; i++) c = s[i], n[i] = t(e[c], c, i);
+					return r(n) || (n = []), n._isVList = !0, n
+				}
+
+				function _e(e, t, n, r) {
+					var i, o = this.$scopedSlots[e];
+					i = o ? (n = n || {}, r && (a(r) || ai("slot v-bind without argument expects an Object",
+						this), n = b(b({}, r), n)), o(n) || t) : this.$slots[e] || t;
+					var s = n && n.slot;
+					return s ? this.$createElement("template", {
+						slot: s
+					}, i) : i
+				}
+
+				function we(e) {
+					return q(this.$options, "filters", e, !0) || Nr
+				}
+
+				function $e(e, t) {
+					return Array.isArray(e) ? -1 === e.indexOf(t) : e !== t
+				}
+
+				function Ce(e, t, n, r, i) {
+					var o = Hr.keyCodes[t] || n;
+					return i && r && !Hr.keyCodes[t] ? $e(i, r) : o ? $e(o, e) : r ? jr(r) !== t : void 0
+				}
+
+				function ke(e, t, n, r, i) {
+					if (n)
+						if (a(n)) {
+							var o;
+							Array.isArray(n) && (n = _(n));
+							for (var s in n) ! function(a) {
+								if ("class" === a || "style" === a || Sr(a)) o = e;
+								else {
+									var s = e.attrs && e.attrs.type;
+									o = r || Hr.mustUseProp(t, s, a) ? e.domProps || (e.domProps = {}) :
+										e.attrs || (e.attrs = {})
+								}
+								var c = Er(a),
+									u = jr(a);
+								if (!(c in o || u in o) && (o[a] = n[a], i)) {
+									(e.on || (e.on = {}))["update:" + a] = function(e) {
+										n[a] = e
+									}
+								}
+							}(s)
+						} else ai("v-bind without argument expects an Object or Array value", this);
+					return e
+				}
+
+				function xe(e, t) {
+					var n = this._staticTrees || (this._staticTrees = []),
+						r = n[e];
+					return r && !t || Se(r = n[e] = this.$options.staticRenderFns[e].call(this._renderProxy,
+						null, this), "__static__" + e, !1), r
+				}
+
+				function Te(e, t, n) {
+					return Se(e, "__once__" + t + (n ? "_" + n : ""), !0), e
+				}
+
+				function Se(e, t, n) {
+					if (Array.isArray(e))
+						for (var r = 0; r < e.length; r++) e[r] && "string" != typeof e[r] && Ae(e[r], t +
+							"_" + r, n);
+					else Ae(e, t, n)
+				}
+
+				function Ae(e, t, n) {
+					e.isStatic = !0, e.key = t, e.isOnce = n
+				}
+
+				function Oe(e, t) {
+					if (t)
+						if (c(t)) {
+							var n = e.on = e.on ? b({}, e.on) : {};
+							for (var r in t) {
+								var i = n[r],
+									o = t[r];
+								n[r] = i ? [].concat(i, o) : o
+							}
+						} else ai("v-on without argument expects an Object value", this);
+					return e
+				}
+
+				function Ee(e, t, n, r) {
+					t = t || {
+						$stable: !n
+					};
+					for (var i = 0; i < e.length; i++) {
+						var o = e[i];
+						Array.isArray(o) ? Ee(o, t, n) : o && (o.proxy && (o.fn.proxy = !0), t[o.key] = o
+							.fn)
+					}
+					return r && (t.$key = r), t
+				}
+
+				function Me(e, t) {
+					for (var n = 0; n < t.length; n += 2) {
+						var r = t[n];
+						"string" == typeof r && r ? e[t[n]] = t[n + 1] : "" !== r && null !== r && ai(
+							"Invalid value for dynamic directive argument (expected string or null): " +
+							r, this)
+					}
+					return e
+				}
+
+				function Le(e, t) {
+					return "string" == typeof e ? t + e : e
+				}
+
+				function je(e) {
+					e._o = Te, e._n = p, e._s = d, e._l = be, e._t = _e, e._q = $, e._i = C, e._m = xe, e
+						._f = we, e._k = Ce, e._b = ke, e._v = E, e._e = gi, e._u = Ee, e._g = Oe, e._d =
+						Me, e._p = Le
+				}
+
+				function De(e, t, n, r, o) {
+					var a, s = this,
+						c = o.options;
+					m(r, "_uid") ? (a = Object.create(r))._original = r : r = (a = r)._original;
+					var u = i(c._compiled),
+						l = !u;
+					this.data = e, this.props = t, this.children = n, this.parent = r, this.listeners = e
+						.on || kr, this.injections = pe(c.inject, r), this.slots = function() {
+							return s.$slots || me(e.scopedSlots, s.$slots = he(n, r)), s.$slots
+						}, Object.defineProperty(this, "scopedSlots", {
+							enumerable: !0,
+							get: function() {
+								return me(e.scopedSlots, this.slots())
+							}
+						}), u && (this.$options = c, this.$slots = this.slots(), this.$scopedSlots = me(e
+							.scopedSlots, this.$slots)), c._scopeId ? this._c = function(e, t, n, i) {
+							var o = Pe(a, e, t, n, i, l);
+							return o && !Array.isArray(o) && (o.fnScopeId = c._scopeId, o.fnContext = r), o
+						} : this._c = function(e, t, n, r) {
+							return Pe(a, e, t, n, r, l)
+						}
+				}
+
+				function Ie(e, t, n, r, i) {
+					var o = M(e);
+					return o.fnContext = n, o.fnOptions = r, (o.devtoolsMeta = o.devtoolsMeta || {})
+						.renderContext = i, t.slot && ((o.data || (o.data = {})).slot = t.slot), o
+				}
+
+				function Ne(e, t) {
+					for (var n in t) e[Er(n)] = t[n]
+				}
+
+				function Re(t, n, o, s, c) {
+					if (!e(t)) {
+						var u = o.$options._base;
+						if (a(t) && (t = u.extend(t)), "function" == typeof t) {
+							var l;
+							if (e(t.cid) && void 0 === (t = function(t, n) {
+									if (i(t.error) && r(t.errorComp)) return t.errorComp;
+									if (r(t.resolved)) return t.resolved;
+									var o = Yi;
+									if (o && r(t.owners) && -1 === t.owners.indexOf(o) && t.owners.push(
+											o), i(t.loading) && r(t.loadingComp)) return t.loadingComp;
+									if (o && !r(t.owners)) {
+										var s = t.owners = [o],
+											c = !0,
+											u = null,
+											l = null;
+										o.$on("hook:destroyed", function() {
+											return v(s, o)
+										});
+										var d = function(e) {
+												for (var t = 0, n = s.length; t < n; t++) s[t]
+													.$forceUpdate();
+												e && (s.length = 0, null !== u && (clearTimeout(u), u =
+													null), null !== l && (clearTimeout(l), l =
+													null))
+											},
+											p = k(function(e) {
+												t.resolved = We(e, n), c ? s.length = 0 : d(!0)
+											}),
+											h = k(function(e) {
+												ai("Failed to resolve async component: " + String(
+													t) + (e ? "\nReason: " + e : "")), r(t
+													.errorComp) && (t.error = !0, d(!0))
+											}),
+											m = t(p, h);
+										return a(m) && (f(m) ? e(t.resolved) && m.then(p, h) : f(m
+												.component) && (m.component.then(p, h), r(m
+												.error) && (t.errorComp = We(m.error, n)), r(m
+													.loading) && (t.loadingComp = We(m.loading, n),
+													0 === m.delay ? t.loading = !0 : u = setTimeout(
+														function() {
+															u = null, e(t.resolved) && e(t.error) &&
+																(t.loading = !0, d(!1))
+														}, m.delay || 200)), r(m.timeout) && (l =
+													setTimeout(function() {
+														l = null, e(t.resolved) && h(
+															"timeout (" + m.timeout + "ms)")
+													}, m.timeout)))), c = !1, t.loading ? t
+											.loadingComp : t.resolved
+									}
+								}(l = t, u))) return function(e, t, n, r, i) {
+								var o = gi();
+								return o.asyncFactory = e, o.asyncMeta = {
+									data: t,
+									context: n,
+									children: r,
+									tag: i
+								}, o
+							}(l, n, o, s, c);
+							n = n || {}, ct(t), r(n.model) && function(e, t) {
+								var n = e.model && e.model.prop || "value",
+									i = e.model && e.model.event || "input";
+								(t.attrs || (t.attrs = {}))[n] = t.model.value;
+								var o = t.on || (t.on = {}),
+									a = o[i],
+									s = t.model.callback;
+								r(a) ? (Array.isArray(a) ? -1 === a.indexOf(s) : a !== s) && (o[i] = [s]
+									.concat(a)) : o[i] = s
+							}(t.options, n);
+							var d = function(t, n, i) {
+								var o = n.options.props;
+								if (!e(o)) {
+									var a = {},
+										s = t.attrs,
+										c = t.props;
+									if (r(s) || r(c))
+										for (var u in o) {
+											var l = jr(u),
+												f = u.toLowerCase();
+											u !== f && s && m(s, f) && si('Prop "' + f +
+													'" is passed to component ' + ui(i || n) +
+													', but the declared prop name is "' + u +
+													'". Note that HTML attributes are case-insensitive and camelCased props need to use their kebab-case equivalents when using in-DOM templates. You should probably use "' +
+													l + '" instead of "' + u + '".'), ce(a, c, u, l, !
+												0) || ce(a, s, u, l, !1)
+										}
+									return a
+								}
+							}(n, t, c);
+							if (i(t.options.functional)) return function(e, t, n, i, o) {
+								var a = e.options,
+									s = {},
+									c = a.props;
+								if (r(c))
+									for (var u in c) s[u] = U(u, c, t || kr);
+								else r(n.attrs) && Ne(s, n.attrs), r(n.props) && Ne(s, n.props);
+								var l = new De(n, s, o, i, e),
+									f = a.render.call(null, l._c, l);
+								if (f instanceof vi) return Ie(f, n, l.parent, a, l);
+								if (Array.isArray(f)) {
+									for (var d = ue(f) || [], p = new Array(d.length), h = 0; h < d
+										.length; h++) p[h] = Ie(d[h], n, l.parent, a, l);
+									return p
+								}
+							}(t, d, n, o, s);
+							var p = n.on;
+							if (n.on = n.nativeOn, i(t.options.abstract)) {
+								var h = n.slot;
+								n = {}, h && (n.slot = h)
+							}! function(e) {
+								for (var t = e.hook || (e.hook = {}), n = 0; n < Gi.length; n++) {
+									var r = Gi[n],
+										i = t[r],
+										o = Ki[r];
+									i === o || i && i._merged || (t[r] = i ? Fe(o, i) : o)
+								}
+							}(n);
+							var g = t.options.name || c;
+							return new vi("vue-component-" + t.cid + (g ? "-" + g : ""), n, void 0, void 0,
+								void 0, o, {
+									Ctor: t,
+									propsData: d,
+									listeners: p,
+									tag: c,
+									children: s
+								}, l)
+						}
+						ai("Invalid Component definition: " + String(t), o)
+					}
+				}
+
+				function Fe(e, t) {
+					var n = function(n, r) {
+						e(n, r), t(n, r)
+					};
+					return n._merged = !0, n
+				}
+
+				function Pe(t, n, s, c, u, l) {
+					return (Array.isArray(s) || o(s)) && (u = c, c = s, s = void 0), i(l) && (u = Xi),
+						function(t, n, s, c, u) {
+							if (r(s) && r(s.__ob__)) return ai(
+								"Avoid using observed data object as vnode data: " + JSON.stringify(
+									s) + "\nAlways create fresh vnode data objects in each render!",
+								t), gi();
+							if (r(s) && r(s.is) && (n = s.is), !n) return gi();
+							r(s) && r(s.key) && !o(s.key) && ai(
+								"Avoid using non-primitive value as key, use string/number value instead.",
+								t), Array.isArray(c) && "function" == typeof c[0] && ((s = s || {})
+								.scopedSlots = {
+									default: c[0]
+								}, c.length = 0), u === Xi ? c = ue(c) : u === Zi && (c = function(e) {
+								for (var t = 0; t < e.length; t++)
+									if (Array.isArray(e[t])) return Array.prototype.concat.apply([],
+										e);
+								return e
+							}(c));
+							var l, f;
+							if ("string" == typeof n) {
+								var d;
+								f = t.$vnode && t.$vnode.ns || Hr.getTagNamespace(n), l = Hr.isReservedTag(
+										n) ? new vi(Hr.parsePlatformTagName(n), s, c, void 0, void 0, t) :
+									s && s.pre || !r(d = q(t.$options, "components", n)) ? new vi(n, s, c,
+										void 0, void 0, t) : Re(d, s, t, c, n)
+							} else l = Re(n, s, t, c);
+							return Array.isArray(l) ? l : r(l) ? (r(f) && function t(n, o, a) {
+								if (n.ns = o, "foreignObject" === n.tag && (a = !(o = void 0)), r(n
+										.children))
+									for (var s = 0, c = n.children.length; s < c; s++) {
+										var u = n.children[s];
+										r(u.tag) && (e(u.ns) || i(a) && "svg" !== u.tag) && t(u, o,
+											a)
+									}
+							}(l, f), r(s) && function(e) {
+								a(e.style) && ie(e.style), a(e.class) && ie(e.class)
+							}(s), l) : gi()
+						}(t, n, s, c, u)
+				}
+
+				function He(e) {
+					e._vnode = null, e._staticTrees = null;
+					var t = e.$options,
+						n = e.$vnode = t._parentVnode,
+						r = n && n.context;
+					e.$slots = he(t._renderChildren, r), e.$scopedSlots = kr, e._c = function(t, n, r, i) {
+						return Pe(e, t, n, r, i, !1)
+					}, e.$createElement = function(t, n, r, i) {
+						return Pe(e, t, n, r, i, !0)
+					};
+					var i = n && n.data;
+					D(e, "$attrs", i && i.attrs || kr, function() {
+						eo || ai("$attrs is readonly.", e)
+					}, !0), D(e, "$listeners", t._parentListeners || kr, function() {
+						eo || ai("$listeners is readonly.", e)
+					}, !0)
+				}
+
+				function We(e, t) {
+					return (e.__esModule || oi && "Module" === e[Symbol.toStringTag]) && (e = e.default), a(
+						e) ? t.extend(e) : e
+				}
+
+				function Be(e) {
+					return e.isComment && e.asyncFactory
+				}
+
+				function Ve(e) {
+					if (Array.isArray(e))
+						for (var t = 0; t < e.length; t++) {
+							var n = e[t];
+							if (r(n) && (r(n.componentOptions) || Be(n))) return n
+						}
+				}
+
+				function qe(e) {
+					e._events = Object.create(null), e._hasHookEvent = !1;
+					var t = e.$options._parentListeners;
+					t && Ke(e, t)
+				}
+
+				function Ue(e, t) {
+					Ji.$on(e, t)
+				}
+
+				function ze(e, t) {
+					Ji.$off(e, t)
+				}
+
+				function Je(e, t) {
+					var n = Ji;
+					return function r() {
+						null !== t.apply(null, arguments) && n.$off(e, r)
+					}
+				}
+
+				function Ke(e, t, n) {
+					ae(t, n || {}, Ue, ze, Je, Ji = e), Ji = void 0
+				}
+
+				function Ge(e) {
+					var t = Qi;
+					return Qi = e,
+						function() {
+							Qi = t
+						}
+				}
+
+				function Ze(e) {
+					var t = e.$options,
+						n = t.parent;
+					if (n && !t.abstract) {
+						for (; n.$options.abstract && n.$parent;) n = n.$parent;
+						n.$children.push(e)
+					}
+					e.$parent = n, e.$root = n ? n.$root : e, e.$children = [], e.$refs = {}, e._watcher =
+						null, e._inactive = null, e._directInactive = !1, e._isMounted = !1, e
+						._isDestroyed = !1, e._isBeingDestroyed = !1
+				}
+
+				function Xe(e) {
+					for (; e = e && e.$parent;)
+						if (e._inactive) return !0;
+					return !1
+				}
+
+				function Ye(e, t) {
+					if (t) {
+						if (e._directInactive = !1, Xe(e)) return
+					} else if (e._directInactive) return;
+					if (e._inactive || null === e._inactive) {
+						e._inactive = !1;
+						for (var n = 0; n < e.$children.length; n++) Ye(e.$children[n]);
+						Qe(e, "activated")
+					}
+				}
+
+				function Qe(e, t) {
+					A();
+					var n = e.$options[t],
+						r = t + " hook";
+					if (n)
+						for (var i = 0, o = n.length; i < o; i++) Q(n[i], e, null, e, r);
+					e._hasHookEvent && e.$emit("hook:" + t), O()
+				}
+
+				function et() {
+					var e, t;
+					for (uo = lo(), so = !0, no.sort(function(e, t) {
+							return e.id - t.id
+						}), co = 0; co < no.length; co++)
+						if ((e = no[co]).before && e.before(), t = e.id, io[t] = null, e.run(), null != io[
+								t] && (oo[t] = (oo[t] || 0) + 1, oo[t] > to)) {
+							ai("You may have an infinite update loop " + (e.user ?
+								'in watcher with expression "' + e.expression + '"' :
+								"in a component render function."), e.vm);
+							break
+						} var n = ro.slice(),
+						r = no.slice();
+					co = no.length = ro.length = 0, io = {}, ao = so = !(oo = {}),
+						function(e) {
+							for (var t = 0; t < e.length; t++) e[t]._inactive = !0, Ye(e[t], !0)
+						}(n),
+						function(e) {
+							for (var t = e.length; t--;) {
+								var n = e[t],
+									r = n.vm;
+								r._watcher === n && r._isMounted && !r._isDestroyed && Qe(r, "updated")
+							}
+						}(r), ii && Hr.devtools && ii.emit("flush")
+				}
+
+				function tt(e, t, n) {
+					vo.get = function() {
+						return this[t][n]
+					}, vo.set = function(e) {
+						this[t][n] = e
+					}, Object.defineProperty(e, n, vo)
+				}
+
+				function nt(e) {
+					e._watchers = [];
+					var t = e.$options;
+					t.props && function(e, t) {
+						var n = e.$options.propsData || {},
+							r = e._props = {},
+							i = e.$options._propKeys = [],
+							o = !e.$parent;
+						o || L(!1);
+						for (var a in t) ! function(a) {
+							i.push(a);
+							var s = U(a, t, n, e),
+								c = jr(a);
+							(Sr(c) || Hr.isReservedAttr(c)) && ai('"' + c +
+								'" is a reserved attribute and cannot be used as component prop.',
+								e), D(r, a, s, function() {
+								o || eo || ai(
+									"Avoid mutating a prop directly since the value will be overwritten whenever the parent component re-renders. Instead, use a data or computed property based on the prop's value. Prop being mutated: \"" +
+									a + '"', e)
+							}), a in e || tt(e, "_props", a)
+						}(a);
+						L(!0)
+					}(e, t.props), t.methods && function(e, t) {
+						var n = e.$options.props;
+						for (var r in t) "function" != typeof t[r] && ai('Method "' + r +
+							'" has type "' + typeof t[r] +
+							'" in the component definition. Did you reference the function correctly?',
+							e), n && m(n, r) && ai('Method "' + r +
+							'" has already been defined as a prop.', e), r in e && x(r) && ai(
+							'Method "' + r +
+							'" conflicts with an existing Vue instance method. Avoid defining component methods that start with _ or $.'
+							), e[r] = "function" != typeof t[r] ? w : Dr(t[r], e)
+					}(e, t.methods), t.data ? function(e) {
+						var t = e.$options.data;
+						c(t = e._data = "function" == typeof t ? function(e, t) {
+							A();
+							try {
+								return e.call(t, t)
+							} catch (e) {
+								return Y(e, t, "data()"), {}
+							} finally {
+								O()
+							}
+						}(t, e) : t || {}) || (t = {}, ai(
+							"data functions should return an object:\nhttps://vuejs.org/v2/guide/components.html#data-Must-Be-a-Function",
+							e));
+						for (var n = Object.keys(t), r = e.$options.props, i = e.$options.methods, o = n
+								.length; o--;) {
+							var a = n[o];
+							i && m(i, a) && ai('Method "' + a +
+									'" has already been defined as a data property.', e), r && m(r, a) ?
+								ai('The data property "' + a +
+									'" is already declared as a prop. Use prop default value instead.',
+									e) : x(a) || tt(e, "_data", a)
+						}
+						j(t, !0)
+					}(e) : j(e._data = {}, !0), t.computed && function(e, t) {
+						var n = e._computedWatchers = Object.create(null),
+							r = ri();
+						for (var i in t) {
+							var o = t[i],
+								a = "function" == typeof o ? o : o.get;
+							null == a && ai('Getter is missing for computed property "' + i + '".', e),
+								r || (n[i] = new ho(e, a || w, w, mo)), i in e ? i in e.$data ? ai(
+									'The computed property "' + i + '" is already defined in data.', e
+									) : e.$options.props && i in e.$options.props && ai(
+									'The computed property "' + i + '" is already defined as a prop.', e
+									) : rt(e, i, o)
+						}
+					}(e, t.computed), t.watch && t.watch !== Qr && function(e, t) {
+						for (var n in t) {
+							var r = t[n];
+							if (Array.isArray(r))
+								for (var i = 0; i < r.length; i++) at(e, n, r[i]);
+							else at(e, n, r)
+						}
+					}(e, t.watch)
+				}
+
+				function rt(e, t, n) {
+					var r = !ri();
+					"function" == typeof n ? (vo.get = r ? it(t) : ot(n), vo.set = w) : (vo.get = n.get ?
+							r && !1 !== n.cache ? it(t) : ot(n.get) : w, vo.set = n.set || w), vo.set ===
+						w && (vo.set = function() {
+							ai('Computed property "' + t + '" was assigned to but it has no setter.',
+								this)
+						}), Object.defineProperty(e, t, vo)
+				}
+
+				function it(e) {
+					return function() {
+						var t = this._computedWatchers && this._computedWatchers[e];
+						if (t) return t.dirty && t.evaluate(), pi.target && t.depend(), t.value
+					}
+				}
+
+				function ot(e) {
+					return function() {
+						return e.call(this, this)
+					}
+				}
+
+				function at(e, t, n, r) {
+					return c(n) && (n = (r = n).handler), "string" == typeof n && (n = e[n]), e.$watch(t, n,
+						r)
+				}
+
+				function st(e, t) {
+					var n = e.$options = Object.create(e.constructor.options),
+						r = t._parentVnode;
+					n.parent = t.parent;
+					var i = (n._parentVnode = r).componentOptions;
+					n.propsData = i.propsData, n._parentListeners = i.listeners, n._renderChildren = i
+						.children, n._componentTag = i.tag, t.render && (n.render = t.render, n
+							.staticRenderFns = t.staticRenderFns)
+				}
+
+				function ct(e) {
+					var t = e.options;
+					if (e.super) {
+						var n = ct(e.super);
+						if (n !== e.superOptions) {
+							e.superOptions = n;
+							var r = function(e) {
+								var t, n = e.options,
+									r = e.sealedOptions;
+								for (var i in n) n[i] !== r[i] && ((t = t || {})[i] = n[i]);
+								return t
+							}(e);
+							r && b(e.extendOptions, r), (t = e.options = V(n, e.extendOptions)).name && (t
+								.components[t.name] = e)
+						}
+					}
+					return t
+				}
+
+				function ut(e) {
+					this instanceof ut || ai(
+						"Vue is a constructor and should be called with the `new` keyword"), this._init(
+						e)
+				}
+
+				function lt(e) {
+					e.cid = 0;
+					var t = 1;
+					e.extend = function(e) {
+						e = e || {};
+						var n = this,
+							r = n.cid,
+							i = e._Ctor || (e._Ctor = {});
+						if (i[r]) return i[r];
+						var o = e.name || n.options.name;
+						o && W(o);
+						var a = function(e) {
+							this._init(e)
+						};
+						return ((a.prototype = Object.create(n.prototype)).constructor = a).cid = t++, a
+							.options = V(n.options, e), a.super = n, a.options.props && function(e) {
+								var t = e.options.props;
+								for (var n in t) tt(e.prototype, "_props", n)
+							}(a), a.options.computed && function(e) {
+								var t = e.options.computed;
+								for (var n in t) rt(e.prototype, n, t[n])
+							}(a), a.extend = n.extend, a.mixin = n.mixin, a.use = n.use, Fr.forEach(
+								function(e) {
+									a[e] = n[e]
+								}), o && (a.options.components[o] = a), a.superOptions = n.options, a
+							.extendOptions = e, a.sealedOptions = b({}, a.options), i[r] = a
+					}
+				}
+
+				function ft(e) {
+					return e && (e.Ctor.options.name || e.tag)
+				}
+
+				function dt(e, t) {
+					return Array.isArray(e) ? -1 < e.indexOf(t) : "string" == typeof e ? -1 < e.split(",")
+						.indexOf(t) : !!u(e) && e.test(t)
+				}
+
+				function pt(e, t) {
+					var n = e.cache,
+						r = e.keys,
+						i = e._vnode;
+					for (var o in n) {
+						var a = n[o];
+						if (a) {
+							var s = ft(a.componentOptions);
+							s && !t(s) && ht(n, o, r, i)
+						}
+					}
+				}
+
+				function ht(e, t, n, r) {
+					var i = e[t];
+					!i || r && i.tag === r.tag || i.componentInstance.$destroy(), e[t] = null, v(n, t)
+				}
+
+				function vt(e) {
+					for (var t = e.data, n = e, i = e; r(i.componentInstance);)(i = i.componentInstance
+						._vnode) && i.data && (t = mt(i.data, t));
+					for (; r(n = n.parent);) n && n.data && (t = mt(t, n.data));
+					return function(e, t) {
+						return r(e) || r(t) ? gt(e, yt(t)) : ""
+					}(t.staticClass, t.class)
+				}
+
+				function mt(e, t) {
+					return {
+						staticClass: gt(e.staticClass, t.staticClass),
+						class: r(e.class) ? [e.class, t.class] : t.class
+					}
+				}
+
+				function gt(e, t) {
+					return e ? t ? e + " " + t : e : t || ""
+				}
+
+				function yt(e) {
+					return Array.isArray(e) ? function(e) {
+						for (var t, n = "", i = 0, o = e.length; i < o; i++) r(t = yt(e[i])) && "" !==
+							t && (n && (n += " "), n += t);
+						return n
+					}(e) : a(e) ? function(e) {
+						var t = "";
+						for (var n in e) e[n] && (t && (t += " "), t += n);
+						return t
+					}(e) : "string" == typeof e ? e : ""
+				}
+
+				function bt(e) {
+					return Vo(e) ? "svg" : "math" === e ? "math" : void 0
+				}
+
+				function _t(e) {
+					return "string" != typeof e ? e : document.querySelector(e) || (ai(
+						"Cannot find element: " + e), document.createElement("div"))
+				}
+
+				function wt(e, t) {
+					var n = e.data.ref;
+					if (r(n)) {
+						var i = e.context,
+							o = e.componentInstance || e.elm,
+							a = i.$refs;
+						t ? Array.isArray(a[n]) ? v(a[n], o) : a[n] === o && (a[n] = void 0) : e.data
+							.refInFor ? Array.isArray(a[n]) ? a[n].indexOf(o) < 0 && a[n].push(o) : a[n] = [
+								o
+							] : a[n] = o
+					}
+				}
+
+				function $t(t, n) {
+					return t.key === n.key && (t.tag === n.tag && t.isComment === n.isComment && r(t
+						.data) === r(n.data) && function(e, t) {
+							if ("input" !== e.tag) return !0;
+							var n, i = r(n = e.data) && r(n = n.attrs) && n.type,
+								o = r(n = t.data) && r(n = n.attrs) && n.type;
+							return i === o || zo(i) && zo(o)
+						}(t, n) || i(t.isAsyncPlaceholder) && t.asyncFactory === n.asyncFactory && e(n
+							.asyncFactory.error))
+				}
+
+				function Ct(e, t, n) {
+					var i, o, a = {};
+					for (i = t; i <= n; ++i) r(o = e[i].key) && (a[o] = i);
+					return a
+				}
+
+				function kt(e, t) {
+					(e.data.directives || t.data.directives) && function(e, t) {
+						var n, r, i, o = e === Go,
+							a = t === Go,
+							s = xt(e.data.directives, e.context),
+							c = xt(t.data.directives, t.context),
+							u = [],
+							l = [];
+						for (n in c) r = s[n], i = c[n], r ? (i.oldValue = r.value, i.oldArg = r.arg, Tt(i,
+							"update", t, e), i.def && i.def.componentUpdated && l.push(i)) : (Tt(i,
+							"bind", t, e), i.def && i.def.inserted && u.push(i));
+						if (u.length) {
+							var f = function() {
+								for (var n = 0; n < u.length; n++) Tt(u[n], "inserted", t, e)
+							};
+							o ? se(t, "insert", f) : f()
+						}
+						if (l.length && se(t, "postpatch", function() {
+								for (var n = 0; n < l.length; n++) Tt(l[n], "componentUpdated", t, e)
+							}), !o)
+							for (n in s) c[n] || Tt(s[n], "unbind", e, e, a)
+					}(e, t)
+				}
+
+				function xt(e, t) {
+					var n, r, i, o = Object.create(null);
+					if (!e) return o;
+					for (n = 0; n < e.length; n++)(r = e[n]).modifiers || (r.modifiers = Yo), (o[(i = r)
+							.rawName || i.name + "." + Object.keys(i.modifiers || {}).join(".")] = r).def =
+						q(t.$options, "directives", r.name, !0);
+					return o
+				}
+
+				function Tt(e, t, n, r, i) {
+					var o = e.def && e.def[t];
+					if (o) try {
+						o(n.elm, e, n, r, i)
+					} catch (r) {
+						Y(r, n.context, "directive " + e.name + " " + t + " hook")
+					}
+				}
+
+				function St(t, n) {
+					var i = n.componentOptions;
+					if (!(r(i) && !1 === i.Ctor.options.inheritAttrs || e(t.data.attrs) && e(n.data
+						.attrs))) {
+						var o, a, s = n.elm,
+							c = t.data.attrs || {},
+							u = n.data.attrs || {};
+						for (o in r(u.__ob__) && (u = n.data.attrs = b({}, u)), u) a = u[o], c[o] !== a &&
+							At(s, o, a);
+						for (o in (Kr || Zr) && u.value !== c.value && At(s, "value", u.value), c) e(u[
+							o]) && (Fo(o) ? s.removeAttributeNS(Ro, Po(o)) : jo(o) || s.removeAttribute(o))
+					}
+				}
+
+				function At(e, t, n) {
+					-1 < e.tagName.indexOf("-") ? Ot(e, t, n) : No(t) ? Ho(n) ? e.removeAttribute(t) : (n =
+							"allowfullscreen" === t && "EMBED" === e.tagName ? "true" : t, e.setAttribute(t,
+								n)) : jo(t) ? e.setAttribute(t, Io(t, n)) : Fo(t) ? Ho(n) ? e
+						.removeAttributeNS(Ro, Po(t)) : e.setAttributeNS(Ro, t, n) : Ot(e, t, n)
+				}
+
+				function Ot(e, t, n) {
+					if (Ho(n)) e.removeAttribute(t);
+					else {
+						if (Kr && !Gr && "TEXTAREA" === e.tagName && "placeholder" === t && "" !== n && !e
+							.__ieph) {
+							var r = function(t) {
+								t.stopImmediatePropagation(), e.removeEventListener("input", r)
+							};
+							e.addEventListener("input", r), e.__ieph = !0
+						}
+						e.setAttribute(t, n)
+					}
+				}
+
+				function Et(t, n) {
+					var i = n.elm,
+						o = n.data,
+						a = t.data;
+					if (!(e(o.staticClass) && e(o.class) && (e(a) || e(a.staticClass) && e(a.class)))) {
+						var s = vt(n),
+							c = i._transitionClasses;
+						r(c) && (s = gt(s, yt(c))), s !== i._prevClass && (i.setAttribute("class", s), i
+							._prevClass = s)
+					}
+				}
+
+				function Mt(e) {
+					function t() {
+						(a = a || []).push(e.slice(h, i).trim()), h = i + 1
+					}
+					var n, r, i, o, a, s = !1,
+						c = !1,
+						u = !1,
+						l = !1,
+						f = 0,
+						d = 0,
+						p = 0,
+						h = 0;
+					for (i = 0; i < e.length; i++)
+						if (r = n, n = e.charCodeAt(i), s) 39 === n && 92 !== r && (s = !1);
+						else if (c) 34 === n && 92 !== r && (c = !1);
+					else if (u) 96 === n && 92 !== r && (u = !1);
+					else if (l) 47 === n && 92 !== r && (l = !1);
+					else if (124 !== n || 124 === e.charCodeAt(i + 1) || 124 === e.charCodeAt(i - 1) || f ||
+						d || p) {
+						switch (n) {
+							case 34:
+								c = !0;
+								break;
+							case 39:
+								s = !0;
+								break;
+							case 96:
+								u = !0;
+								break;
+							case 40:
+								p++;
+								break;
+							case 41:
+								p--;
+								break;
+							case 91:
+								d++;
+								break;
+							case 93:
+								d--;
+								break;
+							case 123:
+								f++;
+								break;
+							case 125:
+								f--
+						}
+						if (47 === n) {
+							for (var v = i - 1, m = void 0; 0 <= v && " " === (m = e.charAt(v)); v--);
+							m && na.test(m) || (l = !0)
+						}
+					} else void 0 === o ? (h = i + 1, o = e.slice(0, i).trim()) : t();
+					if (void 0 === o ? o = e.slice(0, i).trim() : 0 !== h && t(), a)
+						for (i = 0; i < a.length; i++) o = Lt(o, a[i]);
+					return o
+				}
+
+				function Lt(e, t) {
+					var n = t.indexOf("(");
+					if (n < 0) return '_f("' + t + '")(' + e + ")";
+					var r = t.slice(0, n),
+						i = t.slice(n + 1);
+					return '_f("' + r + '")(' + e + (")" !== i ? "," + i : i)
+				}
+
+				function jt(e, t) {}
+
+				function Dt(e, t) {
+					return e ? e.map(function(e) {
+						return e[t]
+					}).filter(function(e) {
+						return e
+					}) : []
+				}
+
+				function It(e, t, n, r, i) {
+					(e.props || (e.props = [])).push(Ut({
+						name: t,
+						value: n,
+						dynamic: i
+					}, r)), e.plain = !1
+				}
+
+				function Nt(e, t, n, r, i) {
+					(i ? e.dynamicAttrs || (e.dynamicAttrs = []) : e.attrs || (e.attrs = [])).push(Ut({
+						name: t,
+						value: n,
+						dynamic: i
+					}, r)), e.plain = !1
+				}
+
+				function Rt(e, t, n, r) {
+					e.attrsMap[t] = n, e.attrsList.push(Ut({
+						name: t,
+						value: n
+					}, r))
+				}
+
+				function Ft(e, t, n, r, i, o, a, s) {
+					(e.directives || (e.directives = [])).push(Ut({
+						name: t,
+						rawName: n,
+						value: r,
+						arg: i,
+						isDynamicArg: o,
+						modifiers: a
+					}, s)), e.plain = !1
+				}
+
+				function Pt(e, t, n) {
+					return n ? "_p(" + t + ',"' + e + '")' : e + t
+				}
+
+				function Ht(e, t, n, r, i, o, a, s) {
+					var c;
+					r = r || kr, o && r.prevent && r.passive && o(
+							"passive and prevent can't be used together. Passive handler can't prevent default event.",
+							a), r.right ? s ? t = "(" + t + ")==='click'?'contextmenu':(" + t + ")" :
+						"click" === t && (t = "contextmenu", delete r.right) : r.middle && (s ? t = "(" +
+							t + ")==='click'?'mouseup':(" + t + ")" : "click" === t && (t = "mouseup")), r
+						.capture && (delete r.capture, t = Pt("!", t, s)), r.once && (delete r.once, t = Pt(
+							"~", t, s)), r.passive && (delete r.passive, t = Pt("&", t, s)), c = r.native ?
+						(delete r.native, e.nativeEvents || (e.nativeEvents = {})) : e.events || (e
+						.events = {});
+					var u = Ut({
+						value: n.trim(),
+						dynamic: s
+					}, a);
+					r !== kr && (u.modifiers = r);
+					var l = c[t];
+					Array.isArray(l) ? i ? l.unshift(u) : l.push(u) : c[t] = l ? i ? [u, l] : [l, u] : u, e
+						.plain = !1
+				}
+
+				function Wt(e, t) {
+					return e.rawAttrsMap[":" + t] || e.rawAttrsMap["v-bind:" + t] || e.rawAttrsMap[t]
+				}
+
+				function Bt(e, t, n) {
+					var r = Vt(e, ":" + t) || Vt(e, "v-bind:" + t);
+					if (null != r) return Mt(r);
+					if (!1 !== n) {
+						var i = Vt(e, t);
+						if (null != i) return JSON.stringify(i)
+					}
+				}
+
+				function Vt(e, t, n) {
+					var r;
+					if (null != (r = e.attrsMap[t]))
+						for (var i = e.attrsList, o = 0, a = i.length; o < a; o++)
+							if (i[o].name === t) {
+								i.splice(o, 1);
+								break
+							} return n && delete e.attrsMap[t], r
+				}
+
+				function qt(e, t) {
+					for (var n = e.attrsList, r = 0, i = n.length; r < i; r++) {
+						var o = n[r];
+						if (t.test(o.name)) return n.splice(r, 1), o
+					}
+				}
+
+				function Ut(e, t) {
+					return t && (null != t.start && (e.start = t.start), null != t.end && (e.end = t.end)),
+						e
+				}
+
+				function zt(e, t, n) {
+					var r = n || {},
+						i = r.number,
+						o = r.trim,
+						a = "$$v";
+					o && (a = "(typeof $$v === 'string'? $$v.trim(): $$v)"), i && (a = "_n(" + a + ")");
+					var s = Jt(t, a);
+					e.model = {
+						value: "(" + t + ")",
+						expression: JSON.stringify(t),
+						callback: "function ($$v) {" + s + "}"
+					}
+				}
+
+				function Jt(e, t) {
+					var n = function(e) {
+						if (e = e.trim(), _o = e.length, e.indexOf("[") < 0 || e.lastIndexOf("]") < _o -
+							1) return -1 < (Co = e.lastIndexOf(".")) ? {
+							exp: e.slice(0, Co),
+							key: '"' + e.slice(Co + 1) + '"'
+						} : {
+							exp: e,
+							key: null
+						};
+						for (wo = e, Co = ko = xo = 0; !Gt();) Zt($o = Kt()) ? Yt($o) : 91 === $o && Xt(
+							$o);
+						return {
+							exp: e.slice(0, ko),
+							key: e.slice(ko + 1, xo)
+						}
+					}(e);
+					return null === n.key ? e + "=" + t : "$set(" + n.exp + ", " + n.key + ", " + t + ")"
+				}
+
+				function Kt() {
+					return wo.charCodeAt(++Co)
+				}
+
+				function Gt() {
+					return _o <= Co
+				}
+
+				function Zt(e) {
+					return 34 === e || 39 === e
+				}
+
+				function Xt(e) {
+					var t = 1;
+					for (ko = Co; !Gt();)
+						if (Zt(e = Kt())) Yt(e);
+						else if (91 === e && t++, 93 === e && t--, 0 === t) {
+						xo = Co;
+						break
+					}
+				}
+
+				function Yt(e) {
+					for (var t = e; !Gt() && (e = Kt()) !== t;);
+				}
+
+				function Qt(e, t, n) {
+					var r = e.attrsMap.type,
+						i = e.attrsMap["v-bind:value"] || e.attrsMap[":value"],
+						o = e.attrsMap["v-bind:type"] || e.attrsMap[":type"];
+					if (i && !o) {
+						var a = e.attrsMap["v-bind:value"] ? "v-bind:value" : ":value";
+						To(a + '="' + i +
+							'" conflicts with v-model on the same element because the latter already expands to a value binding internally',
+							e.rawAttrsMap[a])
+					}
+					var s = n || {},
+						c = s.lazy,
+						u = s.number,
+						l = s.trim,
+						f = !c && "range" !== r,
+						d = c ? "change" : "range" === r ? ra : "input",
+						p = "$event.target.value";
+					l && (p = "$event.target.value.trim()"), u && (p = "_n(" + p + ")");
+					var h = Jt(t, p);
+					f && (h = "if($event.target.composing)return;" + h), It(e, "value", "(" + t + ")"), Ht(
+						e, d, h, null, !0), (l || u) && Ht(e, "blur", "$forceUpdate()")
+				}
+
+				function en(e, t, n) {
+					var r = So;
+					return function i() {
+						null !== t.apply(null, arguments) && nn(e, i, n, r)
+					}
+				}
+
+				function tn(e, t, n, r) {
+					if (oa) {
+						var i = uo,
+							o = t;
+						t = o._wrapper = function(e) {
+							if (e.target === e.currentTarget || e.timeStamp >= i || e.timeStamp <= 0 ||
+								e.target.ownerDocument !== document) return o.apply(this, arguments)
+						}
+					}
+					So.addEventListener(e, t, ei ? {
+						capture: n,
+						passive: r
+					} : n)
+				}
+
+				function nn(e, t, n, r) {
+					(r || So).removeEventListener(e, t._wrapper || t, n)
+				}
+
+				function rn(t, n) {
+					if (!e(t.data.on) || !e(n.data.on)) {
+						var i = n.data.on || {},
+							o = t.data.on || {};
+						So = n.elm,
+							function(e) {
+								if (r(e[ra])) {
+									var t = Kr ? "change" : "input";
+									e[t] = [].concat(e[ra], e[t] || []), delete e[ra]
+								}
+								r(e[ia]) && (e.change = [].concat(e[ia], e.change || []), delete e[ia])
+							}(i), ae(i, o, tn, nn, en, n.context), So = void 0
+					}
+				}
+
+				function on(t, n) {
+					if (!e(t.data.domProps) || !e(n.data.domProps)) {
+						var i, o, a, s, c = n.elm,
+							u = t.data.domProps || {},
+							l = n.data.domProps || {};
+						for (i in r(l.__ob__) && (l = n.data.domProps = b({}, l)), u) i in l || (c[i] = "");
+						for (i in l) {
+							if (o = l[i], "textContent" === i || "innerHTML" === i) {
+								if (n.children && (n.children.length = 0), o === u[i]) continue;
+								1 === c.childNodes.length && c.removeChild(c.childNodes[0])
+							}
+							if ("value" === i && "PROGRESS" !== c.tagName) {
+								var f = e(c._value = o) ? "" : String(o);
+								s = f, (a = c).composing || "OPTION" !== a.tagName && ! function(e, t) {
+									var n = !0;
+									try {
+										n = document.activeElement !== e
+									} catch (e) {}
+									return n && e.value !== t
+								}(a, s) && ! function(e, t) {
+									var n = e.value,
+										i = e._vModifiers;
+									if (r(i)) {
+										if (i.number) return p(n) !== p(t);
+										if (i.trim) return n.trim() !== t.trim()
+									}
+									return n !== t
+								}(a, s) || (c.value = f)
+							} else if ("innerHTML" === i && Vo(c.tagName) && e(c.innerHTML)) {
+								(Ao = Ao || document.createElement("div")).innerHTML = "<svg>" + o +
+									"</svg>";
+								for (var d = Ao.firstChild; c.firstChild;) c.removeChild(c.firstChild);
+								for (; d.firstChild;) c.appendChild(d.firstChild)
+							} else if (o !== u[i]) try {
+								c[i] = o
+							} catch (t) {}
+						}
+					}
+				}
+
+				function an(e) {
+					var t = sn(e.style);
+					return e.staticStyle ? b(e.staticStyle, t) : t
+				}
+
+				function sn(e) {
+					return Array.isArray(e) ? _(e) : "string" == typeof e ? ca(e) : e
+				}
+
+				function cn(t, n) {
+					var i = n.data,
+						o = t.data;
+					if (!(e(i.staticStyle) && e(i.style) && e(o.staticStyle) && e(o.style))) {
+						var a, s, c = n.elm,
+							u = o.staticStyle,
+							l = o.normalizedStyle || o.style || {},
+							f = u || l,
+							d = sn(n.data.style) || {};
+						n.data.normalizedStyle = r(d.__ob__) ? b({}, d) : d;
+						var p = function(e, t) {
+							for (var n, r = {}, i = e; i.componentInstance;)(i = i.componentInstance
+								._vnode) && i.data && (n = an(i.data)) && b(r, n);
+							(n = an(e.data)) && b(r, n);
+							for (var o = e; o = o.parent;) o.data && (n = an(o.data)) && b(r, n);
+							return r
+						}(n);
+						for (s in f) e(p[s]) && fa(c, s, "");
+						for (s in p)(a = p[s]) !== f[s] && fa(c, s, null == a ? "" : a)
+					}
+				}
+
+				function un(e, t) {
+					if (t = t && t.trim())
+						if (e.classList) - 1 < t.indexOf(" ") ? t.split(va).forEach(function(t) {
+							return e.classList.add(t)
+						}) : e.classList.add(t);
+						else {
+							var n = " " + (e.getAttribute("class") || "") + " ";
+							n.indexOf(" " + t + " ") < 0 && e.setAttribute("class", (n + t).trim())
+						}
+				}
+
+				function ln(e, t) {
+					if (t = t && t.trim())
+						if (e.classList) - 1 < t.indexOf(" ") ? t.split(va).forEach(function(t) {
+							return e.classList.remove(t)
+						}) : e.classList.remove(t), e.classList.length || e.removeAttribute("class");
+						else {
+							for (var n = " " + (e.getAttribute("class") || "") + " ", r = " " + t +
+								" "; 0 <= n.indexOf(r);) n = n.replace(r, " ");
+							(n = n.trim()) ? e.setAttribute("class", n): e.removeAttribute("class")
+						}
+				}
+
+				function fn(e) {
+					if (e) {
+						if ("object" != typeof e) return "string" == typeof e ? ma(e) : void 0;
+						var t = {};
+						return !1 !== e.css && b(t, ma(e.name || "v")), b(t, e), t
+					}
+				}
+
+				function dn(e) {
+					ka(function() {
+						ka(e)
+					})
+				}
+
+				function pn(e, t) {
+					var n = e._transitionClasses || (e._transitionClasses = []);
+					n.indexOf(t) < 0 && (n.push(t), un(e, t))
+				}
+
+				function hn(e, t) {
+					e._transitionClasses && v(e._transitionClasses, t), ln(e, t)
+				}
+
+				function vn(e, t, n) {
+					var r = mn(e, t),
+						i = r.type,
+						o = r.timeout,
+						a = r.propCount;
+					if (!i) return n();
+					var s = i === ya ? wa : Ca,
+						c = 0,
+						u = function() {
+							e.removeEventListener(s, l), n()
+						},
+						l = function(t) {
+							t.target === e && ++c >= a && u()
+						};
+					setTimeout(function() {
+						c < a && u()
+					}, o + 1), e.addEventListener(s, l)
+				}
+
+				function mn(e, t) {
+					var n, r = window.getComputedStyle(e),
+						i = (r[_a + "Delay"] || "").split(", "),
+						o = (r[_a + "Duration"] || "").split(", "),
+						a = gn(i, o),
+						s = (r[$a + "Delay"] || "").split(", "),
+						c = (r[$a + "Duration"] || "").split(", "),
+						u = gn(s, c),
+						l = 0,
+						f = 0;
+					return t === ya ? 0 < a && (n = ya, l = a, f = o.length) : t === ba ? 0 < u && (n = ba,
+						l = u, f = c.length) : (l = Math.max(a, u), f = (n = 0 < l ? u < a ? ya : ba :
+						null) ? n === ya ? o.length : c.length : 0), {
+						type: n,
+						timeout: l,
+						propCount: f,
+						hasTransform: n === ya && xa.test(r[_a + "Property"])
+					}
+				}
+
+				function gn(e, t) {
+					for (; e.length < t.length;) e = e.concat(e);
+					return Math.max.apply(null, t.map(function(t, n) {
+						return yn(t) + yn(e[n])
+					}))
+				}
+
+				function yn(e) {
+					return 1e3 * Number(e.slice(0, -1).replace(",", "."))
+				}
+
+				function bn(t, n) {
+					var i = t.elm;
+					r(i._leaveCb) && (i._leaveCb.cancelled = !0, i._leaveCb());
+					var o = fn(t.data.transition);
+					if (!e(o) && !r(i._enterCb) && 1 === i.nodeType) {
+						for (var s = o.css, c = o.type, u = o.enterClass, l = o.enterToClass, f = o
+								.enterActiveClass, d = o.appearClass, h = o.appearToClass, v = o
+								.appearActiveClass, m = o.beforeEnter, g = o.enter, y = o.afterEnter, b = o
+								.enterCancelled, _ = o.beforeAppear, w = o.appear, $ = o.afterAppear, C = o
+								.appearCancelled, x = o.duration, T = Qi, S = Qi.$vnode; S && S.parent;) T =
+							S.context, S = S.parent;
+						var A = !T._isMounted || !t.isRootInsert;
+						if (!A || w || "" === w) {
+							var O = A && d ? d : u,
+								E = A && v ? v : f,
+								M = A && h ? h : l,
+								L = A && _ || m,
+								j = A && "function" == typeof w ? w : g,
+								D = A && $ || y,
+								I = A && C || b,
+								N = p(a(x) ? x.enter : x);
+							null != N && wn(N, "enter", t);
+							var R = !1 !== s && !Gr,
+								F = Cn(j),
+								P = i._enterCb = k(function() {
+									R && (hn(i, M), hn(i, E)), P.cancelled ? (R && hn(i, O), I && I(
+										i)) : D && D(i), i._enterCb = null
+								});
+							t.data.show || se(t, "insert", function() {
+								var e = i.parentNode,
+									n = e && e._pending && e._pending[t.key];
+								n && n.tag === t.tag && n.elm._leaveCb && n.elm._leaveCb(), j && j(
+									i, P)
+							}), L && L(i), R && (pn(i, O), pn(i, E), dn(function() {
+								hn(i, O), P.cancelled || (pn(i, M), F || ($n(N) ? setTimeout(P,
+									N) : vn(i, c, P)))
+							})), t.data.show && (n && n(), j && j(i, P)), R || F || P()
+						}
+					}
+				}
+
+				function _n(t, n) {
+					function i() {
+						C.cancelled || (!t.data.show && o.parentNode && ((o.parentNode._pending || (o
+							.parentNode._pending = {}))[t.key] = t), h && h(o), _ && (pn(o, l), pn(
+							o, d), dn(function() {
+							hn(o, l), C.cancelled || (pn(o, f), w || ($n($) ? setTimeout(C,
+								$) : vn(o, u, C)))
+						})), v && v(o, C), _ || w || C())
+					}
+					var o = t.elm;
+					r(o._enterCb) && (o._enterCb.cancelled = !0, o._enterCb());
+					var s = fn(t.data.transition);
+					if (e(s) || 1 !== o.nodeType) return n();
+					if (!r(o._leaveCb)) {
+						var c = s.css,
+							u = s.type,
+							l = s.leaveClass,
+							f = s.leaveToClass,
+							d = s.leaveActiveClass,
+							h = s.beforeLeave,
+							v = s.leave,
+							m = s.afterLeave,
+							g = s.leaveCancelled,
+							y = s.delayLeave,
+							b = s.duration,
+							_ = !1 !== c && !Gr,
+							w = Cn(v),
+							$ = p(a(b) ? b.leave : b);
+						r($) && wn($, "leave", t);
+						var C = o._leaveCb = k(function() {
+							o.parentNode && o.parentNode._pending && (o.parentNode._pending[t.key] =
+								null), _ && (hn(o, f), hn(o, d)), C.cancelled ? (_ && hn(o, l),
+								g && g(o)) : (n(), m && m(o)), o._leaveCb = null
+						});
+						y ? y(i) : i()
+					}
+				}
+
+				function wn(e, t, n) {
+					"number" != typeof e ? ai("<transition> explicit " + t +
+							" duration is not a valid number - got " + JSON.stringify(e) + ".", n.context) :
+						isNaN(e) && ai("<transition> explicit " + t +
+							" duration is NaN - the duration expression might be incorrect.", n.context)
+				}
+
+				function $n(e) {
+					return "number" == typeof e && !isNaN(e)
+				}
+
+				function Cn(t) {
+					if (e(t)) return !1;
+					var n = t.fns;
+					return r(n) ? Cn(Array.isArray(n) ? n[0] : n) : 1 < (t._length || t.length)
+				}
+
+				function kn(e, t) {
+					!0 !== t.data.show && bn(t)
+				}
+
+				function xn(e, t, n) {
+					Tn(e, t, n), (Kr || Zr) && setTimeout(function() {
+						Tn(e, t, n)
+					}, 0)
+				}
+
+				function Tn(e, t, n) {
+					var r = t.value,
+						i = e.multiple;
+					if (!i || Array.isArray(r)) {
+						for (var o, a, s = 0, c = e.options.length; s < c; s++)
+							if (a = e.options[s], i) o = -1 < C(r, An(a)), a.selected !== o && (a.selected =
+								o);
+							else if ($(An(a), r)) return void(e.selectedIndex !== s && (e.selectedIndex =
+							s));
+						i || (e.selectedIndex = -1)
+					} else ai('<select multiple v-model="' + t.expression +
+						'"> expects an Array value for its binding, but got ' + Object.prototype
+						.toString.call(r).slice(8, -1), n)
+				}
+
+				function Sn(e, t) {
+					return t.every(function(t) {
+						return !$(t, e)
+					})
+				}
+
+				function An(e) {
+					return "_value" in e ? e._value : e.value
+				}
+
+				function On(e) {
+					e.target.composing = !0
+				}
+
+				function En(e) {
+					e.target.composing && (e.target.composing = !1, Mn(e.target, "input"))
+				}
+
+				function Mn(e, t) {
+					var n = document.createEvent("HTMLEvents");
+					n.initEvent(t, !0, !0), e.dispatchEvent(n)
+				}
+
+				function Ln(e) {
+					return !e.componentInstance || e.data && e.data.transition ? e : Ln(e.componentInstance
+						._vnode)
+				}
+
+				function jn(e) {
+					var t = e && e.componentOptions;
+					return t && t.Ctor.options.abstract ? jn(Ve(t.children)) : e
+				}
+
+				function Dn(e) {
+					var t = {},
+						n = e.$options;
+					for (var r in n.propsData) t[r] = e[r];
+					var i = n._parentListeners;
+					for (var o in i) t[Er(o)] = i[o];
+					return t
+				}
+
+				function In(e, t) {
+					if (/\d-keep-alive$/.test(t.tag)) return e("keep-alive", {
+						props: t.componentOptions.propsData
+					})
+				}
+
+				function Nn(e) {
+					e.elm._moveCb && e.elm._moveCb(), e.elm._enterCb && e.elm._enterCb()
+				}
+
+				function Rn(e) {
+					e.data.newPos = e.elm.getBoundingClientRect()
+				}
+
+				function Fn(e) {
+					var t = e.data.pos,
+						n = e.data.newPos,
+						r = t.left - n.left,
+						i = t.top - n.top;
+					if (r || i) {
+						e.data.moved = !0;
+						var o = e.elm.style;
+						o.transform = o.WebkitTransform = "translate(" + r + "px," + i + "px)", o
+							.transitionDuration = "0s"
+					}
+				}
+
+				function Pn(e, t) {
+					var n = t ? Xa(t) : Ga;
+					if (n.test(e)) {
+						for (var r, i, o, a = [], s = [], c = n.lastIndex = 0; r = n.exec(e);) {
+							i = r.index, c < i && (s.push(o = e.slice(c, i)), a.push(JSON.stringify(o)));
+							var u = Mt(r[1].trim());
+							a.push("_s(" + u + ")"), s.push({
+								"@binding": u
+							}), c = i + r[0].length
+						}
+						return c < e.length && (s.push(o = e.slice(c)), a.push(JSON.stringify(o))), {
+							expression: a.join("+"),
+							tokens: s
+						}
+					}
+				}
+
+				function Hn(e, t, n) {
+					return {
+						type: 1,
+						tag: e,
+						attrsList: t,
+						attrsMap: function(e) {
+							for (var t = {}, n = 0, r = e.length; n < r; n++) !t[e[n].name] || Kr ||
+								Zr || Ra("duplicate attribute: " + e[n].name, e[n]), t[e[n].name] = e[n]
+								.value;
+							return t
+						}(t),
+						rawAttrsMap: {},
+						parent: n,
+						children: []
+					}
+				}
+
+				function Wn(e, t) {
+					function n(e, t) {
+						h || (h = !0, Ra(e, t))
+					}
+
+					function r(e) {
+						if (i(e), d || e.processed || (e = Bn(e, t)), u.length || e === s || (s.if && (e
+								.elseif || e.else) ? (o(e), qn(s, {
+								exp: e.elseif,
+								block: e
+							})) : n(
+								"Component template should contain exactly one root element. If you are using v-if on multiple elements, use v-else-if to chain them instead.", {
+									start: e.start
+								})), c && !e.forbidden)
+							if (e.elseif || e.else) ! function(e, t) {
+								var n = function(e) {
+									for (var t = e.length; t--;) {
+										if (1 === e[t].type) return e[t];
+										" " !== e[t].text && Ra('text "' + e[t].text.trim() +
+											'" between v-if and v-else(-if) will be ignored.',
+											e[t]), e.pop()
+									}
+								}(t.children);
+								n && n.if ? qn(n, {
+									exp: e.elseif,
+									block: e
+								}) : Ra("v-" + (e.elseif ? 'else-if="' + e.elseif + '"' : "else") +
+									" used on element <" + e.tag + "> without corresponding v-if.",
+									e.rawAttrsMap[e.elseif ? "v-else-if" : "v-else"])
+							}(e, c);
+							else {
+								if (e.slotScope) {
+									var r = e.slotTarget || '"default"';
+									(c.scopedSlots || (c.scopedSlots = {}))[r] = e
+								}
+								c.children.push(e), e.parent = c
+							} e.children = e.children.filter(function(e) {
+							return !e.slotScope
+						}), i(e), e.pre && (d = !1), Ba(e.tag) && (p = !1);
+						for (var a = 0; a < Wa.length; a++) Wa[a](e, t)
+					}
+
+					function i(e) {
+						if (!p)
+							for (var t;
+								(t = e.children[e.children.length - 1]) && 3 === t.type && " " === t.text;)
+								e.children.pop()
+					}
+
+					function o(e) {
+						"slot" !== e.tag && "template" !== e.tag || n("Cannot use <" + e.tag +
+							"> as component root element because it may contain multiple nodes.", {
+								start: e.start
+							}), e.attrsMap.hasOwnProperty("v-for") && n(
+							"Cannot use v-for on stateful component root element because it renders multiple elements.",
+							e.rawAttrsMap["v-for"])
+					}
+					Ra = t.warn || jt, Ba = t.isPreTag || Ir, Va = t.mustUseProp || Ir, qa = t
+						.getTagNamespace || Ir;
+					var a = t.isReservedTag || Ir;
+					Ua = function(e) {
+							return !!e.component || !a(e.tag)
+						}, Pa = Dt(t.modules, "transformNode"), Ha = Dt(t.modules, "preTransformNode"), Wa =
+						Dt(t.modules, "postTransformNode"), Fa = t.delimiters;
+					var s, c, u = [],
+						l = !1 !== t.preserveWhitespace,
+						f = t.whitespace,
+						d = !1,
+						p = !1,
+						h = !1;
+					return function(e, t) {
+						function n(t) {
+							l += t, e = e.substring(t)
+						}
+
+						function r(e, n, r) {
+							var i, s;
+							if (null == n && (n = l), null == r && (r = l), e)
+								for (s = e.toLowerCase(), i = a.length - 1; 0 <= i && a[i]
+									.lowerCasedTag !== s; i--);
+							else i = 0;
+							if (0 <= i) {
+								for (var c = a.length - 1; i <= c; c--)(i < c || !e && t.warn) && t
+									.warn("tag <" + a[c].tag + "> has no matching end tag.", {
+										start: a[c].start,
+										end: a[c].end
+									}), t.end && t.end(a[c].tag, n, r);
+								a.length = i, o = i && a[i - 1].tag
+							} else "br" === s ? t.start && t.start(e, [], !0, n, r) : "p" === s && (t
+								.start && t.start(e, [], !1, n, r), t.end && t.end(e, n, r))
+						}
+						for (var i, o, a = [], s = t.expectHTML, c = t.isUnaryTag || Ir, u = t
+								.canBeLeftOpenTag || Ir, l = 0; e;) {
+							if (i = e, o && hs(o)) {
+								var f = 0,
+									d = o.toLowerCase(),
+									p = vs[d] || (vs[d] = new RegExp("([\\s\\S]*?)(</" + d + "[^>]*>)",
+										"i")),
+									h = e.replace(p, function(e, n, r) {
+										return f = r.length, hs(d) || "noscript" === d || (n = n
+												.replace(/<!\--([\s\S]*?)-->/g, "$1").replace(
+													/<!\[CDATA\[([\s\S]*?)]]>/g, "$1")), _s(d, n) &&
+											(n = n.slice(1)), t.chars && t.chars(n), ""
+									});
+								l += e.length - h.length, e = h, r(d, l - f, l)
+							} else {
+								var v = e.indexOf("<");
+								if (0 === v) {
+									if (ds.test(e)) {
+										var m = e.indexOf("--\x3e");
+										if (0 <= m) {
+											t.shouldKeepComment && t.comment(e.substring(4, m), l, l +
+												m + 3), n(m + 3);
+											continue
+										}
+									}
+									if (ps.test(e)) {
+										var g = e.indexOf("]>");
+										if (0 <= g) {
+											n(g + 2);
+											continue
+										}
+									}
+									var y = e.match(fs);
+									if (y) {
+										n(y[0].length);
+										continue
+									}
+									var b = e.match(ls);
+									if (b) {
+										var _ = l;
+										n(b[0].length), r(b[1], _, l);
+										continue
+									}
+									var w = function() {
+										var t = e.match(cs);
+										if (t) {
+											var r, i, o = {
+												tagName: t[1],
+												attrs: [],
+												start: l
+											};
+											for (n(t[0].length); !(r = e.match(us)) && (i = e.match(
+													os) || e.match(is));) i.start = l, n(i[0]
+												.length), i.end = l, o.attrs.push(i);
+											if (r) return o.unarySlash = r[1], n(r[0].length), o
+												.end = l, o
+										}
+									}();
+									if (w) {
+										(function(e) {
+											var n = e.tagName,
+												i = e.unarySlash;
+											s && ("p" === o && rs(n) && r(o), u(n) && o === n && r(
+												n));
+											for (var l, f, d, p = c(n) || !!i, h = e.attrs.length,
+													v = new Array(h), m = 0; m < h; m++) {
+												var g = e.attrs[m],
+													y = g[3] || g[4] || g[5] || "",
+													b = "a" === n && "href" === g[1] ? t
+													.shouldDecodeNewlinesForHref : t
+													.shouldDecodeNewlines;
+												v[m] = {
+													name: g[1],
+													value: (l = y, f = b, d = f ? ys : gs, l
+														.replace(d, function(e) {
+															return ms[e]
+														}))
+												}, t.outputSourceRange && (v[m].start = g
+													.start + g[0].match(/^\s*/).length, v[m]
+													.end = g.end)
+											}
+											p || (a.push({
+												tag: n,
+												lowerCasedTag: n.toLowerCase(),
+												attrs: v,
+												start: e.start,
+												end: e.end
+											}), o = n), t.start && t.start(n, v, p, e.start, e
+												.end)
+										})(w), _s(w.tagName, e) && n(1);
+										continue
+									}
+								}
+								var $ = void 0,
+									C = void 0,
+									k = void 0;
+								if (0 <= v) {
+									for (C = e.slice(v); !(ls.test(C) || cs.test(C) || ds.test(C) || ps
+											.test(C) || (k = C.indexOf("<", 1)) < 0);) v += k, C = e
+										.slice(v);
+									$ = e.substring(0, v)
+								}
+								v < 0 && ($ = e), $ && n($.length), t.chars && $ && t.chars($, l - $
+									.length, l)
+							}
+							if (e === i) {
+								t.chars && t.chars(e), !a.length && t.warn && t.warn(
+									'Mal-formatted tag at end of template: "' + e + '"', {
+										start: l + e.length
+									});
+								break
+							}
+						}
+						r()
+					}(e, {
+						warn: Ra,
+						expectHTML: t.expectHTML,
+						isUnaryTag: t.isUnaryTag,
+						canBeLeftOpenTag: t.canBeLeftOpenTag,
+						shouldDecodeNewlines: t.shouldDecodeNewlines,
+						shouldDecodeNewlinesForHref: t.shouldDecodeNewlinesForHref,
+						shouldKeepComment: t.comments,
+						outputSourceRange: t.outputSourceRange,
+						start: function(e, n, i, a, l) {
+							var f = c && c.ns || qa(e);
+							Kr && "svg" === f && (n = function(e) {
+								for (var t = [], n = 0; n < e.length; n++) {
+									var r = e[n];
+									Ns.test(r.name) || (r.name = r.name.replace(Rs, ""),
+										t.push(r))
+								}
+								return t
+							}(n));
+							var h = Hn(e, n, c);
+							f && (h.ns = f), t.outputSourceRange && (h.start = a, h.end = l, h
+								.rawAttrsMap = h.attrsList.reduce(function(e, t) {
+									return e[t.name] = t, e
+								}, {})), n.forEach(function(e) {
+								js.test(e.name) && Ra(
+									"Invalid dynamic argument expression: attribute names cannot contain spaces, quotes, <, >, / or =.", {
+										start: e.start + e.name.indexOf("["),
+										end: e.start + e.name.length
+									})
+							}), ! function(e) {
+								return "style" === e.tag || "script" === e.tag && (!e
+									.attrsMap.type || "text/javascript" === e.attrsMap
+									.type)
+							}(h) || ri() || (h.forbidden = !0, Ra(
+								"Templates should only be responsible for mapping the state to the UI. Avoid placing tags with side-effects in your templates, such as <" +
+								e + ">, as they will not be parsed.", {
+									start: h.start
+								}));
+							for (var v = 0; v < Ha.length; v++) h = Ha[v](h, t) || h;
+							d || (function(e) {
+								null != Vt(e, "v-pre") && (e.pre = !0)
+							}(h), h.pre && (d = !0)), Ba(h.tag) && (p = !0), d ? function(
+							e) {
+								var t = e.attrsList,
+									n = t.length;
+								if (n)
+									for (var r = e.attrs = new Array(n), i = 0; i < n; i++)
+										r[i] = {
+											name: t[i].name,
+											value: JSON.stringify(t[i].value)
+										}, null != t[i].start && (r[i].start = t[i].start,
+											r[i].end = t[i].end);
+								else e.pre || (e.plain = !0)
+							}(h) : h.processed || (Vn(h), function(e) {
+								var t = Vt(e, "v-if");
+								if (t) e.if = t, qn(e, {
+									exp: t,
+									block: e
+								});
+								else {
+									null != Vt(e, "v-else") && (e.else = !0);
+									var n = Vt(e, "v-else-if");
+									n && (e.elseif = n)
+								}
+							}(h), function(e) {
+								null != Vt(e, "v-once") && (e.once = !0)
+							}(h)), s || o(s = h), i ? r(h) : (c = h, u.push(h))
+						},
+						end: function(e, n, i) {
+							var o = u[u.length - 1];
+							u.length -= 1, c = u[u.length - 1], t.outputSourceRange && (o.end =
+								i), r(o)
+						},
+						chars: function(r, i, o) {
+							if (c) {
+								if (!Kr || "textarea" !== c.tag || c.attrsMap.placeholder !==
+									r) {
+									var a, s, u = c.children;
+									(r = p || r.trim() ? function(e) {
+											return "script" === e.tag || "style" === e.tag
+										}(c) ? r : Ds(r) : u.length ? f ? "condense" === f && Ms
+										.test(r) ? "" : " " : l ? " " : "" : "") && (p ||
+										"condense" !== f || (r = r.replace(Ls, " ")), !d &&
+										" " !== r && (a = Pn(r, Fa)) ? s = {
+											type: 2,
+											expression: a.expression,
+											tokens: a.tokens,
+											text: r
+										} : " " === r && u.length && " " === u[u.length - 1]
+										.text || (s = {
+											type: 3,
+											text: r
+										}), s && (t.outputSourceRange && (s.start = i, s.end =
+											o), u.push(s)))
+								}
+							} else r === e ? n(
+								"Component template requires a root element, rather than just text.", {
+									start: i
+								}) : (r = r.trim()) && n('text "' + r +
+								'" outside root element will be ignored.', {
+									start: i
+								})
+						},
+						comment: function(e, n, r) {
+							if (c) {
+								var i = {
+									type: 3,
+									text: e,
+									isComment: !0
+								};
+								t.outputSourceRange && (i.start = n, i.end = r), c.children
+									.push(i)
+							}
+						}
+					}), s
+				}
+
+				function Bn(e, t) {
+					! function(e) {
+						var t = Bt(e, "key");
+						if (t) {
+							if ("template" === e.tag && Ra(
+									"<template> cannot be keyed. Place the key on real elements instead.",
+									Wt(e, "key")), e.for) {
+								var n = e.iterator2 || e.iterator1,
+									r = e.parent;
+								n && n === t && r && "transition-group" === r.tag && Ra(
+									"Do not use v-for index as key on <transition-group> children, this is the same as not using keys.",
+									Wt(e, "key"), !0)
+							}
+							e.key = t
+						}
+					}(e), e.plain = !e.key && !e.scopedSlots && !e.attrsList.length,
+						function(e) {
+							var t = Bt(e, "ref");
+							t && (e.ref = t, e.refInFor = function(e) {
+								for (var t = e; t;) {
+									if (void 0 !== t.for) return !0;
+									t = t.parent
+								}
+								return !1
+							}(e))
+						}(e),
+						function(e) {
+							var t;
+							"template" === e.tag ? ((t = Vt(e, "scope")) && Ra(
+								'the "scope" attribute for scoped slots have been deprecated and replaced by "slot-scope" since 2.5. The new "slot-scope" attribute can also be used on plain elements in addition to <template> to denote scoped slots.',
+								e.rawAttrsMap.scope, !0), e.slotScope = t || Vt(e, "slot-scope")) : (t =
+								Vt(e, "slot-scope")) && (e.attrsMap["v-for"] && Ra(
+								"Ambiguous combined usage of slot-scope and v-for on <" + e.tag +
+								"> (v-for takes higher priority). Use a wrapper <template> for the scoped slot to make it clearer.",
+								e.rawAttrsMap["slot-scope"], !0), e.slotScope = t);
+							var n = Bt(e, "slot");
+							if (n && (e.slotTarget = '""' === n ? '"default"' : n, e.slotTargetDynamic = !(!
+										e.attrsMap[":slot"] && !e.attrsMap["v-bind:slot"]), "template" === e
+									.tag || e.slotScope || Nt(e, "slot", n, Wt(e, "slot"))), "template" ===
+								e.tag) {
+								var r = qt(e, Es);
+								if (r) {
+									(e.slotTarget || e.slotScope) && Ra(
+											"Unexpected mixed usage of different slot syntaxes.", e), e
+										.parent && !Ua(e.parent) && Ra(
+											"<template v-slot> can only appear at the root level inside the receiving the component",
+											e);
+									var i = Un(r),
+										o = i.name,
+										a = i.dynamic;
+									e.slotTarget = o, e.slotTargetDynamic = a, e.slotScope = r.value || Is
+								}
+							} else {
+								var s = qt(e, Es);
+								if (s) {
+									Ua(e) || Ra("v-slot can only be used on components or <template>.", s),
+										(e.slotScope || e.slotTarget) && Ra(
+											"Unexpected mixed usage of different slot syntaxes.", e), e
+										.scopedSlots && Ra(
+											"To avoid scope ambiguity, the default slot should also use <template> syntax when there are other named slots.",
+											s);
+									var c = e.scopedSlots || (e.scopedSlots = {}),
+										u = Un(s),
+										l = u.name,
+										f = u.dynamic,
+										d = c[l] = Hn("template", [], e);
+									d.slotTarget = l, d.slotTargetDynamic = f, d.children = e.children
+										.filter(function(e) {
+											if (!e.slotScope) return e.parent = d, !0
+										}), d.slotScope = s.value || Is, e.children = [], e.plain = !1
+								}
+							}
+						}(e),
+						function(e) {
+							"slot" === e.tag && (e.slotName = Bt(e, "name"), e.key && Ra(
+								"`key` does not work on <slot> because slots are abstract outlets and can possibly expand into multiple elements. Use the key on a wrapping element instead.",
+								Wt(e, "key")))
+						}(e),
+						function(e) {
+							var t;
+							(t = Bt(e, "is")) && (e.component = t), null != Vt(e, "inline-template") && (e
+								.inlineTemplate = !0)
+						}(e);
+					for (var n = 0; n < Pa.length; n++) e = Pa[n](e, t) || e;
+					return function(e) {
+						var t, n, r, i, o, a, s, c, u = e.attrsList;
+						for (t = 0, n = u.length; t < n; t++)
+							if (r = i = u[t].name, o = u[t].value, $s.test(r))
+								if (e.hasBindings = !0, (a = zn(r.replace($s, ""))) && (r = r.replace(
+										Os, "")), As.test(r)) r = r.replace(As, ""), o = Mt(o), (c = Ts
+										.test(r)) && (r = r.slice(1, -1)), 0 === o.trim().length && Ra(
+										'The value for a v-bind expression cannot be empty. Found in "v-bind:' +
+										r + '"'), a && (a.prop && !c && "innerHtml" === (r = Er(r)) && (
+										r = "innerHTML"), a.camel && !c && (r = Er(r)), a.sync && (
+										s = Jt(o, "$event"), c ? Ht(e, '"update:"+(' + r + ")", s,
+											null, !1, Ra, u[t], !0) : (Ht(e, "update:" + Er(r), s,
+											null, !1, Ra, u[t]), jr(r) !== Er(r) && Ht(e,
+											"update:" + jr(r), s, null, !1, Ra, u[t])))), a && a.prop ||
+									!e.component && Va(e.tag, e.attrsMap.type, r) ? It(e, r, o, u[t],
+									c) : Nt(e, r, o, u[t], c);
+								else if (ws.test(r)) r = r.replace(ws, ""), (c = Ts.test(r)) && (r = r
+							.slice(1, -1)), Ht(e, r, o, a, !1, Ra, u[t], c);
+						else {
+							var l = (r = r.replace($s, "")).match(Ss),
+								f = l && l[1];
+							c = !1, f && (r = r.slice(0, -(f.length + 1)), Ts.test(f) && (f = f.slice(1,
+								-1), c = !0)), Ft(e, r, i, o, f, c, a, u[t]), "model" === r && Jn(e,
+								o)
+						} else Pn(o, Fa) && Ra(r + '="' + o +
+								'": Interpolation inside attributes has been removed. Use v-bind or the colon shorthand instead. For example, instead of <div id="{{ val }}">, use <div :id="val">.',
+								u[t]), Nt(e, r, JSON.stringify(o), u[t]), !e.component && "muted" ===
+							r && Va(e.tag, e.attrsMap.type, r) && It(e, r, "true", u[t])
+					}(e), e
+				}
+
+				function Vn(e) {
+					var t;
+					if (t = Vt(e, "v-for")) {
+						var n = function(e) {
+							var t = e.match(Cs);
+							if (t) {
+								var n = {};
+								n.for = t[2].trim();
+								var r = t[1].trim().replace(xs, ""),
+									i = r.match(ks);
+								return i ? (n.alias = r.replace(ks, "").trim(), n.iterator1 = i[1]
+								.trim(), i[2] && (n.iterator2 = i[2].trim())) : n.alias = r, n
+							}
+						}(t);
+						n ? b(e, n) : Ra("Invalid v-for expression: " + t, e.rawAttrsMap["v-for"])
+					}
+				}
+
+				function qn(e, t) {
+					e.ifConditions || (e.ifConditions = []), e.ifConditions.push(t)
+				}
+
+				function Un(e) {
+					var t = e.name.replace(Es, "");
+					return t || ("#" !== e.name[0] ? t = "default" : Ra(
+						"v-slot shorthand syntax requires a slot name.", e)), Ts.test(t) ? {
+						name: t.slice(1, -1),
+						dynamic: !0
+					} : {
+						name: '"' + t + '"',
+						dynamic: !1
+					}
+				}
+
+				function zn(e) {
+					var t = e.match(Os);
+					if (t) {
+						var n = {};
+						return t.forEach(function(e) {
+							n[e.slice(1)] = !0
+						}), n
+					}
+				}
+
+				function Jn(e, t) {
+					for (var n = e; n;) n.for && n.alias === t && Ra("<" + e.tag + ' v-model="' + t +
+						'">: You are binding v-model directly to a v-for iteration alias. This will not be able to modify the v-for source array because writing to the alias is like modifying a function local variable. Consider using an array of objects and use v-model on an object property instead.',
+						e.rawAttrsMap["v-model"]), n = n.parent
+				}
+
+				function Kn(e) {
+					return Hn(e.tag, e.attrsList.slice(), e.parent)
+				}
+
+				function Gn(e, t) {
+					e && (za = Hs(t.staticKeys || ""), Ja = t.isReservedTag || Ir, function e(t) {
+						if (t.static = Zn(t), 1 === t.type) {
+							if (!Ja(t.tag) && "slot" !== t.tag && null == t.attrsMap[
+									"inline-template"]) return;
+							for (var n = 0, r = t.children.length; n < r; n++) {
+								var i = t.children[n];
+								e(i), i.static || (t.static = !1)
+							}
+							if (t.ifConditions)
+								for (var o = 1, a = t.ifConditions.length; o < a; o++) {
+									var s = t.ifConditions[o].block;
+									e(s), s.static || (t.static = !1)
+								}
+						}
+					}(e), function e(t, n) {
+						if (1 === t.type) {
+							if ((t.static || t.once) && (t.staticInFor = n), t.static && t.children
+								.length && (1 !== t.children.length || 3 !== t.children[0].type))
+								return void(t.staticRoot = !0);
+							if (t.staticRoot = !1, t.children)
+								for (var r = 0, i = t.children.length; r < i; r++) e(t.children[r],
+									n || !!t.for);
+							if (t.ifConditions)
+								for (var o = 1, a = t.ifConditions.length; o < a; o++) e(t
+									.ifConditions[o].block, n)
+						}
+					}(e, !1))
+				}
+
+				function Zn(e) {
+					return 2 !== e.type && (3 === e.type || !(!e.pre && (e.hasBindings || e.if || e.for ||
+						Tr(e.tag) || !Ja(e.tag) || function(e) {
+							for (; e.parent;) {
+								if ("template" !== (e = e.parent).tag) return !1;
+								if (e.for) return !0
+							}
+							return !1
+						}(e) || !Object.keys(e).every(za))))
+				}
+
+				function Xn(e, t) {
+					var n = t ? "nativeOn:" : "on:",
+						r = "",
+						i = "";
+					for (var o in e) {
+						var a = Yn(e[o]);
+						e[o] && e[o].dynamic ? i += o + "," + a + "," : r += '"' + o + '":' + a + ","
+					}
+					return r = "{" + r.slice(0, -1) + "}", i ? n + "_d(" + r + ",[" + i.slice(0, -1) +
+						"])" : n + r
+				}
+
+				function Yn(e) {
+					if (!e) return "function(){}";
+					if (Array.isArray(e)) return "[" + e.map(function(e) {
+						return Yn(e)
+					}).join(",") + "]";
+					var t = Vs.test(e.value),
+						n = Ws.test(e.value),
+						r = Vs.test(e.value.replace(Bs, ""));
+					if (e.modifiers) {
+						var i = "",
+							o = "",
+							a = [];
+						for (var s in e.modifiers)
+							if (Js[s]) o += Js[s], qs[s] && a.push(s);
+							else if ("exact" === s) {
+							var c = e.modifiers;
+							o += zs(["ctrl", "shift", "alt", "meta"].filter(function(e) {
+								return !c[e]
+							}).map(function(e) {
+								return "$event." + e + "Key"
+							}).join("||"))
+						} else a.push(s);
+						a.length && (i += function(e) {
+							return "if(!$event.type.indexOf('key')&&" + e.map(Qn).join("&&") +
+								")return null;"
+						}(a)), o && (i += o);
+						return "function($event){" + i + (t ? "return " + e.value + "($event)" : n ?
+								"return (" + e.value + ")($event)" : r ? "return " + e.value : e.value) +
+							"}"
+					}
+					return t || n ? e.value : "function($event){" + (r ? "return " + e.value : e.value) +
+						"}"
+				}
+
+				function Qn(e) {
+					var t = parseInt(e, 10);
+					if (t) return "$event.keyCode!==" + t;
+					var n = qs[e],
+						r = Us[e];
+					return "_k($event.keyCode," + JSON.stringify(e) + "," + JSON.stringify(n) +
+						",$event.key," + JSON.stringify(r) + ")"
+				}
+
+				function er(e, t) {
+					var n = new Gs(t);
+					return {
+						render: "with(this){return " + (e ? tr(e, n) : '_c("div")') + "}",
+						staticRenderFns: n.staticRenderFns
+					}
+				}
+
+				function tr(e, t) {
+					if (e.parent && (e.pre = e.pre || e.parent.pre), e.staticRoot && !e.staticProcessed)
+						return nr(e, t);
+					if (e.once && !e.onceProcessed) return rr(e, t);
+					if (e.for && !e.forProcessed) return or(e, t);
+					if (e.if && !e.ifProcessed) return ir(e, t);
+					if ("template" !== e.tag || e.slotTarget || t.pre) {
+						if ("slot" === e.tag) return function(e, t) {
+							var n = e.slotName || '"default"',
+								r = ur(e, t),
+								i = "_t(" + n + (r ? "," + r : ""),
+								o = e.attrs || e.dynamicAttrs ? dr((e.attrs || []).concat(e
+									.dynamicAttrs || []).map(function(e) {
+									return {
+										name: Er(e.name),
+										value: e.value,
+										dynamic: e.dynamic
+									}
+								})) : null,
+								a = e.attrsMap["v-bind"];
+							return !o && !a || r || (i += ",null"), o && (i += "," + o), a && (i +=
+								(o ? "" : ",null") + "," + a), i + ")"
+						}(e, t);
+						var n;
+						if (e.component) n = function(e, t, n) {
+							var r = t.inlineTemplate ? null : ur(t, n, !0);
+							return "_c(" + e + "," + ar(t, n) + (r ? "," + r : "") + ")"
+						}(e.component, e, t);
+						else {
+							var r;
+							(!e.plain || e.pre && t.maybeComponent(e)) && (r = ar(e, t));
+							var i = e.inlineTemplate ? null : ur(e, t, !0);
+							n = "_c('" + e.tag + "'" + (r ? "," + r : "") + (i ? "," + i : "") + ")"
+						}
+						for (var o = 0; o < t.transforms.length; o++) n = t.transforms[o](e, n);
+						return n
+					}
+					return ur(e, t) || "void 0"
+				}
+
+				function nr(e, t) {
+					e.staticProcessed = !0;
+					var n = t.pre;
+					return e.pre && (t.pre = e.pre), t.staticRenderFns.push("with(this){return " + tr(e,
+						t) + "}"), t.pre = n, "_m(" + (t.staticRenderFns.length - 1) + (e.staticInFor ?
+						",true" : "") + ")"
+				}
+
+				function rr(e, t) {
+					if (e.onceProcessed = !0, e.if && !e.ifProcessed) return ir(e, t);
+					if (e.staticInFor) {
+						for (var n = "", r = e.parent; r;) {
+							if (r.for) {
+								n = r.key;
+								break
+							}
+							r = r.parent
+						}
+						return n ? "_o(" + tr(e, t) + "," + t.onceId++ + "," + n + ")" : (t.warn(
+							"v-once can only be used inside v-for that is keyed. ", e.rawAttrsMap[
+								"v-once"]), tr(e, t))
+					}
+					return nr(e, t)
+				}
+
+				function ir(e, t, n, r) {
+					return e.ifProcessed = !0,
+						function e(t, n, r, i) {
+							function o(e) {
+								return r ? r(e, n) : e.once ? rr(e, n) : tr(e, n)
+							}
+							if (!t.length) return i || "_e()";
+							var a = t.shift();
+							return a.exp ? "(" + a.exp + ")?" + o(a.block) + ":" + e(t, n, r, i) : "" + o(a
+								.block)
+						}(e.ifConditions.slice(), t, n, r)
+				}
+
+				function or(e, t, n, r) {
+					var i = e.for,
+						o = e.alias,
+						a = e.iterator1 ? "," + e.iterator1 : "",
+						s = e.iterator2 ? "," + e.iterator2 : "";
+					return t.maybeComponent(e) && "slot" !== e.tag && "template" !== e.tag && !e.key && t
+						.warn("<" + e.tag + ' v-for="' + o + " in " + i +
+							'">: component lists rendered with v-for should have explicit keys. See https://vuejs.org/guide/list.html#key for more info.',
+							e.rawAttrsMap["v-for"], !0), e.forProcessed = !0, (r || "_l") + "((" + i +
+						"),function(" + o + a + s + "){return " + (n || tr)(e, t) + "})"
+				}
+
+				function ar(e, t) {
+					var n = "{",
+						r = function(e, t) {
+							var n = e.directives;
+							if (n) {
+								var r, i, o, a, s = "directives:[",
+									c = !1;
+								for (r = 0, i = n.length; r < i; r++) {
+									o = n[r], a = !0;
+									var u = t.directives[o.name];
+									u && (a = !!u(e, o, t.warn)), a && (c = !0, s += '{name:"' + o.name +
+										'",rawName:"' + o.rawName + '"' + (o.value ? ",value:(" + o
+											.value + "),expression:" + JSON.stringify(o.value) : "") + (
+											o.arg ? ",arg:" + (o.isDynamicArg ? o.arg : '"' + o.arg +
+												'"') : "") + (o.modifiers ? ",modifiers:" + JSON
+											.stringify(o.modifiers) : "") + "},")
+								}
+								return c ? s.slice(0, -1) + "]" : void 0
+							}
+						}(e, t);
+					r && (n += r + ","), e.key && (n += "key:" + e.key + ","), e.ref && (n += "ref:" + e
+							.ref + ","), e.refInFor && (n += "refInFor:true,"), e.pre && (n += "pre:true,"),
+						e.component && (n += 'tag:"' + e.tag + '",');
+					for (var i = 0; i < t.dataGenFns.length; i++) n += t.dataGenFns[i](e);
+					if (e.attrs && (n += "attrs:" + dr(e.attrs) + ","), e.props && (n += "domProps:" + dr(e
+							.props) + ","), e.events && (n += Xn(e.events, !1) + ","),
+						e.nativeEvents && (n += Xn(e.nativeEvents, !0) + ","), e.slotTarget && !e
+						.slotScope && (n += "slot:" + e.slotTarget + ","), e.scopedSlots && (n += function(
+							e, t, n) {
+							var r = e.for || Object.keys(t).some(function(e) {
+									var n = t[e];
+									return n.slotTargetDynamic || n.if || n.for || sr(n)
+								}),
+								i = !!e.if;
+							if (!r)
+								for (var o = e.parent; o;) {
+									if (o.slotScope && o.slotScope !== Is || o.for) {
+										r = !0;
+										break
+									}
+									o.if && (i = !0), o = o.parent
+								}
+							var a = Object.keys(t).map(function(e) {
+								return cr(t[e], n)
+							}).join(",");
+							return "scopedSlots:_u([" + a + "]" + (r ? ",null,true" : "") + (!r && i ?
+								",null,false," + function(e) {
+									for (var t = 5381, n = e.length; n;) t = 33 * t ^ e.charCodeAt(
+										--n);
+									return t >>> 0
+								}(a) : "") + ")"
+						}(e, e.scopedSlots, t) + ","), e.model && (n += "model:{value:" + e.model.value +
+							",callback:" + e.model.callback + ",expression:" + e.model.expression + "},"), e
+						.inlineTemplate) {
+						var o = function(e, t) {
+							var n = e.children[0];
+							if (1 === e.children.length && 1 === n.type || t.warn(
+									"Inline-template components must have exactly one child element.", {
+										start: e.start
+									}), n && 1 === n.type) {
+								var r = er(n, t.options);
+								return "inlineTemplate:{render:function(){" + r.render +
+									"},staticRenderFns:[" + r.staticRenderFns.map(function(e) {
+										return "function(){" + e + "}"
+									}).join(",") + "]}"
+							}
+						}(e, t);
+						o && (n += o + ",")
+					}
+					return n = n.replace(/,$/, "") + "}", e.dynamicAttrs && (n = "_b(" + n + ',"' + e.tag +
+							'",' + dr(e.dynamicAttrs) + ")"), e.wrapData && (n = e.wrapData(n)), e
+						.wrapListeners && (n = e.wrapListeners(n)), n
+				}
+
+				function sr(e) {
+					return 1 === e.type && ("slot" === e.tag || e.children.some(sr))
+				}
+
+				function cr(e, t) {
+					var n = e.attrsMap["slot-scope"];
+					if (e.if && !e.ifProcessed && !n) return ir(e, t, cr, "null");
+					if (e.for && !e.forProcessed) return or(e, t, cr);
+					var r = e.slotScope === Is ? "" : String(e.slotScope),
+						i = "function(" + r + "){return " + ("template" === e.tag ? e.if && n ? "(" + e.if+
+							")?" + (ur(e, t) || "undefined") + ":undefined" : ur(e, t) || "undefined" : tr(
+								e, t)) + "}",
+						o = r ? "" : ",proxy:true";
+					return "{key:" + (e.slotTarget || '"default"') + ",fn:" + i + o + "}"
+				}
+
+				function ur(e, t, n, r, i) {
+					var o = e.children;
+					if (o.length) {
+						var a = o[0];
+						if (1 === o.length && a.for && "template" !== a.tag && "slot" !== a.tag) {
+							var s = n ? t.maybeComponent(a) ? ",1" : ",0" : "";
+							return (r || tr)(a, t) + s
+						}
+						var c = n ? function(e, t) {
+								for (var n = 0, r = 0; r < e.length; r++) {
+									var i = e[r];
+									if (1 === i.type) {
+										if (lr(i) || i.ifConditions && i.ifConditions.some(function(e) {
+												return lr(e.block)
+											})) {
+											n = 2;
+											break
+										}(t(i) || i.ifConditions && i.ifConditions.some(function(e) {
+											return t(e.block)
+										})) && (n = 1)
+									}
+								}
+								return n
+							}(o, t.maybeComponent) : 0,
+							u = i || fr;
+						return "[" + o.map(function(e) {
+							return u(e, t)
+						}).join(",") + "]" + (c ? "," + c : "")
+					}
+				}
+
+				function lr(e) {
+					return void 0 !== e.for || "template" === e.tag || "slot" === e.tag
+				}
+
+				function fr(e, t) {
+					return 1 === e.type ? tr(e, t) : 3 === e.type && e.isComment ? function(e) {
+						return "_e(" + JSON.stringify(e.text) + ")"
+					}(e) : function(e) {
+						return "_v(" + (2 === e.type ? e.expression : pr(JSON.stringify(e.text))) + ")"
+					}(e)
+				}
+
+				function dr(e) {
+					for (var t = "", n = "", r = 0; r < e.length; r++) {
+						var i = e[r],
+							o = pr(i.value);
+						i.dynamic ? n += i.name + "," + o + "," : t += '"' + i.name + '":' + o + ","
+					}
+					return t = "{" + t.slice(0, -1) + "}", n ? "_d(" + t + ",[" + n.slice(0, -1) + "])" : t
+				}
+
+				function pr(e) {
+					return e.replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029")
+				}
+
+				function hr(e, t) {
+					e && function e(t, n) {
+						if (1 === t.type) {
+							for (var r in t.attrsMap)
+								if ($s.test(r)) {
+									var i = t.attrsMap[r];
+									if (i) {
+										var o = t.rawAttrsMap[r];
+										"v-for" === r ? mr(t, 'v-for="' + i + '"', n, o) : ws.test(r) ?
+											vr(i, r + '="' + i + '"', n, o) : yr(i, r + '="' + i + '"',
+												n, o)
+									}
+								} if (t.children)
+								for (var a = 0; a < t.children.length; a++) e(t.children[a], n)
+						} else 2 === t.type && yr(t.expression, t.text, n, t)
+					}(e, t)
+				}
+
+				function vr(e, t, n, r) {
+					var i = e.replace(Ys, ""),
+						o = i.match(Xs);
+					o && "$" !== i.charAt(o.index - 1) && n(
+						'avoid using JavaScript unary operator as property name: "' + o[0] +
+						'" in expression ' + t.trim(), r), yr(e, t, n, r)
+				}
+
+				function mr(e, t, n, r) {
+					yr(e.for || "", t, n, r), gr(e.alias, "v-for alias", t, n, r), gr(e.iterator1,
+						"v-for iterator", t, n, r), gr(e.iterator2, "v-for iterator", t, n, r)
+				}
+
+				function gr(e, t, n, r, i) {
+					if ("string" == typeof e) try {
+						new Function("var " + e + "=_")
+					} catch (o) {
+						r("invalid " + t + ' "' + e + '" in expression: ' + n.trim(), i)
+					}
+				}
+
+				function yr(e, t, n, r) {
+					try {
+						new Function("return " + e)
+					} catch (o) {
+						var i = e.replace(Ys, "").match(Zs);
+						n(i ? 'avoid using JavaScript keyword as property name: "' + i[0] +
+							'"\n  Raw expression: ' + t.trim() : "invalid expression: " + o.message +
+							" in\n\n    " + e + "\n\n  Raw expression: " + t.trim() + "\n", r)
+					}
+				}
+
+				function br(e, t) {
+					var n = "";
+					if (0 < t)
+						for (; 1 & t && (n += e), !((t >>>= 1) <= 0);) e += e;
+					return n
+				}
+
+				function _r(e, t) {
+					try {
+						return new Function(e)
+					} catch (n) {
+						return t.push({
+							err: n,
+							code: e
+						}), w
+					}
+				}
+
+				function wr(e) {
+					var t = Object.create(null);
+					return function(n, r, i) {
+						var o = (r = b({}, r)).warn || ai;
+						delete r.warn;
+						try {
+							new Function("return 1")
+						} catch (r) {
+							r.toString().match(/unsafe-eval|CSP/) && o(
+								"It seems you are using the standalone build of Vue.js in an environment with Content Security Policy that prohibits unsafe-eval. The template compiler cannot work in this environment. Consider relaxing the policy to allow unsafe-eval or pre-compiling your templates into render functions."
+								)
+						}
+						var a = r.delimiters ? String(r.delimiters) + n : n;
+						if (t[a]) return t[a];
+						var s = e(n, r);
+						s.errors && s.errors.length && (r.outputSourceRange ? s.errors.forEach(function(
+							e) {
+							o("Error compiling template:\n\n" + e.msg + "\n\n" + function(e,
+								t, n) {
+								void 0 === t && (t = 0), void 0 === n && (n = e
+									.length);
+								for (var r = e.split(/\r?\n/), i = 0, o = [], a =
+									0; a < r.length; a++)
+									if (i += r[a].length + 1, t <= i) {
+										for (var s = a - Qs; s <= a + Qs || i <
+											n; s++)
+											if (!(s < 0 || s >= r.length)) {
+												o.push("" + (s + 1) + br(" ", 3 -
+														String(s + 1).length) +
+													"|  " + r[s]);
+												var c = r[s].length;
+												if (s === a) {
+													var u = t - (i - c) + 1,
+														l = i < n ? c - u : n - t;
+													o.push("   |  " + br(" ", u) +
+														br("^", l))
+												} else if (a < s) {
+													if (i < n) {
+														var f = Math.min(n - i, c);
+														o.push("   |  " + br("^",
+															f))
+													}
+													i += c + 1
+												}
+											} break
+									} return o.join("\n")
+							}(n, e.start, e.end), i)
+						}) : o("Error compiling template:\n\n" + n + "\n\n" + s.errors.map(
+							function(e) {
+								return "- " + e
+							}).join("\n") + "\n", i)), s.tips && s.tips.length && (r
+							.outputSourceRange ? s.tips.forEach(function(e) {
+								return si(e.msg, i)
+							}) : s.tips.forEach(function(e) {
+								return si(e, i)
+							}));
+						var c = {},
+							u = [];
+						return c.render = _r(s.render, u), c.staticRenderFns = s.staticRenderFns.map(
+							function(e) {
+								return _r(e, u)
+							}), s.errors && s.errors.length || !u.length || o(
+							"Failed to generate render function:\n\n" + u.map(function(e) {
+								var t = e.err,
+									n = e.code;
+								return t.toString() + " in\n\n" + n + "\n"
+							}).join("\n"), i), t[a] = c
+					}
+				}
+
+				function $r(e) {
+					return (Ka = Ka || document.createElement("div")).innerHTML = e ? '<a href="\n"/>' :
+						'<div a="\n"/>', 0 < Ka.innerHTML.indexOf("&#10;")
+				}
+				var Cr, kr = Object.freeze({}),
+					xr = Object.prototype.toString,
+					Tr = h("slot,component", !0),
+					Sr = h("key,ref,slot,slot-scope,is"),
+					Ar = Object.prototype.hasOwnProperty,
+					Or = /-(\w)/g,
+					Er = g(function(e) {
+						return e.replace(Or, function(e, t) {
+							return t ? t.toUpperCase() : ""
+						})
+					}),
+					Mr = g(function(e) {
+						return e.charAt(0).toUpperCase() + e.slice(1)
+					}),
+					Lr = /\B([A-Z])/g,
+					jr = g(function(e) {
+						return e.replace(Lr, "-$1").toLowerCase()
+					}),
+					Dr = Function.prototype.bind ? function(e, t) {
+						return e.bind(t)
+					} : function(e, t) {
+						function n(n) {
+							var r = arguments.length;
+							return r ? 1 < r ? e.apply(t, arguments) : e.call(t, n) : e.call(t)
+						}
+						return n._length = e.length, n
+					},
+					Ir = function(e, t, n) {
+						return !1
+					},
+					Nr = function(e) {
+						return e
+					},
+					Rr = "data-server-rendered",
+					Fr = ["component", "directive", "filter"],
+					Pr = ["beforeCreate", "created", "beforeMount", "mounted", "beforeUpdate", "updated",
+						"beforeDestroy", "destroyed", "activated", "deactivated", "errorCaptured",
+						"serverPrefetch"
+					],
+					Hr = {
+						optionMergeStrategies: Object.create(null),
+						silent: !1,
+						productionTip: !0,
+						devtools: !0,
+						performance: !1,
+						errorHandler: null,
+						warnHandler: null,
+						ignoredElements: [],
+						keyCodes: Object.create(null),
+						isReservedTag: Ir,
+						isReservedAttr: Ir,
+						isUnknownElement: Ir,
+						getTagNamespace: w,
+						parsePlatformTagName: Nr,
+						mustUseProp: Ir,
+						async: !0,
+						_lifecycleHooks: Pr
+					},
+					Wr =
+					/a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/,
+					Br = new RegExp("[^" + Wr.source + ".$_\\d]"),
+					Vr = "__proto__" in {},
+					qr = "undefined" != typeof window,
+					Ur = "undefined" != typeof WXEnvironment && !!WXEnvironment.platform,
+					zr = Ur && WXEnvironment.platform.toLowerCase(),
+					Jr = qr && window.navigator.userAgent.toLowerCase(),
+					Kr = Jr && /msie|trident/.test(Jr),
+					Gr = Jr && 0 < Jr.indexOf("msie 9.0"),
+					Zr = Jr && 0 < Jr.indexOf("edge/"),
+					Xr = (Jr && Jr.indexOf("android"), Jr && /iphone|ipad|ipod|ios/.test(Jr) || "ios" ===
+						zr),
+					Yr = (Jr && /chrome\/\d+/.test(Jr), Jr && /phantomjs/.test(Jr), Jr && Jr.match(
+						/firefox\/(\d+)/)),
+					Qr = {}.watch,
+					ei = !1;
+				if (qr) try {
+					var ti = {};
+					Object.defineProperty(ti, "passive", {
+						get: function() {
+							ei = !0
+						}
+					}), window.addEventListener("test-passive", null, ti)
+				} catch (g) {}
+				var ni, ri = function() {
+						return void 0 === Cr && (Cr = !qr && !Ur && void 0 !== t && t.process &&
+							"server" === t.process.env.VUE_ENV), Cr
+					},
+					ii = qr && window.__VUE_DEVTOOLS_GLOBAL_HOOK__,
+					oi = "undefined" != typeof Symbol && S(Symbol) && "undefined" != typeof Reflect && S(
+						Reflect.ownKeys);
+				ni = "undefined" != typeof Set && S(Set) ? Set : function() {
+					function e() {
+						this.set = Object.create(null)
+					}
+					return e.prototype.has = function(e) {
+						return !0 === this.set[e]
+					}, e.prototype.add = function(e) {
+						this.set[e] = !0
+					}, e.prototype.clear = function() {
+						this.set = Object.create(null)
+					}, e
+				}();
+				var ai = w,
+					si = w,
+					ci = w,
+					ui = w,
+					li = "undefined" != typeof console,
+					fi = /(?:^|[-_])(\w)/g;
+				ai = function(e, t) {
+					var n = t ? ci(t) : "";
+					Hr.warnHandler ? Hr.warnHandler.call(null, e, t, n) : li && Hr.silent
+				}, si = function(e, t) {
+					li && Hr.silent
+				}, ui = function(e, t) {
+					if (e.$root === e) return "<Root>";
+					var n = "function" == typeof e && null != e.cid ? e.options : e._isVue ? e
+						.$options || e.constructor.options : e,
+						r = n.name || n._componentTag,
+						i = n.__file;
+					if (!r && i) {
+						var o = i.match(/([^\/\\]+)\.vue$/);
+						r = o && o[1]
+					}
+					return (r ? "<" + function(e) {
+						return e.replace(fi, function(e) {
+							return e.toUpperCase()
+						}).replace(/[-_]/g, "")
+					}(r) + ">" : "<Anonymous>") + (i && !1 !== t ? " at " + i : "")
+				}, ci = function(e) {
+					if (e._isVue && e.$parent) {
+						for (var t = [], n = 0; e;) {
+							if (0 < t.length) {
+								var r = t[t.length - 1];
+								if (r.constructor === e.constructor) {
+									n++, e = e.$parent;
+									continue
+								}
+								0 < n && (t[t.length - 1] = [r, n], n = 0)
+							}
+							t.push(e), e = e.$parent
+						}
+						return "\n\nfound in\n\n" + t.map(function(e, t) {
+							return "" + (0 === t ? "---\x3e " : function(e, t) {
+								for (var n = ""; t;) t % 2 == 1 && (n += e), t > 1 && (
+									e += e), t >>= 1;
+								return n
+							}(" ", 5 + 2 * t)) + (Array.isArray(e) ? ui(e[0]) + "... (" + e[
+								1] + " recursive calls)" : ui(e))
+						}).join("\n")
+					}
+					return "\n\n(found in " + ui(e) + ")"
+				};
+				var di = 0,
+					pi = function() {
+						this.id = di++, this.subs = []
+					};
+				pi.prototype.addSub = function(e) {
+					this.subs.push(e)
+				}, pi.prototype.removeSub = function(e) {
+					v(this.subs, e)
+				}, pi.prototype.depend = function() {
+					pi.target && pi.target.addDep(this)
+				}, pi.prototype.notify = function() {
+					var e = this.subs.slice();
+					Hr.async || e.sort(function(e, t) {
+						return e.id - t.id
+					});
+					for (var t = 0, n = e.length; t < n; t++) e[t].update()
+				}, pi.target = null;
+				var hi = [],
+					vi = function(e, t, n, r, i, o, a, s) {
+						this.tag = e, this.data = t, this.children = n, this.text = r, this.elm = i, this
+							.ns = void 0, this.context = o, this.fnContext = void 0, this.fnOptions =
+							void 0, this.fnScopeId = void 0, this.key = t && t.key, this.componentOptions =
+							a, this.componentInstance = void 0, this.parent = void 0, this.raw = !1, this
+							.isStatic = !1, this.isRootInsert = !0, this.isComment = !1, this.isCloned = !1,
+							this.isOnce = !1, this.asyncFactory = s, this.asyncMeta = void 0, this
+							.isAsyncPlaceholder = !1
+					},
+					mi = {
+						child: {
+							configurable: !0
+						}
+					};
+				mi.child.get = function() {
+					return this.componentInstance
+				}, Object.defineProperties(vi.prototype, mi);
+				var gi = function(e) {
+						void 0 === e && (e = "");
+						var t = new vi;
+						return t.text = e, t.isComment = !0, t
+					},
+					yi = Array.prototype,
+					bi = Object.create(yi);
+				["push", "pop", "shift", "unshift", "splice", "sort", "reverse"].forEach(function(e) {
+					var t = yi[e];
+					T(bi, e, function() {
+						for (var n = [], r = arguments.length; r--;) n[r] = arguments[r];
+						var i, o = t.apply(this, n),
+							a = this.__ob__;
+						switch (e) {
+							case "push":
+							case "unshift":
+								i = n;
+								break;
+							case "splice":
+								i = n.slice(2)
+						}
+						return i && a.observeArray(i), a.dep.notify(), o
+					})
+				});
+				var _i = Object.getOwnPropertyNames(bi),
+					wi = !0,
+					$i = function(e) {
+						this.value = e, this.dep = new pi, this.vmCount = 0, T(e, "__ob__", this), Array
+							.isArray(e) ? (Vr ? function(e, t) {
+								e.__proto__ = t
+							}(e, bi) : function(e, t, n) {
+								for (var r = 0, i = n.length; r < i; r++) {
+									var o = n[r];
+									T(e, o, t[o])
+								}
+							}(e, bi, _i), this.observeArray(e)) : this.walk(e)
+					};
+				$i.prototype.walk = function(e) {
+					for (var t = Object.keys(e), n = 0; n < t.length; n++) D(e, t[n])
+				}, $i.prototype.observeArray = function(e) {
+					for (var t = 0, n = e.length; t < n; t++) j(e[t])
+				};
+				var Ci = Hr.optionMergeStrategies;
+				Ci.el = Ci.propsData = function(e, t, n, r) {
+					return n || ai('option "' + r +
+						'" can only be used during instance creation with the `new` keyword.'), Si(
+						e, t)
+				}, Ci.data = function(e, t, n) {
+					return n ? F(e, t, n) : t && "function" != typeof t ? (ai(
+						'The "data" option should be a function that returns a per-instance value in component definitions.',
+						n), e) : F(e, t)
+				}, Pr.forEach(function(e) {
+					Ci[e] = P
+				}), Fr.forEach(function(e) {
+					Ci[e + "s"] = H
+				}), Ci.watch = function(e, t, n, r) {
+					if (e === Qr && (e = void 0), t === Qr && (t = void 0), !t) return Object.create(
+						e || null);
+					if (B(r, t, n), !e) return t;
+					var i = {};
+					for (var o in b(i, e), t) {
+						var a = i[o],
+							s = t[o];
+						a && !Array.isArray(a) && (a = [a]), i[o] = a ? a.concat(s) : Array.isArray(s) ?
+							s : [s]
+					}
+					return i
+				}, Ci.props = Ci.methods = Ci.inject = Ci.computed = function(e, t, n, r) {
+					if (t && B(r, t, n), !e) return t;
+					var i = Object.create(null);
+					return b(i, e), t && b(i, t), i
+				}, Ci.provide = F;
+				var ki, xi, Ti, Si = function(e, t) {
+						return void 0 === t ? e : t
+					},
+					Ai = /^(String|Number|Boolean|Function|Symbol)$/,
+					Oi = !1,
+					Ei = [],
+					Mi = !1;
+				if ("undefined" != typeof Promise && S(Promise)) {
+					var Li = Promise.resolve();
+					ki = function() {
+						Li.then(ne), Xr && setTimeout(w)
+					}, Oi = !0
+				} else if (Kr || "undefined" == typeof MutationObserver || !S(MutationObserver) &&
+					"[object MutationObserverConstructor]" !== MutationObserver.toString()) ki = void 0 !==
+					n && S(n) ? function() {
+						n(ne)
+					} : function() {
+						setTimeout(ne, 0)
+					};
+				else {
+					var ji = 1,
+						Di = new MutationObserver(ne),
+						Ii = document.createTextNode(String(ji));
+					Di.observe(Ii, {
+						characterData: !0
+					}), ki = function() {
+						ji = (ji + 1) % 2, Ii.data = String(ji)
+					}, Oi = !0
+				}
+				var Ni, Ri = qr && window.performance;
+				Ri && Ri.mark && Ri.measure && Ri.clearMarks && Ri.clearMeasures && (xi = function(e) {
+					return Ri.mark(e)
+				}, Ti = function(e, t, n) {
+					Ri.measure(e, t, n), Ri.clearMarks(t), Ri.clearMarks(n)
+				});
+				var Fi = h(
+						"Infinity,undefined,NaN,isFinite,isNaN,parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,require"
+						),
+					Pi = function(e, t) {
+						ai('Property or method "' + t +
+							'" is not defined on the instance but referenced during render. Make sure that this property is reactive, either in the data option, or for class-based components, by initializing the property. See: https://vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.',
+							e)
+					},
+					Hi = function(e, t) {
+						ai('Property "' + t + '" must be accessed with "$data.' + t +
+							'" because properties starting with "$" or "_" are not proxied in the Vue instance to prevent conflicts with Vue internalsSee: https://vuejs.org/v2/api/#data',
+							e)
+					},
+					Wi = "undefined" != typeof Proxy && S(Proxy);
+				if (Wi) {
+					var Bi = h("stop,prevent,self,ctrl,shift,alt,meta,exact");
+					Hr.keyCodes = new Proxy(Hr.keyCodes, {
+						set: function(e, t, n) {
+							return Bi(t) ? (ai(
+								"Avoid overwriting built-in modifier in config.keyCodes: ." +
+								t), !1) : (e[t] = n, !0)
+						}
+					})
+				}
+				var Vi = {
+						has: function(e, t) {
+							var n = t in e,
+								r = Fi(t) || "string" == typeof t && "_" === t.charAt(0) && !(t in e
+									.$data);
+							return n || r || (t in e.$data ? Hi(e, t) : Pi(e, t)), n || !r
+						}
+					},
+					qi = {
+						get: function(e, t) {
+							return "string" != typeof t || t in e || (t in e.$data ? Hi(e, t) : Pi(e,
+								t)), e[t]
+						}
+					};
+				Ni = function(e) {
+					if (Wi) {
+						var t = e.$options,
+							n = t.render && t.render._withStripped ? qi : Vi;
+						e._renderProxy = new Proxy(e, n)
+					} else e._renderProxy = e
+				};
+				var Ui = new ni,
+					zi = g(function(e) {
+						var t = "&" === e.charAt(0),
+							n = "~" === (e = t ? e.slice(1) : e).charAt(0),
+							r = "!" === (e = n ? e.slice(1) : e).charAt(0);
+						return {
+							name: e = r ? e.slice(1) : e,
+							once: n,
+							capture: r,
+							passive: t
+						}
+					});
+				je(De.prototype);
+				var Ji, Ki = {
+						init: function(e, t) {
+							if (e.componentInstance && !e.componentInstance._isDestroyed && e.data
+								.keepAlive) {
+								var n = e;
+								Ki.prepatch(n, n)
+							} else {
+								(e.componentInstance = function(e, t) {
+									var n = {
+											_isComponent: !0,
+											_parentVnode: e,
+											parent: t
+										},
+										i = e.data.inlineTemplate;
+									return r(i) && (n.render = i.render, n.staticRenderFns = i
+										.staticRenderFns), new e.componentOptions.Ctor(n)
+								}(e, Qi)).$mount(t ? e.elm : void 0, t)
+							}
+						},
+						prepatch: function(e, t) {
+							var n = t.componentOptions,
+								r = t.componentInstance = e.componentInstance;
+							! function(e, t, n, r, i) {
+								eo = !0;
+								var o = r.data.scopedSlots,
+									a = e.$scopedSlots,
+									s = !!(o && !o.$stable || a !== kr && !a.$stable || o && e
+										.$scopedSlots.$key !== o.$key),
+									c = !!(i || e.$options._renderChildren || s);
+								if (e.$options._parentVnode = r, e.$vnode = r, e._vnode && (e._vnode
+										.parent = r), e.$options._renderChildren = i, e.$attrs = r.data
+									.attrs || kr, e.$listeners = n || kr, t && e.$options.props) {
+									L(!1);
+									for (var u = e._props, l = e.$options._propKeys || [], f = 0; f < l
+										.length; f++) {
+										var d = l[f],
+											p = e.$options.props;
+										u[d] = U(d, p, t, e)
+									}
+									L(!0), e.$options.propsData = t
+								}
+								n = n || kr;
+								var h = e.$options._parentListeners;
+								e.$options._parentListeners = n, Ke(e, n, h), c && (e.$slots = he(i, r
+									.context), e.$forceUpdate()), eo = !1
+							}(r, n.propsData, n.listeners, t, n.children)
+						},
+						insert: function(e) {
+							var t = e.context,
+								n = e.componentInstance;
+							n._isMounted || (n._isMounted = !0, Qe(n, "mounted")), e.data.keepAlive && (
+								t._isMounted ? function(e) {
+									e._inactive = !1, ro.push(e)
+								}(n) : Ye(n, !0))
+						},
+						destroy: function(e) {
+							var t = e.componentInstance;
+							t._isDestroyed || (e.data.keepAlive ? function e(t, n) {
+								if (!(n && (t._directInactive = !0, Xe(t)) || t._inactive)) {
+									t._inactive = !0;
+									for (var r = 0; r < t.$children.length; r++) e(t.$children[
+										r]);
+									Qe(t, "deactivated")
+								}
+							}(t, !0) : t.$destroy())
+						}
+					},
+					Gi = Object.keys(Ki),
+					Zi = 1,
+					Xi = 2,
+					Yi = null,
+					Qi = null,
+					eo = !1,
+					to = 100,
+					no = [],
+					ro = [],
+					io = {},
+					oo = {},
+					ao = !1,
+					so = !1,
+					co = 0,
+					uo = 0,
+					lo = Date.now;
+				if (qr && !Kr) {
+					var fo = window.performance;
+					fo && "function" == typeof fo.now && lo() > document.createEvent("Event").timeStamp && (
+						lo = function() {
+							return fo.now()
+						})
+				}
+				var po = 0,
+					ho = function(e, t, n, r, i) {
+						this.vm = e, i && (e._watcher = this), e._watchers.push(this), r ? (this.deep = !!r
+								.deep, this.user = !!r.user, this.lazy = !!r.lazy, this.sync = !!r.sync,
+								this.before = r.before) : this.deep = this.user = this.lazy = this.sync = !
+							1, this.cb = n, this.id = ++po, this.active = !0, this.dirty = this.lazy, this
+							.deps = [], this.newDeps = [], this.depIds = new ni, this.newDepIds = new ni,
+							this.expression = t.toString(), "function" == typeof t ? this.getter = t : (this
+								.getter = function(e) {
+									if (!Br.test(e)) {
+										var t = e.split(".");
+										return function(e) {
+											for (var n = 0; n < t.length; n++) {
+												if (!e) return;
+												e = e[t[n]]
+											}
+											return e
+										}
+									}
+								}(t), this.getter || (this.getter = w, ai('Failed watching path: "' + t +
+									'" Watcher only accepts simple dot-delimited paths. For full control, use a function instead.',
+									e))), this.value = this.lazy ? void 0 : this.get()
+					};
+				ho.prototype.get = function() {
+					var e;
+					A(this);
+					var t = this.vm;
+					try {
+						e = this.getter.call(t, t)
+					} catch (e) {
+						if (!this.user) throw e;
+						Y(e, t, 'getter for watcher "' + this.expression + '"')
+					} finally {
+						this.deep && ie(e), O(), this.cleanupDeps()
+					}
+					return e
+				}, ho.prototype.addDep = function(e) {
+					var t = e.id;
+					this.newDepIds.has(t) || (this.newDepIds.add(t), this.newDeps.push(e), this.depIds
+						.has(t) || e.addSub(this))
+				}, ho.prototype.cleanupDeps = function() {
+					for (var e = this.deps.length; e--;) {
+						var t = this.deps[e];
+						this.newDepIds.has(t.id) || t.removeSub(this)
+					}
+					var n = this.depIds;
+					this.depIds = this.newDepIds, this.newDepIds = n, this.newDepIds.clear(), n = this
+						.deps, this.deps = this.newDeps, this.newDeps = n, this.newDeps.length = 0
+				}, ho.prototype.update = function() {
+					this.lazy ? this.dirty = !0 : this.sync ? this.run() : function(e) {
+						var t = e.id;
+						if (null == io[t]) {
+							if (io[t] = !0, so) {
+								for (var n = no.length - 1; co < n && no[n].id > e.id;) n--;
+								no.splice(n + 1, 0, e)
+							} else no.push(e);
+							if (!ao) {
+								if (ao = !0, !Hr.async) return et();
+								re(et)
+							}
+						}
+					}(this)
+				}, ho.prototype.run = function() {
+					if (this.active) {
+						var e = this.get();
+						if (e !== this.value || a(e) || this.deep) {
+							var t = this.value;
+							if (this.value = e, this.user) try {
+								this.cb.call(this.vm, e, t)
+							} catch (e) {
+								Y(e, this.vm, 'callback for watcher "' + this.expression + '"')
+							} else this.cb.call(this.vm, e, t)
+						}
+					}
+				}, ho.prototype.evaluate = function() {
+					this.value = this.get(), this.dirty = !1
+				}, ho.prototype.depend = function() {
+					for (var e = this.deps.length; e--;) this.deps[e].depend()
+				}, ho.prototype.teardown = function() {
+					if (this.active) {
+						this.vm._isBeingDestroyed || v(this.vm._watchers, this);
+						for (var e = this.deps.length; e--;) this.deps[e].removeSub(this);
+						this.active = !1
+					}
+				};
+				var vo = {
+						enumerable: !0,
+						configurable: !0,
+						get: w,
+						set: w
+					},
+					mo = {
+						lazy: !0
+					},
+					go = 0;
+				(function(e) {
+					e.prototype._init = function(e) {
+						var t, n, r = this;
+						r._uid = go++, Hr.performance && xi && (t = "vue-perf-start:" + r._uid, n =
+								"vue-perf-end:" + r._uid, xi(t)), r._isVue = !0, e && e
+							._isComponent ? st(r, e) : r.$options = V(ct(r.constructor), e || {},
+							r), Ni(r), Ze(r._self = r), qe(r), He(r), Qe(r, "beforeCreate"), de(r),
+							nt(r), fe(r), Qe(r, "created"), Hr.performance && xi && (r._name = ui(r,
+								!1), xi(n), Ti("vue " + r._name + " init", t, n)), r.$options.el &&
+							r.$mount(r.$options.el)
+					}
+				})(ut),
+				function(e) {
+					var t = {
+							get: function() {
+								return this._data
+							}
+						},
+						n = {
+							get: function() {
+								return this._props
+							}
+						};
+					t.set = function() {
+							ai("Avoid replacing instance root $data. Use nested data properties instead.",
+								this)
+						}, n.set = function() {
+							ai("$props is readonly.", this)
+						}, Object.defineProperty(e.prototype, "$data", t), Object.defineProperty(e
+							.prototype, "$props", n), e.prototype.$set = I, e.prototype.$delete = N, e
+						.prototype.$watch = function(e, t, n) {
+							var r = this;
+							if (c(t)) return at(r, e, t, n);
+							(n = n || {}).user = !0;
+							var i = new ho(r, e, t, n);
+							if (n.immediate) try {
+								t.call(r, i.value)
+							} catch (e) {
+								Y(e, r, 'callback for immediate watcher "' + i.expression + '"')
+							}
+							return function() {
+								i.teardown()
+							}
+						}
+				}(ut),
+				function(e) {
+					var t = /^hook:/;
+					e.prototype.$on = function(e, n) {
+						var r = this;
+						if (Array.isArray(e))
+							for (var i = 0, o = e.length; i < o; i++) r.$on(e[i], n);
+						else(r._events[e] || (r._events[e] = [])).push(n), t.test(e) && (r
+							._hasHookEvent = !0);
+						return r
+					}, e.prototype.$once = function(e, t) {
+						function n() {
+							r.$off(e, n), t.apply(r, arguments)
+						}
+						var r = this;
+						return n.fn = t, r.$on(e, n), r
+					}, e.prototype.$off = function(e, t) {
+						var n = this;
+						if (!arguments.length) return n._events = Object.create(null), n;
+						if (Array.isArray(e)) {
+							for (var r = 0, i = e.length; r < i; r++) n.$off(e[r], t);
+							return n
+						}
+						var o, a = n._events[e];
+						if (!a) return n;
+						if (!t) return n._events[e] = null, n;
+						for (var s = a.length; s--;)
+							if ((o = a[s]) === t || o.fn === t) {
+								a.splice(s, 1);
+								break
+							} return n
+					}, e.prototype.$emit = function(e) {
+						var t = this,
+							n = e.toLowerCase();
+						n !== e && t._events[n] && si('Event "' + n + '" is emitted in component ' + ui(
+								t) + ' but the handler is registered for "' + e +
+							'". Note that HTML attributes are case-insensitive and you cannot use v-on to listen to camelCase events when using in-DOM templates. You should probably use "' +
+							jr(e) + '" instead of "' + e + '".');
+						var r = t._events[e];
+						if (r) {
+							r = 1 < r.length ? y(r) : r;
+							for (var i = y(arguments, 1), o = 'event handler for "' + e + '"', a = 0,
+									s = r.length; a < s; a++) Q(r[a], t, i, t, o)
+						}
+						return t
+					}
+				}(ut),
+				function(e) {
+					e.prototype._update = function(e, t) {
+						var n = this,
+							r = n.$el,
+							i = n._vnode,
+							o = Ge(n);
+						n._vnode = e, n.$el = i ? n.__patch__(i, e) : n.__patch__(n.$el, e, t, !1), o(),
+							r && (r.__vue__ = null), n.$el && (n.$el.__vue__ = n), n.$vnode && n
+							.$parent && n.$vnode === n.$parent._vnode && (n.$parent.$el = n.$el)
+					}, e.prototype.$forceUpdate = function() {
+						this._watcher && this._watcher.update()
+					}, e.prototype.$destroy = function() {
+						var e = this;
+						if (!e._isBeingDestroyed) {
+							Qe(e, "beforeDestroy"), e._isBeingDestroyed = !0;
+							var t = e.$parent;
+							!t || t._isBeingDestroyed || e.$options.abstract || v(t.$children, e), e
+								._watcher && e._watcher.teardown();
+							for (var n = e._watchers.length; n--;) e._watchers[n].teardown();
+							e._data.__ob__ && e._data.__ob__.vmCount--, e._isDestroyed = !0, e
+								.__patch__(e._vnode, null), Qe(e, "destroyed"), e.$off(), e.$el && (e
+									.$el.__vue__ = null), e.$vnode && (e.$vnode.parent = null)
+						}
+					}
+				}(ut),
+				function(e) {
+					je(e.prototype), e.prototype.$nextTick = function(e) {
+						return re(e, this)
+					}, e.prototype._render = function() {
+						var e, t = this,
+							n = t.$options,
+							r = n.render,
+							i = n._parentVnode;
+						i && (t.$scopedSlots = me(i.data.scopedSlots, t.$slots, t.$scopedSlots)), t
+							.$vnode = i;
+						try {
+							Yi = t, e = r.call(t._renderProxy, t.$createElement)
+						} catch (n) {
+							if (Y(n, t, "render"), t.$options.renderError) try {
+								e = t.$options.renderError.call(t._renderProxy, t.$createElement, n)
+							} catch (n) {
+								Y(n, t, "renderError"), e = t._vnode
+							} else e = t._vnode
+						} finally {
+							Yi = null
+						}
+						return Array.isArray(e) && 1 === e.length && (e = e[0]), e instanceof vi || (
+							Array.isArray(e) && ai(
+								"Multiple root nodes returned from render function. Render function should return a single root node.",
+								t), e = gi()), e.parent = i, e
+					}
+				}(ut);
+				var yo = [String, RegExp, Array],
+					bo = {
+						KeepAlive: {
+							name: "keep-alive",
+							abstract: !0,
+							props: {
+								include: yo,
+								exclude: yo,
+								max: [String, Number]
+							},
+							created: function() {
+								this.cache = Object.create(null), this.keys = []
+							},
+							destroyed: function() {
+								for (var e in this.cache) ht(this.cache, e, this.keys)
+							},
+							mounted: function() {
+								var e = this;
+								this.$watch("include", function(t) {
+									pt(e, function(e) {
+										return dt(t, e)
+									})
+								}), this.$watch("exclude", function(t) {
+									pt(e, function(e) {
+										return !dt(t, e)
+									})
+								})
+							},
+							render: function() {
+								var e = this.$slots.default,
+									t = Ve(e),
+									n = t && t.componentOptions;
+								if (n) {
+									var r = ft(n),
+										i = this.include,
+										o = this.exclude;
+									if (i && (!r || !dt(i, r)) || o && r && dt(o, r)) return t;
+									var a = this.cache,
+										s = this.keys,
+										c = null == t.key ? n.Ctor.cid + (n.tag ? "::" + n.tag : "") : t
+										.key;
+									a[c] ? (t.componentInstance = a[c].componentInstance, v(s, c), s
+											.push(c)) : (a[c] = t, s.push(c), this.max && s.length >
+											parseInt(this.max) && ht(a, s[0], s, this._vnode)), t.data
+										.keepAlive = !0
+								}
+								return t || e && e[0]
+							}
+						}
+					};
+				(function(e) {
+					var t = {
+						get: function() {
+							return Hr
+						},
+						set: function() {
+							ai("Do not replace the Vue.config object, set individual fields instead.")
+						}
+					};
+					Object.defineProperty(e, "config", t), e.util = {
+						warn: ai,
+						extend: b,
+						mergeOptions: V,
+						defineReactive: D
+					}, e.set = I, e.delete = N, e.nextTick = re, e.observable = function(e) {
+						return j(e), e
+					}, e.options = Object.create(null), Fr.forEach(function(t) {
+						e.options[t + "s"] = Object.create(null)
+					}), b((e.options._base = e).options.components, bo), i = e, i.use = function(
+					e) {
+						var t = this._installedPlugins || (this._installedPlugins = []);
+						if (-1 < t.indexOf(e)) return this;
+						var n = y(arguments, 1);
+						return n.unshift(this), "function" == typeof e.install ? e.install.apply(e,
+							n) : "function" == typeof e && e.apply(null, n), t.push(e), this
+					}, r = e, r.mixin = function(e) {
+						return this.options = V(this.options, e), this
+					}, lt(e), n = e, Fr.forEach(function(e) {
+						n[e] = function(t, n) {
+							return n ? ("component" === e && W(t), "component" === e && c(
+								n) && (n.name = n.name || t, n = this.options._base
+									.extend(n)), "directive" === e && "function" ==
+								typeof n && (n = {
+									bind: n,
+									update: n
+								}), this.options[e + "s"][t] = n) : this.options[e +
+								"s"][t]
+						}
+					});
+					var n, r, i
+				})(ut), Object.defineProperty(ut.prototype, "$isServer", {
+					get: ri
+				}), Object.defineProperty(ut.prototype, "$ssrContext", {
+					get: function() {
+						return this.$vnode && this.$vnode.ssrContext
+					}
+				}), Object.defineProperty(ut, "FunctionalRenderContext", {
+					value: De
+				}), ut.version = "2.6.10";
+				var _o, wo, $o, Co, ko, xo, To, So, Ao, Oo, Eo = h("style,class"),
+					Mo = h("input,textarea,option,select,progress"),
+					Lo = function(e, t, n) {
+						return "value" === n && Mo(e) && "button" !== t || "selected" === n && "option" ===
+							e || "checked" === n && "input" === e || "muted" === n && "video" === e
+					},
+					jo = h("contenteditable,draggable,spellcheck"),
+					Do = h("events,caret,typing,plaintext-only"),
+					Io = function(e, t) {
+						return Ho(t) || "false" === t ? "false" : "contenteditable" === e && Do(t) ? t :
+							"true"
+					},
+					No = h(
+						"allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,translate,truespeed,typemustmatch,visible"
+						),
+					Ro = "http://www.w3.org/1999/xlink",
+					Fo = function(e) {
+						return ":" === e.charAt(5) && "xlink" === e.slice(0, 5)
+					},
+					Po = function(e) {
+						return Fo(e) ? e.slice(6, e.length) : ""
+					},
+					Ho = function(e) {
+						return null == e || !1 === e
+					},
+					Wo = {
+						svg: "http://www.w3.org/2000/svg",
+						math: "http://www.w3.org/1998/Math/MathML"
+					},
+					Bo = h(
+						"html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,menuitem,summary,content,element,shadow,template,blockquote,iframe,tfoot"
+						),
+					Vo = h(
+						"svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,foreignObject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view",
+						!0),
+					qo = function(e) {
+						return Bo(e) || Vo(e)
+					},
+					Uo = Object.create(null),
+					zo = h("text,number,password,search,email,tel,url"),
+					Jo = Object.freeze({
+						createElement: function(e, t) {
+							var n = document.createElement(e);
+							return "select" !== e ? n : (t.data && t.data.attrs && void 0 !== t.data
+								.attrs.multiple && n.setAttribute("multiple", "multiple"), n)
+						},
+						createElementNS: function(e, t) {
+							return document.createElementNS(Wo[e], t)
+						},
+						createTextNode: function(e) {
+							return document.createTextNode(e)
+						},
+						createComment: function(e) {
+							return document.createComment(e)
+						},
+						insertBefore: function(e, t, n) {
+							e.insertBefore(t, n)
+						},
+						removeChild: function(e, t) {
+							e.removeChild(t)
+						},
+						appendChild: function(e, t) {
+							e.appendChild(t)
+						},
+						parentNode: function(e) {
+							return e.parentNode
+						},
+						nextSibling: function(e) {
+							return e.nextSibling
+						},
+						tagName: function(e) {
+							return e.tagName
+						},
+						setTextContent: function(e, t) {
+							e.textContent = t
+						},
+						setStyleScope: function(e, t) {
+							e.setAttribute(t, "")
+						}
+					}),
+					Ko = {
+						create: function(e, t) {
+							wt(t)
+						},
+						update: function(e, t) {
+							e.data.ref !== t.data.ref && (wt(e, !0), wt(t))
+						},
+						destroy: function(e) {
+							wt(e, !0)
+						}
+					},
+					Go = new vi("", {}, []),
+					Zo = ["create", "activate", "update", "remove", "destroy"],
+					Xo = {
+						create: kt,
+						update: kt,
+						destroy: function(e) {
+							kt(e, Go)
+						}
+					},
+					Yo = Object.create(null),
+					Qo = [Ko, Xo],
+					ea = {
+						create: St,
+						update: St
+					},
+					ta = {
+						create: Et,
+						update: Et
+					},
+					na = /[\w).+\-_$\]]/,
+					ra = "__r",
+					ia = "__c",
+					oa = Oi && !(Yr && Number(Yr[1]) <= 53),
+					aa = {
+						create: rn,
+						update: rn
+					},
+					sa = {
+						create: on,
+						update: on
+					},
+					ca = g(function(e) {
+						var t = {},
+							n = /:(.+)/;
+						return e.split(/;(?![^(]*\))/g).forEach(function(e) {
+							if (e) {
+								var r = e.split(n);
+								1 < r.length && (t[r[0].trim()] = r[1].trim())
+							}
+						}), t
+					}),
+					ua = /^--/,
+					la = /\s*!important$/,
+					fa = function(e, t, n) {
+						if (ua.test(t)) e.style.setProperty(t, n);
+						else if (la.test(n)) e.style.setProperty(jr(t), n.replace(la, ""), "important");
+						else {
+							var r = pa(t);
+							if (Array.isArray(n))
+								for (var i = 0, o = n.length; i < o; i++) e.style[r] = n[i];
+							else e.style[r] = n
+						}
+					},
+					da = ["Webkit", "Moz", "ms"],
+					pa = g(function(e) {
+						if (Oo = Oo || document.createElement("div").style, "filter" !== (e = Er(e)) &&
+							e in Oo) return e;
+						for (var t = e.charAt(0).toUpperCase() + e.slice(1), n = 0; n < da
+							.length; n++) {
+							var r = da[n] + t;
+							if (r in Oo) return r
+						}
+					}),
+					ha = {
+						create: cn,
+						update: cn
+					},
+					va = /\s+/,
+					ma = g(function(e) {
+						return {
+							enterClass: e + "-enter",
+							enterToClass: e + "-enter-to",
+							enterActiveClass: e + "-enter-active",
+							leaveClass: e + "-leave",
+							leaveToClass: e + "-leave-to",
+							leaveActiveClass: e + "-leave-active"
+						}
+					}),
+					ga = qr && !Gr,
+					ya = "transition",
+					ba = "animation",
+					_a = "transition",
+					wa = "transitionend",
+					$a = "animation",
+					Ca = "animationend";
+				ga && (void 0 === window.ontransitionend && void 0 !== window.onwebkittransitionend && (_a =
+						"WebkitTransition", wa = "webkitTransitionEnd"), void 0 === window
+					.onanimationend && void 0 !== window.onwebkitanimationend && ($a =
+						"WebkitAnimation", Ca = "webkitAnimationEnd"));
+				var ka = qr ? window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) :
+					setTimeout : function(e) {
+						return e()
+					},
+					xa = /\b(transform|all)(,|$)/,
+					Ta = [ea, ta, aa, sa, ha, qr ? {
+						create: kn,
+						activate: kn,
+						remove: function(e, t) {
+							!0 !== e.data.show ? _n(e, t) : t()
+						}
+					} : {}].concat(Qo),
+					Sa = function(t) {
+						function n(e) {
+							var t = j.parentNode(e);
+							r(t) && j.removeChild(t, e)
+						}
+
+						function a(e, t) {
+							return !t && !e.ns && !(Hr.ignoredElements.length && Hr.ignoredElements.some(
+								function(t) {
+									return u(t) ? t.test(e.tag) : t === e.tag
+								})) && Hr.isUnknownElement(e.tag)
+						}
+
+						function s(e, t, n, o, s, u, l) {
+							if (r(e.elm) && r(u) && (e = u[l] = M(e)), e.isRootInsert = !s, !c(e, t, n,
+								o)) {
+								var p = e.data,
+									h = e.children,
+									g = e.tag;
+								r(g) ? (p && p.pre && D++, a(e, D) && ai("Unknown custom element: <" + g +
+										'> - did you register the component correctly? For recursive components, make sure to provide the "name" option.',
+										e.context), e.elm = e.ns ? j.createElementNS(e.ns, g) : j
+									.createElement(g, e), m(e), d(e, h, t), r(p) && v(e, t), f(n, e.elm,
+										o), p && p.pre && D--) : (i(e.isComment) ? e.elm = j
+									.createComment(e.text) : e.elm = j.createTextNode(e.text), f(n, e
+										.elm, o))
+							}
+						}
+
+						function c(e, t, n, o) {
+							var a = e.data;
+							if (r(a)) {
+								var s = r(e.componentInstance) && a.keepAlive;
+								if (r(a = a.hook) && r(a = a.init) && a(e, !1), r(e.componentInstance))
+									return l(e, t), f(n, e.elm, o), i(s) && function(e, t, n, i) {
+										for (var o, a = e; a.componentInstance;)
+											if (a = a.componentInstance._vnode, r(o = a.data) && r(o = o
+													.transition)) {
+												for (o = 0; o < E.activate.length; ++o) E.activate[o](
+													Go, a);
+												t.push(a);
+												break
+											} f(n, e.elm, i)
+									}(e, t, n, o), !0
+							}
+						}
+
+						function l(e, t) {
+							r(e.data.pendingInsert) && (t.push.apply(t, e.data.pendingInsert), e.data
+								.pendingInsert = null), e.elm = e.componentInstance.$el, p(e) ? (v(e,
+								t), m(e)) : (wt(e), t.push(e))
+						}
+
+						function f(e, t, n) {
+							r(e) && (r(n) ? j.parentNode(n) === e && j.insertBefore(e, t, n) : j
+								.appendChild(e, t))
+						}
+
+						function d(e, t, n) {
+							if (Array.isArray(t)) {
+								$(t);
+								for (var r = 0; r < t.length; ++r) s(t[r], n, e.elm, null, !0, t, r)
+							} else o(e.text) && j.appendChild(e.elm, j.createTextNode(String(e.text)))
+						}
+
+						function p(e) {
+							for (; e.componentInstance;) e = e.componentInstance._vnode;
+							return r(e.tag)
+						}
+
+						function v(e, t) {
+							for (var n = 0; n < E.create.length; ++n) E.create[n](Go, e);
+							r(A = e.data.hook) && (r(A.create) && A.create(Go, e), r(A.insert) && t.push(e))
+						}
+
+						function m(e) {
+							var t;
+							if (r(t = e.fnScopeId)) j.setStyleScope(e.elm, t);
+							else
+								for (var n = e; n;) r(t = n.context) && r(t = t.$options._scopeId) && j
+									.setStyleScope(e.elm, t), n = n.parent;
+							r(t = Qi) && t !== e.context && t !== e.fnContext && r(t = t.$options
+								._scopeId) && j.setStyleScope(e.elm, t)
+						}
+
+						function g(e, t, n, r, i, o) {
+							for (; r <= i; ++r) s(n[r], o, e, t, !1, n, r)
+						}
+
+						function y(e) {
+							var t, n, i = e.data;
+							if (r(i))
+								for (r(t = i.hook) && r(t = t.destroy) && t(e), t = 0; t < E.destroy
+									.length; ++t) E.destroy[t](e);
+							if (r(t = e.children))
+								for (n = 0; n < e.children.length; ++n) y(e.children[n])
+						}
+
+						function b(e, t, i, o) {
+							for (; i <= o; ++i) {
+								var a = t[i];
+								r(a) && (r(a.tag) ? (_(a), y(a)) : n(a.elm))
+							}
+						}
+
+						function _(e, t) {
+							function i() {
+								0 == --i.listeners && n(s)
+							}
+							if (r(t) || r(e.data)) {
+								var o, a = E.remove.length + 1;
+								for (r(t) ? t.listeners += a : (s = e.elm, i.listeners = a, t = i), r(o = e
+										.componentInstance) && r(o = o._vnode) && r(o.data) && _(o, t), o =
+									0; o < E.remove.length; ++o) E.remove[o](e, t);
+								r(o = e.data.hook) && r(o = o.remove) ? o(e, t) : t()
+							} else n(e.elm);
+							var s
+						}
+
+						function w(t, n, i, o, a) {
+							var c, u, l, f, d = 0,
+								p = 0,
+								h = n.length - 1,
+								v = n[0],
+								m = n[h],
+								y = i.length - 1,
+								_ = i[0],
+								w = i[y],
+								x = !a;
+							for ($(i); d <= h && p <= y;) e(v) ? v = n[++d] : e(m) ? m = n[--h] : $t(v, _) ?
+								(k(v, _, o, i, p), v = n[++d], _ = i[++p]) : $t(m, w) ? (k(m, w, o, i, y),
+									m = n[--h], w = i[--y]) : $t(v, w) ? (k(v, w, o, i, y), x && j
+									.insertBefore(t, v.elm, j.nextSibling(m.elm)), v = n[++d], w = i[--y]) :
+								($t(m, _) ? (k(m, _, o, i, p), x && j.insertBefore(t, m.elm, v.elm), m = n[
+									--h]) : (e(c) && (c = Ct(n, d, h)), e(u = r(_.key) ? c[_.key] : C(_,
+									n, d, h)) ? s(_, o, t, v.elm, !1, i, p) : $t(l = n[u], _) ? (k(
+									l, _, o, i, p), n[u] = void 0, x && j.insertBefore(t, l.elm,
+									v.elm)) : s(_, o, t, v.elm, !1, i, p)), _ = i[++p]);
+							h < d ? (f = e(i[y + 1]) ? null : i[y + 1].elm, g(t, f, i, p, y, o)) : y < p &&
+								b(t, n, d, h)
+						}
+
+						function $(e) {
+							for (var t = {}, n = 0; n < e.length; n++) {
+								var i = e[n],
+									o = i.key;
+								r(o) && (t[o] ? ai("Duplicate keys detected: '" + o +
+									"'. This may cause an update error.", i.context) : t[o] = !0)
+							}
+						}
+
+						function C(e, t, n, i) {
+							for (var o = n; o < i; o++) {
+								var a = t[o];
+								if (r(a) && $t(e, a)) return o
+							}
+						}
+
+						function k(t, n, o, a, s, c) {
+							if (t !== n) {
+								r(n.elm) && r(a) && (n = a[s] = M(n));
+								var u = n.elm = t.elm;
+								if (i(t.isAsyncPlaceholder)) r(n.asyncFactory.resolved) ? T(t.elm, n, o) : n
+									.isAsyncPlaceholder = !0;
+								else if (i(n.isStatic) && i(t.isStatic) && n.key === t.key && (i(n
+										.isCloned) || i(n.isOnce))) n.componentInstance = t
+									.componentInstance;
+								else {
+									var l, f = n.data;
+									r(f) && r(l = f.hook) && r(l = l.prepatch) && l(t, n);
+									var d = t.children,
+										h = n.children;
+									if (r(f) && p(n)) {
+										for (l = 0; l < E.update.length; ++l) E.update[l](t, n);
+										r(l = f.hook) && r(l = l.update) && l(t, n)
+									}
+									e(n.text) ? r(d) && r(h) ? d !== h && w(u, d, h, o, c) : r(h) ? ($(h),
+											r(t.text) && j.setTextContent(u, ""), g(u, null, h, 0, h
+												.length - 1, o)) : r(d) ? b(0, d, 0, d.length - 1) : r(t
+											.text) && j.setTextContent(u, "") : t.text !== n.text && j
+										.setTextContent(u, n.text), r(f) && r(l = f.hook) && r(l = l
+											.postpatch) && l(t, n)
+								}
+							}
+						}
+
+						function x(e, t, n) {
+							if (i(n) && r(e.parent)) e.parent.data.pendingInsert = t;
+							else
+								for (var o = 0; o < t.length; ++o) t[o].data.hook.insert(t[o])
+						}
+
+						function T(e, t, n, o) {
+							var a, s = t.tag,
+								c = t.data,
+								u = t.children;
+							if (o = o || c && c.pre, t.elm = e, i(t.isComment) && r(t.asyncFactory))
+							return t.isAsyncPlaceholder = !0;
+							if (!S(e, t, o)) return !1;
+							if (r(c) && (r(a = c.hook) && r(a = a.init) && a(t, !0), r(a = t
+									.componentInstance))) return l(t, n), !0;
+							if (r(s)) {
+								if (r(u))
+									if (e.hasChildNodes())
+										if (r(a = c) && r(a = a.domProps) && r(a = a.innerHTML)) {
+											if (a !== e.innerHTML) return "undefined" == typeof console ||
+												I || (I = !0), !1
+										} else {
+											for (var f = !0, p = e.firstChild, h = 0; h < u.length; h++) {
+												if (!p || !T(p, u[h], n, o)) {
+													f = !1;
+													break
+												}
+												p = p.nextSibling
+											}
+											if (!f || p) return "undefined" == typeof console || I || (I = !
+												0), !1
+										}
+								else d(t, u, n);
+								if (r(c)) {
+									var m = !1;
+									for (var g in c)
+										if (!N(g)) {
+											m = !0, v(t, n);
+											break
+										}! m && c.class && ie(c.class)
+								}
+							} else e.data !== t.text && (e.data = t.text);
+							return !0
+						}
+
+						function S(e, t, n) {
+							return r(t.tag) ? 0 === t.tag.indexOf("vue-component") || !a(t, n) && t.tag
+								.toLowerCase() === (e.tagName && e.tagName.toLowerCase()) : e.nodeType === (
+									t.isComment ? 8 : 3)
+						}
+						var A, O, E = {},
+							L = t.modules,
+							j = t.nodeOps;
+						for (A = 0; A < Zo.length; ++A)
+							for (E[Zo[A]] = [], O = 0; O < L.length; ++O) r(L[O][Zo[A]]) && E[Zo[A]].push(L[
+								O][Zo[A]]);
+						var D = 0,
+							I = !1,
+							N = h("attrs,class,staticClass,staticStyle,key");
+						return function(t, n, o, a) {
+							if (!e(n)) {
+								var c, u = !1,
+									l = [];
+								if (e(t)) u = !0, s(n, l);
+								else {
+									var f = r(t.nodeType);
+									if (!f && $t(t, n)) k(t, n, l, null, null, a);
+									else {
+										if (f) {
+											if (1 === t.nodeType && t.hasAttribute(Rr) && (t
+													.removeAttribute(Rr), o = !0), i(o)) {
+												if (T(t, n, l)) return x(n, l, !0), t;
+												ai("The client-side rendered virtual DOM tree is not matching server-rendered content. This is likely caused by incorrect HTML markup, for example nesting block-level elements inside <p>, or missing <tbody>. Bailing hydration and performing full client-side render.")
+											}
+											c = t, t = new vi(j.tagName(c).toLowerCase(), {}, [],
+												void 0, c)
+										}
+										var d = t.elm,
+											h = j.parentNode(d);
+										if (s(n, l, d._leaveCb ? null : h, j.nextSibling(d)), r(n
+												.parent))
+											for (var v = n.parent, m = p(n); v;) {
+												for (var g = 0; g < E.destroy.length; ++g) E.destroy[g](
+													v);
+												if (v.elm = n.elm, m) {
+													for (var _ = 0; _ < E.create.length; ++_) E.create[
+														_](Go, v);
+													var w = v.data.hook.insert;
+													if (w.merged)
+														for (var $ = 1; $ < w.fns.length; $++) w.fns[$]
+														()
+												} else wt(v);
+												v = v.parent
+											}
+										r(h) ? b(0, [t], 0, 0) : r(t.tag) && y(t)
+									}
+								}
+								return x(n, l, u), n.elm
+							}
+							r(t) && y(t)
+						}
+					}({
+						nodeOps: Jo,
+						modules: Ta
+					});
+				Gr && document.addEventListener("selectionchange", function() {
+					var e = document.activeElement;
+					e && e.vmodel && Mn(e, "input")
+				});
+				var Aa = {
+						inserted: function(e, t, n, r) {
+							"select" === n.tag ? (r.elm && !r.elm._vOptions ? se(n, "postpatch",
+								function() {
+									Aa.componentUpdated(e, t, n)
+								}) : xn(e, t, n.context), e._vOptions = [].map.call(e.options,
+								An)) : "textarea" !== n.tag && !zo(e.type) || (e._vModifiers = t
+								.modifiers, t.modifiers.lazy || (e.addEventListener(
+										"compositionstart", On), e.addEventListener(
+										"compositionend", En), e.addEventListener("change", En),
+									Gr && (e.vmodel = !0)))
+						},
+						componentUpdated: function(e, t, n) {
+							if ("select" === n.tag) {
+								xn(e, t, n.context);
+								var r = e._vOptions,
+									i = e._vOptions = [].map.call(e.options, An);
+								if (i.some(function(e, t) {
+										return !$(e, r[t])
+									})) {
+									(e.multiple ? t.value.some(function(e) {
+										return Sn(e, i)
+									}) : t.value !== t.oldValue && Sn(t.value, i)) && Mn(e, "change")
+								}
+							}
+						}
+					},
+					Oa = {
+						model: Aa,
+						show: {
+							bind: function(e, t, n) {
+								var r = t.value,
+									i = (n = Ln(n)).data && n.data.transition,
+									o = e.__vOriginalDisplay = "none" === e.style.display ? "" : e.style
+									.display;
+								r && i ? (n.data.show = !0, bn(n, function() {
+									e.style.display = o
+								})) : e.style.display = r ? o : "none"
+							},
+							update: function(e, t, n) {
+								var r = t.value;
+								!r != !t.oldValue && ((n = Ln(n)).data && n.data.transition ? (n.data
+									.show = !0, r ? bn(n, function() {
+										e.style.display = e.__vOriginalDisplay
+									}) : _n(n, function() {
+										e.style.display = "none"
+									})) : e.style.display = r ? e.__vOriginalDisplay : "none")
+							},
+							unbind: function(e, t, n, r, i) {
+								i || (e.style.display = e.__vOriginalDisplay)
+							}
+						}
+					},
+					Ea = {
+						name: String,
+						appear: Boolean,
+						css: Boolean,
+						mode: String,
+						type: String,
+						enterClass: String,
+						leaveClass: String,
+						enterToClass: String,
+						leaveToClass: String,
+						enterActiveClass: String,
+						leaveActiveClass: String,
+						appearClass: String,
+						appearActiveClass: String,
+						appearToClass: String,
+						duration: [Number, String, Object]
+					},
+					Ma = function(e) {
+						return e.tag || Be(e)
+					},
+					La = function(e) {
+						return "show" === e.name
+					},
+					ja = {
+						name: "transition",
+						props: Ea,
+						abstract: !0,
+						render: function(e) {
+							var t = this,
+								n = this.$slots.default;
+							if (n && (n = n.filter(Ma)).length) {
+								1 < n.length && ai(
+									"<transition> can only be used on a single element. Use <transition-group> for lists.",
+									this.$parent);
+								var r = this.mode;
+								r && "in-out" !== r && "out-in" !== r && ai(
+									"invalid <transition> mode: " + r, this.$parent);
+								var i = n[0];
+								if (function(e) {
+										for (; e = e.parent;)
+											if (e.data.transition) return !0
+									}(this.$vnode)) return i;
+								var a = jn(i);
+								if (!a) return i;
+								if (this._leaving) return In(e, i);
+								var s = "__transition-" + this._uid + "-";
+								a.key = null == a.key ? a.isComment ? s + "comment" : s + a.tag : o(a
+										.key) ? 0 === String(a.key).indexOf(s) ? a.key : s + a.key : a
+									.key;
+								var c = (a.data || (a.data = {})).transition = Dn(this),
+									u = this._vnode,
+									l = jn(u);
+								if (a.data.directives && a.data.directives.some(La) && (a.data.show = !
+										0), l && l.data && ! function(e, t) {
+										return t.key === e.key && t.tag === e.tag
+									}(a, l) && !Be(l) && (!l.componentInstance || !l.componentInstance
+										._vnode.isComment)) {
+									var f = l.data.transition = b({}, c);
+									if ("out-in" === r) return this._leaving = !0, se(f, "afterLeave",
+										function() {
+											t._leaving = !1, t.$forceUpdate()
+										}), In(e, i);
+									if ("in-out" === r) {
+										if (Be(a)) return u;
+										var d, p = function() {
+											d()
+										};
+										se(c, "afterEnter", p), se(c, "enterCancelled", p), se(f,
+											"delayLeave",
+											function(e) {
+												d = e
+											})
+									}
+								}
+								return i
+							}
+						}
+					},
+					Da = b({
+						tag: String,
+						moveClass: String
+					}, Ea);
+				delete Da.mode;
+				var Ia = {
+					Transition: ja,
+					TransitionGroup: {
+						props: Da,
+						beforeMount: function() {
+							var e = this,
+								t = this._update;
+							this._update = function(n, r) {
+								var i = Ge(e);
+								e.__patch__(e._vnode, e.kept, !1, !0), e._vnode = e.kept, i(), t
+									.call(e, n, r)
+							}
+						},
+						render: function(e) {
+							for (var t = this.tag || this.$vnode.data.tag || "span", n = Object
+									.create(null), r = this.prevChildren = this.children, i = this
+									.$slots.default || [], o = this.children = [], a = Dn(this), s =
+									0; s < i.length; s++) {
+								var c = i[s];
+								if (c.tag)
+									if (null != c.key && 0 !== String(c.key).indexOf("__vlist")) o
+										.push(c), ((n[c.key] = c).data || (c.data = {}))
+										.transition = a;
+									else {
+										var u = c.componentOptions,
+											l = u ? u.Ctor.options.name || u.tag || "" : c.tag;
+										ai("<transition-group> children must be keyed: <" + l + ">")
+									}
+							}
+							if (r) {
+								for (var f = [], d = [], p = 0; p < r.length; p++) {
+									var h = r[p];
+									h.data.transition = a, h.data.pos = h.elm
+									.getBoundingClientRect(), n[h.key] ? f.push(h) : d.push(h)
+								}
+								this.kept = e(t, null, f), this.removed = d
+							}
+							return e(t, null, o)
+						},
+						updated: function() {
+							var e = this.prevChildren,
+								t = this.moveClass || (this.name || "v") + "-move";
+							e.length && this.hasMove(e[0].elm, t) && (e.forEach(Nn), e.forEach(Rn),
+								e.forEach(Fn), this._reflow = document.body.offsetHeight, e
+								.forEach(function(e) {
+									if (e.data.moved) {
+										var n = e.elm,
+											r = n.style;
+										pn(n, t), r.transform = r.WebkitTransform = r
+											.transitionDuration = "", n.addEventListener(wa,
+												n._moveCb = function e(r) {
+													r && r.target !== n || r && !
+														/transform$/.test(r.propertyName) ||
+														(n.removeEventListener(wa, e), n
+															._moveCb = null, hn(n, t))
+												})
+									}
+								}))
+						},
+						methods: {
+							hasMove: function(e, t) {
+								if (!ga) return !1;
+								if (this._hasMove) return this._hasMove;
+								var n = e.cloneNode();
+								e._transitionClasses && e._transitionClasses.forEach(function(e) {
+									ln(n, e)
+								}), un(n, t), n.style.display = "none", this.$el.appendChild(n);
+								var r = mn(n);
+								return this.$el.removeChild(n), this._hasMove = r.hasTransform
+							}
+						}
+					}
+				};
+				ut.config.mustUseProp = Lo, ut.config.isReservedTag = qo, ut.config.isReservedAttr = Eo, ut
+					.config.getTagNamespace = bt, ut.config.isUnknownElement = function(e) {
+						if (!qr) return !0;
+						if (qo(e)) return !1;
+						if (e = e.toLowerCase(), null != Uo[e]) return Uo[e];
+						var t = document.createElement(e);
+						return -1 < e.indexOf("-") ? Uo[e] = t.constructor === window.HTMLUnknownElement ||
+							t.constructor === window.HTMLElement : Uo[e] = /HTMLUnknownElement/.test(t
+								.toString())
+					}, b(ut.options.directives, Oa), b(ut.options.components, Ia), ut.prototype.__patch__ =
+					qr ? Sa : w, ut.prototype.$mount = function(e, t) {
+						return function(e, t, n) {
+							var r;
+							return e.$el = t, e.$options.render || (e.$options.render = gi, e.$options
+								.template && "#" !== e.$options.template.charAt(0) || e.$options
+								.el || t ? ai(
+									"You are using the runtime-only build of Vue where the template compiler is not available. Either pre-compile the templates into render functions, or use the compiler-included build.",
+									e) : ai(
+									"Failed to mount component: template or render function not defined.",
+									e)), Qe(e, "beforeMount"), r = Hr.performance && xi ?
+						function() {
+								var t = e._name,
+									r = e._uid,
+									i = "vue-perf-start:" + r,
+									o = "vue-perf-end:" + r;
+								xi(i);
+								var a = e._render();
+								xi(o), Ti("vue " + t + " render", i, o), xi(i), e._update(a, n), xi(
+									o), Ti("vue " + t + " patch", i, o)
+							} : function() {
+								e._update(e._render(), n)
+							}, new ho(e, r, w, {
+								before: function() {
+									e._isMounted && !e._isDestroyed && Qe(e, "beforeUpdate")
+								}
+							}, !0), n = !1, null == e.$vnode && (e._isMounted = !0, Qe(e,
+								"mounted")), e
+						}(this, e = e && qr ? _t(e) : void 0, t)
+					}, qr && setTimeout(function() {
+						Hr.devtools && ii && ii.emit("init", ut), Hr.productionTip
+					}, 0);
+				var Na, Ra, Fa, Pa, Ha, Wa, Ba, Va, qa, Ua, za, Ja, Ka, Ga = /\{\{((?:.|\r?\n)+?)\}\}/g,
+					Za = /[-.*+?^${}()|[\]\/\\]/g,
+					Xa = g(function(e) {
+						var t = e[0].replace(Za, "\\$&"),
+							n = e[1].replace(Za, "\\$&");
+						return new RegExp(t + "((?:.|\\n)+?)" + n, "g")
+					}),
+					Ya = {
+						staticKeys: ["staticClass"],
+						transformNode: function(e, t) {
+							var n = t.warn || jt,
+								r = Vt(e, "class");
+							r && Pn(r, t.delimiters) && n('class="' + r +
+								'": Interpolation inside attributes has been removed. Use v-bind or the colon shorthand instead. For example, instead of <div class="{{ val }}">, use <div :class="val">.',
+								e.rawAttrsMap.class), r && (e.staticClass = JSON.stringify(r));
+							var i = Bt(e, "class", !1);
+							i && (e.classBinding = i)
+						},
+						genData: function(e) {
+							var t = "";
+							return e.staticClass && (t += "staticClass:" + e.staticClass + ","), e
+								.classBinding && (t += "class:" + e.classBinding + ","), t
+						}
+					},
+					Qa = {
+						staticKeys: ["staticStyle"],
+						transformNode: function(e, t) {
+							var n = t.warn || jt,
+								r = Vt(e, "style");
+							r && (Pn(r, t.delimiters) && n('style="' + r +
+								'": Interpolation inside attributes has been removed. Use v-bind or the colon shorthand instead. For example, instead of <div style="{{ val }}">, use <div :style="val">.',
+								e.rawAttrsMap.style), e.staticStyle = JSON.stringify(ca(r)));
+							var i = Bt(e, "style", !1);
+							i && (e.styleBinding = i)
+						},
+						genData: function(e) {
+							var t = "";
+							return e.staticStyle && (t += "staticStyle:" + e.staticStyle + ","), e
+								.styleBinding && (t += "style:(" + e.styleBinding + "),"), t
+						}
+					},
+					es = {
+						decode: function(e) {
+							return (Na = Na || document.createElement("div")).innerHTML = e, Na
+								.textContent
+						}
+					},
+					ts = h(
+						"area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"
+						),
+					ns = h("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),
+					rs = h(
+						"address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"
+						),
+					is = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,
+					os =
+					/^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,
+					as = "[a-zA-Z_][\\-\\.0-9_a-zA-Z" + Wr.source + "]*",
+					ss = "((?:" + as + "\\:)?" + as + ")",
+					cs = new RegExp("^<" + ss),
+					us = /^\s*(\/?)>/,
+					ls = new RegExp("^<\\/" + ss + "[^>]*>"),
+					fs = /^<!DOCTYPE [^>]+>/i,
+					ds = /^<!\--/,
+					ps = /^<!\[/,
+					hs = h("script,style,textarea", !0),
+					vs = {},
+					ms = {
+						"&lt;": "<",
+						"&gt;": ">",
+						"&quot;": '"',
+						"&amp;": "&",
+						"&#10;": "\n",
+						"&#9;": "\t",
+						"&#39;": "'"
+					},
+					gs = /&(?:lt|gt|quot|amp|#39);/g,
+					ys = /&(?:lt|gt|quot|amp|#39|#10|#9);/g,
+					bs = h("pre,textarea", !0),
+					_s = function(e, t) {
+						return e && bs(e) && "\n" === t[0]
+					},
+					ws = /^@|^v-on:/,
+					$s = /^v-|^@|^:/,
+					Cs = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,
+					ks = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/,
+					xs = /^\(|\)$/g,
+					Ts = /^\[.*\]$/,
+					Ss = /:(.*)$/,
+					As = /^:|^\.|^v-bind:/,
+					Os = /\.[^.\]]+(?=[^\]]*$)/g,
+					Es = /^v-slot(:|$)|^#/,
+					Ms = /[]/,
+					Ls = /\s+/g,
+					js = /[\s"'<>\/=]/,
+					Ds = g(es.decode),
+					Is = "_empty_",
+					Ns = /^xmlns:NS\d+/,
+					Rs = /^NS\d+:/,
+					Fs = [Ya, Qa, {
+						preTransformNode: function(e, t) {
+							if ("input" === e.tag) {
+								var n, r = e.attrsMap;
+								if (!r["v-model"]) return;
+								if ((r[":type"] || r["v-bind:type"]) && (n = Bt(e, "type")), r
+									.type || n || !r["v-bind"] || (n = "(" + r["v-bind"] +
+									").type"), n) {
+									var i = Vt(e, "v-if", !0),
+										o = i ? "&&(" + i + ")" : "",
+										a = null != Vt(e, "v-else", !0),
+										s = Vt(e, "v-else-if", !0),
+										c = Kn(e);
+									Vn(c), Rt(c, "type", "checkbox"), Bn(c, t), c.processed = !0, c
+										.if = "(" + n + ")==='checkbox'" + o, qn(c, {
+											exp: c.if,
+											block: c
+										});
+									var u = Kn(e);
+									Vt(u, "v-for", !0), Rt(u, "type", "radio"), Bn(u, t), qn(c, {
+										exp: "(" + n + ")==='radio'" + o,
+										block: u
+									});
+									var l = Kn(e);
+									return Vt(l, "v-for", !0), Rt(l, ":type", n), Bn(l, t), qn(c, {
+										exp: i,
+										block: l
+									}), a ? c.else = !0 : s && (c.elseif = s), c
+								}
+							}
+						}
+					}],
+					Ps = {
+						expectHTML: !0,
+						modules: Fs,
+						directives: {
+							model: function(e, t, n) {
+								To = n;
+								var r = t.value,
+									i = t.modifiers,
+									o = e.tag,
+									a = e.attrsMap.type;
+								if ("input" === o && "file" === a && To("<" + e.tag + ' v-model="' + r +
+										'" type="file">:\nFile inputs are read only. Use a v-on:change listener instead.',
+										e.rawAttrsMap["v-model"]), e.component) return zt(e, r, i), !1;
+								if ("select" === o) b = e, _ = r, $ = ($ =
+										'var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return ' +
+										((w = i) && w.number ? "_n(val)" : "val") + "});") + " " + Jt(_,
+										"$event.target.multiple ? $$selectedVal : $$selectedVal[0]"),
+									Ht(b, "change", $, null, !0);
+								else if ("input" === o && "checkbox" === a) d = e, p = r, v = (h = i) &&
+									h.number, m = Bt(d, "value") || "null", g = Bt(d, "true-value") ||
+									"true", y = Bt(d, "false-value") || "false", It(d, "checked",
+										"Array.isArray(" + p + ")?_i(" + p + "," + m + ")>-1" + (
+											"true" === g ? ":(" + p + ")" : ":_q(" + p + "," + g + ")")
+										), Ht(d, "change", "var $$a=" + p +
+										",$$el=$event.target,$$c=$$el.checked?(" + g + "):(" + y +
+										");if(Array.isArray($$a)){var $$v=" + (v ? "_n(" + m + ")" :
+										m) + ",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&(" + Jt(p,
+											"$$a.concat([$$v])") + ")}else{$$i>-1&&(" + Jt(p,
+											"$$a.slice(0,$$i).concat($$a.slice($$i+1))") + ")}}else{" +
+										Jt(p, "$$c") + "}", null, !0);
+								else if ("input" === o && "radio" === a) s = e, c = r, l = (u = i) && u
+									.number, f = Bt(s, "value") || "null", It(s, "checked", "_q(" + c +
+										"," + (f = l ? "_n(" + f + ")" : f) + ")"), Ht(s, "change", Jt(
+										c, f), null, !0);
+								else if ("input" === o || "textarea" === o) Qt(e, r, i);
+								else {
+									if (!Hr.isReservedTag(o)) return zt(e, r, i), !1;
+									To("<" + e.tag + ' v-model="' + r +
+										"\">: v-model is not supported on this element type. If you are working with contenteditable, it's recommended to wrap a library dedicated for that purpose inside a custom component.",
+										e.rawAttrsMap["v-model"])
+								}
+								var s, c, u, l, f, d, p, h, v, m, g, y, b, _, w, $;
+								return !0
+							},
+							text: function(e, t) {
+								t.value && It(e, "textContent", "_s(" + t.value + ")", t)
+							},
+							html: function(e, t) {
+								t.value && It(e, "innerHTML", "_s(" + t.value + ")", t)
+							}
+						},
+						isPreTag: function(e) {
+							return "pre" === e
+						},
+						isUnaryTag: ts,
+						mustUseProp: Lo,
+						canBeLeftOpenTag: ns,
+						isReservedTag: qo,
+						getTagNamespace: bt,
+						staticKeys: function(e) {
+							return e.reduce(function(e, t) {
+								return e.concat(t.staticKeys || [])
+							}, []).join(",")
+						}(Fs)
+					},
+					Hs = g(function(e) {
+						return h(
+							"type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap" +
+							(e ? "," + e : ""))
+					}),
+					Ws = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/,
+					Bs = /\([^)]*?\);*$/,
+					Vs =
+					/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,
+					qs = {
+						esc: 27,
+						tab: 9,
+						enter: 13,
+						space: 32,
+						up: 38,
+						left: 37,
+						right: 39,
+						down: 40,
+						delete: [8, 46]
+					},
+					Us = {
+						esc: ["Esc", "Escape"],
+						tab: "Tab",
+						enter: "Enter",
+						space: [" ", "Spacebar"],
+						up: ["Up", "ArrowUp"],
+						left: ["Left", "ArrowLeft"],
+						right: ["Right", "ArrowRight"],
+						down: ["Down", "ArrowDown"],
+						delete: ["Backspace", "Delete", "Del"]
+					},
+					zs = function(e) {
+						return "if(" + e + ")return null;"
+					},
+					Js = {
+						stop: "$event.stopPropagation();",
+						prevent: "$event.preventDefault();",
+						self: zs("$event.target !== $event.currentTarget"),
+						ctrl: zs("!$event.ctrlKey"),
+						shift: zs("!$event.shiftKey"),
+						alt: zs("!$event.altKey"),
+						meta: zs("!$event.metaKey"),
+						left: zs("'button' in $event && $event.button !== 0"),
+						middle: zs("'button' in $event && $event.button !== 1"),
+						right: zs("'button' in $event && $event.button !== 2")
+					},
+					Ks = {
+						on: function(e, t) {
+							t.modifiers && ai("v-on without argument does not support modifiers."), e
+								.wrapListeners = function(e) {
+									return "_g(" + e + "," + t.value + ")"
+								}
+						},
+						bind: function(e, t) {
+							e.wrapData = function(n) {
+								return "_b(" + n + ",'" + e.tag + "'," + t.value + "," + (t
+									.modifiers && t.modifiers.prop ? "true" : "false") + (t
+									.modifiers && t.modifiers.sync ? ",true" : "") + ")"
+							}
+						},
+						cloak: w
+					},
+					Gs = function(e) {
+						this.options = e, this.warn = e.warn || jt, this.transforms = Dt(e.modules,
+								"transformCode"), this.dataGenFns = Dt(e.modules, "genData"), this
+							.directives = b(b({}, Ks), e.directives);
+						var t = e.isReservedTag || Ir;
+						this.maybeComponent = function(e) {
+							return !!e.component || !t(e.tag)
+						}, this.onceId = 0, this.staticRenderFns = [], this.pre = !1
+					},
+					Zs = new RegExp("\\b" +
+						"do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,super,throw,while,yield,delete,export,import,return,switch,default,extends,finally,continue,debugger,function,arguments"
+						.split(",").join("\\b|\\b") + "\\b"),
+					Xs = new RegExp("\\b" + "delete,typeof,void".split(",").join("\\s*\\([^\\)]*\\)|\\b") +
+						"\\s*\\([^\\)]*\\)"),
+					Ys =
+					/'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`/g,
+					Qs = 2,
+					ec = function(e) {
+						return function(t) {
+							function n(n, r) {
+								var i = Object.create(t),
+									o = [],
+									a = [],
+									s = function(e, t, n) {
+										(n ? a : o).push(e)
+									};
+								if (r) {
+									if (r.outputSourceRange) {
+										var c = n.match(/^\s*/)[0].length;
+										s = function(e, t, n) {
+											var r = {
+												msg: e
+											};
+											t && (null != t.start && (r.start = t.start + c),
+												null != t.end && (r.end = t.end + c)), (n ? a :
+												o).push(r)
+										}
+									}
+									for (var u in r.modules && (i.modules = (t.modules || []).concat(r
+											.modules)), r.directives && (i.directives = b(Object
+											.create(t.directives || null), r.directives)), r)
+										"modules" !== u && "directives" !== u && (i[u] = r[u])
+								}
+								i.warn = s;
+								var l = e(n.trim(), i);
+								return hr(l.ast, s), l.errors = o, l.tips = a, l
+							}
+							return {
+								compile: n,
+								compileToFunctions: wr(n)
+							}
+						}
+					}(function(e, t) {
+						var n = Wn(e.trim(), t);
+						!1 !== t.optimize && Gn(n, t);
+						var r = er(n, t);
+						return {
+							ast: n,
+							render: r.render,
+							staticRenderFns: r.staticRenderFns
+						}
+					})(Ps),
+					tc = (ec.compile, ec.compileToFunctions),
+					nc = !!qr && $r(!1),
+					rc = !!qr && $r(!0),
+					ic = g(function(e) {
+						var t = _t(e);
+						return t && t.innerHTML
+					}),
+					oc = ut.prototype.$mount;
+				return ut.prototype.$mount = function(e, t) {
+					if ((e = e && _t(e)) === document.body || e === document.documentElement) return ai(
+						"Do not mount Vue to <html> or <body> - mount to normal elements instead."
+						), this;
+					var n = this.$options;
+					if (!n.render) {
+						var r = n.template;
+						if (r)
+							if ("string" == typeof r) "#" === r.charAt(0) && ((r = ic(r)) || ai(
+								"Template element not found or is empty: " + n.template, this));
+							else {
+								if (!r.nodeType) return ai("invalid template option:" + r, this), this;
+								r = r.innerHTML
+							}
+						else e && (r = function(e) {
+							if (e.outerHTML) return e.outerHTML;
+							var t = document.createElement("div");
+							return t.appendChild(e.cloneNode(!0)), t.innerHTML
+						}(e));
+						if (r) {
+							Hr.performance && xi && xi("compile");
+							var i = tc(r, {
+									outputSourceRange: !0,
+									shouldDecodeNewlines: nc,
+									shouldDecodeNewlinesForHref: rc,
+									delimiters: n.delimiters,
+									comments: n.comments
+								}, this),
+								o = i.render,
+								a = i.staticRenderFns;
+							n.render = o, n.staticRenderFns = a, Hr.performance && xi && (xi(
+								"compile end"), Ti("vue " + this._name + " compile", "compile",
+								"compile end"))
+						}
+					}
+					return oc.call(this, e, t)
+				}, ut.compile = tc, ut
+			}()
+		}).call(this, n(1), n(23).setImmediate)
+	}, function(e, t) {
+		var n;
+		n = function() {
+			return this
+		}();
+		try {
+			n = n || new Function("return this")()
+		} catch (e) {
+			"object" == typeof window && (n = window)
+		}
+		e.exports = n
+	}, function(e, t, n) {}, function(e, t, n) {}, function(e, t, n) {}, function(e, t, n) {}, function(e, t, n) {},
+	function(e, t, n) {},
+	function(e, t, n) {},
+	function(e, t, n) {},
+	function(e, t, n) {},
+	function(e, t, n) {},
+	function(e, t, n) {},
+	function(e, t, n) {
+		"use strict";
+		(function(e) {
+			function n(e, t) {
+				Object.keys(e).forEach(function(n) {
+					return t(e[n], n)
+				})
+			}
+
+			function r(e, t) {
+				this.runtime = t, this._children = Object.create(null);
+				var n = (this._rawModule = e).state;
+				this.state = ("function" == typeof n ? n() : n) || {}
+			}
+
+			function i(e) {
+				this.register([], e, !1)
+			}
+
+			function o(e) {
+				var t = this;
+				void 0 === e && (e = {}), !y && "undefined" != typeof window && window.Vue && d(window.Vue);
+				var n = e.plugins;
+				void 0 === n && (n = []);
+				var r = e.strict;
+				void 0 === r && (r = !1), this._committing = !1, this._actions = Object.create(null), this
+					._actionSubscribers = [], this._mutations = Object.create(null), this._wrappedGetters =
+					Object.create(null), this._modules = new i(e), this._modulesNamespaceMap = Object.create(
+						null), this._subscribers = [], this._watcherVM = new y;
+				var o = this,
+					a = this.dispatch,
+					s = this.commit;
+				this.dispatch = function(e, t) {
+					return a.call(o, e, t)
+				}, this.commit = function(e, t, n) {
+					return s.call(o, e, t, n)
+				}, this.strict = r;
+				var l = this._modules.root.state;
+				u(this, l, [], this._modules.root), c(this, l), n.forEach(function(e) {
+					return e(t)
+				}), (void 0 !== e.devtools ? e.devtools : y.config.devtools) && function(e) {
+					m && ((e._devtoolHook = m).emit("vuex:init", e), m.on("vuex:travel-to-state", function(
+						t) {
+						e.replaceState(t)
+					}), e.subscribe(function(e, t) {
+						m.emit("vuex:mutation", e, t)
+					}))
+				}(this)
+			}
+
+			function a(e, t) {
+				return t.indexOf(e) < 0 && t.push(e),
+					function() {
+						var n = t.indexOf(e); - 1 < n && t.splice(n, 1)
+					}
+			}
+
+			function s(e, t) {
+				e._actions = Object.create(null), e._mutations = Object.create(null), e._wrappedGetters = Object
+					.create(null), e._modulesNamespaceMap = Object.create(null);
+				var n = e.state;
+				u(e, n, [], e._modules.root, !0), c(e, n, t)
+			}
+
+			function c(e, t, r) {
+				var i = e._vm;
+				e.getters = {};
+				var o = e._wrappedGetters,
+					a = {};
+				n(o, function(t, n) {
+					a[n] = function(e, t) {
+						return function() {
+							return e(t)
+						}
+					}(t, e), Object.defineProperty(e.getters, n, {
+						get: function() {
+							return e._vm[n]
+						},
+						enumerable: !0
+					})
+				});
+				var s = y.config.silent;
+				y.config.silent = !0, e._vm = new y({
+					data: {
+						$$state: t
+					},
+					computed: a
+				}), y.config.silent = s, e.strict && function(e) {
+					e._vm.$watch(function() {
+						return this._data.$$state
+					}, function() {}, {
+						deep: !0,
+						sync: !0
+					})
+				}(e), i && (r && e._withCommit(function() {
+					i._data.$$state = null
+				}), y.nextTick(function() {
+					return i.$destroy()
+				}))
+			}
+
+			function u(e, t, n, r, i) {
+				var o = !n.length,
+					a = e._modules.getNamespace(n);
+				if (r.namespaced && (e._modulesNamespaceMap[a] = r), !o && !i) {
+					var s = l(t, n.slice(0, -1)),
+						c = n[n.length - 1];
+					e._withCommit(function() {
+						y.set(s, c, r.state)
+					})
+				}
+				var d = r.context = function(e, t, n) {
+					var r = "" === t,
+						i = {
+							dispatch: r ? e.dispatch : function(n, r, i) {
+								var o = f(n, r, i),
+									a = o.payload,
+									s = o.options,
+									c = o.type;
+								return s && s.root || (c = t + c), e.dispatch(c, a)
+							},
+							commit: r ? e.commit : function(n, r, i) {
+								var o = f(n, r, i),
+									a = o.payload,
+									s = o.options,
+									c = o.type;
+								s && s.root || (c = t + c), e.commit(c, a, s)
+							}
+						};
+					return Object.defineProperties(i, {
+						getters: {
+							get: r ? function() {
+								return e.getters
+							} : function() {
+								return function(e, t) {
+									var n = {},
+										r = t.length;
+									return Object.keys(e.getters).forEach(function(i) {
+										if (i.slice(0, r) === t) {
+											var o = i.slice(r);
+											Object.defineProperty(n, o, {
+												get: function() {
+													return e.getters[i]
+												},
+												enumerable: !0
+											})
+										}
+									}), n
+								}(e, t)
+							}
+						},
+						state: {
+							get: function() {
+								return l(e.state, n)
+							}
+						}
+					}), i
+				}(e, a, n);
+				r.forEachMutation(function(t, n) {
+					! function(e, t, n, r) {
+						(e._mutations[t] || (e._mutations[t] = [])).push(function(t) {
+							n.call(e, r.state, t)
+						})
+					}(e, a + n, t, d)
+				}), r.forEachAction(function(t, n) {
+					var r = t.root ? n : a + n,
+						i = t.handler || t;
+					! function(e, t, n, r) {
+						(e._actions[t] || (e._actions[t] = [])).push(function(t, i) {
+							var o = n.call(e, {
+								dispatch: r.dispatch,
+								commit: r.commit,
+								getters: r.getters,
+								state: r.state,
+								rootGetters: e.getters,
+								rootState: e.state
+							}, t, i);
+							return function(e) {
+								return e && "function" == typeof e.then
+							}(o) || (o = Promise.resolve(o)), e._devtoolHook ? o.catch(
+								function(t) {
+									throw e._devtoolHook.emit("vuex:error", t), t
+								}) : o
+						})
+					}(e, r, i, d)
+				}), r.forEachGetter(function(t, n) {
+					! function(e, t, n, r) {
+						e._wrappedGetters[t] || (e._wrappedGetters[t] = function(e) {
+							return n(r.state, r.getters, e.state, e.getters)
+						})
+					}(e, a + n, t, d)
+				}), r.forEachChild(function(r, o) {
+					u(e, t, n.concat(o), r, i)
+				})
+			}
+
+			function l(e, t) {
+				return t.length ? t.reduce(function(e, t) {
+					return e[t]
+				}, e) : e
+			}
+
+			function f(e, t, n) {
+				return function(e) {
+					return null !== e && "object" == typeof e
+				}(e) && e.type && (n = t, e = (t = e).type), {
+					type: e,
+					payload: t,
+					options: n
+				}
+			}
+
+			function d(e) {
+				y && e === y || function(e) {
+					function t() {
+						var e = this.$options;
+						e.store ? this.$store = "function" == typeof e.store ? e.store() : e.store : e
+							.parent && e.parent.$store && (this.$store = e.parent.$store)
+					}
+					if (2 <= Number(e.version.split(".")[0])) e.mixin({
+						beforeCreate: t
+					});
+					else {
+						var n = e.prototype._init;
+						e.prototype._init = function(e) {
+							void 0 === e && (e = {}), e.init = e.init ? [t].concat(e.init) : t, n.call(
+								this, e)
+						}
+					}
+				}(y = e)
+			}
+
+			function p(e) {
+				return Array.isArray(e) ? e.map(function(e) {
+					return {
+						key: e,
+						val: e
+					}
+				}) : Object.keys(e).map(function(t) {
+					return {
+						key: t,
+						val: e[t]
+					}
+				})
+			}
+
+			function h(e) {
+				return function(t, n) {
+					return "string" != typeof t ? (n = t, t = "") : "/" !== t.charAt(t.length - 1) && (t +=
+						"/"), e(t, n)
+				}
+			}
+
+			function v(e, t, n) {
+				return e._modulesNamespaceMap[n]
+			}
+			var m = ("undefined" != typeof window ? window : void 0 !== e ? e : {})
+				.__VUE_DEVTOOLS_GLOBAL_HOOK__,
+				g = {
+					namespaced: {
+						configurable: !0
+					}
+				};
+			g.namespaced.get = function() {
+				return !!this._rawModule.namespaced
+			}, r.prototype.addChild = function(e, t) {
+				this._children[e] = t
+			}, r.prototype.removeChild = function(e) {
+				delete this._children[e]
+			}, r.prototype.getChild = function(e) {
+				return this._children[e]
+			}, r.prototype.update = function(e) {
+				this._rawModule.namespaced = e.namespaced, e.actions && (this._rawModule.actions = e
+					.actions), e.mutations && (this._rawModule.mutations = e.mutations), e.getters && (
+					this._rawModule.getters = e.getters)
+			}, r.prototype.forEachChild = function(e) {
+				n(this._children, e)
+			}, r.prototype.forEachGetter = function(e) {
+				this._rawModule.getters && n(this._rawModule.getters, e)
+			}, r.prototype.forEachAction = function(e) {
+				this._rawModule.actions && n(this._rawModule.actions, e)
+			}, r.prototype.forEachMutation = function(e) {
+				this._rawModule.mutations && n(this._rawModule.mutations, e)
+			}, Object.defineProperties(r.prototype, g), i.prototype.get = function(e) {
+				return e.reduce(function(e, t) {
+					return e.getChild(t)
+				}, this.root)
+			}, i.prototype.getNamespace = function(e) {
+				var t = this.root;
+				return e.reduce(function(e, n) {
+					return e + ((t = t.getChild(n)).namespaced ? n + "/" : "")
+				}, "")
+			}, i.prototype.update = function(e) {
+				! function e(t, n, r) {
+					if (n.update(r), r.modules)
+						for (var i in r.modules) {
+							if (!n.getChild(i)) return;
+							e(t.concat(i), n.getChild(i), r.modules[i])
+						}
+				}([], this.root, e)
+			}, i.prototype.register = function(e, t, i) {
+				var o = this;
+				void 0 === i && (i = !0);
+				var a = new r(t, i);
+				0 === e.length ? this.root = a : this.get(e.slice(0, -1)).addChild(e[e.length - 1], a), t
+					.modules && n(t.modules, function(t, n) {
+						o.register(e.concat(n), t, i)
+					})
+			}, i.prototype.unregister = function(e) {
+				var t = this.get(e.slice(0, -1)),
+					n = e[e.length - 1];
+				t.getChild(n).runtime && t.removeChild(n)
+			};
+			var y, b = {
+				state: {
+					configurable: !0
+				}
+			};
+			b.state.get = function() {
+				return this._vm._data.$$state
+			}, b.state.set = function(e) {}, o.prototype.commit = function(e, t, n) {
+				var r = this,
+					i = f(e, t, n),
+					o = i.type,
+					a = i.payload,
+					s = (i.options, {
+						type: o,
+						payload: a
+					}),
+					c = this._mutations[o];
+				c && (this._withCommit(function() {
+					c.forEach(function(e) {
+						e(a)
+					})
+				}), this._subscribers.forEach(function(e) {
+					return e(s, r.state)
+				}))
+			}, o.prototype.dispatch = function(e, t) {
+				var n = this,
+					r = f(e, t),
+					i = r.type,
+					o = r.payload,
+					a = {
+						type: i,
+						payload: o
+					},
+					s = this._actions[i];
+				if (s) {
+					try {
+						this._actionSubscribers.filter(function(e) {
+							return e.before
+						}).forEach(function(e) {
+							return e.before(a, n.state)
+						})
+					} catch (e) {}
+					return (1 < s.length ? Promise.all(s.map(function(e) {
+						return e(o)
+					})) : s[0](o)).then(function(e) {
+						try {
+							n._actionSubscribers.filter(function(e) {
+								return e.after
+							}).forEach(function(e) {
+								return e.after(a, n.state)
+							})
+						} catch (e) {}
+						return e
+					})
+				}
+			}, o.prototype.subscribe = function(e) {
+				return a(e, this._subscribers)
+			}, o.prototype.subscribeAction = function(e) {
+				return a("function" == typeof e ? {
+					before: e
+				} : e, this._actionSubscribers)
+			}, o.prototype.watch = function(e, t, n) {
+				var r = this;
+				return this._watcherVM.$watch(function() {
+					return e(r.state, r.getters)
+				}, t, n)
+			}, o.prototype.replaceState = function(e) {
+				var t = this;
+				this._withCommit(function() {
+					t._vm._data.$$state = e
+				})
+			}, o.prototype.registerModule = function(e, t, n) {
+				void 0 === n && (n = {}), "string" == typeof e && (e = [e]), this._modules.register(e, t),
+					u(this, this.state, e, this._modules.get(e), n.preserveState), c(this, this.state)
+			}, o.prototype.unregisterModule = function(e) {
+				var t = this;
+				"string" == typeof e && (e = [e]), this._modules.unregister(e), this._withCommit(
+			function() {
+					var n = l(t.state, e.slice(0, -1));
+					y.delete(n, e[e.length - 1])
+				}), s(this)
+			}, o.prototype.hotUpdate = function(e) {
+				this._modules.update(e), s(this, !0)
+			}, o.prototype._withCommit = function(e) {
+				var t = this._committing;
+				this._committing = !0, e(), this._committing = t
+			}, Object.defineProperties(o.prototype, b);
+			var _ = h(function(e, t) {
+					var n = {};
+					return p(t).forEach(function(t) {
+						var r = t.key,
+							i = t.val;
+						n[r] = function() {
+							var t = this.$store.state,
+								n = this.$store.getters;
+							if (e) {
+								var r = v(this.$store, "mapState", e);
+								if (!r) return;
+								t = r.context.state, n = r.context.getters
+							}
+							return "function" == typeof i ? i.call(this, t, n) : t[i]
+						}, n[r].vuex = !0
+					}), n
+				}),
+				w = h(function(e, t) {
+					var n = {};
+					return p(t).forEach(function(t) {
+						var r = t.key,
+							i = t.val;
+						n[r] = function() {
+							for (var t = [], n = arguments.length; n--;) t[n] = arguments[n];
+							var r = this.$store.commit;
+							if (e) {
+								var o = v(this.$store, "mapMutations", e);
+								if (!o) return;
+								r = o.context.commit
+							}
+							return "function" == typeof i ? i.apply(this, [r].concat(t)) : r
+								.apply(this.$store, [i].concat(t))
+						}
+					}), n
+				}),
+				$ = h(function(e, t) {
+					var n = {};
+					return p(t).forEach(function(t) {
+						var r = t.key,
+							i = t.val;
+						i = e + i, n[r] = function() {
+							if (!e || v(this.$store, "mapGetters", e)) return this.$store
+								.getters[i]
+						}, n[r].vuex = !0
+					}), n
+				}),
+				C = h(function(e, t) {
+					var n = {};
+					return p(t).forEach(function(t) {
+						var r = t.key,
+							i = t.val;
+						n[r] = function() {
+							for (var t = [], n = arguments.length; n--;) t[n] = arguments[n];
+							var r = this.$store.dispatch;
+							if (e) {
+								var o = v(this.$store, "mapActions", e);
+								if (!o) return;
+								r = o.context.dispatch
+							}
+							return "function" == typeof i ? i.apply(this, [r].concat(t)) : r
+								.apply(this.$store, [i].concat(t))
+						}
+					}), n
+				}),
+				k = {
+					Store: o,
+					install: d,
+					version: "3.1.1",
+					mapState: _,
+					mapMutations: w,
+					mapGetters: $,
+					mapActions: C,
+					createNamespacedHelpers: function(e) {
+						return {
+							mapState: _.bind(null, e),
+							mapGetters: $.bind(null, e),
+							mapMutations: w.bind(null, e),
+							mapActions: C.bind(null, e)
+						}
+					}
+				};
+			t.a = k
+		}).call(this, n(1))
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = Object.getOwnPropertySymbols,
+			i = Object.prototype.hasOwnProperty,
+			o = Object.prototype.propertyIsEnumerable;
+		e.exports = function() {
+			try {
+				if (!Object.assign) return !1;
+				var e = new String("abc");
+				if (e[5] = "de", "5" === Object.getOwnPropertyNames(e)[0]) return !1;
+				for (var t = {}, n = 0; n < 10; n++) t["_" + String.fromCharCode(n)] = n;
+				if ("0123456789" !== Object.getOwnPropertyNames(t).map(function(e) {
+						return t[e]
+					}).join("")) return !1;
+				var r = {};
+				return "abcdefghijklmnopqrst".split("").forEach(function(e) {
+					r[e] = e
+				}), "abcdefghijklmnopqrst" === Object.keys(Object.assign({}, r)).join("")
+			} catch (e) {
+				return !1
+			}
+		}() ? Object.assign : function(e, t) {
+			for (var n, a, s = function(e) {
+					if (null == e) throw new TypeError(
+						"Object.assign cannot be called with null or undefined");
+					return Object(e)
+				}(e), c = 1; c < arguments.length; c++) {
+				for (var u in n = Object(arguments[c])) i.call(n, u) && (s[u] = n[u]);
+				if (r) {
+					a = r(n);
+					for (var l = 0; l < a.length; l++) o.call(n, a[l]) && (s[a[l]] = n[a[l]])
+				}
+			}
+			return s
+		}
+	},
+	function(e, t) {},
+	function(e, t) {},
+	function(e, t, n) {
+		"use strict";
+		var r = n(2);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(3);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(4);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(5);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(6);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(7);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		(function(e) {
+			function r(e, t) {
+				this._id = e, this._clearFn = t
+			}
+			var i = void 0 !== e && e || "undefined" != typeof self && self || window,
+				o = Function.prototype.apply;
+			t.setTimeout = function() {
+					return new r(o.call(setTimeout, i, arguments), clearTimeout)
+				}, t.setInterval = function() {
+					return new r(o.call(setInterval, i, arguments), clearInterval)
+				}, t.clearTimeout = t.clearInterval = function(e) {
+					e && e.close()
+				}, r.prototype.unref = r.prototype.ref = function() {}, r.prototype.close = function() {
+					this._clearFn.call(i, this._id)
+				}, t.enroll = function(e, t) {
+					clearTimeout(e._idleTimeoutId), e._idleTimeout = t
+				}, t.unenroll = function(e) {
+					clearTimeout(e._idleTimeoutId), e._idleTimeout = -1
+				},
+				t._unrefActive = t.active = function(e) {
+					clearTimeout(e._idleTimeoutId);
+					var t = e._idleTimeout;
+					0 <= t && (e._idleTimeoutId = setTimeout(function() {
+						e._onTimeout && e._onTimeout()
+					}, t))
+				}, n(24), t.setImmediate = "undefined" != typeof self && self.setImmediate || void 0 !== e && e
+				.setImmediate || this && this.setImmediate, t.clearImmediate = "undefined" != typeof self &&
+				self.clearImmediate || void 0 !== e && e.clearImmediate || this && this.clearImmediate
+		}).call(this, n(1))
+	},
+	function(e, t, n) {
+		(function(e, t) {
+			! function(e, n) {
+				"use strict";
+
+				function r(e) {
+					delete f[e]
+				}
+
+				function i(e) {
+					if (d) setTimeout(i, 0, e);
+					else {
+						var t = f[e];
+						if (t) {
+							d = !0;
+							try {
+								! function(e) {
+									var t = e.callback,
+										r = e.args;
+									switch (r.length) {
+										case 0:
+											t();
+											break;
+										case 1:
+											t(r[0]);
+											break;
+										case 2:
+											t(r[0], r[1]);
+											break;
+										case 3:
+											t(r[0], r[1], r[2]);
+											break;
+										default:
+											t.apply(n, r)
+									}
+								}(t)
+							} finally {
+								r(e), d = !1
+							}
+						}
+					}
+				}
+
+				function o(t) {
+					t.source === e && "string" == typeof t.data && 0 === t.data.indexOf(u) && i(+t.data.slice(u
+						.length))
+				}
+				if (!e.setImmediate) {
+					var a, s, c, u, l = 1,
+						f = {},
+						d = !1,
+						p = e.document,
+						h = Object.getPrototypeOf && Object.getPrototypeOf(e);
+					h = h && h.setTimeout ? h : e, a = "[object process]" === {}.toString.call(e.process) ?
+						function(e) {
+							t.nextTick(function() {
+								i(e)
+							})
+						} : function() {
+							if (e.postMessage && !e.importScripts) {
+								var t = !0,
+									n = e.onmessage;
+								return e.onmessage = function() {
+									t = !1
+								}, e.postMessage("", "*"), e.onmessage = n, t
+							}
+						}() ? (u = "setImmediate$" + Math.random() + "$", e.addEventListener ? e
+							.addEventListener("message", o, !1) : e.attachEvent("onmessage", o),
+							function(t) {
+								e.postMessage(u + t, "*")
+							}) : e.MessageChannel ? ((c = new MessageChannel).port1.onmessage = function(e) {
+							i(e.data)
+						}, function(e) {
+							c.port2.postMessage(e)
+						}) : p && "onreadystatechange" in p.createElement("script") ? (s = p.documentElement,
+							function(e) {
+								var t = p.createElement("script");
+								t.onreadystatechange = function() {
+									i(e), t.onreadystatechange = null, s.removeChild(t), t = null
+								}, s.appendChild(t)
+							}) : function(e) {
+							setTimeout(i, 0, e)
+						}, h.setImmediate = function(e) {
+							"function" != typeof e && (e = new Function("" + e));
+							for (var t = new Array(arguments.length - 1), n = 0; n < t.length; n++) t[n] =
+								arguments[n + 1];
+							var r = {
+								callback: e,
+								args: t
+							};
+							return f[l] = r, a(l), l++
+						}, h.clearImmediate = r
+				}
+			}("undefined" == typeof self ? void 0 === e ? this : e : self)
+		}).call(this, n(1), n(25))
+	},
+	function(e, t) {
+		function n() {
+			throw new Error("setTimeout has not been defined")
+		}
+
+		function r() {
+			throw new Error("clearTimeout has not been defined")
+		}
+
+		function i(e) {
+			if (u === setTimeout) return setTimeout(e, 0);
+			if ((u === n || !u) && setTimeout) return u = setTimeout, setTimeout(e, 0);
+			try {
+				return u(e, 0)
+			} catch (t) {
+				try {
+					return u.call(null, e, 0)
+				} catch (t) {
+					return u.call(this, e, 0)
+				}
+			}
+		}
+
+		function o() {
+			h && d && (h = !1, d.length ? p = d.concat(p) : v = -1, p.length && a())
+		}
+
+		function a() {
+			if (!h) {
+				var e = i(o);
+				h = !0;
+				for (var t = p.length; t;) {
+					for (d = p, p = []; ++v < t;) d && d[v].run();
+					v = -1, t = p.length
+				}
+				d = null, h = !1,
+					function(e) {
+						if (l === clearTimeout) return clearTimeout(e);
+						if ((l === r || !l) && clearTimeout) return l = clearTimeout, clearTimeout(e);
+						try {
+							l(e)
+						} catch (t) {
+							try {
+								return l.call(null, e)
+							} catch (t) {
+								return l.call(this, e)
+							}
+						}
+					}(e)
+			}
+		}
+
+		function s(e, t) {
+			this.fun = e, this.array = t
+		}
+
+		function c() {}
+		var u, l, f = e.exports = {};
+		! function() {
+			try {
+				u = "function" == typeof setTimeout ? setTimeout : n
+			} catch (e) {
+				u = n
+			}
+			try {
+				l = "function" == typeof clearTimeout ? clearTimeout : r
+			} catch (e) {
+				l = r
+			}
+		}();
+		var d, p = [],
+			h = !1,
+			v = -1;
+		f.nextTick = function(e) {
+				var t = new Array(arguments.length - 1);
+				if (1 < arguments.length)
+					for (var n = 1; n < arguments.length; n++) t[n - 1] = arguments[n];
+				p.push(new s(e, t)), 1 !== p.length || h || i(a)
+			}, s.prototype.run = function() {
+				this.fun.apply(null, this.array)
+			}, f.title = "browser", f.browser = !0, f.env = {}, f.argv = [], f.version = "", f.versions = {}, f.on =
+			c, f.addListener = c, f.once = c, f.off = c, f.removeListener = c, f.removeAllListeners = c, f.emit = c,
+			f.prependListener = c, f.prependOnceListener = c, f.listeners = function(e) {
+				return []
+			}, f.binding = function(e) {
+				throw new Error("process.binding is not supported")
+			}, f.cwd = function() {
+				return "/"
+			}, f.chdir = function(e) {
+				throw new Error("process.chdir is not supported")
+			}, f.umask = function() {
+				return 0
+			}
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(8);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(9);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(10);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(11);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+		var r = n(12);
+		n.n(r).a
+	},
+	function(e, t, n) {
+		"use strict";
+
+		function r() {
+			var e = this.$createElement,
+				t = this._self._c || e;
+			return t("div", {
+				staticClass: "page-m-calculator",
+				attrs: {
+					id: "app"
+				}
+			}, [t("div", {
+				directives: [{
+					name: "show",
+					rawName: "v-show",
+					value: this.isShowModel,
+					expression: "isShowModel"
+				}],
+				staticClass: "tabs-model"
+			}, [t("h2", [this._v("请先选择您要计算的品类")])]), this._v(" "), t("Main")], 1)
+		}
+
+		function i() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				staticClass: "view-main"
+			}, [n("Tabs", {
+				attrs: {
+					tabs: e.tabConfig
+				},
+				model: {
+					value: e.activeTabId,
+					callback: function(t) {
+						e.activeTabId = t
+					},
+					expression: "activeTabId"
+				}
+			}), e._v(" "), n("Panel", {
+				staticClass: "component-main"
+			}, [n("Result", {
+				attrs: {
+					currentTab: e.activeTabId
+				},
+				model: {
+					value: e.result,
+					callback: function(t) {
+						e.result = t
+					},
+					expression: "result"
+				}
+			}), e._v(" "), n("Select", {
+				staticClass: "view-select",
+				attrs: {
+					list: e.selectList,
+					current: e.currentCategory,
+					defaultShow: !0,
+					label: "品类",
+					placeholder: "请选择"
+				},
+				on: {
+					select: e.handleSelect
+				}
+			}), e._v(" "), n("Form", {
+				ref: "form",
+				attrs: {
+					autoCalc: e.autoCalc,
+					inputPlaceholder: "0",
+					isMobile: !0,
+					currentTab: e.activeTabId,
+					currentCategory: e.currentCategory,
+					currentMaterial: e.currentMaterial
+				},
+				on: {
+					active: e.handleActive,
+					calculateResult: e.handleResult
+				}
+			}), e._v(" "), n("Drawer", {
+				attrs: {
+					list: e.materialList,
+					current: e.currentMaterial
+				},
+				on: {
+					select: e.handleMaterialChange
+				}
+			}), e._v(" "), n("Operation", {
+				staticClass: "component-operation",
+				attrs: {
+					autoCalc: e.autoCalc,
+					active: e.active
+				},
+				on: {
+					confirm: e.handleCalculate,
+					clear: e.clear
+				}
+			})], 1), e._v(" "), n("div", {
+				staticClass: "tips"
+			}, [e._v("本工具计算结果是理论估算值, 与实际测量值存在偏差, 仅供参考")])], 1)
+		}
+
+		function o() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				staticClass: "component-tabs"
+			}, e._l(e.tabs, function(t) {
+				return n("div", {
+					key: t.id,
+					class: ["tab-item", e.value === t.id ? "active" : ""],
+					on: {
+						click: function(n) {
+							return e.handleTabClick(t.id)
+						}
+					}
+				}, [e._v("\n    " + e._s(t.name) + "\n  ")])
+			}), 0)
+		}
+
+		function a(e, t, n, r, i, o, a, s) {
+			var c, u = "function" == typeof e ? e.options : e;
+			if (t && (u.render = t, u.staticRenderFns = n, u._compiled = !0), r && (u.functional = !0), o && (u
+					._scopeId = "data-v-" + o), a ? (c = function(e) {
+					(e = e || this.$vnode && this.$vnode.ssrContext || this.parent && this.parent.$vnode && this
+						.parent.$vnode.ssrContext) || "undefined" == typeof __VUE_SSR_CONTEXT__ || (e =
+							__VUE_SSR_CONTEXT__), i && i.call(this, e), e && e._registeredComponents && e
+						._registeredComponents.add(a)
+				}, u._ssrRegister = c) : i && (c = s ? function() {
+					i.call(this, this.$root.$options.shadowRoot)
+				} : i), c)
+				if (u.functional) {
+					u._injectStyles = c;
+					var l = u.render;
+					u.render = function(e, t) {
+						return c.call(t), l(e, t)
+					}
+				} else {
+					var f = u.beforeCreate;
+					u.beforeCreate = f ? [].concat(f, c) : [c]
+				} return {
+				exports: e,
+				options: u
+			}
+		}
+
+		function s() {
+			var e = this.$createElement;
+			return (this._self._c || e)("div", {
+				staticClass: "component-panel"
+			}, [this._t("default")], 2)
+		}
+
+		function c() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				staticClass: "view-calculator-form",
+				class: {
+					disabled: e.disabled
+				}
+			}, [e._l(e.renderList, function(t, r) {
+				return [n("div", {
+					key: r + e.renderId,
+					staticClass: "calculator-field"
+				}, [t.required ? n("span", {
+					staticClass: "required"
+				}, [e._v("*")]) : e._e(), e._v(" "), n("span", {
+					staticClass: "label"
+				}, [e._v("\n        " + e._s(t.model.name) + "\n      ")]), e._v(
+					" "), n("span", {
+					staticClass: "unit"
+				}, [e._v(e._s(t.unit))]), e._v(" "), n("BaseInput", {
+					staticClass: "field",
+					attrs: {
+						tipType: "attach",
+						inputType: e.isMobile ? "number" : "text",
+						sizeLimit: 20,
+						lazy: !1,
+						rules: t.rule,
+						value: t.value,
+						disable: e.disabled,
+						placeholder: e.inputPlaceholder
+					},
+					on: {
+						input: function(n) {
+							return e.handleInput(t, r, n)
+						}
+					}
+				})], 1)]
+			})], 2)
+		}
+
+		function u() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				class: ["component-input", e.needIcon ? "icon" : ""]
+			}, [n("input", e._g(e._b({
+				ref: "input",
+				class: ["input-base", e.error ? "error" : "", e.defaultValue ? "default" :
+					""
+				],
+				attrs: {
+					type: e.type,
+					disabled: e.disable
+				},
+				domProps: {
+					value: e.defaultValue ? e.defaultValue : e.value
+				}
+			}, "input", e.$attrs, !1), e.inputListeners)), e._v(" "), e.needIcon ? [n("i", {
+				class: ["icon-input", e.iconType || ""]
+			})] : e._e(), e._v(" "), "bubble" === e.tipType ? [e.error && e.errorMessage && e.focus ? n(
+				"p", {
+					staticClass: "error-message"
+				}, [e._v(e._s(e.errorMessage))]) : e._e()] : e._e()], 2)
+		}
+
+		function l(e, t) {
+			var n = e.fields[R[t].id].value;
+			return isNaN(n) && (L = !0), "roundRadiusOfLegEnd" !== t && "radiusOfInnerArc" !== t || n ? (
+				"weight" === t && (n *= 1e3), parseFloat(n)) : 0
+		}
+
+		function f(e) {
+			return L ? (L = !1, null) : e
+		}
+
+		function d() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				staticClass: "view-result"
+			}, [null === e.value.result || isNaN(e.value.result) && void 0 !== e.value.result && "-" !== e
+				.value.result ? [n("p", [e._v("计算结果")]), e._v(" "), n("h2", [e._v("信息错误")])] : [n("p", [e
+					._v("计算结果")
+				]), e._v(" "), n("h2", [n("span", [e.value.needNumScroll ? n("AnimateNum", {
+						attrs: {
+							value: e.formattedValue
+						}
+					}) : n("span", [e._v(e._s(e.formattedValue))]), e._v(" "), null !== e
+					.formattedValue ? n("span", {
+						staticClass: "unit"
+					}, [e._v(e._s(e.currentTab === e.paramConstant.weight.id ? "吨" :
+						"米"))]) : n("span", [e._v("信息错误")])
+				], 1)])], e._v(" "), e.isAllRequiredFilled && e.notRequiredHasEmpty ? n("p", {
+					staticClass: "tips"
+				}, [e._v("建议填写非必填项信息, 否则估算值会与实际值存在较大偏差")]) : e._e()
+			], 2)
+		}
+
+		function p() {
+			var e = this.$createElement;
+			return (this._self._c || e)("span", [this._v(this._s(this.amount))])
+		}
+
+		function h() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				staticClass: "view-operation"
+			}, [e.autoCalc ? e._e() : n("div", {
+				staticClass: "operation button",
+				class: {
+					disabled: e.disabled
+				},
+				on: {
+					click: function(t) {
+						return e.$emit("confirm")
+					}
+				}
+			}, [e._v("计算结果")]), e._v(" "), n("div", {
+				class: ["operation clear light", e.active ? "active" : ""],
+				on: {
+					click: e.handleClear
+				}
+			}, [n("i", {
+				staticClass: "icon-clear"
+			}), e._v("\n    清空"), e.autoCalc ? n("span", [e._v("数据")]) : e._e()])])
+		}
+
+		function v() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				directives: [{
+					name: "clickoutside",
+					rawName: "v-clickoutside",
+					value: e.handleClickoutside,
+					expression: "handleClickoutside"
+				}],
+				staticClass: "component-select"
+			}, [n("span", {
+				staticClass: "label"
+			}, [e._v(e._s(e.label))]), e._v(" "), n("BaseInput", e._b({
+				ref: "baseInput",
+				class: {
+					fold: !e.showDropdown
+				},
+				attrs: {
+					unselectable: "on",
+					onfocus: "this.blur()",
+					defaultValue: e.placeholder,
+					needIcon: !0,
+					readonly: !0
+				},
+				on: {
+					focus: e.handleFocus
+				},
+				nativeOn: {
+					click: function(t) {
+						return e.handleClick(t)
+					}
+				},
+				model: {
+					value: e.localValue,
+					callback: function(t) {
+						e.localValue = t
+					},
+					expression: "localValue"
+				}
+			}, "BaseInput", e.$attrs, !1)), e._v(" "), n("Tags", {
+				attrs: {
+					show: e.showDropdown,
+					list: e.listToPass,
+					current: e.current
+				},
+				on: {
+					select: e.handleSelect
+				}
+			})], 1)
+		}
+
+		function m() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", {
+				directives: [{
+					name: "show",
+					rawName: "v-show",
+					value: e.show,
+					expression: "show"
+				}],
+				staticClass: "component-tags"
+			}, e._l(e.list, function(t, r) {
+				return n("div", {
+					key: r,
+					class: ["tag-item", e.current === r ? "active" : ""],
+					on: {
+						click: function(t) {
+							return e.handleClick(r, t)
+						}
+					}
+				}, [e._v("\n    " + e._s(t) + "\n  ")])
+			}), 0)
+		}
+
+		function g(e, t, n) {
+			e && t && n && e.addEventListener(t, n, !1)
+		}
+
+		function y(e, t, n) {
+			return function() {
+				var r = 0 < arguments.length && void 0 !== arguments[0] ? arguments[0] : {},
+					i = 1 < arguments.length && void 0 !== arguments[1] ? arguments[1] : {};
+				!(n && n.context && r.target && i.target) || e.contains(r.target) || e.contains(i.target) ||
+					e === r.target || n.context.popperElm && (n.context.popperElm.contains(r.target) || n
+						.context.popperElm.contains(i.target)) || (t.expression && e[re].methodName && n
+						.context[e[re].methodName] ? n.context[e[re].methodName]() : e[re].bindingFn && e[re]
+						.bindingFn())
+			}
+		}
+
+		function b() {
+			var e = this,
+				t = e.$createElement,
+				n = e._self._c || t;
+			return n("div", [n("p", {
+				staticClass: "material-result",
+				on: {
+					click: e.handleShowDrawer
+				}
+			}, [e._v("材质"), e.defaultFlag ? n("em", [e._v("默认")]) : e._e(), e._v("为"), n("span", [e
+				._v(e._s(e.current.name))
+			])]), e._v(" "), n("transition", {
+				attrs: {
+					name: "fade"
+				}
+			}, [n("div", {
+				directives: [{
+					name: "show",
+					rawName: "v-show",
+					value: e.showDrawer,
+					expression: "showDrawer"
+				}],
+				staticClass: "drawer-container"
+			}, [n("transition", {
+				attrs: {
+					name: "slide"
+				}
+			}, [n("div", {
+				directives: [{
+					name: "show",
+					rawName: "v-show",
+					value: e.showDrawer,
+					expression: "showDrawer"
+				}, {
+					name: "clickoutside",
+					rawName: "v-clickoutside",
+					value: e.handleCloseDrawer,
+					expression: "handleCloseDrawer"
+				}],
+				staticClass: "drawer-box"
+			}, [n("h3", [e._v("请选择材质\n            "), n("i", {
+				staticClass: "icon-close",
+				on: {
+					click: e.handleCloseDrawer
+				}
+			})]), e._v(" "), n("ul", {
+				staticClass: "material-list"
+			}, e._l(e.list, function(t) {
+				return n("li", {
+					key: t.name,
+					class: {
+						selected: t.name === e.current
+							.name
+					},
+					on: {
+						click: function(n) {
+							return e.handleClick(t,
+								n)
+						}
+					}
+				}, [e._v("\n              " + e._s(t
+					.name) + "\n            ")])
+			}), 0)])])], 1)])], 1)
+		}
+		n.r(t);
+		var _ = n(0),
+			w = n.n(_);
+		o._withStripped = i._withStripped = r._withStripped = !0;
+		var $ = a({
+			name: "components-tab",
+			props: {
+				value: {
+					type: Number,
+					default: ""
+				},
+				tabs: {
+					type: Array,
+					default: function() {}
+				}
+			},
+			data: function() {
+				return {
+					currentActiveTabId: ""
+				}
+			},
+			methods: {
+				handleTabClick: function(e) {
+					this.$emit("input", e)
+				}
+			}
+		}, o, [], !1, null, "4f37e659", null);
+		$.options.__file = "components/Tabs.vue";
+		var C = $.exports;
+		s._withStripped = !0;
+		var k = {
+				name: "components-panel",
+				data: function() {
+					return {}
+				}
+			},
+			x = (n(17), a(k, s, [], !1, null, "a639d88e", null));
+		x.options.__file = "components/Panel.vue";
+		var T = x.exports;
+		u._withStripped = c._withStripped = !0;
+		var S = n(14),
+			A = n.n(S);
+		Object.prototype.toString;
+		var O = {
+				name: "component-input",
+				props: {
+					defaultValue: {
+						type: String,
+						value: ""
+					},
+					tipType: {
+						type: String,
+						default: "bubble"
+					},
+					sizeLimit: {
+						type: Number,
+						default: -1
+					},
+					needIcon: {
+						type: Boolean,
+						default: !1
+					},
+					iconType: {
+						type: String,
+						default: ""
+					},
+					lazy: {
+						type: Boolean,
+						default: !1
+					},
+					value: {
+						required: !0
+					},
+					show: {
+						type: Boolean,
+						default: !0
+					},
+					rules: {
+						type: Object,
+						default: function() {
+							return {}
+						}
+					},
+					disable: {
+						type: Boolean,
+						default: !1
+					},
+					type: {
+						type: String,
+						default: "text"
+					},
+					inputType: {
+						type: String,
+						default: "text"
+					}
+				},
+				data: function() {
+					return {
+						requiredError: !1,
+						error: !1,
+						errorMessage: "",
+						focus: !1
+					}
+				},
+				computed: {
+					inputListeners: function() {
+						var e = this;
+						return A()(this.$listeners, {
+							input: function(t) {
+								if (!e.disable) {
+									"number" === e.inputType && (t.target.value = t.target.value
+											.replace(/[^\d.]/g, "")), -1 !== e.sizeLimit && t.target
+										.value.length > e.sizeLimit && (t.target.value = t.target
+											.value.slice(0, e.sizeLimit));
+									var n = t.target.value;
+									e.validate(n), e.lazy || e.$emit("input", n)
+								}
+							},
+							focus: function(t) {
+								e.focus = !0, e.requiredError && !e.error && (e.requiredError = !1),
+									e.$emit("focus")
+							},
+							blur: function(t) {
+								e.focus = !1, e.$emit("blur")
+							},
+							change: function(t) {
+								e.lazy && e.$emit("input", t.target.value), e.$emit("change")
+							}
+						})
+					}
+				},
+				methods: {
+					validateOnSubmit: function() {
+						return this.rules.required && ! function(e) {
+							return null != e && "" !== e
+						}(this.value) ? (this.requiredError = !0, this.requiredError) : (this.validate(this
+							.value), this.error)
+					},
+					validate: function(e) {
+						var t = this.rules.on,
+							n = t && t.input,
+							r = !0,
+							i = "";
+						if (n) {
+							var o = n(e);
+							r = o.pass, i = o.errorMessage
+						}
+						this.error = !r, this.errorMessage = i
+					},
+					blur: function() {
+						this.$refs.input.blur()
+					}
+				},
+				created: function() {
+					this.validate(this.value)
+				},
+				inheritAttrs: !1
+			},
+			E = (n(18), a(O, u, [], !1, null, "c4810c7c", null));
+		E.options.__file = "components/Input/index.vue";
+		var M = E.exports,
+			L = !1,
+			j = [{
+				name: "钢材",
+				value: .00785
+			}, {
+				name: "低碳钢(C:0.1%)",
+				value: .00785
+			}, {
+				name: "中碳钢(C:0.4%)",
+				value: .00782
+			}, {
+				name: "高碳钢(C:1.0%)",
+				value: .00781
+			}, {
+				name: "不锈钢(Cr、Ni系)",
+				value: .00793
+			}, {
+				name: "不锈钢(Cr、Ni、Mo系)",
+				value: .00798
+			}, {
+				name: "不锈钢(Cr:13%)",
+				value: .00775
+			}, {
+				name: "不锈钢(Cr:17%)",
+				value: .0077
+			}, {
+				name: "高工钢(W:9%)",
+				value: .0083
+			}, {
+				name: "高工钢(W:18%)",
+				value: .0087
+			}, {
+				name: "灰铸铁(≤HT200)",
+				value: .0072
+			}, {
+				name: "灰铸铁(≥HT200)",
+				value: .00735
+			}, {
+				name: "铸钢",
+				value: .0078
+			}, {
+				name: "工业纯铁",
+				value: .00787
+			}],
+			D = [{
+				name: "钢板",
+				calculateWeight: function(e) {
+					return f(l(this, "thickness") * l(this, "width") * l(this, "length") * e)
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "width") / l(this, "thickness") / e)
+				}
+			}, {
+				name: "螺纹钢",
+				calculateWeight: function(e) {
+					return f(l(this, "sectionDiameter") * l(this, "sectionDiameter") * l(this, "length") * (
+						.785988 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "sectionDiameter") / l(this, "sectionDiameter") / (
+						.785988 * e))
+				}
+			}, {
+				name: "盘条(线材)",
+				calculateWeight: function(e) {
+					return f(l(this, "sectionDiameter") * l(this, "sectionDiameter") * l(this, "length") * (
+						.785398 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "sectionDiameter") / l(this, "sectionDiameter") / (
+						.785398 * e))
+				}
+			}, {
+				name: "圆钢",
+				calculateWeight: function(e) {
+					return f(l(this, "sectionDiameter") * l(this, "sectionDiameter") * l(this, "length") * (
+						.785398 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "sectionDiameter") / l(this, "sectionDiameter") / (
+						.785398 * e))
+				}
+			}, {
+				name: "方钢",
+				calculateWeight: function(e) {
+					return f(l(this, "sideLengthOfSection") * l(this, "sideLengthOfSection") * l(this,
+						"length") * e)
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "sideLengthOfSection") / l(this,
+						"sideLengthOfSection") / e)
+				}
+			}, {
+				name: "扁钢",
+				calculateWeight: function(e) {
+					return f(l(this, "width") * l(this, "thickness") * l(this, "length") * e)
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "width") / l(this, "thickness") / e)
+				}
+			}, {
+				name: "六角钢",
+				calculateWeight: function(e) {
+					return f(l(this, "crossSectionDiameters") * l(this, "crossSectionDiameters") * l(this,
+						"length") * (.865987 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "crossSectionDiameters") / l(this,
+						"crossSectionDiameters") / (.865987 * e))
+				}
+			}, {
+				name: "八角钢",
+				calculateWeight: function(e) {
+					return f(l(this, "crossSectionDiameters") * l(this, "crossSectionDiameters") * l(this,
+						"length") * (.828026 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "crossSectionDiameters") / l(this,
+						"crossSectionDiameters") / (.828026 * e))
+				}
+			}, {
+				name: "无缝钢管",
+				calculateWeight: function(e) {
+					return f(l(this, "wallThickness") * (l(this, "externalDiameter") - l(this,
+						"wallThickness")) * l(this, "length") * (3.1416 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "wallThickness") / (l(this, "externalDiameter") -
+						l(this, "wallThickness")) / (3.1416 * e))
+				}
+			}, {
+				name: "直缝焊管",
+				calculateWeight: function(e) {
+					return f(l(this, "wallThickness") * (l(this, "externalDiameter") - l(this,
+						"wallThickness")) * l(this, "length") * e * 3.1416)
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "wallThickness") / (l(this, "externalDiameter") -
+						l(this, "wallThickness")) / e / 3.1416)
+				}
+			}, {
+				name: "方形钢管",
+				calculateWeight: function(e) {
+					return f((4 * l(this, "outsideDiameterAndSideLength") - 5.7168 * l(this,
+						"wallThickness")) * l(this, "wallThickness") * l(this, "length") * e)
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / (4 * l(this, "outsideDiameterAndSideLength") - 5.7168 * l(
+						this, "wallThickness")) / l(this, "wallThickness") / e)
+				}
+			}, {
+				name: "矩形管",
+				calculateWeight: function(e) {
+					return f((2 * (l(this, "externalDiameterLength") + l(this, "externalDiameterWidth")) -
+						5.7168 * l(this, "wallThickness")) * l(this, "wallThickness") * l(this,
+						"length") * e)
+				},
+				calculateLength: function() {
+					return f(l(this, "weight") / l(this, "wallThickness") / cft / (2 * (l(this,
+							"externalDiameterLength") + l(this, "externalDiameterWidth")) - 5.7168 *
+						l(this, "wallThickness")))
+				}
+			}, {
+				name: "螺旋管",
+				calculateWeight: function(e) {
+					return f(l(this, "wallThickness") * (l(this, "externalDiameter") - l(this,
+						"wallThickness")) * l(this, "length") * (3.1416 * e))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "wallThickness") / (l(this, "externalDiameter") -
+						l(this, "wallThickness")) / (3.1416 * e))
+				}
+			}, {
+				name: "等边角钢",
+				calculateWeight: function(e) {
+					return f(l(this, "sideWidth") * l(this, "edgeThickness") * l(this, "length") * (
+						1.910829 * e))
+				},
+				calculateLength: function() {
+					return f(l(this, "weight") / (l(this, "sideWidth") * l(this, "edgeThickness")) / (
+						1.910829 * cft))
+				}
+			}, {
+				name: "不等边角钢",
+				calculateWeight: function(e) {
+					return f((l(this, "longEdgeWidth") + l(this, "shortEdgeWidth")) * l(this,
+						"edgeThickness") * (.968153 * e) * l(this, "length"))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / l(this, "edgeThickness") / (l(this, "longEdgeWidth") + l(
+						this, "shortEdgeWidth")) / (.968153 * e))
+				}
+			}, {
+				name: "工字钢",
+				calculateWeight: function(e) {
+					return f(e * (l(this, "waistHeight") * l(this, "waistThickness") + 2 * l(this,
+						"averageLegthickness") * (l(this, "legWidth") - l(this,
+						"waistThickness")) + .615 * (l(this, "radiusOfInnerArc") * l(this,
+						"radiusOfInnerArc") - l(this, "roundRadiusOfLegEnd") * l(this,
+						"roundRadiusOfLegEnd"))) * l(this, "length"))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / e / (l(this, "waistHeight") * l(this, "waistThickness") +
+						2 * l(this, "averageLegthickness") * (l(this, "legWidth") - l(this,
+							"waistThickness")) + .615 * (l(this, "radiusOfInnerArc") * l(this,
+							"radiusOfInnerArc") - l(this, "roundRadiusOfLegEnd") * l(this,
+							"roundRadiusOfLegEnd"))))
+				}
+			}, {
+				name: "槽钢",
+				calculateWeight: function(e) {
+					return f(e * (l(this, "waistHeight") * l(this, "waistThickness") + 2 * l(this,
+						"averageLegthickness") * (l(this, "legWidth") - l(this,
+						"waistThickness")) + .349 * (l(this, "radiusOfInnerArc") * l(this,
+						"radiusOfInnerArc") - l(this, "roundRadiusOfLegEnd") * l(this,
+						"roundRadiusOfLegEnd"))) * l(this, "length"))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / e / (l(this, "waistHeight") * l(this, "waistThickness") +
+						2 * l(this, "averageLegthickness") * (l(this, "legWidth") - l(this,
+							"waistThickness")) + .349 * (l(this, "radiusOfInnerArc") * l(this,
+							"radiusOfInnerArc") - l(this, "roundRadiusOfLegEnd") * l(this,
+							"roundRadiusOfLegEnd"))))
+				}
+			}, {
+				name: "L型钢",
+				calculateWeight: function(e) {
+					return f(e * (l(this, "longEdgeWidth") * l(this, "longEdgeThickness") + l(this,
+						"shortEdgeThickness") * (l(this, "shortEdgeWidth") - l(this,
+						"longEdgeThickness")) + .215 * (l(this, "radiusOfInnerArc") * l(this,
+						"radiusOfInnerArc") - l(this, "roundRadiusOfLegEnd") * l(this,
+						"roundRadiusOfLegEnd"))) * l(this, "length"))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / e / (l(this, "longEdgeWidth") * l(this,
+						"longEdgeThickness") + l(this, "shortEdgeThickness") * (l(this,
+						"shortEdgeWidth") - l(this, "longEdgeThickness")) + .215 * (l(this,
+						"radiusOfInnerArc") * l(this, "radiusOfInnerArc") - l(this,
+						"roundRadiusOfLegEnd") * l(this, "roundRadiusOfLegEnd"))))
+				}
+			}, {
+				name: "H型钢",
+				calculateWeight: function(e) {
+					return f(e * (l(this, "waistThickness") * (l(this, "waistHeight") - 2 * l(this,
+							"legThickness")) + 2 * l(this, "legWidth") * l(this, "legThickness") +
+						.858 * l(this, "roundRadiusOfLegEnd") * l(this, "roundRadiusOfLegEnd")) * l(
+						this, "length"))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / e / (l(this, "waistThickness") * (l(this, "waistHeight") -
+						2 * l(this, "legThickness")) + 2 * l(this, "legWidth") * l(this,
+						"legThickness") + .858 * l(this, "roundRadiusOfLegEnd") * l(this,
+						"roundRadiusOfLegEnd")))
+				}
+			}, {
+				name: "T型钢",
+				calculateWeight: function(e) {
+					return f(e * (l(this, "waistThickness") * (l(this, "waistHeight") - l(this,
+							"legThickness")) + l(this, "legWidth") * l(this, "legThickness") +
+						.429 * l(this, "roundRadiusOfLegEnd") * l(this, "roundRadiusOfLegEnd")) * l(
+						this, "length"))
+				},
+				calculateLength: function(e) {
+					return f(l(this, "weight") / e / (l(this, "waistThickness") * (l(this, "waistHeight") -
+							l(this, "legThickness")) + l(this, "legWidth") * l(this,
+						"legThickness") + .429 * l(this, "roundRadiusOfLegEnd") * l(this,
+							"roundRadiusOfLegEnd")))
+				}
+			}],
+			I = D.map(function(e, t) {
+				return t
+			}),
+			N = {
+				name: "请选择品类",
+				fields: {}
+			},
+			R = {
+				weight: {
+					name: "重量",
+					belong: I,
+					unit: "吨",
+					weight: 1,
+					isDefault: !0
+				},
+				thickness: {
+					name: "厚度",
+					belong: [0, 5],
+					isDefault: !0
+				},
+				width: {
+					name: "宽度",
+					belong: [0, 5],
+					isDefault: !0
+				},
+				length: {
+					name: "长度",
+					belong: I,
+					isDefault: !0,
+					unit: "米",
+					weight: 1
+				},
+				sectionDiameter: {
+					name: "截面直径",
+					belong: [1, 2, 3]
+				},
+				sideLengthOfSection: {
+					name: "截面边长",
+					belong: [4]
+				},
+				crossSectionDiameters: {
+					name: "截面对边直径",
+					belong: [6, 7]
+				},
+				wallThickness: {
+					name: "壁厚",
+					belong: [8, 9, 10, 11, 12]
+				},
+				externalDiameter: {
+					name: "外直径",
+					belong: [8, 9, 12]
+				},
+				outsideDiameterAndSideLength: {
+					name: "外径边长",
+					belong: [10]
+				},
+				externalDiameterLength: {
+					name: "外径长",
+					belong: [11]
+				},
+				externalDiameterWidth: {
+					name: "外径宽",
+					belong: [11]
+				},
+				sideWidth: {
+					name: "边宽",
+					belong: [13]
+				},
+				edgeThickness: {
+					name: "边厚",
+					belong: [13, 14]
+				},
+				longEdgeWidth: {
+					name: "长边宽",
+					belong: [14, 17]
+				},
+				shortEdgeWidth: {
+					name: "短边宽",
+					belong: [14, 17]
+				},
+				waistHeight: {
+					name: "腰高",
+					belong: [15, 16, 18, 19]
+				},
+				waistThickness: {
+					name: "腰厚",
+					belong: [15, 16, 18, 19]
+				},
+				averageLegthickness: {
+					name: "平均腿厚",
+					belong: [15, 16]
+				},
+				legWidth: {
+					name: "腿宽",
+					belong: [15, 16, 18, 19]
+				},
+				radiusOfInnerArc: {
+					name: "内弧圆半径",
+					belong: [15, 16, 17],
+					required: !1
+				},
+				roundRadiusOfLegEnd: {
+					name: "腿端圆弧半径",
+					belong: [15, 16, 17, 18, 19],
+					required: !1
+				},
+				legThickness: {
+					name: "腿厚",
+					belong: [18, 19]
+				},
+				longEdgeThickness: {
+					name: "长边厚",
+					belong: [17]
+				},
+				shortEdgeThickness: {
+					name: "短边厚",
+					belong: [17]
+				}
+			},
+			F = 0;
+		Object.keys(R).forEach(function(e) {
+			R[e].id = F++;
+			var t = R[e].belong || [],
+				n = R[e].isDefault;
+			t.forEach(function(t) {
+				D[t].fields || (D[t].fields = {}), D[t].fields[R[e].id] = {
+					model: R[e],
+					value: "",
+					unit: R[e].unit || "毫米",
+					required: !1 !== R[e].required || R[e].required,
+					name: R[e].name,
+					timestamp: +Date.now() * t + R[e].id,
+					weight: R[e].weight || 2
+				}
+			}), n && (N.fields[R[e].id] = {
+				model: R[e],
+				value: "",
+				unit: R[e].unit || "毫米",
+				required: !1 !== R[e].required || R[e].required,
+				name: R[e].name,
+				timestamp: +Date.now() + R[e].id,
+				weight: R[e].weight || 2
+			})
+		});
+		var P = D,
+			H = [{
+				name: "计算重量",
+				id: R.weight.id
+			}, {
+				name: "计算长度",
+				id: R.length.id
+			}],
+			W = {
+				name: "view-calculator-form",
+				props: {
+					currentCategory: {
+						type: Number,
+						default: -1
+					},
+					currentMaterial: {
+						type: Object
+					},
+					currentTab: {
+						type: Number,
+						default: ""
+					},
+					isMobile: {
+						type: Boolean,
+						default: !1
+					},
+					autoCalc: {
+						type: Boolean,
+						default: !1
+					},
+					inputPlaceholder: {
+						type: String,
+						default: ""
+					}
+				},
+				data: function() {
+					return {
+						formulaConfig: P,
+						formulaConfigCopied: null,
+						renderId: +Date.now()
+					}
+				},
+				watch: {
+					currentCategory: {
+						handler: function() {
+							this.clear(), this.renderId = +Date.now()
+						}
+					},
+					currentTab: {
+						handler: function() {
+							this.clear()
+						}
+					}
+				},
+				computed: {
+					current: function() {
+						return this.disabled ? N : this.formulaConfig[this.currentCategory]
+					},
+					selected: function() {
+						return this.current.fields
+					},
+					renderList: function() {
+						var e = this.selected,
+							t = this.currentTab;
+						return Object.keys(e).map(function(n) {
+							if (e[n].model.id !== t) return e[n].rule = {
+								required: e[n].required,
+								on: {}
+							}, e[n]
+						}).filter(function(e) {
+							return !!e
+						}).sort(function(e, t) {
+							return t.weight - e.weight
+						})
+					},
+					disabled: function() {
+						return null === this.currentCategory
+					}
+				},
+				methods: {
+					handleInput: function(e, t, n) {
+						var r = this;
+						this.$set(this.renderList[t], "value", n), this.$nextTick(function() {
+							r.autoCalc && r.calculate(), n && r.$emit("active")
+						})
+					},
+					checkIsAllRequiredField: function() {
+						var e = this.$children.map(function(e) {
+								return "BaseInput" === e.$options._componentTag && e
+							}),
+							t = !0,
+							n = !1;
+						return e.forEach(function(e) {
+							e.validateOnSubmit() && (t = !1)
+						}), this.renderList.forEach(function(e) {
+							e.required || e.value || (n = !0)
+						}), {
+							allRequiredFilled: t,
+							notRequiredHasEmpty: n
+						}
+					},
+					calculate: function(e) {
+						var t = 0 < arguments.length && void 0 !== e && e,
+							n = this.checkIsAllRequiredField(),
+							r = n.allRequiredFilled,
+							i = n.notRequiredHasEmpty,
+							o = "-";
+						r && (o = this.currentTab === R.weight.id ? this.current.calculateWeight.apply(this
+								.current, [this.currentMaterial.value]) : this.current.calculateLength
+							.apply(this.current, [this.currentMaterial.value])), this.$emit(
+							"calculateResult", r, i, o, t)
+					},
+					clear: function() {
+						if (null !== this.currentCategory) {
+							var e = this.formulaConfig[this.currentCategory].fields;
+							for (var t in e) e[t].value = ""
+						}
+					}
+				},
+				components: {
+					BaseInput: M
+				}
+			},
+			B = (n(19), a(W, c, [], !1, null, null, null));
+		B.options.__file = "components/CalculatorForm.vue";
+		var V = B.exports;
+		p._withStripped = d._withStripped = !0;
+		var q = a({
+			props: {
+				value: {
+					type: [String]
+				}
+			},
+			data: function() {
+				return {
+					amount: "-",
+					result: 0
+				}
+			},
+			watch: {
+				value: {
+					handler: function(e) {
+						"-" !== e && "0.0000" !== e ? (this.result = 0, this.amount = 0, this.numFun(0,
+							Number(e))) : this.amount = e
+					},
+					immediate: !0
+				}
+			},
+			methods: {
+				numFun: function(e, t) {
+					var n = this,
+						r = (t - e) / 15,
+						i = setInterval(function() {
+							n.result = n.result + Number(r.toFixed(4)), n.result < t ? n.amount = n
+								.result.toFixed(4) : (n.amount = t, clearInterval(i))
+						}, 50)
+				}
+			}
+		}, p, [], !1, null, null, null);
+		q.options.__file = "components/AnimateNum.vue";
+		var U = q.exports,
+			z = {
+				name: "view-result",
+				props: {
+					currentTab: {
+						type: Number,
+						default: ""
+					},
+					value: {
+						type: Object,
+						default: function() {
+							return {}
+						}
+					}
+				},
+				computed: {
+					notRequiredHasEmpty: function() {
+						return this.value.notRequiredHasEmpty
+					},
+					isAllRequiredFilled: function() {
+						return this.value.isAllRequiredFilled
+					},
+					formattedValue: function() {
+						try {
+							if ("-" === this.value.result) return "-";
+							var e = parseFloat(this.value.result);
+							if (0 === e) return "0.0000";
+							if (!isFinite(e)) throw new Error("分母不能为0");
+							if (e < 0) throw new Error("不能小于0");
+							return e.toFixed(4)
+						} catch (e) {
+							return null
+						}
+					}
+				},
+				data: function() {
+					return {
+						paramConstant: R
+					}
+				},
+				components: {
+					AnimateNum: U
+				}
+			},
+			J = (n(20), a(z, d, [], !1, null, "7337339a", null));
+		J.options.__file = "components/CalculatorResult.vue";
+		var K = J.exports;
+		h._withStripped = !0;
+		var G = {
+				name: "view-operation",
+				props: {
+					active: {
+						type: Boolean,
+						default: !1
+					},
+					autoCalc: {
+						type: Boolean,
+						default: !1
+					},
+					disabled: {
+						type: Boolean,
+						default: !1
+					}
+				},
+				methods: {
+					handleClear: function() {
+						this.active && this.$emit("clear")
+					}
+				}
+			},
+			Z = (n(21), a(G, h, [], !1, null, "124bf6fa", null));
+		Z.options.__file = "components/CalculatorOperation.vue";
+		var X = {
+			data: function() {
+				return {
+					tabConfig: H,
+					formulaConfig: P,
+					activeTabId: "",
+					currentCategory: null,
+					currentMaterial: j[0],
+					result: {
+						result: 0
+					},
+					active: !1
+				}
+			},
+			computed: {
+				selectList: function() {
+					return this.formulaConfig.map(function(e) {
+						return e.name
+					})
+				},
+				materialList: function() {
+					return j
+				},
+				isCalculatingWeight: function() {
+					return this.activeTabId === this.tabConfig[0].id
+				},
+				disabled: function() {
+					return null === this.currentCategory
+				}
+			},
+			watch: {
+				currentCategory: function() {
+					this.resetResult(), this.$emit("categoryUpdate")
+				},
+				activeTabId: function() {
+					this.resetResult(), this.active = !1
+				}
+			},
+			methods: {
+				handleActive: function() {
+					this.active = !0
+				},
+				resetResult: function() {
+					this.result = {
+						result: "-"
+					}
+				},
+				handleTabSwitch: function(e) {
+					this.activeTabId = e
+				},
+				handleCalculate: function() {
+					null !== this.currentCategory && this.$refs.form.calculate(!0)
+				},
+				clear: function() {
+					null !== this.currentCategory && this.$refs.form.clear(), this.active = !1, this
+						.resetResult()
+				},
+				handleSelect: function(e) {
+					this.currentCategory = e
+				},
+				handleMaterialChange: function(e) {
+					var t = this;
+					this.currentMaterial = e, this.$nextTick(function() {
+						t.autoCalc && t.$refs.form.calculate(!0)
+					})
+				},
+				handleResult: function(e, t, n, r) {
+					this.isCalculatingWeight && null !== n && "-" !== n && (n /= 1e3), this.result = {
+						isAllRequiredFilled: e,
+						notRequiredHasEmpty: t,
+						result: n,
+						needNumScroll: r
+					}
+				}
+			},
+			created: function() {
+				this.activeTabId = this.tabConfig[0].id
+			},
+			components: {
+				Tabs: C,
+				Panel: T,
+				Form: V,
+				Result: K,
+				Operation: Z.exports
+			}
+		};
+		m._withStripped = v._withStripped = !0;
+		var Y = {
+				name: "component-tags",
+				props: {
+					show: {
+						type: Boolean,
+						default: !1
+					},
+					current: {
+						type: Number,
+						default: -1
+					},
+					list: {
+						type: Array,
+						default: function() {
+							return []
+						}
+					}
+				},
+				data: function() {
+					return {
+						itemHeight: 0,
+						cancelBlur: !1
+					}
+				},
+				methods: {
+					handleClick: function(e, t) {
+						this.$store.commit("switchModel", !1), this.$emit("select", e)
+					}
+				}
+			},
+			Q = (n(22), a(Y, m, [], !1, null, "3a298670", null));
+		Q.options.__file = "components/SelectTags/Tags.vue";
+		var ee, te = Q.exports,
+			ne = [],
+			re = "@@clickoutsideContext",
+			ie = 0,
+			oe = "mousedown",
+			ae = "mouseup";
+		try {
+			/iPad|iPhone|iPod/.test(navigator.userAgent) && (oe = "touchstart", ae = "touchend")
+		} catch (L) {}
+		w.a.prototype.$isServer || g(document, oe, function(e) {
+			return ee = e
+		}), w.a.prototype.$isServer || g(document, ae, function(e) {
+			ne.forEach(function(t) {
+				return t[re].documentHandler(e, ee)
+			})
+		});
+		var se = {
+				bind: function(e, t, n) {
+					ne.push(e);
+					var r = ie++;
+					e[re] = {
+						id: r,
+						documentHandler: y(e, t, n),
+						methodName: t.expression,
+						bindingFn: t.value
+					}
+				},
+				update: function(e, t, n) {
+					e[re].documentHandler = y(e, t, n), e[re].methodName = t.expression, e[re].bindingFn = t
+						.value
+				},
+				unbind: function(e) {
+					for (var t = ne.length, n = 0; n < t; n++)
+						if (ne[n][re].id === e[re].id) {
+							ne.splice(n, 1);
+							break
+						} delete e[re]
+				}
+			},
+			ce = {
+				name: "component-select",
+				props: {
+					value: {
+						type: String
+					},
+					list: {
+						type: Array,
+						default: function() {
+							return []
+						}
+					},
+					current: {
+						type: Number,
+						default: -1
+					},
+					label: {
+						type: String
+					},
+					defaultShow: {
+						type: Boolean,
+						default: !1
+					}
+				},
+				data: function() {
+					return {
+						localValue: this.value,
+						showDropdown: this.defaultShow,
+						cancelBlur: !1,
+						placeholder: "请选择"
+					}
+				},
+				computed: {
+					listToPass: function() {
+						return this.list
+					}
+				},
+				methods: {
+					handleClick: function() {
+						this.$store.commit("switchModel", !window.calculatorStore.state.isShowModel), this
+							.showDropdown = !this.showDropdown
+					},
+					closeDropdown: function() {
+						window.calculatorStore.state.isShowModel || this.$store.commit("switchModel", !window
+								.calculatorStore.state.isShowModel), this.showDropdown = !1, this.$refs
+							.baseInput.blur()
+					},
+					handleCancelBlur: function(e) {
+						this.cancelBlur = e
+					},
+					handleClickoutside: function() {
+						this.closeDropdown()
+					},
+					handleFocus: function() {},
+					handleSelect: function(e) {
+						this.$emit("select", e), this.closeDropdown()
+					}
+				},
+				directives: {
+					clickoutside: se
+				},
+				watch: {
+					current: {
+						immediate: !0,
+						handler: function(e) {
+							this.localValue = this.list[e], this.localValue && (this.placeholder = "")
+						}
+					}
+				},
+				components: {
+					BaseInput: M,
+					Tags: te
+				},
+				inheritAttrs: !1
+			},
+			ue = (n(26), a(ce, v, [], !1, null, null, null));
+		ue.options.__file = "components/SelectTags/index.vue";
+		var le = ue.exports;
+		b._withStripped = !0;
+		var fe = {
+				name: "component-drawer",
+				props: {
+					list: {
+						type: Array,
+						default: function() {
+							return []
+						}
+					},
+					current: {
+						type: Object,
+						default: function() {}
+					}
+				},
+				data: function() {
+					return {
+						localValue: this.value,
+						showDrawer: !1,
+						defaultFlag: !0
+					}
+				},
+				directives: {
+					clickoutside: se
+				},
+				methods: {
+					handleClick: function(e, t) {
+						e !== this.current && (this.defaultFlag && (this.defaultFlag = !1), this.$emit("select",
+							e)), this.handleCloseDrawer()
+					},
+					handleShowDrawer: function() {
+						this.showDrawer = !0
+					},
+					handleCloseDrawer: function() {
+						this.showDrawer = !1
+					}
+				},
+				mounted: function() {}
+			},
+			de = (n(27), a(fe, b, [], !1, null, "82a1b9e2", null));
+		de.options.__file = "components/Drawer/index.vue";
+		var pe = {
+				name: "page-m-calculator",
+				mixins: [X],
+				data: function() {
+					return {
+						autoCalc: !0
+					}
+				},
+				components: {
+					Select: le,
+					Drawer: de.exports
+				}
+			},
+			he = (n(28), a(pe, i, [], !1, null, null, null));
+		he.options.__file = "src/views/Main.vue";
+		var ve = {
+				name: "page-m-calculator",
+				data: function() {
+					return {}
+				},
+				created: function() {},
+				computed: {
+					isShowModel: function() {
+						return this.$nextTick(function() {
+							document.getElementsByClassName("tabs-model")[0].style.height = document
+								.body.offsetHeight + "px"
+						}), !window.calculatorStore.state.isShowModel
+					}
+				},
+				components: {
+					Main: he.exports
+				}
+			},
+			me = (n(29), n(30), a(ve, r, [], !1, null, "7ba5bd90", null));
+		me.options.__file = "src/App.vue";
+		var ge = me.exports,
+			ye = n(13),
+			be = n(15),
+			_e = n.n(be),
+			we = n(16),
+			$e = n.n(we);
+		w.a.use(ye.a);
+		var Ce = new ye.a.Store({
+				state: {
+					isShowModel: !1
+				},
+				getters: _e.a,
+				mutations: {
+					switchModel: function(e, t) {
+						e.isShowModel = t
+					}
+				},
+				actions: $e.a
+			}),
+			ke = window.calculatorStore = Ce;
+		new w.a({
+			el: "#app",
+			store: ke,
+			render: function(e) {
+				return e(ge)
+			},
+			mounted: function() {
+				document.dispatchEvent(new Event("render-event"))
+			}
+		}), document.documentElement.addEventListener("touchstart", function(e) {
+			1 < e.touches.length && e.preventDefault()
+		}, !1);
+		var xe = 0;
+		document.documentElement.addEventListener("touchend", function(e) {
+			var t = Date.now();
+			t - xe <= 300 && e.preventDefault(), xe = t
+		}, !1)
+	}
+]);
\ No newline at end of file
diff --git a/static/gangcai-cal/jisuan.css b/static/gangcai-cal/jisuan.css
new file mode 100644
index 0000000..b722325
--- /dev/null
+++ b/static/gangcai-cal/jisuan.css
@@ -0,0 +1,988 @@
+html {
+	color: #000;
+	overflow-y: scroll;
+	background: #fff
+}
+
+blockquote,
+body,
+button,
+dd,
+dl,
+dt,
+fieldset,
+form,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+input,
+lengend,
+li,
+ol,
+p,
+pre,
+td,
+textarea,
+th,
+ul {
+	margin: 0;
+	padding: 0
+}
+
+body,
+button,
+input,
+select,
+textarea {
+	font: 12px/1.5 'microsoft yahei', arial, sans-serif
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-size: 100%;
+	font-weight: 400
+}
+
+address,
+cite,
+dfn,
+em,
+var {
+	font-style: normal
+}
+
+code,
+kbd,
+pre,
+samp,
+tt {
+	font-family: "Courier New", Courier, monospace
+}
+
+small {
+	font-size: 12px
+}
+
+ol,
+ul {
+	list-style: none
+}
+
+a {
+	text-decoration: none
+}
+
+a:hover {
+	text-decoration: underline
+}
+
+abbr[title],
+acronym[title] {
+	border-bottom: 1px dotted;
+	cursor: help
+}
+
+q:after,
+q:before {
+	content: ''
+}
+
+:focus {
+	outline: 0
+}
+
+legend {
+	color: #000
+}
+
+fieldset,
+img {
+	border: none
+}
+
+button,
+input,
+select,
+textarea {
+	font-size: 100%
+}
+
+table {
+	border-collapse: collapse;
+	border-spacing: 0
+}
+
+hr {
+	border: none;
+	height: 1px;
+	*color: #fff
+}
+
+img {
+	-ms-interpolation-mode: bicubic
+}
+
+.yug-left {
+	float: left
+}
+
+.yug-right {
+	float: right
+}
+
+.yug-clear {
+	clear: both
+}
+
+.yug-clr {
+	*zoom: 1
+}
+
+.yug-clr:after {
+	display: block;
+	clear: both;
+	height: 0;
+	content: "\0020"
+}
+
+.yug-hide {
+	display: none
+}
+
+.yug-show {
+	display: block
+}
+
+.yug-locate {
+	position: relative
+}
+
+.yug-cny {
+	font-family: Helvetica, Arial
+}
+
+.yug-gray {
+	color: #666
+}
+
+.yug-bold {
+	font-weight: 700
+}
+
+.screen {
+	width: 990px;
+	margin: 0 auto;
+	padding: 0 5px
+}
+
+#content,
+#footer,
+#header,
+.layout {
+	*zoom: 1
+}
+
+#content:after,
+#footer:after,
+#header:after,
+.layout:after {
+	display: block;
+	clear: both;
+	height: 0;
+	content: "\0020"
+}
+
+.layout .grid {
+	float: left
+}
+
+.layout .grid-fixed {
+	margin-right: 0 !important
+}
+
+.w952 {
+	width: 952px;
+	margin: 0 auto;
+	padding: 0 4px
+}
+
+.component-panel[data-v-a639d88e] {
+	width: 100%;
+	background: #fff;
+	border: 1px solid #e1e1e1;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+.bubble[data-v-c4810c7c] {
+	position: absolute;
+	z-index: 1;
+	top: -30px;
+	left: 50%;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	padding: 4px 16px;
+	-webkit-transform: translateX(-50%);
+	transform: translateX(-50%);
+	background: #fff;
+	-webkit-box-shadow: 0 0 16px 0 rgba(197, 197, 197, .5);
+	box-shadow: 0 0 16px 0 rgba(197, 197, 197, .5);
+	cursor: text;
+	white-space: nowrap;
+	font-size: 12px;
+	line-height: 1.4
+}
+
+.bubble.bubble-warn[data-v-c4810c7c] {
+	color: #ff7300
+}
+
+.bubble[data-v-c4810c7c]::after {
+	content: '';
+	position: absolute;
+	bottom: -12px;
+	left: 50%;
+	margin-left: -6px;
+	border: 6px solid transparent;
+	border-top-color: #fff
+}
+
+.bubble.bubble-down[data-v-c4810c7c] {
+	top: auto;
+	margin-top: 5px
+}
+
+.bubble.bubble-down[data-v-c4810c7c]::after {
+	bottom: 24px;
+	border: 6px solid transparent;
+	border-bottom-color: #fff
+}
+
+p[data-v-c4810c7c] {
+	margin: 0
+}
+
+.focus[data-v-c4810c7c],
+.input-base[data-v-c4810c7c]:focus {
+	border-style: solid;
+	border-color: #a92924
+}
+
+.error[data-v-c4810c7c],
+.input-base.error[data-v-c4810c7c] {
+	border-style: solid;
+	border-color: #ff7300
+}
+
+.component-input[data-v-c4810c7c] {
+	display: inline-block;
+	position: relative
+}
+
+.component-input .icon-input[data-v-c4810c7c] {
+	display: inline-block;
+	vertical-align: middle;
+	position: absolute
+}
+
+.component-input .icon-input.search[data-v-c4810c7c] {
+	left: 8px;
+	top: 50%;
+	margin-top: -8px;
+	width: 16px;
+	height: 16px;
+	background: url(//img.wuage.com/150459187333058icon-sprite@2x.png) center center no-repeat;
+	background-size: 72px 57px;
+	background-position: -36px -31px
+}
+
+.input-base[data-v-c4810c7c] {
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	border-style: solid;
+	border-color: #ccc;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	background-color: #fff;
+	background-image: none;
+	color: #1f2d3d;
+	font-size: inherit;
+	outline: 0
+}
+
+.input-base[data-v-c4810c7c]:disabled {
+	border-style: solid;
+	border-color: #e1e1e1;
+	background-color: #f5f5f5;
+	color: #959595;
+	cursor: not-allowed;
+	opacity: 1
+}
+
+.error-message[data-v-c4810c7c] {
+	position: absolute;
+	top: -45px;
+	left: 50%;
+	-webkit-transform: translateX(-50%);
+	transform: translateX(-50%);
+	line-height: 12px;
+	padding: 12px 16px;
+	z-index: 5;
+	font-size: 12px;
+	font-weight: 400;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	background: #fff;
+	-webkit-box-shadow: 0 0 16px 0 rgba(197, 197, 197, .5);
+	box-shadow: 0 0 16px 0 rgba(197, 197, 197, .5);
+	cursor: text;
+	white-space: nowrap;
+	color: #ff7300
+}
+
+.error-message[data-v-c4810c7c]::after {
+	content: '';
+	position: absolute;
+	bottom: -12px;
+	left: 50%;
+	margin-left: -6px;
+	border: 6px solid transparent;
+	border-top-color: #fff
+}
+
+.error-msg.attach[data-v-c4810c7c] {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	width: 100%;
+	line-height: normal;
+	text-align: left;
+	color: #ff7300
+}
+
+.view-calculator-form .calculator-field {
+	position: relative
+}
+
+.view-calculator-form .calculator-field .label,
+.view-calculator-form .calculator-field .unit {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none
+}
+
+.operation[data-v-124bf6fa] {
+	vertical-align: middle
+}
+
+.operation.active .icon-clear[data-v-124bf6fa] {
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAFy0lEQVRYR72Ze2wUVRTGvzN9pUa0wWCQRMFoVIoBw0O6MxKsVt07mJCAYiSgkoABJWIQNWgENGgQg/gWRJEIRkWFBHGm5W1kZ1tQiZBiwIgaMTyEQECoLd35zK7Szs7udKbd6v1z7znf/d1z7uPMXUEXm+3wcRILw9xFsFbpMibMLqxfwgyC+i2HX4C4M8xfBMfjMfQSEYbZdtTfJVCSmu3gOICKKINLEQapKtkdxTbIplOgJGWLgyuaNUyAi/lRBxbB6mLBvOIq/Fgt0hrVz2uXF/Q8UKuGyhQxQIgBEFSCqCRwYVcGSvuI4ByI/RA0EmgEsbdEQ2OUCbSB1tVziJvC9O4A6vREBC0A9guwF8BnSpdP/RptoLbDB0ks7fQg3ewgwCplyMRg0AbGmMI93Txup+VEwzeqSlYFgnZa8X92CNz1dpJjQMT+ax4hDscNWRQ2TiColeDzAJ4KEyi0X4DtypARYTqBoLUOZ7jEK2EChfaLYI3SZWyYTkeg413iwzCBgvsFS0xdpoXpBIMmWeO62OgX0CQT5VMuMcfXd1oTTHWBh0AYWbeKYJMQHxBYRqDM26cJnovrMrfLoHY9BzKF7/0CZUC/W3T8VptEK4m2iYqgTukSz3cei4axKiZrbIffkhjsA50e1+XNLoNu3cHeTedwKOc8K8V1apjssxM8nXWdCmxTF7M2ycmui2VZfkW4w6ySDbbDRhKVvmiPy3cTRT5Ht5LFfyXR4o1a2lnTMCQek+9sh0dIXNom2AGoFGGEqpLttsOfSfTLghDcbOryVZcjmna0HR4jcUlWBNoHPUDiyiigEAw2ddllJ3iUQC+vXomGytti8kNBoJbDvSD6+1IVV7rUWQ73gLg+CmhpMa6tGS77LYdnQFzg1SsvQ6/qoXKsIFDb4TYSI32gY5Qua22HDSRujAKKIlxuVslB26HrW0oppaMkSvXfYeFsO1xN4m5f6iemiwY7wS0EqqOA9uiBnuUtaD7ajDO+9XnE1KV3WDTT/WGgb5B42BfRqUqXpbbD9SRGRQHtW4Gyo024qKkZf/hA95i6DCwY1HI4B8SzWaAaZqqYLLYdfkJiXATQlGlI8eYE+zYDv/gmvVnpUlMwaG2SU10Xb2eJA88oQ+ZbSS6Hi0lhoCI4pXS52KpnJVJo9IF+pHQZXzBoutSji8994guULrNth9nLIugcFRw2dblsQwOHtrZipy/1r5q6PFo4aD1vYgpf+1L/morJDCvBFwE8ERpR4CdlyNWWw5Egtnm1NA1Px2PyQsGgmxp4TUsr9vki+p7SZXLO+g2IqAh2K10G2fU0mcKXPtAp8Zi8WzDo1l2saDqLE/nWleVwFoiXIkS0XhkSsxK8C0DW16VoGK1isq5g0LSA7TB935ecFxNgnTJktJXkNLh4KxRUkNnZdpL308WKLKgixMwqqe8e0AR/J9CnDTRo4KDUB00MQGkprqoZJge6BdRKcBeAGzwRTSpD9JxUBoFq+FjF5N6cpQKgvAI9qgfIn90CaidYR+B2T0Qzm6MuSZVyYUVIfWbz2UnOpYt5HvsmU5esAqUj4NBHMjvBlQQmeCKa/7gJTv3rypBH8hxnv5q6ZNemHZBGAV1EYKYH9JAypE/OAR58POW9IESwU+nSXn2F5D8U1ErwSQALPKnPXIkbk+x/zs08av3TgiOauXLtBN8n8IBnwpYypL2oKRS0NsFJLrDcM0CrMqQkp8gI3kyPqZi87C9iBFihDGmvFboBdJQLrPfqpMu2gydRkQKOeCJdq3RRtUlOcV28c/53TcO0eEyW5JSFwELTkHS2IrXQ1NsJDiOww6smgtkESn0l4AkpyrxEzyRxq2cCm6BhMVOZx4y2p3QNmBXlzcmTyY4nlK+OjBSCECMNuC9uyMqoWqERdRyWnyTORhWMaieCzEdiZPsohjmPDVGcwmz+/YQOM4uc+rRhbZILXBc9o4pGsSstxuya4ZL+CyhS+xte+QRYHpOxpQAAAABJRU5ErkJggg==)
+}
+
+.button.disabled[data-v-124bf6fa] {
+	background-color: #e5e5e5
+}
+
+.icon-clear[data-v-124bf6fa] {
+	display: inline-block;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAFq0lEQVRYR72Zf4hUVRTHz7k7s1puJi6zO+9cKqOoXENDK9hKLJLyRyBoGYlWgoaWZJgVFqmFhRmm/dZ+ShqVlYKZZVkYCVlWkqKhkRX1znV2kwXNjXZn7om3OMPzOjPv7czU/WvYc873fu65v867i1BhM8bcZ61dFhWOiBuJaGKUX5QdoxxK2X3f/wAAbogRf4SIUogoMXxLulQEKiKKmY8AwIA4nScSiWHNzc174viW8ukVqIigMeZsAJgqIkt60fF6RFzsed5PiJjtRVzBtShoHggRWwBgiLV2yInfLSLSUElHQQwidgPAQRHZp5TaBwD7g99xBlAAZeYRIjKnFkAVDKQLEYMB7FdKved53ruuRhj0DhFZXUEnNQ1BxHVENK0kaCaTac3lcjfXtNfKxL4lonUlQSvT/P+iSu56Zp4oIq3/NYpS6rDnecuj+ikH+piIPBglUK0dEXcQ0cgonXKgc0VkZZRAtXZE3EBEk6J0yoFOEZE3owSqtSPiKiKaHaVTEjSTyYzOZrOfnrL7EFeKyFEAWBi2IeIxAJgFAHeKyJVO3DZEfENEXgaAPo7tUa31ompAh2az2R+KgA7yPO93Y0w2uMHydkTcSkRjmPmU8xgRJxHRBmb+TkSGhzWVUnM8z3u+YtC2trZ0d3e3cQXq6+svSqVSB5j5WPg6RcSPiGic7/szACDIXKEh4vVE9Akz7xOR4FouNKXU5GI3UexzVEQSxpiucNZOBI/QWn/PzBkRaQpltBzoSCLawcy/iMggB/Rqz/O+qDijQaDv+38CQKOTnXynh0Tk3DigyWRyeFNT025mbhORlKPXQkQ/VgXKzEF1M9gRHkNEW5l5r4hcHAe0vr7+wlQqdZCZj4vI6Y5eioiChJRtZetRZt4uIqMc4YlEtJGZvxaRy+OA9u3b96zGxsY/mNk6GzDneV4yTvUfBbpeRG5yQKcFRQMzfy4i18QB7dev38DOzs5/ROS4o5UhonRUNgN7WVDf958DgLsc8VlEtJqZN4vI+DigRNTHGNNfRNodqL1a66FVgxpjFlprH3FA5xHRCt/33wGAyVGgiJgjogQznyMivzpQn2mtR1cNysyzRORFB/RhIlri+/5rADA9BuhRIjrTGNNirQ0+PwoNEd8ioim1AA1Kvfcd8aVEtMBdFqUOfEQ8TEQeM18qIrscraeJ6J5agF4lIl864s8Q0VxjzBPW2vtjZPRnIjrfGDPKWrvd0XqIiB6vGrS9vf2Crq6uA474q0Q0w12/Za7QPVrrYcaYcdbaDx2omVrrV6oG7ejoGNDZ2dlRbF0ZY+Zba5+MyigA7NRatxpjbrTWnvR1WVdXNyGdTm+qGjQQYObgvk+GxDZprScYY2Zba1+IAdqzs40xt1lr14Sh6urqWtPp9M6agPq+7wMAhcSKdlxm6osOLNBLJBLnNTc3H6oV6G4AuCQk9pXW+gp3KsuAvq21vsVdKoFeMpk8o6mp6a+agDLzVhG5LiSW3xxjrbVboqYeEfObb5G1dnFI52+t9UkFSjngyEcyZl4rIlNDQEWPm1IZVUo963ne3UWOs9+I6KTatFrQ5SIyLwRqiIjcA7zMgV/qgthFRIXqK2r6IzPq+/4DALA0BNpzJTLz4OBRK8bU56/c1wHg9pD/FiIqFDVVgxpjpltrg3u9pwXvm0SUdIuMMhm9l4iecosYAFijtS7UCrUAHW+t3RwWCsq2TCYzIJfLZUID+JiIxjLzTBF5KfT32US0yi0LlVLLPM8LZitWi5x6Y8xl1tpvwmqIuAAR650SsEMpNdVaG6zna0P+25RSK6y1wWNG4SldKTU/zptTYcBRwylRR0aFRdoR8VYiWhvpmF9yUY4ichozd0b59daOiD0fiXHjIqc+EHIfG+KKl/PLf0LH1YoFaoxZKiID44rG8WtoaFjQv3//4F9Asdq/6ZFNWMKIiEMAAAAASUVORK5CYII=) no-repeat
+}
+
+.component-tags[data-v-3a298670] {
+	position: absolute;
+	left: 50%;
+	-webkit-transform: translateX(-50%);
+	transform: translateX(-50%);
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap;
+	-webkit-box-pack: justify;
+	-ms-flex-pack: justify;
+	justify-content: space-between;
+	padding: .32rem .16rem .08rem;
+	width: 6.22rem;
+	background: #fff;
+	overflow: auto;
+	z-index: 5;
+	font-size: 0;
+	text-align: left;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-box-shadow: 0 0 .16rem 0 rgba(53, 53, 53, .28);
+	box-shadow: 0 0 .16rem 0 rgba(53, 53, 53, .28)
+}
+
+.component-tags[data-v-3a298670]:after {
+	content: "";
+	width: 30%;
+	display: block;
+	height: 0;
+	width: 30%
+}
+
+.tag-item[data-v-3a298670] {
+	-webkit-box-flex: 0;
+	-ms-flex: 0 0 30%;
+	flex: 0 0 30%;
+	width: 2.12rem;
+	line-height: .64rem;
+	margin-bottom: .24rem;
+	text-align: left;
+	color: #353535;
+	background: #fff;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-size: .28rem;
+	text-align: center;
+	border: .02rem solid #e1e1e1
+}
+
+.tag-item[data-v-3a298670]:after {
+	content: '';
+	-webkit-box-flex: 1;
+	-ms-flex: auto;
+	flex: auto
+}
+
+.component-tags[data-v-3a298670] {
+	border-radius: 9px;
+	-webkit-box-shadow: 2px 2px 10px 5px #000;
+	box-shadow: 2px 2px 10px 5px #000
+}
+
+.component-tags .tag-item[data-v-3a298670] {
+	position: relative
+}
+
+.component-tags .tag-item.active[data-v-3a298670] {
+	background: #f8e1e0;
+	border-color: #efaaa8;
+	color: #a92924;
+	border-radius: .04rem
+}
+
+.component-tags .tag-item.active[data-v-3a298670]:before {
+	content: '';
+	position: absolute;
+	right: -.02rem;
+	bottom: -.02rem;
+	width: .38rem;
+	height: .36rem;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAkCAYAAADl9UilAAAACXBIWXMAAAsTAAALEwEAmpwYAAAFEmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgOS4xLWMwMDEgNzkuMTQ2Mjg5OTc3NywgMjAyMy8wNi8yNS0yMzo1NzoxNCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB0aWZmOk9yaWVudGF0aW9uPSIxIiB4bXA6Q3JlYXRlRGF0ZT0iMjAyMy0xMi0xN1QyMTozODowMiswODowMCIgeG1wOk1vZGlmeURhdGU9IjIwMjMtMTItMTdUMjE6NDE6MDQrMDg6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMjMtMTItMTdUMjE6NDE6MDQrMDg6MDAiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOmFhM2FmMzA4LTZjN2UtNDA0MC1iNTkzLTMzMTZjZGIwNGUzNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDphYTNhZjMwOC02YzdlLTQwNDAtYjU5My0zMzE2Y2RiMDRlMzciIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDphYTNhZjMwOC02YzdlLTQwNDAtYjU5My0zMzE2Y2RiMDRlMzciPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphYTNhZjMwOC02YzdlLTQwNDAtYjU5My0zMzE2Y2RiMDRlMzciIHN0RXZ0OndoZW49IjIwMjMtMTItMTdUMjE6NDE6MDQrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyNS4wIChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PmI8wJAAAANxSURBVFiFzZddaBxVFMd/d2aSbNyk23y00j4ERUNqawrV9EGxtA9K6WOxabKx2UlJBcFCE/ChhAWVQqUPFbQtVipUDQShlUBBIYJRLBQRv/ADtJrQ+BAE12Rd3aTdnXuPD2tjk+5mZzeb3ZynmTn/c8+Pc2fu/hfWYHh9PSdVpSGWhncofEZhjq4ZMD0QdYj9+haIC7AmwPRA1LFiv4wY6Lz9zKokEICODgVVYuLKnVBQ4Ynp6FBQTU1+ICK7l+YqBibH+ptlJvmhiOzMlnfKDQQZKDObHEekPZem7BOTI5EWuZUaF5EHltPZ5QIC0G53qxL9qRi5P5+2bGByOLIdrT8TI5v86MsCJpHwTjH6IxFp9luz6ueY6QvvFq0/LgQKVnli+mDnPoQrWCpYaO2qgYkbPqBsLouippj6VdlK6e1yMWbECFXFrlFyMOntft4Ib68ECkoMJj1dx43IWT9aE6xn5tmBnPmSvWNeX89JRF7yoxWnisTxlwm1tzG7sYXarz+/S1OS30rvUPiM8vRRv/r44BCh+zZnAH6byqpZEdj/rtO4fmtm3ecIbW3NXH/1PU1jo6UFy+Y680Vi735Ce57IXE/HaDz/ak5tUS9/LtepG5sQJ/vHmNz1FHXdTwOQvpWm/vQJlJfO2aPgiWVzneJUEX+mn7pdjxP/9keazp5aVJNq20a127twL2++gT3z57J9CpqYHOtvVlOTnyy1wspLw8Z7sW2LhkfbSezdv5DzNmxCBl/AtjOt/hobJ/DNF3l7+T4u7nCdO7Llq3/6AW/Pk9iOjf3QFvTP10EMN6MnCNQFAIhfv0Hj+dO++vkCkyORFvnn5lVEtuTSWPPzzKUtqh/eimUpUjs6mH/kMeo2rAdgLp6k/pUXUemUL7C8W6nd7la81NV8Vhhg3dgoiekYAIFgLes2Z5yO1oaa105hJf/2BZUXTA5HtivDNeNJi98FgxdeR2uz6FnqnWGqbkz6hoJltrIY1wlgx2dJ3NNA4MGMrY9f+5LQ6EhBUJBjYsW6ztux/vIwc/EkiekYDRfPFbPE3X/f9MHOfTjW+1jUFrXif5Fq24b9x+95z6usUEpNLAITN3xgpQavFGHBpQUw6e1ygQsVh1KkcWo6rAxUaVxnSaBQg+riu99ZhbjO1Qql1IQFl3BqOtTwe+cA/gUkPG+gHiXC9QAAAABJRU5ErkJggg==) center center no-repeat;
+	background-size: 100% 100%
+}
+
+.component-select {
+	position: relative;
+	cursor: pointer;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+.component-select .label {
+	font-size: .32rem
+}
+
+.component-select input {
+	cursor: pointer;
+	font-weight: 700
+}
+
+.component-select .component-input {
+	position: relative;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+.component-select .component-input.icon:after {
+	content: '';
+	position: absolute;
+	bottom: .2rem;
+	right: 0;
+	width: .24rem;
+	height: .24rem;
+	background: url(//img.wuage.com/public/158078075504781193542_56_32.png) no-repeat center right;
+	background-size: .24rem;
+	-webkit-transition: ease .3s;
+	transition: ease .3s
+}
+
+.component-select .component-input.icon.fold:after {
+	-webkit-transform: rotate(-180deg);
+	transform: rotate(-180deg)
+}
+
+.component-select .component-input .input-base {
+	border-color: #f1f2f3
+}
+
+h3[data-v-82a1b9e2] {
+	position: absolute;
+	top: 0;
+	width: 100%;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	height: .88rem;
+	line-height: .88rem;
+	font-size: .36rem;
+	border-bottom: 1px solid #e5e5e5;
+	padding: 0 .32rem
+}
+
+h3 .icon-close[data-v-82a1b9e2] {
+	position: absolute;
+	width: .4rem;
+	height: .4rem;
+	right: 0;
+	top: .24rem
+}
+
+h3 .icon-close[data-v-82a1b9e2]:after {
+	position: absolute;
+	content: '';
+	width: 1px;
+	height: .4rem;
+	background: #666;
+	-webkit-transform: rotate(45deg);
+	transform: rotate(45deg)
+}
+
+h3 .icon-close[data-v-82a1b9e2]:before {
+	position: absolute;
+	content: '';
+	width: 1px;
+	height: .4rem;
+	background: #666;
+	-webkit-transform: rotate(-45deg);
+	transform: rotate(-45deg)
+}
+
+.material-result[data-v-82a1b9e2] {
+	text-align: right;
+	padding: 0 .32rem;
+	margin-top: .17rem;
+	font-size: .24rem;
+	color: #959595
+}
+
+.material-result span[data-v-82a1b9e2] {
+	display: inline-block;
+	color: #353535;
+	margin-left: .2rem
+}
+
+.material-result[data-v-82a1b9e2]:after {
+	content: '';
+	display: inline-block;
+	margin-left: .2rem;
+	width: 7px;
+	height: 7px;
+	border-top: 1px solid #bec0c4;
+	border-right: 1px solid #bec0c4;
+	-webkit-transform: rotate(45deg);
+	transform: rotate(45deg)
+}
+
+.drawer-container[data-v-82a1b9e2] {
+	text-align: left;
+	position: fixed;
+	z-index: 10;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, .16)
+}
+
+.drawer-container .drawer-box[data-v-82a1b9e2] {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	padding-top: .88rem;
+	width: 100%;
+	max-height: 60vh;
+	background: #fff
+}
+
+ul.material-list[data-v-82a1b9e2] {
+	overflow-y: scroll;
+	height: calc(60vh)
+}
+
+ul.material-list li[data-v-82a1b9e2] {
+	height: .84rem;
+	line-height: .84rem;
+	font-size: .28rem;
+	border-bottom: 1px solid #f1f2f3;
+	color: #525662;
+	padding: 0 .32rem
+}
+
+ul.material-list li.selected[data-v-82a1b9e2] {
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAAoCAYAAACxbNkLAAAC2klEQVRoQ9WYP0xTURTGf6emGAbDhJuOupmw6ySGKCwsoqMOuuiqYjE+Yh/BxU2MK6yigw4CjrgyyibRgQkHSESDocfctmBbXvvOfe9JX+/a79x7frl/3vdV6MUxpbPAb8oStLYvPcUTaIE95oC71b4LTLdC9Q7Qay3yjXngRtMmtED1BtAL7ecHb1CuRZ6oBqj8A83qADu8By51vB51qHwDzeggP1lCGTLd9QLT+QUq6RlgBeW8CcaJhMl8AgV6jj1WgLNGGEW4Ryhz+QN6okNU+Ihy2gizj3CLUBZqm5SnUdKLKB+AAVNbwl71GQ/l3YE+P0CP9SqwCPQbYXYRxinLcqM+H0AlnUBxR6ZogoFtTjDKM/mcP+tT0jvAK5SCCUbYQhlhRtai9N3doZI+QHluAqmJNikwTFnW29V0D8g55goPPWC+1mE2OtUcP1CrY7YRfaGPKwSyGSc/XiDnmL+zgDIR19jh78IaRUYIZMtSc3xANce8iOKeZ9sQVikySiA7toJ2H9YprSXBiERonbhJZ3XMzR+UZYqME8iuz5pHd8jBVHhanSQiEfpMXtX6OubaAm/p4yaBOCfgNZqBGmEOpkkDlcQxF5jnAre5LvteJHXxP6AomDRQzjH/4ROKiwHW8ZKQ+4iotaBVVwPqBJMEyjnmfZaAQXNjwiyhTJr1bYRigvGB8nXMbm5hklDcX1Ophx+QW67TnfJ1zHAYzFKTNN0hy5FrXDEKyt8xNwWzbIGs96gdlL9jPhLMsgdKClXhF2A//0JkMPs/QEmg/DrZRhgjlFW/Mrs62sv53inLejHBzDKFRdPenGYLFRvMLM1aNJ3ddhZQwgbCZcrSMZhZmrVo4uNDGihhnSLDlmBmadaiiQdK+lB4BjNLsxaNDcgXygWzU4zxSLYtTWSpsQNZoYREwSwrKD+geKjEwax7QO2gUgaz7gIdhUodzLoPdAClnMwimGUF9BdnPhclFOCD6AAAAABJRU5ErkJggg==) no-repeat 94% center;
+	background-size: .26rem
+}
+
+.slide-enter-active[data-v-82a1b9e2],
+.slide-leave-active[data-v-82a1b9e2] {
+	-webkit-transition: all .3s ease;
+	transition: all .3s ease
+}
+
+.slide-enter[data-v-82a1b9e2],
+.slide-leave-to[data-v-82a1b9e2] {
+	height: 0
+}
+
+.slide-enter-to[data-v-82a1b9e2],
+.slide-leave[data-v-82a1b9e2] {
+	height: 60vh
+}
+
+.fade-enter-active[data-v-82a1b9e2],
+.fade-leave-active[data-v-82a1b9e2] {
+	-webkit-transition: all .3s ease;
+	transition: all .3s ease
+}
+
+.fade-enter[data-v-82a1b9e2],
+.fade-leave-to[data-v-82a1b9e2] {
+	background: 0 0
+}
+
+.fade-enter-to[data-v-82a1b9e2],
+.fade-leave[data-v-82a1b9e2] {
+	background: rgba(0, 0, 0, .16)
+}
+
+* {
+	-webkit-tap-highlight-color: transparent
+}
+
+* .view-main {
+	margin: 0 auto;
+	padding: .32rem 0 .24rem;
+	width: 6.86rem
+}
+
+.view-select {
+	position: relative;
+	width: 100%;
+	text-align: left;
+	border-bottom: 1px solid #f1f2f3
+}
+
+.view-select .label {
+	position: absolute;
+	left: 0;
+	z-index: 1;
+	height: .96rem;
+	line-height: 1.3rem
+}
+
+.view-select .component-input,
+.view-select .input-base {
+	width: 100%;
+	height: .96rem;
+	line-height: 1.3rem;
+	background: 0 0;
+	font-size: .32rem !important;
+	text-align: right;
+	padding-right: .3rem
+}
+
+.view-select .component-input .input-base,
+.view-select .input-base .input-base {
+	border: none
+}
+
+.view-select .component-input .input-base:focus,
+.view-select .input-base .input-base:focus {
+	border-top: none;
+	border-left: none;
+	border-right: none
+}
+
+.view-select .component-input .input-base.default,
+.view-select .input-base .input-base.default {
+	color: #93969d;
+	text-align: right
+}
+
+.view-select .component-input::-webkit-input-placeholder,
+.view-select .input-base::-webkit-input-placeholder {
+	color: #353535 !important
+}
+
+.view-select .component-input::-moz-placeholder,
+.view-select .input-base::-moz-placeholder {
+	color: #a92924 !important
+}
+
+.view-select .component-input::-moz-placeholder,
+.view-select .input-base::-moz-placeholder {
+	color: #a92924 !important
+}
+
+.view-select .component-input::-ms-input-placeholder,
+.view-select .input-base::-ms-input-placeholder {
+	color: #a92924 !important
+}
+
+.view-select .component-input:-ms-input-placeholder,
+.view-select .input-base:-ms-input-placeholder {
+	color: #a92924 !important
+}
+
+.view-select .component-input::placeholder,
+.view-select .input-base::placeholder {
+	color: #a92924 !important
+}
+
+.view-main .tips {
+	margin-top: .24rem;
+	font-size: .24rem;
+	color: #aaa
+}
+
+.page-m-calculator .component-tabs {
+	width: 4.8rem;
+	margin: 0 auto;
+	font-size: 0
+}
+
+.page-m-calculator .component-tabs .tab-item {
+	display: inline-block;
+	position: relative;
+	width: 50%;
+	line-height: .64rem;
+	border: .02rem solid #a92924;
+	color: #a92924;
+	box-sizing: border-box;
+	font-size: .32rem;
+	cursor: pointer
+}
+
+.page-m-calculator .component-tabs .tab-item:last-child {
+	border-top-right-radius: .08rem;
+	border-bottom-right-radius: .08rem
+}
+
+.page-m-calculator .component-tabs .tab-item:not(:last-child) {
+	border-right: none;
+	border-top-left-radius: .08rem;
+	border-bottom-left-radius: .08rem
+}
+
+.page-m-calculator .component-tabs .tab-item.active {
+	background-color: #a92924;
+	color: #fff
+}
+
+.page-m-calculator .component-panel {
+	border: none;
+	margin-top: .32rem
+}
+
+.focus,
+.input-base:focus {
+	border-width: .01rem
+}
+
+.error,
+.input-base.error {
+	border-width: .01rem
+}
+
+.component-input .icon-input.search {
+	left: 8px;
+	top: 50%;
+	margin-top: -8px;
+	width: 16px;
+	height: 16px;
+	background: url(//img.wuage.com/150459187333058icon-sprite@2x.png) center center no-repeat;
+	background-size: 72px 57px;
+	background-position: -36px -31px
+}
+
+.input-base {
+	line-height: 1;
+	padding-left: .24rem;
+	border-width: .01rem
+}
+
+.input-base:disabled {
+	border-width: .01rem
+}
+
+.error-msg.attach {
+	font-size: .24rem
+}
+
+.page-m-calculator .view-calculator-form {
+	font-size: .28rem;
+	color: #353535
+}
+
+.page-m-calculator .view-calculator-form.disabled {
+	background: #fcfcfc
+}
+
+.page-m-calculator .view-calculator-form .calculator-field {
+	position: relative;
+	height: 1.09rem;
+	line-height: 1.09rem;
+	border-bottom: 1px solid #f1f2f3
+}
+
+.page-m-calculator .view-calculator-form .calculator-field .required {
+	left: 0;
+	color: #ff7300
+}
+
+.page-m-calculator .view-calculator-form .calculator-field .label {
+	color: #525662;
+	margin-left: .3rem
+}
+
+.page-m-calculator .view-calculator-form .calculator-field .label,
+.page-m-calculator .view-calculator-form .calculator-field .required {
+	float: left
+}
+
+.page-m-calculator .view-calculator-form .calculator-field .unit {
+	position: absolute;
+	right: .32rem;
+	bottom: .1rem;
+	z-index: 1;
+	width: .8rem;
+	margin-left: .24rem;
+	text-align: right;
+	font-size: .18rem;
+	line-height: .18rem;
+	color: #959595
+}
+
+.page-m-calculator .view-calculator-form .calculator-field .field {
+	float: right;
+	margin-right: .32rem
+}
+
+.page-m-calculator .view-calculator-form .calculator-field .input-base {
+	width: 3rem;
+	text-align: right;
+	border: none;
+	background: 0 0;
+	font-size: .42rem
+}
+
+.page-m-calculator .view-main .view-result {
+	margin-top: .24rem
+}
+
+.page-m-calculator .view-main .view-result .tips {
+	margin: .16rem auto .48rem;
+	font-size: .2rem;
+	color: #ff7300
+}
+
+.page-m-calculator .view-main p {
+	display: block;
+	color: #93969d;
+	font-size: .28rem
+}
+
+.page-m-calculator .view-main h2 {
+	font-size: .42rem;
+	color: #a92924
+}
+
+.page-m-calculator .view-operation {
+	margin-top: .48rem;
+	padding-bottom: .48rem;
+	font-size: 0;
+	line-height: .32rem
+}
+
+.page-m-calculator .button,
+.page-m-calculator .light {
+	display: inline-block;
+	font-size: .24rem
+}
+
+.page-m-calculator .button {
+	width: 5.42rem;
+	line-height: .8rem;
+	margin: 0 auto;
+	background: #a92924;
+	cursor: pointer;
+	color: #fff
+}
+
+.page-m-calculator .button:active {
+	background: #a92924
+}
+
+.page-m-calculator .light {
+	margin-left: .2rem;
+	color: #c5c5c5;
+	cursor: not-allowed
+}
+
+.page-m-calculator .light.active {
+	cursor: pointer;
+	color: #a92924
+}
+
+.page-m-calculator .icon-clear {
+	width: .24rem;
+	line-height: .32rem;
+	height: .32rem;
+	background-size: .24rem;
+	vertical-align: middle
+}
+
+body {
+	min-height: 100vh;
+	background: #fff
+}
+
+.page-m-calculator[data-v-7ba5bd90] {
+	text-align: center;
+	box-sizing: border-box
+}
+
+.page-m-calculator .tabs-model[data-v-7ba5bd90] {
+	width: 100vw;
+	height: 100vh;
+	background: rgba(0, 0, 0, .78);
+	position: absolute;
+	z-index: 2
+}
+
+.page-m-calculator .tabs-model h2[data-v-7ba5bd90] {
+	white-space: nowrap;
+	color: #fff;
+	font-size: 17px;
+	position: absolute;
+	left: 50%;
+	font-weight: 500;
+	top: 13%;
+	-webkit-transform: translateX(-50%);
+	transform: translateX(-50%)
+}
\ No newline at end of file
diff --git a/static/images/aecd46b81f8b452c9294ae36ab8404f5.png b/static/images/aecd46b81f8b452c9294ae36ab8404f5.png
new file mode 100644
index 0000000..15ad097
Binary files /dev/null and b/static/images/aecd46b81f8b452c9294ae36ab8404f5.png differ
diff --git a/static/images/banner@2x.png b/static/images/banner@2x.png
new file mode 100644
index 0000000..7f5c6eb
Binary files /dev/null and b/static/images/banner@2x.png differ
diff --git a/static/images/bcc976f4396e437abf19deb11c1f06b4.png b/static/images/bcc976f4396e437abf19deb11c1f06b4.png
new file mode 100644
index 0000000..3ee0d1e
Binary files /dev/null and b/static/images/bcc976f4396e437abf19deb11c1f06b4.png differ
diff --git a/static/images/check.png b/static/images/check.png
new file mode 100644
index 0000000..d3f9f6b
Binary files /dev/null and b/static/images/check.png differ
diff --git a/static/images/god2hover-0.jpg b/static/images/god2hover-0.jpg
new file mode 100644
index 0000000..b7e62d4
Binary files /dev/null and b/static/images/god2hover-0.jpg differ
diff --git a/static/images/god3hover.jpg b/static/images/god3hover.jpg
new file mode 100644
index 0000000..2f457a0
Binary files /dev/null and b/static/images/god3hover.jpg differ
diff --git a/static/images/god4hover.jpg b/static/images/god4hover.jpg
new file mode 100644
index 0000000..82b5e81
Binary files /dev/null and b/static/images/god4hover.jpg differ
diff --git a/static/images/home1.jpg b/static/images/home1.jpg
new file mode 100644
index 0000000..5cdde53
Binary files /dev/null and b/static/images/home1.jpg differ
diff --git a/static/images/home2.jpg b/static/images/home2.jpg
new file mode 100644
index 0000000..eae417e
Binary files /dev/null and b/static/images/home2.jpg differ
diff --git a/static/images/home3.jpg b/static/images/home3.jpg
new file mode 100644
index 0000000..d36bd62
Binary files /dev/null and b/static/images/home3.jpg differ
diff --git a/static/images/index/feture-1.jpg b/static/images/index/feture-1.jpg
new file mode 100644
index 0000000..fe2f794
Binary files /dev/null and b/static/images/index/feture-1.jpg differ
diff --git a/static/images/index/gg1.png b/static/images/index/gg1.png
new file mode 100644
index 0000000..f59ff32
Binary files /dev/null and b/static/images/index/gg1.png differ
diff --git a/static/images/index/gg2.png b/static/images/index/gg2.png
new file mode 100644
index 0000000..ee2de4f
Binary files /dev/null and b/static/images/index/gg2.png differ
diff --git a/static/images/index/god1hover.jpg b/static/images/index/god1hover.jpg
new file mode 100644
index 0000000..9bd3f25
Binary files /dev/null and b/static/images/index/god1hover.jpg differ
diff --git a/static/images/index/god5hover.jpg b/static/images/index/god5hover.jpg
new file mode 100644
index 0000000..9c1c0ef
Binary files /dev/null and b/static/images/index/god5hover.jpg differ
diff --git a/static/images/index/icon10.png b/static/images/index/icon10.png
new file mode 100644
index 0000000..3cf2bc4
Binary files /dev/null and b/static/images/index/icon10.png differ
diff --git a/static/images/index/icon11.png b/static/images/index/icon11.png
new file mode 100644
index 0000000..c126c9a
Binary files /dev/null and b/static/images/index/icon11.png differ
diff --git a/static/images/index/icon12.png b/static/images/index/icon12.png
new file mode 100644
index 0000000..217cde0
Binary files /dev/null and b/static/images/index/icon12.png differ
diff --git a/static/images/index/icon13.png b/static/images/index/icon13.png
new file mode 100644
index 0000000..dcb250e
Binary files /dev/null and b/static/images/index/icon13.png differ
diff --git a/static/images/index/icon9.png b/static/images/index/icon9.png
new file mode 100644
index 0000000..1f27f00
Binary files /dev/null and b/static/images/index/icon9.png differ
diff --git a/static/images/index/xw1.jpg b/static/images/index/xw1.jpg
new file mode 100644
index 0000000..250b4f3
Binary files /dev/null and b/static/images/index/xw1.jpg differ
diff --git a/static/images/index/xw2.jpg b/static/images/index/xw2.jpg
new file mode 100644
index 0000000..d227ec7
Binary files /dev/null and b/static/images/index/xw2.jpg differ
diff --git a/static/images/logo-bg.jpg b/static/images/logo-bg.jpg
new file mode 100644
index 0000000..18ca98f
Binary files /dev/null and b/static/images/logo-bg.jpg differ
diff --git a/static/images/logo-small.jpg b/static/images/logo-small.jpg
new file mode 100644
index 0000000..2eb7666
Binary files /dev/null and b/static/images/logo-small.jpg differ
diff --git a/static/images/old/btn01.png b/static/images/old/btn01.png
new file mode 100644
index 0000000..341224e
Binary files /dev/null and b/static/images/old/btn01.png differ
diff --git a/static/images/old/btn02.png b/static/images/old/btn02.png
new file mode 100644
index 0000000..d71854c
Binary files /dev/null and b/static/images/old/btn02.png differ
diff --git a/static/images/old/btn03.png b/static/images/old/btn03.png
new file mode 100644
index 0000000..ec0981a
Binary files /dev/null and b/static/images/old/btn03.png differ
diff --git a/static/images/old/btn04.png b/static/images/old/btn04.png
new file mode 100644
index 0000000..f31371a
Binary files /dev/null and b/static/images/old/btn04.png differ
diff --git a/static/images/order/toBePaid.png b/static/images/order/toBePaid.png
new file mode 100644
index 0000000..75f174a
Binary files /dev/null and b/static/images/order/toBePaid.png differ
diff --git a/static/images/selfSupport/company.jpg b/static/images/selfSupport/company.jpg
deleted file mode 100644
index 09d8c92..0000000
Binary files a/static/images/selfSupport/company.jpg and /dev/null differ
diff --git a/static/images/selfSupport/company.png b/static/images/selfSupport/company.png
new file mode 100644
index 0000000..8839f21
Binary files /dev/null and b/static/images/selfSupport/company.png differ
diff --git a/static/images/selfSupport/cost.png b/static/images/selfSupport/cost.png
new file mode 100644
index 0000000..5371110
Binary files /dev/null and b/static/images/selfSupport/cost.png differ
diff --git a/static/images/selfSupport/product.jpg b/static/images/selfSupport/product.jpg
index 85b50cb..9058d9b 100644
Binary files a/static/images/selfSupport/product.jpg and b/static/images/selfSupport/product.jpg differ
diff --git a/static/images/swiper_5.png b/static/images/swiper_5.png
new file mode 100644
index 0000000..3cd2229
Binary files /dev/null and b/static/images/swiper_5.png differ
diff --git a/static/images/uncheck.png b/static/images/uncheck.png
new file mode 100644
index 0000000..04bcd7b
Binary files /dev/null and b/static/images/uncheck.png differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..31c7ad7
Binary files /dev/null and b/static/logo.png differ
diff --git a/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/index.js b/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/index.js
deleted file mode 100644
index 068e796..0000000
--- a/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-const querystring = require('querystring');
-exports.main = async (event, context) => {
-	//event为客户端上传的参数
-	console.log('event : ', event)
-	const {
-		body
-	} = event
-	
-	let obj = querystring.parse(body);
-	// 验证签名
-	// Base64(SHA1(app_id +MD5(timestamp)+SHA1(app_secret+authenticationType+certStatus+customerId+serialNo+status+statusDesc)))
-	
-	let callFunctionRes = await uniCloud.callFunction({
-	  name: "router",
-	  data: {
-	    $url: "client/fadada.pub_contractNotify",
-	    data: obj
-	  }
-	});
-	
-	return callFunctionRes
-};
diff --git a/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/package.json b/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/package.json
deleted file mode 100644
index 6aa6125..0000000
--- a/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "fadada_contract_notify",
-  "dependencies": {},
-  "extensions": {
-    "uni-cloud-jql": {}
-  }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/fadada_verify_notify/index.js b/uniCloud-aliyun/cloudfunctions/fadada_verify_notify/index.js
deleted file mode 100644
index 9124ff1..0000000
--- a/uniCloud-aliyun/cloudfunctions/fadada_verify_notify/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-const querystring = require('querystring');
-exports.main = async (event, context) => {
-	//event为客户端上传的参数
-	console.log('event : ', event)
-	const {
-		body
-	} = event
-
-	let obj = querystring.parse(body);
-	// 验证签名
-	// Base64(SHA1(app_id +MD5(timestamp)+SHA1(app_secret+authenticationType+certStatus+customerId+serialNo+status+statusDesc)))
-	
-	let callFunctionRes = await uniCloud.callFunction({
-	  name: "router",
-	  data: {
-	    $url: "client/fadada.pub_verifyNotify",
-	    data: obj
-	  }
-	});
-	
-	return callFunctionRes
-};
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/fadada_verify_notify/package.json b/uniCloud-aliyun/cloudfunctions/fadada_verify_notify/package.json
deleted file mode 100644
index 0a2c8a5..0000000
--- a/uniCloud-aliyun/cloudfunctions/fadada_verify_notify/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "fadada_verify_notify",
-  "dependencies": {},
-  "extensions": {
-    "uni-cloud-jql": {}
-  }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/pay_notify/index.js b/uniCloud-aliyun/cloudfunctions/pay_notify/index.js
deleted file mode 100644
index 96d452e..0000000
--- a/uniCloud-aliyun/cloudfunctions/pay_notify/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-const querystring = require('querystring');
-exports.main = async (event, context) => {
-    //event为客户端上传的参数
-    console.log('event : ', event)
-    const {
-        body
-    } = event
-
-    const obj = querystring.parse(body);
-    // // 验证签名
-    // // Base64(SHA1(app_id +MD5(timestamp)+SHA1(app_secret+authenticationType+certStatus+customerId+serialNo+status+statusDesc)))
-    //
-    await uniCloud.callFunction({
-        name: "router",
-        data: {
-            $url: "client/payment.pub_payNotify",
-            data: obj
-        }
-    });
-    //
-    // return callFunctionRes
-    // console.log(obj)
-    return 'SUCCESS'
-};
diff --git a/uniCloud-aliyun/cloudfunctions/pay_notify/package.json b/uniCloud-aliyun/cloudfunctions/pay_notify/package.json
deleted file mode 100644
index d815755..0000000
--- a/uniCloud-aliyun/cloudfunctions/pay_notify/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "pay_notify",
-  "dependencies": {},
-  "extensions": {
-    "uni-cloud-jql": {}
-  }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/config.js b/uniCloud-aliyun/cloudfunctions/router/dao/config.js
deleted file mode 100644
index 385ac2d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/dao/config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-// 涉及的表名
-const dbName = {
-	spotCategory: "jjx-spot-category", //商品-分类表
-	spotGoods: "jjx-spot-goods", //商品-现货表
-	contract: "jjx-contract", // 合同
-	userContract: "jjx-user-contract", // 用户合同
-	enquirySheet: "jjx-enquiry-sheet", // 询价单
-	enquiryQuote: "jjx-enquiry-quotre", // 报价单
-	enquiryTemplate: "jjx-enquiry-template", // 询价模板
-	enquiryAttributes: "jjx-enquiry-attributes", // 询价模板属性
-	user: "uni-id-users", //用户
-	seal: "jjx-seal", //印章
-	processSheet: "jjx-process-sheet", //找加工
-	processQuote: "jjx-process-quote", //找加工报价单
-};
-module.exports = dbName;
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/modules/contractDao.js b/uniCloud-aliyun/cloudfunctions/router/dao/modules/contractDao.js
deleted file mode 100644
index 37c4bb3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/dao/modules/contractDao.js
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * 
- */
-// 涉及的表名
-const dbName = {
-	contractDao: "jjx-contract", // 请在此处填写表中文含义
-};
-
-var dao = {};
-var util = {};
-// 初始化
-dao.init = function(obj) {
-	util = obj;
-}
-/**
- * 查 - 根据id获取单条记录
- * @param {String} _id 
- * @param {Object} fieldJson 字段显示规则
- * 调用示例
- * let contractDaoInfo = await vk.daoCenter.contractDaoDao.findById(_id);
- * 或
- let contractDaoInfo = await vk.daoCenter.contractDaoDao.findById({
-	db: transaction,
-	id: _id
- });
- */
-dao.findById = async (_id, fieldJson) => {
-	let { vk, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	if (typeof _id === "object") {
-		// 支持事务
-		res = await vk.baseDao.findById({
-			..._id,
-			dbName: dbName.contractDao,
-		});
-	} else {
-		// 不支持事务
-		res = await vk.baseDao.findById({
-			dbName: dbName.contractDao,
-			id: _id,
-			fieldJson
-		});
-	}
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-/**
- * 查 - 根据whereJson获取单条记录
- * @param {Object} whereJson 条件
- * @param {Object} fieldJson 字段显示规则
- * 调用示例
-let contractDaoInfo = await vk.daoCenter.contractDaoDao.findByWhereJson({
-	
-});
- */
-dao.findByWhereJson = async (whereJson, fieldJson) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.findByWhereJson({
-		dbName: dbName.contractDao,
-		whereJson,
-		fieldJson
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 增 - 添加一条记录
- * @param {Object} dataJson 添加的数据
- * 调用示例
-await vk.daoCenter.contractDaoDao.add({
-	
-});
-或
- * 调用示例
-await vk.daoCenter.contractDaoDao.add({
-	db: transaction,
-	dataJson: {
-		
-	}
-});
- */
-dao.add = async (obj) => {
-	let { vk, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	if (obj.db && obj.dataJson) {
-		// 支持事务
-		res = await vk.baseDao.add({
-			...obj,
-			dbName: dbName.contractDao,
-		});
-	} else {
-		// 不支持事务
-		res = await vk.baseDao.add({
-			dbName: dbName.contractDao,
-			dataJson: obj
-		});
-	}
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 增 - 添加多条记录
- * @param {Object} dataJson 添加的数据
- * 调用示例
-await vk.daoCenter.contractDaoDao.adds(dataArr);
- */
-dao.adds = async (dataArr) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.adds({
-		dbName: dbName.contractDao,
-		dataJson: dataArr
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 删 - 删除多条记录
- * @param {Object} whereJson 条件
- * 调用示例
-await vk.daoCenter.contractDaoDao.del({
-	
-});
- */
-dao.del = async (whereJson) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.del({
-		dbName: dbName.contractDao,
-		whereJson
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 删 - 据ID删除单条数据
- * @param {String} _id 
- * 调用示例
-await vk.daoCenter.contractDaoDao.deleteById(_id);
-或
-await vk.daoCenter.contractDaoDao.deleteById(_id, transaction);
- */
-dao.deleteById = async (_id, db) => {
-	let { vk, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.deleteById({
-		db,
-		dbName: dbName.contractDao,
-		id: _id
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 改 - 批量修改
- * @param {Object} whereJson 条件
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.contractDaoDao.update({
-	whereJson:{
-		
-	},
-	dataJson:{
-		
-	}
-});
- */
-dao.update = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.update({
-		...obj,
-		dbName: dbName.contractDao,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-
-/**
- * 改 - 根据ID修改数据
- * @param {String} _id 
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.contractDaoDao.updateById({
-	id: _id, 
-	dataJson: {
-		
-	}
-});
- */
-dao.updateById = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.updateById({
-		...obj,
-		dbName: dbName.contractDao
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 改 - 更新并返回更新后的数据（无论条件匹配到多少条记录，只会修改第一条记录，同时返回修改后的数据）
- * @param {Object} whereJson 条件
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.contractDaoDao.updateAndReturn({
-	whereJson:{
-		
-	},
-	dataJson:{
-		
-	}
-});
- */
-dao.updateAndReturn = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.updateAndReturn({
-		...obj,
-		dbName: dbName.contractDao
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 根据ID判断存在则修改，不存在则添加
- * @param {String} id 如果传了id参数，则会与dataJson中的_id判断是否一致，不一致会报错
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.contractDaoDao.setById({
-	dataJson: {
-		
-	}
-});
- */
-dao.setById = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.setById({
-		...obj,
-		dbName: dbName.contractDao
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 获取记录总条数
- * @param {Object} whereJson 条件
- * 调用示例
-await vk.daoCenter.contractDaoDao.count(whereJson);
- */
-dao.count = async (whereJson) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.count({
-		dbName: dbName.contractDao,
-		whereJson
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求和
- * @param {String} fieldName 需要求和的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let contractDaoSum = await vk.daoCenter.contractDaoDao.sum({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.sum = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.sum({
-		...obj,
-		dbName: dbName.contractDao,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求最大值
- * @param {String} fieldName 需要求最大值的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let contractDaoMax = await vk.daoCenter.contractDaoDao.max({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.max = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.max({
-		...obj,
-		dbName: dbName.contractDao,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求最小值
- * @param {String} fieldName 需要求最小值的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let contractDaoMin = await vk.daoCenter.contractDaoDao.min({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.min = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.min({
-		...obj,
-		dbName: dbName.contractDao,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求最平均值
- * @param {String} fieldName 需要求最平均值的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let contractDaoAvg = await vk.daoCenter.contractDaoDao.avg({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.avg = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.avg({
-		...obj,
-		dbName: dbName.contractDao,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-
-/**
- * 查 - 获取数据列表
- * 调用示例
-let contractDaoList = await vk.daoCenter.contractDaoDao.select({
-	pageIndex:1,
-	pageSize:20,
-	getMain:false,
-	whereJson:{
-		
-	},
-	fieldJson:{},
-	sortArr:[{ "name":"_id", "type":"desc" }],
-});
- */
-dao.select = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.select({
-		...obj,
-		dbName: dbName.contractDao
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 获取数据列表
- * 调用示例
-let contractDaoList = await vk.daoCenter.contractDaoDao.selects({
-	pageIndex:1,
-	pageSize:20,
-	getMain:false,
-	whereJson:{
-		
-	},
-	fieldJson:{},
-	sortArr:[{ "name":"_id", "type":"desc" }],
-	// 副表列表
-	foreignDB:[
-		{
-			dbName:"副表表名",
-			localKey:"主表外键名",
-			foreignKey:"副表外键名",
-			as:"副表as字段",
-			limit:1
-		}
-	]
-});
- */
-dao.selects = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.selects({
-		...obj,
-		dbName: dbName.contractDao
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 获取数据列表
- * 调用示例
-res = await vk.daoCenter.contractDaoDao.getTableData({ 
-	data
-});
- */
-dao.getTableData = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.getTableData({
-		...obj,
-		dbName: dbName.contractDao
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-
-module.exports = dao;
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/modules/userContractDao.js b/uniCloud-aliyun/cloudfunctions/router/dao/modules/userContractDao.js
deleted file mode 100644
index 9913515..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/dao/modules/userContractDao.js
+++ /dev/null
@@ -1,461 +0,0 @@
-/**
- * 
- */
-// 涉及的表名
-const dbName = {
-	userContract: "jjx-user-contract", // 用户合同关联表
-};
-
-var dao = {};
-var util = {};
-// 初始化
-dao.init = function(obj) {
-	util = obj;
-}
-/**
- * 查 - 根据id获取单条记录
- * @param {String} _id 
- * @param {Object} fieldJson 字段显示规则
- * 调用示例
- * let userContractInfo = await vk.daoCenter.userContractDao.findById(_id);
- * 或
- let userContractInfo = await vk.daoCenter.userContractDao.findById({
-	db: transaction,
-	id: _id
- });
- */
-dao.findById = async (_id, fieldJson) => {
-	let { vk, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	if (typeof _id === "object") {
-		// 支持事务
-		res = await vk.baseDao.findById({
-			..._id,
-			dbName: dbName.userContract,
-		});
-	} else {
-		// 不支持事务
-		res = await vk.baseDao.findById({
-			dbName: dbName.userContract,
-			id: _id,
-			fieldJson
-		});
-	}
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-/**
- * 查 - 根据whereJson获取单条记录
- * @param {Object} whereJson 条件
- * @param {Object} fieldJson 字段显示规则
- * 调用示例
-let userContractInfo = await vk.daoCenter.userContractDao.findByWhereJson({
-	
-});
- */
-dao.findByWhereJson = async (whereJson, fieldJson) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.findByWhereJson({
-		dbName: dbName.userContract,
-		whereJson,
-		fieldJson
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 增 - 添加一条记录
- * @param {Object} dataJson 添加的数据
- * 调用示例
-await vk.daoCenter.userContractDao.add({
-	
-});
-或
- * 调用示例
-await vk.daoCenter.userContractDao.add({
-	db: transaction,
-	dataJson: {
-		
-	}
-});
- */
-dao.add = async (obj) => {
-	let { vk, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	if (obj.db && obj.dataJson) {
-		// 支持事务
-		res = await vk.baseDao.add({
-			...obj,
-			dbName: dbName.userContract,
-		});
-	} else {
-		// 不支持事务
-		res = await vk.baseDao.add({
-			dbName: dbName.userContract,
-			dataJson: obj
-		});
-	}
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 增 - 添加多条记录
- * @param {Object} dataJson 添加的数据
- * 调用示例
-await vk.daoCenter.userContractDao.adds(dataArr);
- */
-dao.adds = async (dataArr) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.adds({
-		dbName: dbName.userContract,
-		dataJson: dataArr
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 删 - 删除多条记录
- * @param {Object} whereJson 条件
- * 调用示例
-await vk.daoCenter.userContractDao.del({
-	
-});
- */
-dao.del = async (whereJson) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.del({
-		dbName: dbName.userContract,
-		whereJson
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 删 - 据ID删除单条数据
- * @param {String} _id 
- * 调用示例
-await vk.daoCenter.userContractDao.deleteById(_id);
-或
-await vk.daoCenter.userContractDao.deleteById(_id, transaction);
- */
-dao.deleteById = async (_id, db) => {
-	let { vk, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.deleteById({
-		db,
-		dbName: dbName.userContract,
-		id: _id
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 改 - 批量修改
- * @param {Object} whereJson 条件
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.userContractDao.update({
-	whereJson:{
-		
-	},
-	dataJson:{
-		
-	}
-});
- */
-dao.update = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.update({
-		...obj,
-		dbName: dbName.userContract,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-
-/**
- * 改 - 根据ID修改数据
- * @param {String} _id 
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.userContractDao.updateById({
-	id: _id, 
-	dataJson: {
-		
-	}
-});
- */
-dao.updateById = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.updateById({
-		...obj,
-		dbName: dbName.userContract
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 改 - 更新并返回更新后的数据（无论条件匹配到多少条记录，只会修改第一条记录，同时返回修改后的数据）
- * @param {Object} whereJson 条件
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.userContractDao.updateAndReturn({
-	whereJson:{
-		
-	},
-	dataJson:{
-		
-	}
-});
- */
-dao.updateAndReturn = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.updateAndReturn({
-		...obj,
-		dbName: dbName.userContract
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 根据ID判断存在则修改，不存在则添加
- * @param {String} id 如果传了id参数，则会与dataJson中的_id判断是否一致，不一致会报错
- * @param {Object} dataJson 修改的数据
- * 调用示例
-await vk.daoCenter.userContractDao.setById({
-	dataJson: {
-		
-	}
-});
- */
-dao.setById = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.setById({
-		...obj,
-		dbName: dbName.userContract
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 获取记录总条数
- * @param {Object} whereJson 条件
- * 调用示例
-await vk.daoCenter.userContractDao.count(whereJson);
- */
-dao.count = async (whereJson) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.count({
-		dbName: dbName.userContract,
-		whereJson
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求和
- * @param {String} fieldName 需要求和的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let userContractSum = await vk.daoCenter.userContractDao.sum({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.sum = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.sum({
-		...obj,
-		dbName: dbName.userContract,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求最大值
- * @param {String} fieldName 需要求最大值的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let userContractMax = await vk.daoCenter.userContractDao.max({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.max = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.max({
-		...obj,
-		dbName: dbName.userContract,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求最小值
- * @param {String} fieldName 需要求最小值的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let userContractMin = await vk.daoCenter.userContractDao.min({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.min = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.min({
-		...obj,
-		dbName: dbName.userContract,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 求最平均值
- * @param {String} fieldName 需要求最平均值的字段名 
- * @param {Object} whereJson 筛选条件
- * 调用示例
-let userContractAvg = await vk.daoCenter.userContractDao.avg({
-	fieldName: "",
-	whereJson: {
-		
-	}
-});
- */
-dao.avg = async (obj) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.avg({
-		...obj,
-		dbName: dbName.userContract,
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-
-/**
- * 查 - 获取数据列表
- * 调用示例
-let userContractList = await vk.daoCenter.userContractDao.select({
-	pageIndex:1,
-	pageSize:20,
-	getMain:false,
-	whereJson:{
-		
-	},
-	fieldJson:{},
-	sortArr:[{ "name":"_id", "type":"desc" }],
-});
- */
-dao.select = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.select({
-		...obj,
-		dbName: dbName.userContract
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 获取数据列表
- * 调用示例
-let userContractList = await vk.daoCenter.userContractDao.selects({
-	pageIndex:1,
-	pageSize:20,
-	getMain:false,
-	whereJson:{
-		
-	},
-	fieldJson:{},
-	sortArr:[{ "name":"_id", "type":"desc" }],
-	// 副表列表
-	foreignDB:[
-		{
-			dbName:"副表表名",
-			localKey:"主表外键名",
-			foreignKey:"副表外键名",
-			as:"副表as字段",
-			limit:1
-		}
-	]
-});
- */
-dao.selects = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.selects({
-		...obj,
-		dbName: dbName.userContract
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-
-/**
- * 查 - 获取数据列表
- * 调用示例
-res = await vk.daoCenter.userContractDao.getTableData({ 
-	data
-});
- */
-dao.getTableData = async (obj = {}) => {
-	let { vk, db, _ } = util;
-	let res = {};
-	// 数据库操作开始-----------------------------------------------------------
-	res = await vk.baseDao.getTableData({
-		...obj,
-		dbName: dbName.userContract
-	});
-	// 数据库操作结束-----------------------------------------------------------
-	return res;
-};
-module.exports = dao;
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/.package-lock.json b/uniCloud-aliyun/cloudfunctions/router/node_modules/.package-lock.json
deleted file mode 100644
index 300c623..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/.package-lock.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "router",
-  "version": "1.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center": {
-      "version": "0.0.3",
-      "license": "Apache-2.0"
-    },
-    "../../../uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id": {
-      "version": "3.3.28",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-      }
-    },
-    "../../../uni_modules/vk-unicloud/uniCloud/cloudfunctions/common/vk-unicloud": {
-      "version": "2.15.3",
-      "license": "Apache-2.0"
-    },
-    "node_modules/crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-    },
-    "node_modules/uni-config-center": {
-      "resolved": "../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-      "link": true
-    },
-    "node_modules/uni-id": {
-      "resolved": "../../../uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id",
-      "link": true
-    },
-    "node_modules/vk-unicloud": {
-      "resolved": "../../../uni_modules/vk-unicloud/uniCloud/cloudfunctions/common/vk-unicloud",
-      "link": true
-    }
-  }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/CONTRIBUTING.md b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/CONTRIBUTING.md
deleted file mode 100644
index 09bf774..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/CONTRIBUTING.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contribution
-
-# Git Flow 
-
-The crypto-js project uses [git flow](https://github.com/nvie/gitflow) to manage branches. 
-Do your changes on the `develop` or even better on a `feature/*` branch. Don't do any changes on the `master` branch.
-
-# Pull request
-
-Target your pull request on `develop` branch. Other pull request won't be accepted.
-
-# How to build
-
-1. Clone
-
-2. Run
-
-    ```sh
-    npm install
-    ```
-
-3. Run
-
-    ```sh
-    npm run build
-    ```
-    
-4. Check `build` folder
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/LICENSE b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/LICENSE
deleted file mode 100644
index b0828e5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-# License
-
-[The MIT License (MIT)](http://opensource.org/licenses/MIT)
-
-Copyright (c) 2009-2013 Jeff Mott  
-Copyright (c) 2013-2016 Evan Vosberg
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/README.md b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/README.md
deleted file mode 100644
index 6a9bcdf..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/README.md
+++ /dev/null
@@ -1,275 +0,0 @@
-# crypto-js
-
-JavaScript library of crypto standards.
-
-## Discontinued
-
-Active development of CryptoJS has been discontinued. This library is no longer maintained.
-
-Nowadays, NodeJS and modern browsers have a native `Crypto` module. The latest version of CryptoJS already uses the native Crypto module for random number generation, since `Math.random()` is not crypto-safe. Further development of CryptoJS would result in it only being a wrapper of native Crypto. Therefore, development and maintenance has been discontinued, it is time to go for the native `crypto` module.
-
-## Node.js (Install)
-
-Requirements:
-
-- Node.js
-- npm (Node.js package manager)
-
-```bash
-npm install crypto-js
-```
-
-### Usage
-
-ES6 import for typical API call signing use case:
-
-```javascript
-import sha256 from 'crypto-js/sha256';
-import hmacSHA512 from 'crypto-js/hmac-sha512';
-import Base64 from 'crypto-js/enc-base64';
-
-const message, nonce, path, privateKey; // ...
-const hashDigest = sha256(nonce + message);
-const hmacDigest = Base64.stringify(hmacSHA512(path + hashDigest, privateKey));
-```
-
-Modular include:
-
-```javascript
-var AES = require("crypto-js/aes");
-var SHA256 = require("crypto-js/sha256");
-...
-console.log(SHA256("Message"));
-```
-
-Including all libraries, for access to extra methods:
-
-```javascript
-var CryptoJS = require("crypto-js");
-console.log(CryptoJS.HmacSHA1("Message", "Key"));
-```
-
-## Client (browser)
-
-Requirements:
-
-- Node.js
-- Bower (package manager for frontend)
-
-```bash
-bower install crypto-js
-```
-
-### Usage
-
-Modular include:
-
-```javascript
-require.config({
-    packages: [
-        {
-            name: 'crypto-js',
-            location: 'path-to/bower_components/crypto-js',
-            main: 'index'
-        }
-    ]
-});
-
-require(["crypto-js/aes", "crypto-js/sha256"], function (AES, SHA256) {
-    console.log(SHA256("Message"));
-});
-```
-
-Including all libraries, for access to extra methods:
-
-```javascript
-// Above-mentioned will work or use this simple form
-require.config({
-    paths: {
-        'crypto-js': 'path-to/bower_components/crypto-js/crypto-js'
-    }
-});
-
-require(["crypto-js"], function (CryptoJS) {
-    console.log(CryptoJS.HmacSHA1("Message", "Key"));
-});
-```
-
-### Usage without RequireJS
-
-```html
-<script type="text/javascript" src="path-to/bower_components/crypto-js/crypto-js.js"></script>
-<script type="text/javascript">
-    var encrypted = CryptoJS.AES(...);
-    var encrypted = CryptoJS.SHA256(...);
-</script>
-```
-
-## API
-
-See: https://cryptojs.gitbook.io/docs/
-
-### AES Encryption
-
-#### Plain text encryption
-
-```javascript
-var CryptoJS = require("crypto-js");
-
-// Encrypt
-var ciphertext = CryptoJS.AES.encrypt('my message', 'secret key 123').toString();
-
-// Decrypt
-var bytes  = CryptoJS.AES.decrypt(ciphertext, 'secret key 123');
-var originalText = bytes.toString(CryptoJS.enc.Utf8);
-
-console.log(originalText); // 'my message'
-```
-
-#### Object encryption
-
-```javascript
-var CryptoJS = require("crypto-js");
-
-var data = [{id: 1}, {id: 2}]
-
-// Encrypt
-var ciphertext = CryptoJS.AES.encrypt(JSON.stringify(data), 'secret key 123').toString();
-
-// Decrypt
-var bytes  = CryptoJS.AES.decrypt(ciphertext, 'secret key 123');
-var decryptedData = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
-
-console.log(decryptedData); // [{id: 1}, {id: 2}]
-```
-
-### List of modules
-
-
-- ```crypto-js/core```
-- ```crypto-js/x64-core```
-- ```crypto-js/lib-typedarrays```
-
----
-
-- ```crypto-js/md5```
-- ```crypto-js/sha1```
-- ```crypto-js/sha256```
-- ```crypto-js/sha224```
-- ```crypto-js/sha512```
-- ```crypto-js/sha384```
-- ```crypto-js/sha3```
-- ```crypto-js/ripemd160```
-
----
-
-- ```crypto-js/hmac-md5```
-- ```crypto-js/hmac-sha1```
-- ```crypto-js/hmac-sha256```
-- ```crypto-js/hmac-sha224```
-- ```crypto-js/hmac-sha512```
-- ```crypto-js/hmac-sha384```
-- ```crypto-js/hmac-sha3```
-- ```crypto-js/hmac-ripemd160```
-
----
-
-- ```crypto-js/pbkdf2```
-
----
-
-- ```crypto-js/aes```
-- ```crypto-js/tripledes```
-- ```crypto-js/rc4```
-- ```crypto-js/rabbit```
-- ```crypto-js/rabbit-legacy```
-- ```crypto-js/evpkdf```
-
----
-
-- ```crypto-js/format-openssl```
-- ```crypto-js/format-hex```
-
----
-
-- ```crypto-js/enc-latin1```
-- ```crypto-js/enc-utf8```
-- ```crypto-js/enc-hex```
-- ```crypto-js/enc-utf16```
-- ```crypto-js/enc-base64```
-
----
-
-- ```crypto-js/mode-cfb```
-- ```crypto-js/mode-ctr```
-- ```crypto-js/mode-ctr-gladman```
-- ```crypto-js/mode-ofb```
-- ```crypto-js/mode-ecb```
-
----
-
-- ```crypto-js/pad-pkcs7```
-- ```crypto-js/pad-ansix923```
-- ```crypto-js/pad-iso10126```
-- ```crypto-js/pad-iso97971```
-- ```crypto-js/pad-zeropadding```
-- ```crypto-js/pad-nopadding```
-
-
-## Release notes
-
-### 4.2.0
-
-Change default hash algorithm and iteration's for PBKDF2 to prevent weak security by using the default configuration.
-
-Custom KDF Hasher
-
-Blowfish support
-
-### 4.1.1
-
-Fix module order in bundled release.
-
-Include the browser field in the released package.json.
-
-### 4.1.0
-
-Added url safe variant of base64 encoding. [357](https://github.com/brix/crypto-js/pull/357)
-
-Avoid webpack to add crypto-browser package. [364](https://github.com/brix/crypto-js/pull/364)
-
-### 4.0.0
-
-This is an update including breaking changes for some environments.
-
-In this version `Math.random()` has been replaced by the random methods of the native crypto module.
-
-For this reason CryptoJS might not run in some JavaScript environments without native crypto module. Such as IE 10 or before or React Native.
-
-### 3.3.0
-
-Rollback, `3.3.0` is the same as `3.1.9-1`.
-
-The move of using native secure crypto module will be shifted to a new `4.x.x` version. As it is a breaking change the impact is too big for a minor release.
-
-### 3.2.1
-
-The usage of the native crypto module has been fixed. The import and access of the native crypto module has been improved.
-
-### 3.2.0
-
-In this version `Math.random()` has been replaced by the random methods of the native crypto module.
-
-For this reason CryptoJS might does not run in some JavaScript environments without native crypto module. Such as IE 10 or before.
-
-If it's absolute required to run CryptoJS in such an environment, stay with `3.1.x` version. Encrypting and decrypting stays compatible. But keep in mind `3.1.x` versions still use `Math.random()` which is cryptographically not secure, as it's not random enough. 
-
-This version came along with `CRITICAL` `BUG`. 
-
-DO NOT USE THIS VERSION! Please, go for a newer version!
-
-### 3.1.x
-
-The `3.1.x` are based on the original CryptoJS, wrapped in CommonJS modules.
-
-
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/aes.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/aes.js
deleted file mode 100644
index 166e3ea..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/aes.js
+++ /dev/null
@@ -1,234 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    // Lookup tables
-	    var SBOX = [];
-	    var INV_SBOX = [];
-	    var SUB_MIX_0 = [];
-	    var SUB_MIX_1 = [];
-	    var SUB_MIX_2 = [];
-	    var SUB_MIX_3 = [];
-	    var INV_SUB_MIX_0 = [];
-	    var INV_SUB_MIX_1 = [];
-	    var INV_SUB_MIX_2 = [];
-	    var INV_SUB_MIX_3 = [];
-
-	    // Compute lookup tables
-	    (function () {
-	        // Compute double table
-	        var d = [];
-	        for (var i = 0; i < 256; i++) {
-	            if (i < 128) {
-	                d[i] = i << 1;
-	            } else {
-	                d[i] = (i << 1) ^ 0x11b;
-	            }
-	        }
-
-	        // Walk GF(2^8)
-	        var x = 0;
-	        var xi = 0;
-	        for (var i = 0; i < 256; i++) {
-	            // Compute sbox
-	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
-	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
-	            SBOX[x] = sx;
-	            INV_SBOX[sx] = x;
-
-	            // Compute multiplication
-	            var x2 = d[x];
-	            var x4 = d[x2];
-	            var x8 = d[x4];
-
-	            // Compute sub bytes, mix columns tables
-	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
-	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
-	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
-	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
-	            SUB_MIX_3[x] = t;
-
-	            // Compute inv sub bytes, inv mix columns tables
-	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
-	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
-	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
-	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
-	            INV_SUB_MIX_3[sx] = t;
-
-	            // Compute next counter
-	            if (!x) {
-	                x = xi = 1;
-	            } else {
-	                x = x2 ^ d[d[d[x8 ^ x2]]];
-	                xi ^= d[d[xi]];
-	            }
-	        }
-	    }());
-
-	    // Precomputed Rcon lookup
-	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-
-	    /**
-	     * AES block cipher algorithm.
-	     */
-	    var AES = C_algo.AES = BlockCipher.extend({
-	        _doReset: function () {
-	            var t;
-
-	            // Skip reset of nRounds has been set before and key did not change
-	            if (this._nRounds && this._keyPriorReset === this._key) {
-	                return;
-	            }
-
-	            // Shortcuts
-	            var key = this._keyPriorReset = this._key;
-	            var keyWords = key.words;
-	            var keySize = key.sigBytes / 4;
-
-	            // Compute number of rounds
-	            var nRounds = this._nRounds = keySize + 6;
-
-	            // Compute number of key schedule rows
-	            var ksRows = (nRounds + 1) * 4;
-
-	            // Compute key schedule
-	            var keySchedule = this._keySchedule = [];
-	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
-	                if (ksRow < keySize) {
-	                    keySchedule[ksRow] = keyWords[ksRow];
-	                } else {
-	                    t = keySchedule[ksRow - 1];
-
-	                    if (!(ksRow % keySize)) {
-	                        // Rot word
-	                        t = (t << 8) | (t >>> 24);
-
-	                        // Sub word
-	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
-
-	                        // Mix Rcon
-	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
-	                    } else if (keySize > 6 && ksRow % keySize == 4) {
-	                        // Sub word
-	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
-	                    }
-
-	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
-	                }
-	            }
-
-	            // Compute inv key schedule
-	            var invKeySchedule = this._invKeySchedule = [];
-	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
-	                var ksRow = ksRows - invKsRow;
-
-	                if (invKsRow % 4) {
-	                    var t = keySchedule[ksRow];
-	                } else {
-	                    var t = keySchedule[ksRow - 4];
-	                }
-
-	                if (invKsRow < 4 || ksRow <= 4) {
-	                    invKeySchedule[invKsRow] = t;
-	                } else {
-	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
-	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
-	                }
-	            }
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            // Swap 2nd and 4th rows
-	            var t = M[offset + 1];
-	            M[offset + 1] = M[offset + 3];
-	            M[offset + 3] = t;
-
-	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
-
-	            // Inv swap 2nd and 4th rows
-	            var t = M[offset + 1];
-	            M[offset + 1] = M[offset + 3];
-	            M[offset + 3] = t;
-	        },
-
-	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
-	            // Shortcut
-	            var nRounds = this._nRounds;
-
-	            // Get input, add round key
-	            var s0 = M[offset]     ^ keySchedule[0];
-	            var s1 = M[offset + 1] ^ keySchedule[1];
-	            var s2 = M[offset + 2] ^ keySchedule[2];
-	            var s3 = M[offset + 3] ^ keySchedule[3];
-
-	            // Key schedule row counter
-	            var ksRow = 4;
-
-	            // Rounds
-	            for (var round = 1; round < nRounds; round++) {
-	                // Shift rows, sub bytes, mix columns, add round key
-	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
-	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
-	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
-	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
-
-	                // Update state
-	                s0 = t0;
-	                s1 = t1;
-	                s2 = t2;
-	                s3 = t3;
-	            }
-
-	            // Shift rows, sub bytes, add round key
-	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
-	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
-	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
-	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
-
-	            // Set output
-	            M[offset]     = t0;
-	            M[offset + 1] = t1;
-	            M[offset + 2] = t2;
-	            M[offset + 3] = t3;
-	        },
-
-	        keySize: 256/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.AES = BlockCipher._createHelper(AES);
-	}());
-
-
-	return CryptoJS.AES;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/blowfish.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/blowfish.js
deleted file mode 100644
index 149812f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/blowfish.js
+++ /dev/null
@@ -1,471 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    const N = 16;
-
-	    //Origin pbox and sbox, derived from PI
-	    const ORIG_P = [
-	        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
-	        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
-	        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
-	        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
-	        0x9216D5D9, 0x8979FB1B
-	    ];
-
-	    const ORIG_S = [
-	        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
-	            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
-	            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
-	            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
-	            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
-	            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
-	            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
-	            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
-	            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
-	            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
-	            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
-	            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
-	            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
-	            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
-	            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
-	            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
-	            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
-	            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
-	            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
-	            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
-	            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
-	            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
-	            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
-	            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
-	            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
-	            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
-	            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
-	            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
-	            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
-	            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
-	            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
-	            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
-	            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
-	            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
-	            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
-	            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
-	            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
-	            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
-	            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
-	            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
-	            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
-	            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
-	            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
-	            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
-	            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
-	            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
-	            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
-	            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
-	            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
-	            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
-	            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
-	            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
-	            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
-	            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
-	            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
-	            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
-	            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
-	            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
-	            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
-	            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
-	            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
-	            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
-	            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
-	            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],
-	        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
-	            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
-	            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
-	            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
-	            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
-	            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
-	            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
-	            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
-	            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
-	            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
-	            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
-	            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
-	            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
-	            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
-	            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
-	            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
-	            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
-	            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
-	            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
-	            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
-	            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
-	            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
-	            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
-	            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
-	            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
-	            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
-	            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
-	            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
-	            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
-	            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
-	            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
-	            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
-	            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
-	            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
-	            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
-	            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
-	            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
-	            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
-	            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
-	            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
-	            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
-	            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
-	            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
-	            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
-	            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
-	            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
-	            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
-	            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
-	            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
-	            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
-	            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
-	            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
-	            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
-	            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
-	            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
-	            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
-	            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
-	            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
-	            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
-	            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
-	            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
-	            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
-	            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
-	            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],
-	        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
-	            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
-	            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
-	            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
-	            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
-	            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
-	            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
-	            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
-	            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
-	            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
-	            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
-	            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
-	            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
-	            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
-	            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
-	            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
-	            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
-	            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
-	            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
-	            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
-	            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
-	            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
-	            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
-	            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
-	            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
-	            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
-	            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
-	            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
-	            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
-	            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
-	            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
-	            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
-	            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
-	            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
-	            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
-	            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
-	            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
-	            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
-	            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
-	            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
-	            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
-	            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
-	            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
-	            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
-	            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
-	            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
-	            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
-	            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
-	            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
-	            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
-	            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
-	            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
-	            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
-	            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
-	            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
-	            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
-	            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
-	            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
-	            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
-	            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
-	            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
-	            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
-	            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
-	            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],
-	        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
-	            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
-	            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
-	            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
-	            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
-	            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
-	            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
-	            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
-	            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
-	            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
-	            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
-	            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
-	            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
-	            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
-	            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
-	            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
-	            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
-	            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
-	            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
-	            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
-	            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
-	            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
-	            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
-	            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
-	            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
-	            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
-	            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
-	            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
-	            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
-	            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
-	            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
-	            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
-	            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
-	            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
-	            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
-	            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
-	            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
-	            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
-	            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
-	            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
-	            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
-	            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
-	            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
-	            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
-	            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
-	            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
-	            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
-	            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
-	            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
-	            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
-	            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
-	            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
-	            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
-	            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
-	            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
-	            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
-	            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
-	            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
-	            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
-	            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
-	            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
-	            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
-	            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
-	            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]
-	    ];
-
-	    var BLOWFISH_CTX = {
-	        pbox: [],
-	        sbox: []
-	    }
-
-	    function F(ctx, x){
-	        let a = (x >> 24) & 0xFF;
-	        let b = (x >> 16) & 0xFF;
-	        let c = (x >> 8) & 0xFF;
-	        let d = x & 0xFF;
-
-	        let y = ctx.sbox[0][a] + ctx.sbox[1][b];
-	        y = y ^ ctx.sbox[2][c];
-	        y = y + ctx.sbox[3][d];
-
-	        return y;
-	    }
-
-	    function BlowFish_Encrypt(ctx, left, right){
-	        let Xl = left;
-	        let Xr = right;
-	        let temp;
-
-	        for(let i = 0; i < N; ++i){
-	            Xl = Xl ^ ctx.pbox[i];
-	            Xr = F(ctx, Xl) ^ Xr;
-
-	            temp = Xl;
-	            Xl = Xr;
-	            Xr = temp;
-	        }
-
-	        temp = Xl;
-	        Xl = Xr;
-	        Xr = temp;
-
-	        Xr = Xr ^ ctx.pbox[N];
-	        Xl = Xl ^ ctx.pbox[N + 1];
-
-	        return {left: Xl, right: Xr};
-	    }
-
-	    function BlowFish_Decrypt(ctx, left, right){
-	        let Xl = left;
-	        let Xr = right;
-	        let temp;
-
-	        for(let i = N + 1; i > 1; --i){
-	            Xl = Xl ^ ctx.pbox[i];
-	            Xr = F(ctx, Xl) ^ Xr;
-
-	            temp = Xl;
-	            Xl = Xr;
-	            Xr = temp;
-	        }
-
-	        temp = Xl;
-	        Xl = Xr;
-	        Xr = temp;
-
-	        Xr = Xr ^ ctx.pbox[1];
-	        Xl = Xl ^ ctx.pbox[0];
-
-	        return {left: Xl, right: Xr};
-	    }
-
-	    /**
-	     * Initialization ctx's pbox and sbox.
-	     *
-	     * @param {Object} ctx The object has pbox and sbox.
-	     * @param {Array} key An array of 32-bit words.
-	     * @param {int} keysize The length of the key.
-	     *
-	     * @example
-	     *
-	     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);
-	     */
-	    function BlowFishInit(ctx, key, keysize)
-	    {
-	        for(let Row = 0; Row < 4; Row++)
-	        {
-	            ctx.sbox[Row] = [];
-	            for(let Col = 0; Col < 256; Col++)
-	            {
-	                ctx.sbox[Row][Col] = ORIG_S[Row][Col];
-	            }
-	        }
-
-	        let keyIndex = 0;
-	        for(let index = 0; index < N + 2; index++)
-	        {
-	            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];
-	            keyIndex++;
-	            if(keyIndex >= keysize)
-	            {
-	                keyIndex = 0;
-	            }
-	        }
-
-	        let Data1 = 0;
-	        let Data2 = 0;
-	        let res = 0;
-	        for(let i = 0; i < N + 2; i += 2)
-	        {
-	            res = BlowFish_Encrypt(ctx, Data1, Data2);
-	            Data1 = res.left;
-	            Data2 = res.right;
-	            ctx.pbox[i] = Data1;
-	            ctx.pbox[i + 1] = Data2;
-	        }
-
-	        for(let i = 0; i < 4; i++)
-	        {
-	            for(let j = 0; j < 256; j += 2)
-	            {
-	                res = BlowFish_Encrypt(ctx, Data1, Data2);
-	                Data1 = res.left;
-	                Data2 = res.right;
-	                ctx.sbox[i][j] = Data1;
-	                ctx.sbox[i][j + 1] = Data2;
-	            }
-	        }
-
-	        return true;
-	    }
-
-	    /**
-	     * Blowfish block cipher algorithm.
-	     */
-	    var Blowfish = C_algo.Blowfish = BlockCipher.extend({
-	        _doReset: function () {
-	            // Skip reset of nRounds has been set before and key did not change
-	            if (this._keyPriorReset === this._key) {
-	                return;
-	            }
-
-	            // Shortcuts
-	            var key = this._keyPriorReset = this._key;
-	            var keyWords = key.words;
-	            var keySize = key.sigBytes / 4;
-
-	            //Initialization pbox and sbox
-	            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
-	            M[offset] = res.left;
-	            M[offset + 1] = res.right;
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
-	            M[offset] = res.left;
-	            M[offset + 1] = res.right;
-	        },
-
-	        blockSize: 64/32,
-
-	        keySize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);
-	     */
-	    C.Blowfish = BlockCipher._createHelper(Blowfish);
-	}());
-
-
-	return CryptoJS.Blowfish;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/bower.json b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/bower.json
deleted file mode 100644
index 4dee617..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/bower.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "name": "crypto-js",
-  "version": "4.2.0",
-  "description": "JavaScript library of crypto standards.",
-  "license": "MIT",
-  "homepage": "http://github.com/brix/crypto-js",
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/brix/crypto-js.git"
-  },
-  "keywords": [
-    "security",
-    "crypto",
-    "Hash",
-    "MD5",
-    "SHA1",
-    "SHA-1",
-    "SHA256",
-    "SHA-256",
-    "RC4",
-    "Rabbit",
-    "AES",
-    "DES",
-    "PBKDF2",
-    "HMAC",
-    "OFB",
-    "CFB",
-    "CTR",
-    "CBC",
-    "Base64",
-    "Base64url"
-  ],
-  "main": "index.js",
-  "dependencies": {},
-  "browser": {
-    "crypto": false
-  },
-  "ignore": []
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/cipher-core.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/cipher-core.js
deleted file mode 100644
index 903f462..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/cipher-core.js
+++ /dev/null
@@ -1,895 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./evpkdf"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./evpkdf"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * Cipher core components.
-	 */
-	CryptoJS.lib.Cipher || (function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
-	    var C_enc = C.enc;
-	    var Utf8 = C_enc.Utf8;
-	    var Base64 = C_enc.Base64;
-	    var C_algo = C.algo;
-	    var EvpKDF = C_algo.EvpKDF;
-
-	    /**
-	     * Abstract base cipher template.
-	     *
-	     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
-	     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
-	     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
-	     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
-	     */
-	    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {WordArray} iv The IV to use for this operation.
-	         */
-	        cfg: Base.extend(),
-
-	        /**
-	         * Creates this cipher in encryption mode.
-	         *
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {Cipher} A cipher instance.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
-	         */
-	        createEncryptor: function (key, cfg) {
-	            return this.create(this._ENC_XFORM_MODE, key, cfg);
-	        },
-
-	        /**
-	         * Creates this cipher in decryption mode.
-	         *
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {Cipher} A cipher instance.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
-	         */
-	        createDecryptor: function (key, cfg) {
-	            return this.create(this._DEC_XFORM_MODE, key, cfg);
-	        },
-
-	        /**
-	         * Initializes a newly created cipher.
-	         *
-	         * @param {number} xformMode Either the encryption or decryption transormation mode constant.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
-	         */
-	        init: function (xformMode, key, cfg) {
-	            // Apply config defaults
-	            this.cfg = this.cfg.extend(cfg);
-
-	            // Store transform mode and key
-	            this._xformMode = xformMode;
-	            this._key = key;
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this cipher to its initial state.
-	         *
-	         * @example
-	         *
-	         *     cipher.reset();
-	         */
-	        reset: function () {
-	            // Reset data buffer
-	            BufferedBlockAlgorithm.reset.call(this);
-
-	            // Perform concrete-cipher logic
-	            this._doReset();
-	        },
-
-	        /**
-	         * Adds data to be encrypted or decrypted.
-	         *
-	         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
-	         *
-	         * @return {WordArray} The data after processing.
-	         *
-	         * @example
-	         *
-	         *     var encrypted = cipher.process('data');
-	         *     var encrypted = cipher.process(wordArray);
-	         */
-	        process: function (dataUpdate) {
-	            // Append
-	            this._append(dataUpdate);
-
-	            // Process available blocks
-	            return this._process();
-	        },
-
-	        /**
-	         * Finalizes the encryption or decryption process.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
-	         *
-	         * @return {WordArray} The data after final processing.
-	         *
-	         * @example
-	         *
-	         *     var encrypted = cipher.finalize();
-	         *     var encrypted = cipher.finalize('data');
-	         *     var encrypted = cipher.finalize(wordArray);
-	         */
-	        finalize: function (dataUpdate) {
-	            // Final data update
-	            if (dataUpdate) {
-	                this._append(dataUpdate);
-	            }
-
-	            // Perform concrete-cipher logic
-	            var finalProcessedData = this._doFinalize();
-
-	            return finalProcessedData;
-	        },
-
-	        keySize: 128/32,
-
-	        ivSize: 128/32,
-
-	        _ENC_XFORM_MODE: 1,
-
-	        _DEC_XFORM_MODE: 2,
-
-	        /**
-	         * Creates shortcut functions to a cipher's object interface.
-	         *
-	         * @param {Cipher} cipher The cipher to create a helper for.
-	         *
-	         * @return {Object} An object with encrypt and decrypt shortcut functions.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
-	         */
-	        _createHelper: (function () {
-	            function selectCipherStrategy(key) {
-	                if (typeof key == 'string') {
-	                    return PasswordBasedCipher;
-	                } else {
-	                    return SerializableCipher;
-	                }
-	            }
-
-	            return function (cipher) {
-	                return {
-	                    encrypt: function (message, key, cfg) {
-	                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
-	                    },
-
-	                    decrypt: function (ciphertext, key, cfg) {
-	                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
-	                    }
-	                };
-	            };
-	        }())
-	    });
-
-	    /**
-	     * Abstract base stream cipher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
-	     */
-	    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
-	        _doFinalize: function () {
-	            // Process partial blocks
-	            var finalProcessedBlocks = this._process(!!'flush');
-
-	            return finalProcessedBlocks;
-	        },
-
-	        blockSize: 1
-	    });
-
-	    /**
-	     * Mode namespace.
-	     */
-	    var C_mode = C.mode = {};
-
-	    /**
-	     * Abstract base block cipher mode template.
-	     */
-	    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
-	        /**
-	         * Creates this mode for encryption.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
-	         */
-	        createEncryptor: function (cipher, iv) {
-	            return this.Encryptor.create(cipher, iv);
-	        },
-
-	        /**
-	         * Creates this mode for decryption.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
-	         */
-	        createDecryptor: function (cipher, iv) {
-	            return this.Decryptor.create(cipher, iv);
-	        },
-
-	        /**
-	         * Initializes a newly created mode.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
-	         */
-	        init: function (cipher, iv) {
-	            this._cipher = cipher;
-	            this._iv = iv;
-	        }
-	    });
-
-	    /**
-	     * Cipher Block Chaining mode.
-	     */
-	    var CBC = C_mode.CBC = (function () {
-	        /**
-	         * Abstract base CBC mode.
-	         */
-	        var CBC = BlockCipherMode.extend();
-
-	        /**
-	         * CBC encryptor.
-	         */
-	        CBC.Encryptor = CBC.extend({
-	            /**
-	             * Processes the data block at offset.
-	             *
-	             * @param {Array} words The data words to operate on.
-	             * @param {number} offset The offset where the block starts.
-	             *
-	             * @example
-	             *
-	             *     mode.processBlock(data.words, offset);
-	             */
-	            processBlock: function (words, offset) {
-	                // Shortcuts
-	                var cipher = this._cipher;
-	                var blockSize = cipher.blockSize;
-
-	                // XOR and encrypt
-	                xorBlock.call(this, words, offset, blockSize);
-	                cipher.encryptBlock(words, offset);
-
-	                // Remember this block to use with next block
-	                this._prevBlock = words.slice(offset, offset + blockSize);
-	            }
-	        });
-
-	        /**
-	         * CBC decryptor.
-	         */
-	        CBC.Decryptor = CBC.extend({
-	            /**
-	             * Processes the data block at offset.
-	             *
-	             * @param {Array} words The data words to operate on.
-	             * @param {number} offset The offset where the block starts.
-	             *
-	             * @example
-	             *
-	             *     mode.processBlock(data.words, offset);
-	             */
-	            processBlock: function (words, offset) {
-	                // Shortcuts
-	                var cipher = this._cipher;
-	                var blockSize = cipher.blockSize;
-
-	                // Remember this block to use with next block
-	                var thisBlock = words.slice(offset, offset + blockSize);
-
-	                // Decrypt and XOR
-	                cipher.decryptBlock(words, offset);
-	                xorBlock.call(this, words, offset, blockSize);
-
-	                // This block becomes the previous block
-	                this._prevBlock = thisBlock;
-	            }
-	        });
-
-	        function xorBlock(words, offset, blockSize) {
-	            var block;
-
-	            // Shortcut
-	            var iv = this._iv;
-
-	            // Choose mixing block
-	            if (iv) {
-	                block = iv;
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            } else {
-	                block = this._prevBlock;
-	            }
-
-	            // XOR blocks
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= block[i];
-	            }
-	        }
-
-	        return CBC;
-	    }());
-
-	    /**
-	     * Padding namespace.
-	     */
-	    var C_pad = C.pad = {};
-
-	    /**
-	     * PKCS #5/7 padding strategy.
-	     */
-	    var Pkcs7 = C_pad.Pkcs7 = {
-	        /**
-	         * Pads data using the algorithm defined in PKCS #5/7.
-	         *
-	         * @param {WordArray} data The data to pad.
-	         * @param {number} blockSize The multiple that the data should be padded to.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
-	         */
-	        pad: function (data, blockSize) {
-	            // Shortcut
-	            var blockSizeBytes = blockSize * 4;
-
-	            // Count padding bytes
-	            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
-
-	            // Create padding word
-	            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
-
-	            // Create padding
-	            var paddingWords = [];
-	            for (var i = 0; i < nPaddingBytes; i += 4) {
-	                paddingWords.push(paddingWord);
-	            }
-	            var padding = WordArray.create(paddingWords, nPaddingBytes);
-
-	            // Add padding
-	            data.concat(padding);
-	        },
-
-	        /**
-	         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
-	         *
-	         * @param {WordArray} data The data to unpad.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     CryptoJS.pad.Pkcs7.unpad(wordArray);
-	         */
-	        unpad: function (data) {
-	            // Get number of padding bytes from last byte
-	            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	            // Remove padding
-	            data.sigBytes -= nPaddingBytes;
-	        }
-	    };
-
-	    /**
-	     * Abstract base block cipher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
-	     */
-	    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {Mode} mode The block mode to use. Default: CBC
-	         * @property {Padding} padding The padding strategy to use. Default: Pkcs7
-	         */
-	        cfg: Cipher.cfg.extend({
-	            mode: CBC,
-	            padding: Pkcs7
-	        }),
-
-	        reset: function () {
-	            var modeCreator;
-
-	            // Reset cipher
-	            Cipher.reset.call(this);
-
-	            // Shortcuts
-	            var cfg = this.cfg;
-	            var iv = cfg.iv;
-	            var mode = cfg.mode;
-
-	            // Reset block mode
-	            if (this._xformMode == this._ENC_XFORM_MODE) {
-	                modeCreator = mode.createEncryptor;
-	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-	                modeCreator = mode.createDecryptor;
-	                // Keep at least one block in the buffer for unpadding
-	                this._minBufferSize = 1;
-	            }
-
-	            if (this._mode && this._mode.__creator == modeCreator) {
-	                this._mode.init(this, iv && iv.words);
-	            } else {
-	                this._mode = modeCreator.call(mode, this, iv && iv.words);
-	                this._mode.__creator = modeCreator;
-	            }
-	        },
-
-	        _doProcessBlock: function (words, offset) {
-	            this._mode.processBlock(words, offset);
-	        },
-
-	        _doFinalize: function () {
-	            var finalProcessedBlocks;
-
-	            // Shortcut
-	            var padding = this.cfg.padding;
-
-	            // Finalize
-	            if (this._xformMode == this._ENC_XFORM_MODE) {
-	                // Pad data
-	                padding.pad(this._data, this.blockSize);
-
-	                // Process final blocks
-	                finalProcessedBlocks = this._process(!!'flush');
-	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-	                // Process final blocks
-	                finalProcessedBlocks = this._process(!!'flush');
-
-	                // Unpad data
-	                padding.unpad(finalProcessedBlocks);
-	            }
-
-	            return finalProcessedBlocks;
-	        },
-
-	        blockSize: 128/32
-	    });
-
-	    /**
-	     * A collection of cipher parameters.
-	     *
-	     * @property {WordArray} ciphertext The raw ciphertext.
-	     * @property {WordArray} key The key to this ciphertext.
-	     * @property {WordArray} iv The IV used in the ciphering operation.
-	     * @property {WordArray} salt The salt used with a key derivation function.
-	     * @property {Cipher} algorithm The cipher algorithm.
-	     * @property {Mode} mode The block mode used in the ciphering operation.
-	     * @property {Padding} padding The padding scheme used in the ciphering operation.
-	     * @property {number} blockSize The block size of the cipher.
-	     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
-	     */
-	    var CipherParams = C_lib.CipherParams = Base.extend({
-	        /**
-	         * Initializes a newly created cipher params object.
-	         *
-	         * @param {Object} cipherParams An object with any of the possible cipher parameters.
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.lib.CipherParams.create({
-	         *         ciphertext: ciphertextWordArray,
-	         *         key: keyWordArray,
-	         *         iv: ivWordArray,
-	         *         salt: saltWordArray,
-	         *         algorithm: CryptoJS.algo.AES,
-	         *         mode: CryptoJS.mode.CBC,
-	         *         padding: CryptoJS.pad.PKCS7,
-	         *         blockSize: 4,
-	         *         formatter: CryptoJS.format.OpenSSL
-	         *     });
-	         */
-	        init: function (cipherParams) {
-	            this.mixIn(cipherParams);
-	        },
-
-	        /**
-	         * Converts this cipher params object to a string.
-	         *
-	         * @param {Format} formatter (Optional) The formatting strategy to use.
-	         *
-	         * @return {string} The stringified cipher params.
-	         *
-	         * @throws Error If neither the formatter nor the default formatter is set.
-	         *
-	         * @example
-	         *
-	         *     var string = cipherParams + '';
-	         *     var string = cipherParams.toString();
-	         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
-	         */
-	        toString: function (formatter) {
-	            return (formatter || this.formatter).stringify(this);
-	        }
-	    });
-
-	    /**
-	     * Format namespace.
-	     */
-	    var C_format = C.format = {};
-
-	    /**
-	     * OpenSSL formatting strategy.
-	     */
-	    var OpenSSLFormatter = C_format.OpenSSL = {
-	        /**
-	         * Converts a cipher params object to an OpenSSL-compatible string.
-	         *
-	         * @param {CipherParams} cipherParams The cipher params object.
-	         *
-	         * @return {string} The OpenSSL-compatible string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
-	         */
-	        stringify: function (cipherParams) {
-	            var wordArray;
-
-	            // Shortcuts
-	            var ciphertext = cipherParams.ciphertext;
-	            var salt = cipherParams.salt;
-
-	            // Format
-	            if (salt) {
-	                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
-	            } else {
-	                wordArray = ciphertext;
-	            }
-
-	            return wordArray.toString(Base64);
-	        },
-
-	        /**
-	         * Converts an OpenSSL-compatible string to a cipher params object.
-	         *
-	         * @param {string} openSSLStr The OpenSSL-compatible string.
-	         *
-	         * @return {CipherParams} The cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
-	         */
-	        parse: function (openSSLStr) {
-	            var salt;
-
-	            // Parse base64
-	            var ciphertext = Base64.parse(openSSLStr);
-
-	            // Shortcut
-	            var ciphertextWords = ciphertext.words;
-
-	            // Test for salt
-	            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
-	                // Extract salt
-	                salt = WordArray.create(ciphertextWords.slice(2, 4));
-
-	                // Remove salt from ciphertext
-	                ciphertextWords.splice(0, 4);
-	                ciphertext.sigBytes -= 16;
-	            }
-
-	            return CipherParams.create({ ciphertext: ciphertext, salt: salt });
-	        }
-	    };
-
-	    /**
-	     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
-	     */
-	    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
-	         */
-	        cfg: Base.extend({
-	            format: OpenSSLFormatter
-	        }),
-
-	        /**
-	         * Encrypts a message.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {WordArray|string} message The message to encrypt.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {CipherParams} A cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         */
-	        encrypt: function (cipher, message, key, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Encrypt
-	            var encryptor = cipher.createEncryptor(key, cfg);
-	            var ciphertext = encryptor.finalize(message);
-
-	            // Shortcut
-	            var cipherCfg = encryptor.cfg;
-
-	            // Create and return serializable cipher params
-	            return CipherParams.create({
-	                ciphertext: ciphertext,
-	                key: key,
-	                iv: cipherCfg.iv,
-	                algorithm: cipher,
-	                mode: cipherCfg.mode,
-	                padding: cipherCfg.padding,
-	                blockSize: cipher.blockSize,
-	                formatter: cfg.format
-	            });
-	        },
-
-	        /**
-	         * Decrypts serialized ciphertext.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {WordArray} The plaintext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         */
-	        decrypt: function (cipher, ciphertext, key, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Convert string to CipherParams
-	            ciphertext = this._parse(ciphertext, cfg.format);
-
-	            // Decrypt
-	            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
-
-	            return plaintext;
-	        },
-
-	        /**
-	         * Converts serialized ciphertext to CipherParams,
-	         * else assumed CipherParams already and returns ciphertext unchanged.
-	         *
-	         * @param {CipherParams|string} ciphertext The ciphertext.
-	         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
-	         *
-	         * @return {CipherParams} The unserialized ciphertext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
-	         */
-	        _parse: function (ciphertext, format) {
-	            if (typeof ciphertext == 'string') {
-	                return format.parse(ciphertext, this);
-	            } else {
-	                return ciphertext;
-	            }
-	        }
-	    });
-
-	    /**
-	     * Key derivation function namespace.
-	     */
-	    var C_kdf = C.kdf = {};
-
-	    /**
-	     * OpenSSL key derivation function.
-	     */
-	    var OpenSSLKdf = C_kdf.OpenSSL = {
-	        /**
-	         * Derives a key and IV from a password.
-	         *
-	         * @param {string} password The password to derive from.
-	         * @param {number} keySize The size in words of the key to generate.
-	         * @param {number} ivSize The size in words of the IV to generate.
-	         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
-	         *
-	         * @return {CipherParams} A cipher params object with the key, IV, and salt.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
-	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
-	         */
-	        execute: function (password, keySize, ivSize, salt, hasher) {
-	            // Generate random salt
-	            if (!salt) {
-	                salt = WordArray.random(64/8);
-	            }
-
-	            // Derive key and IV
-	            if (!hasher) {
-	                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
-	            } else {
-	                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
-	            }
-
-
-	            // Separate key and IV
-	            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
-	            key.sigBytes = keySize * 4;
-
-	            // Return params
-	            return CipherParams.create({ key: key, iv: iv, salt: salt });
-	        }
-	    };
-
-	    /**
-	     * A serializable cipher wrapper that derives the key from a password,
-	     * and returns ciphertext as a serializable cipher params object.
-	     */
-	    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
-	         */
-	        cfg: SerializableCipher.cfg.extend({
-	            kdf: OpenSSLKdf
-	        }),
-
-	        /**
-	         * Encrypts a message using a password.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {WordArray|string} message The message to encrypt.
-	         * @param {string} password The password.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {CipherParams} A cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
-	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
-	         */
-	        encrypt: function (cipher, message, password, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Derive key and other params
-	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);
-
-	            // Add IV to config
-	            cfg.iv = derivedParams.iv;
-
-	            // Encrypt
-	            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
-
-	            // Mix in derived params
-	            ciphertext.mixIn(derivedParams);
-
-	            return ciphertext;
-	        },
-
-	        /**
-	         * Decrypts serialized ciphertext using a password.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
-	         * @param {string} password The password.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {WordArray} The plaintext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
-	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
-	         */
-	        decrypt: function (cipher, ciphertext, password, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Convert string to CipherParams
-	            ciphertext = this._parse(ciphertext, cfg.format);
-
-	            // Derive key and other params
-	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);
-
-	            // Add IV to config
-	            cfg.iv = derivedParams.iv;
-
-	            // Decrypt
-	            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
-
-	            return plaintext;
-	        }
-	    });
-	}());
-
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/core.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/core.js
deleted file mode 100644
index e3a498b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/core.js
+++ /dev/null
@@ -1,807 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory();
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define([], factory);
-	}
-	else {
-		// Global (browser)
-		root.CryptoJS = factory();
-	}
-}(this, function () {
-
-	/*globals window, global, require*/
-
-	/**
-	 * CryptoJS core components.
-	 */
-	var CryptoJS = CryptoJS || (function (Math, undefined) {
-
-	    var crypto;
-
-	    // Native crypto from window (Browser)
-	    if (typeof window !== 'undefined' && window.crypto) {
-	        crypto = window.crypto;
-	    }
-
-	    // Native crypto in web worker (Browser)
-	    if (typeof self !== 'undefined' && self.crypto) {
-	        crypto = self.crypto;
-	    }
-
-	    // Native crypto from worker
-	    if (typeof globalThis !== 'undefined' && globalThis.crypto) {
-	        crypto = globalThis.crypto;
-	    }
-
-	    // Native (experimental IE 11) crypto from window (Browser)
-	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
-	        crypto = window.msCrypto;
-	    }
-
-	    // Native crypto from global (NodeJS)
-	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
-	        crypto = global.crypto;
-	    }
-
-	    // Native crypto import via require (NodeJS)
-	    if (!crypto && typeof require === 'function') {
-	        try {
-	            crypto = require('crypto');
-	        } catch (err) {}
-	    }
-
-	    /*
-	     * Cryptographically secure pseudorandom number generator
-	     *
-	     * As Math.random() is cryptographically not safe to use
-	     */
-	    var cryptoSecureRandomInt = function () {
-	        if (crypto) {
-	            // Use getRandomValues method (Browser)
-	            if (typeof crypto.getRandomValues === 'function') {
-	                try {
-	                    return crypto.getRandomValues(new Uint32Array(1))[0];
-	                } catch (err) {}
-	            }
-
-	            // Use randomBytes method (NodeJS)
-	            if (typeof crypto.randomBytes === 'function') {
-	                try {
-	                    return crypto.randomBytes(4).readInt32LE();
-	                } catch (err) {}
-	            }
-	        }
-
-	        throw new Error('Native crypto module could not be used to get secure random number.');
-	    };
-
-	    /*
-	     * Local polyfill of Object.create
-
-	     */
-	    var create = Object.create || (function () {
-	        function F() {}
-
-	        return function (obj) {
-	            var subtype;
-
-	            F.prototype = obj;
-
-	            subtype = new F();
-
-	            F.prototype = null;
-
-	            return subtype;
-	        };
-	    }());
-
-	    /**
-	     * CryptoJS namespace.
-	     */
-	    var C = {};
-
-	    /**
-	     * Library namespace.
-	     */
-	    var C_lib = C.lib = {};
-
-	    /**
-	     * Base object for prototypal inheritance.
-	     */
-	    var Base = C_lib.Base = (function () {
-
-
-	        return {
-	            /**
-	             * Creates a new object that inherits from this object.
-	             *
-	             * @param {Object} overrides Properties to copy into the new object.
-	             *
-	             * @return {Object} The new object.
-	             *
-	             * @static
-	             *
-	             * @example
-	             *
-	             *     var MyType = CryptoJS.lib.Base.extend({
-	             *         field: 'value',
-	             *
-	             *         method: function () {
-	             *         }
-	             *     });
-	             */
-	            extend: function (overrides) {
-	                // Spawn
-	                var subtype = create(this);
-
-	                // Augment
-	                if (overrides) {
-	                    subtype.mixIn(overrides);
-	                }
-
-	                // Create default initializer
-	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
-	                    subtype.init = function () {
-	                        subtype.$super.init.apply(this, arguments);
-	                    };
-	                }
-
-	                // Initializer's prototype is the subtype object
-	                subtype.init.prototype = subtype;
-
-	                // Reference supertype
-	                subtype.$super = this;
-
-	                return subtype;
-	            },
-
-	            /**
-	             * Extends this object and runs the init method.
-	             * Arguments to create() will be passed to init().
-	             *
-	             * @return {Object} The new object.
-	             *
-	             * @static
-	             *
-	             * @example
-	             *
-	             *     var instance = MyType.create();
-	             */
-	            create: function () {
-	                var instance = this.extend();
-	                instance.init.apply(instance, arguments);
-
-	                return instance;
-	            },
-
-	            /**
-	             * Initializes a newly created object.
-	             * Override this method to add some logic when your objects are created.
-	             *
-	             * @example
-	             *
-	             *     var MyType = CryptoJS.lib.Base.extend({
-	             *         init: function () {
-	             *             // ...
-	             *         }
-	             *     });
-	             */
-	            init: function () {
-	            },
-
-	            /**
-	             * Copies properties into this object.
-	             *
-	             * @param {Object} properties The properties to mix in.
-	             *
-	             * @example
-	             *
-	             *     MyType.mixIn({
-	             *         field: 'value'
-	             *     });
-	             */
-	            mixIn: function (properties) {
-	                for (var propertyName in properties) {
-	                    if (properties.hasOwnProperty(propertyName)) {
-	                        this[propertyName] = properties[propertyName];
-	                    }
-	                }
-
-	                // IE won't copy toString using the loop above
-	                if (properties.hasOwnProperty('toString')) {
-	                    this.toString = properties.toString;
-	                }
-	            },
-
-	            /**
-	             * Creates a copy of this object.
-	             *
-	             * @return {Object} The clone.
-	             *
-	             * @example
-	             *
-	             *     var clone = instance.clone();
-	             */
-	            clone: function () {
-	                return this.init.prototype.extend(this);
-	            }
-	        };
-	    }());
-
-	    /**
-	     * An array of 32-bit words.
-	     *
-	     * @property {Array} words The array of 32-bit words.
-	     * @property {number} sigBytes The number of significant bytes in this word array.
-	     */
-	    var WordArray = C_lib.WordArray = Base.extend({
-	        /**
-	         * Initializes a newly created word array.
-	         *
-	         * @param {Array} words (Optional) An array of 32-bit words.
-	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.lib.WordArray.create();
-	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
-	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
-	         */
-	        init: function (words, sigBytes) {
-	            words = this.words = words || [];
-
-	            if (sigBytes != undefined) {
-	                this.sigBytes = sigBytes;
-	            } else {
-	                this.sigBytes = words.length * 4;
-	            }
-	        },
-
-	        /**
-	         * Converts this word array to a string.
-	         *
-	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
-	         *
-	         * @return {string} The stringified word array.
-	         *
-	         * @example
-	         *
-	         *     var string = wordArray + '';
-	         *     var string = wordArray.toString();
-	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
-	         */
-	        toString: function (encoder) {
-	            return (encoder || Hex).stringify(this);
-	        },
-
-	        /**
-	         * Concatenates a word array to this word array.
-	         *
-	         * @param {WordArray} wordArray The word array to append.
-	         *
-	         * @return {WordArray} This word array.
-	         *
-	         * @example
-	         *
-	         *     wordArray1.concat(wordArray2);
-	         */
-	        concat: function (wordArray) {
-	            // Shortcuts
-	            var thisWords = this.words;
-	            var thatWords = wordArray.words;
-	            var thisSigBytes = this.sigBytes;
-	            var thatSigBytes = wordArray.sigBytes;
-
-	            // Clamp excess bits
-	            this.clamp();
-
-	            // Concat
-	            if (thisSigBytes % 4) {
-	                // Copy one byte at a time
-	                for (var i = 0; i < thatSigBytes; i++) {
-	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
-	                }
-	            } else {
-	                // Copy one word at a time
-	                for (var j = 0; j < thatSigBytes; j += 4) {
-	                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
-	                }
-	            }
-	            this.sigBytes += thatSigBytes;
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Removes insignificant bits.
-	         *
-	         * @example
-	         *
-	         *     wordArray.clamp();
-	         */
-	        clamp: function () {
-	            // Shortcuts
-	            var words = this.words;
-	            var sigBytes = this.sigBytes;
-
-	            // Clamp
-	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
-	            words.length = Math.ceil(sigBytes / 4);
-	        },
-
-	        /**
-	         * Creates a copy of this word array.
-	         *
-	         * @return {WordArray} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = wordArray.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-	            clone.words = this.words.slice(0);
-
-	            return clone;
-	        },
-
-	        /**
-	         * Creates a word array filled with random bytes.
-	         *
-	         * @param {number} nBytes The number of random bytes to generate.
-	         *
-	         * @return {WordArray} The random word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
-	         */
-	        random: function (nBytes) {
-	            var words = [];
-
-	            for (var i = 0; i < nBytes; i += 4) {
-	                words.push(cryptoSecureRandomInt());
-	            }
-
-	            return new WordArray.init(words, nBytes);
-	        }
-	    });
-
-	    /**
-	     * Encoder namespace.
-	     */
-	    var C_enc = C.enc = {};
-
-	    /**
-	     * Hex encoding strategy.
-	     */
-	    var Hex = C_enc.Hex = {
-	        /**
-	         * Converts a word array to a hex string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The hex string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var hexChars = [];
-	            for (var i = 0; i < sigBytes; i++) {
-	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                hexChars.push((bite >>> 4).toString(16));
-	                hexChars.push((bite & 0x0f).toString(16));
-	            }
-
-	            return hexChars.join('');
-	        },
-
-	        /**
-	         * Converts a hex string to a word array.
-	         *
-	         * @param {string} hexStr The hex string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
-	         */
-	        parse: function (hexStr) {
-	            // Shortcut
-	            var hexStrLength = hexStr.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < hexStrLength; i += 2) {
-	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
-	            }
-
-	            return new WordArray.init(words, hexStrLength / 2);
-	        }
-	    };
-
-	    /**
-	     * Latin1 encoding strategy.
-	     */
-	    var Latin1 = C_enc.Latin1 = {
-	        /**
-	         * Converts a word array to a Latin1 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The Latin1 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var latin1Chars = [];
-	            for (var i = 0; i < sigBytes; i++) {
-	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                latin1Chars.push(String.fromCharCode(bite));
-	            }
-
-	            return latin1Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Latin1 string to a word array.
-	         *
-	         * @param {string} latin1Str The Latin1 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
-	         */
-	        parse: function (latin1Str) {
-	            // Shortcut
-	            var latin1StrLength = latin1Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < latin1StrLength; i++) {
-	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
-	            }
-
-	            return new WordArray.init(words, latin1StrLength);
-	        }
-	    };
-
-	    /**
-	     * UTF-8 encoding strategy.
-	     */
-	    var Utf8 = C_enc.Utf8 = {
-	        /**
-	         * Converts a word array to a UTF-8 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-8 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            try {
-	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
-	            } catch (e) {
-	                throw new Error('Malformed UTF-8 data');
-	            }
-	        },
-
-	        /**
-	         * Converts a UTF-8 string to a word array.
-	         *
-	         * @param {string} utf8Str The UTF-8 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
-	         */
-	        parse: function (utf8Str) {
-	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
-	        }
-	    };
-
-	    /**
-	     * Abstract buffered block algorithm template.
-	     *
-	     * The property blockSize must be implemented in a concrete subtype.
-	     *
-	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
-	     */
-	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
-	        /**
-	         * Resets this block algorithm's data buffer to its initial state.
-	         *
-	         * @example
-	         *
-	         *     bufferedBlockAlgorithm.reset();
-	         */
-	        reset: function () {
-	            // Initial values
-	            this._data = new WordArray.init();
-	            this._nDataBytes = 0;
-	        },
-
-	        /**
-	         * Adds new data to this block algorithm's buffer.
-	         *
-	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
-	         *
-	         * @example
-	         *
-	         *     bufferedBlockAlgorithm._append('data');
-	         *     bufferedBlockAlgorithm._append(wordArray);
-	         */
-	        _append: function (data) {
-	            // Convert string to WordArray, else assume WordArray already
-	            if (typeof data == 'string') {
-	                data = Utf8.parse(data);
-	            }
-
-	            // Append
-	            this._data.concat(data);
-	            this._nDataBytes += data.sigBytes;
-	        },
-
-	        /**
-	         * Processes available data blocks.
-	         *
-	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
-	         *
-	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
-	         *
-	         * @return {WordArray} The processed data.
-	         *
-	         * @example
-	         *
-	         *     var processedData = bufferedBlockAlgorithm._process();
-	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
-	         */
-	        _process: function (doFlush) {
-	            var processedWords;
-
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-	            var dataSigBytes = data.sigBytes;
-	            var blockSize = this.blockSize;
-	            var blockSizeBytes = blockSize * 4;
-
-	            // Count blocks ready
-	            var nBlocksReady = dataSigBytes / blockSizeBytes;
-	            if (doFlush) {
-	                // Round up to include partial blocks
-	                nBlocksReady = Math.ceil(nBlocksReady);
-	            } else {
-	                // Round down to include only full blocks,
-	                // less the number of blocks that must remain in the buffer
-	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
-	            }
-
-	            // Count words ready
-	            var nWordsReady = nBlocksReady * blockSize;
-
-	            // Count bytes ready
-	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
-
-	            // Process blocks
-	            if (nWordsReady) {
-	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
-	                    // Perform concrete-algorithm logic
-	                    this._doProcessBlock(dataWords, offset);
-	                }
-
-	                // Remove processed words
-	                processedWords = dataWords.splice(0, nWordsReady);
-	                data.sigBytes -= nBytesReady;
-	            }
-
-	            // Return processed words
-	            return new WordArray.init(processedWords, nBytesReady);
-	        },
-
-	        /**
-	         * Creates a copy of this object.
-	         *
-	         * @return {Object} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = bufferedBlockAlgorithm.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-	            clone._data = this._data.clone();
-
-	            return clone;
-	        },
-
-	        _minBufferSize: 0
-	    });
-
-	    /**
-	     * Abstract hasher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
-	     */
-	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
-	        /**
-	         * Configuration options.
-	         */
-	        cfg: Base.extend(),
-
-	        /**
-	         * Initializes a newly created hasher.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
-	         *
-	         * @example
-	         *
-	         *     var hasher = CryptoJS.algo.SHA256.create();
-	         */
-	        init: function (cfg) {
-	            // Apply config defaults
-	            this.cfg = this.cfg.extend(cfg);
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this hasher to its initial state.
-	         *
-	         * @example
-	         *
-	         *     hasher.reset();
-	         */
-	        reset: function () {
-	            // Reset data buffer
-	            BufferedBlockAlgorithm.reset.call(this);
-
-	            // Perform concrete-hasher logic
-	            this._doReset();
-	        },
-
-	        /**
-	         * Updates this hasher with a message.
-	         *
-	         * @param {WordArray|string} messageUpdate The message to append.
-	         *
-	         * @return {Hasher} This hasher.
-	         *
-	         * @example
-	         *
-	         *     hasher.update('message');
-	         *     hasher.update(wordArray);
-	         */
-	        update: function (messageUpdate) {
-	            // Append
-	            this._append(messageUpdate);
-
-	            // Update the hash
-	            this._process();
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Finalizes the hash computation.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
-	         *
-	         * @return {WordArray} The hash.
-	         *
-	         * @example
-	         *
-	         *     var hash = hasher.finalize();
-	         *     var hash = hasher.finalize('message');
-	         *     var hash = hasher.finalize(wordArray);
-	         */
-	        finalize: function (messageUpdate) {
-	            // Final message update
-	            if (messageUpdate) {
-	                this._append(messageUpdate);
-	            }
-
-	            // Perform concrete-hasher logic
-	            var hash = this._doFinalize();
-
-	            return hash;
-	        },
-
-	        blockSize: 512/32,
-
-	        /**
-	         * Creates a shortcut function to a hasher's object interface.
-	         *
-	         * @param {Hasher} hasher The hasher to create a helper for.
-	         *
-	         * @return {Function} The shortcut function.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
-	         */
-	        _createHelper: function (hasher) {
-	            return function (message, cfg) {
-	                return new hasher.init(cfg).finalize(message);
-	            };
-	        },
-
-	        /**
-	         * Creates a shortcut function to the HMAC's object interface.
-	         *
-	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
-	         *
-	         * @return {Function} The shortcut function.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
-	         */
-	        _createHmacHelper: function (hasher) {
-	            return function (message, key) {
-	                return new C_algo.HMAC.init(hasher, key).finalize(message);
-	            };
-	        }
-	    });
-
-	    /**
-	     * Algorithm namespace.
-	     */
-	    var C_algo = C.algo = {};
-
-	    return C;
-	}(Math));
-
-
-	return CryptoJS;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/crypto-js.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/crypto-js.js
deleted file mode 100644
index 958ee53..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/crypto-js.js
+++ /dev/null
@@ -1,6657 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory();
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define([], factory);
-	}
-	else {
-		// Global (browser)
-		root.CryptoJS = factory();
-	}
-}(this, function () {
-
-	/*globals window, global, require*/
-
-	/**
-	 * CryptoJS core components.
-	 */
-	var CryptoJS = CryptoJS || (function (Math, undefined) {
-
-	    var crypto;
-
-	    // Native crypto from window (Browser)
-	    if (typeof window !== 'undefined' && window.crypto) {
-	        crypto = window.crypto;
-	    }
-
-	    // Native crypto in web worker (Browser)
-	    if (typeof self !== 'undefined' && self.crypto) {
-	        crypto = self.crypto;
-	    }
-
-	    // Native crypto from worker
-	    if (typeof globalThis !== 'undefined' && globalThis.crypto) {
-	        crypto = globalThis.crypto;
-	    }
-
-	    // Native (experimental IE 11) crypto from window (Browser)
-	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
-	        crypto = window.msCrypto;
-	    }
-
-	    // Native crypto from global (NodeJS)
-	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
-	        crypto = global.crypto;
-	    }
-
-	    // Native crypto import via require (NodeJS)
-	    if (!crypto && typeof require === 'function') {
-	        try {
-	            crypto = require('crypto');
-	        } catch (err) {}
-	    }
-
-	    /*
-	     * Cryptographically secure pseudorandom number generator
-	     *
-	     * As Math.random() is cryptographically not safe to use
-	     */
-	    var cryptoSecureRandomInt = function () {
-	        if (crypto) {
-	            // Use getRandomValues method (Browser)
-	            if (typeof crypto.getRandomValues === 'function') {
-	                try {
-	                    return crypto.getRandomValues(new Uint32Array(1))[0];
-	                } catch (err) {}
-	            }
-
-	            // Use randomBytes method (NodeJS)
-	            if (typeof crypto.randomBytes === 'function') {
-	                try {
-	                    return crypto.randomBytes(4).readInt32LE();
-	                } catch (err) {}
-	            }
-	        }
-
-	        throw new Error('Native crypto module could not be used to get secure random number.');
-	    };
-
-	    /*
-	     * Local polyfill of Object.create
-
-	     */
-	    var create = Object.create || (function () {
-	        function F() {}
-
-	        return function (obj) {
-	            var subtype;
-
-	            F.prototype = obj;
-
-	            subtype = new F();
-
-	            F.prototype = null;
-
-	            return subtype;
-	        };
-	    }());
-
-	    /**
-	     * CryptoJS namespace.
-	     */
-	    var C = {};
-
-	    /**
-	     * Library namespace.
-	     */
-	    var C_lib = C.lib = {};
-
-	    /**
-	     * Base object for prototypal inheritance.
-	     */
-	    var Base = C_lib.Base = (function () {
-
-
-	        return {
-	            /**
-	             * Creates a new object that inherits from this object.
-	             *
-	             * @param {Object} overrides Properties to copy into the new object.
-	             *
-	             * @return {Object} The new object.
-	             *
-	             * @static
-	             *
-	             * @example
-	             *
-	             *     var MyType = CryptoJS.lib.Base.extend({
-	             *         field: 'value',
-	             *
-	             *         method: function () {
-	             *         }
-	             *     });
-	             */
-	            extend: function (overrides) {
-	                // Spawn
-	                var subtype = create(this);
-
-	                // Augment
-	                if (overrides) {
-	                    subtype.mixIn(overrides);
-	                }
-
-	                // Create default initializer
-	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
-	                    subtype.init = function () {
-	                        subtype.$super.init.apply(this, arguments);
-	                    };
-	                }
-
-	                // Initializer's prototype is the subtype object
-	                subtype.init.prototype = subtype;
-
-	                // Reference supertype
-	                subtype.$super = this;
-
-	                return subtype;
-	            },
-
-	            /**
-	             * Extends this object and runs the init method.
-	             * Arguments to create() will be passed to init().
-	             *
-	             * @return {Object} The new object.
-	             *
-	             * @static
-	             *
-	             * @example
-	             *
-	             *     var instance = MyType.create();
-	             */
-	            create: function () {
-	                var instance = this.extend();
-	                instance.init.apply(instance, arguments);
-
-	                return instance;
-	            },
-
-	            /**
-	             * Initializes a newly created object.
-	             * Override this method to add some logic when your objects are created.
-	             *
-	             * @example
-	             *
-	             *     var MyType = CryptoJS.lib.Base.extend({
-	             *         init: function () {
-	             *             // ...
-	             *         }
-	             *     });
-	             */
-	            init: function () {
-	            },
-
-	            /**
-	             * Copies properties into this object.
-	             *
-	             * @param {Object} properties The properties to mix in.
-	             *
-	             * @example
-	             *
-	             *     MyType.mixIn({
-	             *         field: 'value'
-	             *     });
-	             */
-	            mixIn: function (properties) {
-	                for (var propertyName in properties) {
-	                    if (properties.hasOwnProperty(propertyName)) {
-	                        this[propertyName] = properties[propertyName];
-	                    }
-	                }
-
-	                // IE won't copy toString using the loop above
-	                if (properties.hasOwnProperty('toString')) {
-	                    this.toString = properties.toString;
-	                }
-	            },
-
-	            /**
-	             * Creates a copy of this object.
-	             *
-	             * @return {Object} The clone.
-	             *
-	             * @example
-	             *
-	             *     var clone = instance.clone();
-	             */
-	            clone: function () {
-	                return this.init.prototype.extend(this);
-	            }
-	        };
-	    }());
-
-	    /**
-	     * An array of 32-bit words.
-	     *
-	     * @property {Array} words The array of 32-bit words.
-	     * @property {number} sigBytes The number of significant bytes in this word array.
-	     */
-	    var WordArray = C_lib.WordArray = Base.extend({
-	        /**
-	         * Initializes a newly created word array.
-	         *
-	         * @param {Array} words (Optional) An array of 32-bit words.
-	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.lib.WordArray.create();
-	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
-	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
-	         */
-	        init: function (words, sigBytes) {
-	            words = this.words = words || [];
-
-	            if (sigBytes != undefined) {
-	                this.sigBytes = sigBytes;
-	            } else {
-	                this.sigBytes = words.length * 4;
-	            }
-	        },
-
-	        /**
-	         * Converts this word array to a string.
-	         *
-	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
-	         *
-	         * @return {string} The stringified word array.
-	         *
-	         * @example
-	         *
-	         *     var string = wordArray + '';
-	         *     var string = wordArray.toString();
-	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
-	         */
-	        toString: function (encoder) {
-	            return (encoder || Hex).stringify(this);
-	        },
-
-	        /**
-	         * Concatenates a word array to this word array.
-	         *
-	         * @param {WordArray} wordArray The word array to append.
-	         *
-	         * @return {WordArray} This word array.
-	         *
-	         * @example
-	         *
-	         *     wordArray1.concat(wordArray2);
-	         */
-	        concat: function (wordArray) {
-	            // Shortcuts
-	            var thisWords = this.words;
-	            var thatWords = wordArray.words;
-	            var thisSigBytes = this.sigBytes;
-	            var thatSigBytes = wordArray.sigBytes;
-
-	            // Clamp excess bits
-	            this.clamp();
-
-	            // Concat
-	            if (thisSigBytes % 4) {
-	                // Copy one byte at a time
-	                for (var i = 0; i < thatSigBytes; i++) {
-	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
-	                }
-	            } else {
-	                // Copy one word at a time
-	                for (var j = 0; j < thatSigBytes; j += 4) {
-	                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
-	                }
-	            }
-	            this.sigBytes += thatSigBytes;
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Removes insignificant bits.
-	         *
-	         * @example
-	         *
-	         *     wordArray.clamp();
-	         */
-	        clamp: function () {
-	            // Shortcuts
-	            var words = this.words;
-	            var sigBytes = this.sigBytes;
-
-	            // Clamp
-	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
-	            words.length = Math.ceil(sigBytes / 4);
-	        },
-
-	        /**
-	         * Creates a copy of this word array.
-	         *
-	         * @return {WordArray} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = wordArray.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-	            clone.words = this.words.slice(0);
-
-	            return clone;
-	        },
-
-	        /**
-	         * Creates a word array filled with random bytes.
-	         *
-	         * @param {number} nBytes The number of random bytes to generate.
-	         *
-	         * @return {WordArray} The random word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
-	         */
-	        random: function (nBytes) {
-	            var words = [];
-
-	            for (var i = 0; i < nBytes; i += 4) {
-	                words.push(cryptoSecureRandomInt());
-	            }
-
-	            return new WordArray.init(words, nBytes);
-	        }
-	    });
-
-	    /**
-	     * Encoder namespace.
-	     */
-	    var C_enc = C.enc = {};
-
-	    /**
-	     * Hex encoding strategy.
-	     */
-	    var Hex = C_enc.Hex = {
-	        /**
-	         * Converts a word array to a hex string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The hex string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var hexChars = [];
-	            for (var i = 0; i < sigBytes; i++) {
-	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                hexChars.push((bite >>> 4).toString(16));
-	                hexChars.push((bite & 0x0f).toString(16));
-	            }
-
-	            return hexChars.join('');
-	        },
-
-	        /**
-	         * Converts a hex string to a word array.
-	         *
-	         * @param {string} hexStr The hex string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
-	         */
-	        parse: function (hexStr) {
-	            // Shortcut
-	            var hexStrLength = hexStr.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < hexStrLength; i += 2) {
-	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
-	            }
-
-	            return new WordArray.init(words, hexStrLength / 2);
-	        }
-	    };
-
-	    /**
-	     * Latin1 encoding strategy.
-	     */
-	    var Latin1 = C_enc.Latin1 = {
-	        /**
-	         * Converts a word array to a Latin1 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The Latin1 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var latin1Chars = [];
-	            for (var i = 0; i < sigBytes; i++) {
-	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                latin1Chars.push(String.fromCharCode(bite));
-	            }
-
-	            return latin1Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Latin1 string to a word array.
-	         *
-	         * @param {string} latin1Str The Latin1 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
-	         */
-	        parse: function (latin1Str) {
-	            // Shortcut
-	            var latin1StrLength = latin1Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < latin1StrLength; i++) {
-	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
-	            }
-
-	            return new WordArray.init(words, latin1StrLength);
-	        }
-	    };
-
-	    /**
-	     * UTF-8 encoding strategy.
-	     */
-	    var Utf8 = C_enc.Utf8 = {
-	        /**
-	         * Converts a word array to a UTF-8 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-8 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            try {
-	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
-	            } catch (e) {
-	                throw new Error('Malformed UTF-8 data');
-	            }
-	        },
-
-	        /**
-	         * Converts a UTF-8 string to a word array.
-	         *
-	         * @param {string} utf8Str The UTF-8 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
-	         */
-	        parse: function (utf8Str) {
-	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
-	        }
-	    };
-
-	    /**
-	     * Abstract buffered block algorithm template.
-	     *
-	     * The property blockSize must be implemented in a concrete subtype.
-	     *
-	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
-	     */
-	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
-	        /**
-	         * Resets this block algorithm's data buffer to its initial state.
-	         *
-	         * @example
-	         *
-	         *     bufferedBlockAlgorithm.reset();
-	         */
-	        reset: function () {
-	            // Initial values
-	            this._data = new WordArray.init();
-	            this._nDataBytes = 0;
-	        },
-
-	        /**
-	         * Adds new data to this block algorithm's buffer.
-	         *
-	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
-	         *
-	         * @example
-	         *
-	         *     bufferedBlockAlgorithm._append('data');
-	         *     bufferedBlockAlgorithm._append(wordArray);
-	         */
-	        _append: function (data) {
-	            // Convert string to WordArray, else assume WordArray already
-	            if (typeof data == 'string') {
-	                data = Utf8.parse(data);
-	            }
-
-	            // Append
-	            this._data.concat(data);
-	            this._nDataBytes += data.sigBytes;
-	        },
-
-	        /**
-	         * Processes available data blocks.
-	         *
-	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
-	         *
-	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
-	         *
-	         * @return {WordArray} The processed data.
-	         *
-	         * @example
-	         *
-	         *     var processedData = bufferedBlockAlgorithm._process();
-	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
-	         */
-	        _process: function (doFlush) {
-	            var processedWords;
-
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-	            var dataSigBytes = data.sigBytes;
-	            var blockSize = this.blockSize;
-	            var blockSizeBytes = blockSize * 4;
-
-	            // Count blocks ready
-	            var nBlocksReady = dataSigBytes / blockSizeBytes;
-	            if (doFlush) {
-	                // Round up to include partial blocks
-	                nBlocksReady = Math.ceil(nBlocksReady);
-	            } else {
-	                // Round down to include only full blocks,
-	                // less the number of blocks that must remain in the buffer
-	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
-	            }
-
-	            // Count words ready
-	            var nWordsReady = nBlocksReady * blockSize;
-
-	            // Count bytes ready
-	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
-
-	            // Process blocks
-	            if (nWordsReady) {
-	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
-	                    // Perform concrete-algorithm logic
-	                    this._doProcessBlock(dataWords, offset);
-	                }
-
-	                // Remove processed words
-	                processedWords = dataWords.splice(0, nWordsReady);
-	                data.sigBytes -= nBytesReady;
-	            }
-
-	            // Return processed words
-	            return new WordArray.init(processedWords, nBytesReady);
-	        },
-
-	        /**
-	         * Creates a copy of this object.
-	         *
-	         * @return {Object} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = bufferedBlockAlgorithm.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-	            clone._data = this._data.clone();
-
-	            return clone;
-	        },
-
-	        _minBufferSize: 0
-	    });
-
-	    /**
-	     * Abstract hasher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
-	     */
-	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
-	        /**
-	         * Configuration options.
-	         */
-	        cfg: Base.extend(),
-
-	        /**
-	         * Initializes a newly created hasher.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
-	         *
-	         * @example
-	         *
-	         *     var hasher = CryptoJS.algo.SHA256.create();
-	         */
-	        init: function (cfg) {
-	            // Apply config defaults
-	            this.cfg = this.cfg.extend(cfg);
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this hasher to its initial state.
-	         *
-	         * @example
-	         *
-	         *     hasher.reset();
-	         */
-	        reset: function () {
-	            // Reset data buffer
-	            BufferedBlockAlgorithm.reset.call(this);
-
-	            // Perform concrete-hasher logic
-	            this._doReset();
-	        },
-
-	        /**
-	         * Updates this hasher with a message.
-	         *
-	         * @param {WordArray|string} messageUpdate The message to append.
-	         *
-	         * @return {Hasher} This hasher.
-	         *
-	         * @example
-	         *
-	         *     hasher.update('message');
-	         *     hasher.update(wordArray);
-	         */
-	        update: function (messageUpdate) {
-	            // Append
-	            this._append(messageUpdate);
-
-	            // Update the hash
-	            this._process();
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Finalizes the hash computation.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
-	         *
-	         * @return {WordArray} The hash.
-	         *
-	         * @example
-	         *
-	         *     var hash = hasher.finalize();
-	         *     var hash = hasher.finalize('message');
-	         *     var hash = hasher.finalize(wordArray);
-	         */
-	        finalize: function (messageUpdate) {
-	            // Final message update
-	            if (messageUpdate) {
-	                this._append(messageUpdate);
-	            }
-
-	            // Perform concrete-hasher logic
-	            var hash = this._doFinalize();
-
-	            return hash;
-	        },
-
-	        blockSize: 512/32,
-
-	        /**
-	         * Creates a shortcut function to a hasher's object interface.
-	         *
-	         * @param {Hasher} hasher The hasher to create a helper for.
-	         *
-	         * @return {Function} The shortcut function.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
-	         */
-	        _createHelper: function (hasher) {
-	            return function (message, cfg) {
-	                return new hasher.init(cfg).finalize(message);
-	            };
-	        },
-
-	        /**
-	         * Creates a shortcut function to the HMAC's object interface.
-	         *
-	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
-	         *
-	         * @return {Function} The shortcut function.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
-	         */
-	        _createHmacHelper: function (hasher) {
-	            return function (message, key) {
-	                return new C_algo.HMAC.init(hasher, key).finalize(message);
-	            };
-	        }
-	    });
-
-	    /**
-	     * Algorithm namespace.
-	     */
-	    var C_algo = C.algo = {};
-
-	    return C;
-	}(Math));
-
-
-	(function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var X32WordArray = C_lib.WordArray;
-
-	    /**
-	     * x64 namespace.
-	     */
-	    var C_x64 = C.x64 = {};
-
-	    /**
-	     * A 64-bit word.
-	     */
-	    var X64Word = C_x64.Word = Base.extend({
-	        /**
-	         * Initializes a newly created 64-bit word.
-	         *
-	         * @param {number} high The high 32 bits.
-	         * @param {number} low The low 32 bits.
-	         *
-	         * @example
-	         *
-	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
-	         */
-	        init: function (high, low) {
-	            this.high = high;
-	            this.low = low;
-	        }
-
-	        /**
-	         * Bitwise NOTs this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after negating.
-	         *
-	         * @example
-	         *
-	         *     var negated = x64Word.not();
-	         */
-	        // not: function () {
-	            // var high = ~this.high;
-	            // var low = ~this.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise ANDs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to AND with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after ANDing.
-	         *
-	         * @example
-	         *
-	         *     var anded = x64Word.and(anotherX64Word);
-	         */
-	        // and: function (word) {
-	            // var high = this.high & word.high;
-	            // var low = this.low & word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise ORs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to OR with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after ORing.
-	         *
-	         * @example
-	         *
-	         *     var ored = x64Word.or(anotherX64Word);
-	         */
-	        // or: function (word) {
-	            // var high = this.high | word.high;
-	            // var low = this.low | word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise XORs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to XOR with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after XORing.
-	         *
-	         * @example
-	         *
-	         *     var xored = x64Word.xor(anotherX64Word);
-	         */
-	        // xor: function (word) {
-	            // var high = this.high ^ word.high;
-	            // var low = this.low ^ word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Shifts this word n bits to the left.
-	         *
-	         * @param {number} n The number of bits to shift.
-	         *
-	         * @return {X64Word} A new x64-Word object after shifting.
-	         *
-	         * @example
-	         *
-	         *     var shifted = x64Word.shiftL(25);
-	         */
-	        // shiftL: function (n) {
-	            // if (n < 32) {
-	                // var high = (this.high << n) | (this.low >>> (32 - n));
-	                // var low = this.low << n;
-	            // } else {
-	                // var high = this.low << (n - 32);
-	                // var low = 0;
-	            // }
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Shifts this word n bits to the right.
-	         *
-	         * @param {number} n The number of bits to shift.
-	         *
-	         * @return {X64Word} A new x64-Word object after shifting.
-	         *
-	         * @example
-	         *
-	         *     var shifted = x64Word.shiftR(7);
-	         */
-	        // shiftR: function (n) {
-	            // if (n < 32) {
-	                // var low = (this.low >>> n) | (this.high << (32 - n));
-	                // var high = this.high >>> n;
-	            // } else {
-	                // var low = this.high >>> (n - 32);
-	                // var high = 0;
-	            // }
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Rotates this word n bits to the left.
-	         *
-	         * @param {number} n The number of bits to rotate.
-	         *
-	         * @return {X64Word} A new x64-Word object after rotating.
-	         *
-	         * @example
-	         *
-	         *     var rotated = x64Word.rotL(25);
-	         */
-	        // rotL: function (n) {
-	            // return this.shiftL(n).or(this.shiftR(64 - n));
-	        // },
-
-	        /**
-	         * Rotates this word n bits to the right.
-	         *
-	         * @param {number} n The number of bits to rotate.
-	         *
-	         * @return {X64Word} A new x64-Word object after rotating.
-	         *
-	         * @example
-	         *
-	         *     var rotated = x64Word.rotR(7);
-	         */
-	        // rotR: function (n) {
-	            // return this.shiftR(n).or(this.shiftL(64 - n));
-	        // },
-
-	        /**
-	         * Adds this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to add with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after adding.
-	         *
-	         * @example
-	         *
-	         *     var added = x64Word.add(anotherX64Word);
-	         */
-	        // add: function (word) {
-	            // var low = (this.low + word.low) | 0;
-	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
-	            // var high = (this.high + word.high + carry) | 0;
-
-	            // return X64Word.create(high, low);
-	        // }
-	    });
-
-	    /**
-	     * An array of 64-bit words.
-	     *
-	     * @property {Array} words The array of CryptoJS.x64.Word objects.
-	     * @property {number} sigBytes The number of significant bytes in this word array.
-	     */
-	    var X64WordArray = C_x64.WordArray = Base.extend({
-	        /**
-	         * Initializes a newly created word array.
-	         *
-	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
-	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create();
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create([
-	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
-	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
-	         *     ]);
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create([
-	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
-	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
-	         *     ], 10);
-	         */
-	        init: function (words, sigBytes) {
-	            words = this.words = words || [];
-
-	            if (sigBytes != undefined) {
-	                this.sigBytes = sigBytes;
-	            } else {
-	                this.sigBytes = words.length * 8;
-	            }
-	        },
-
-	        /**
-	         * Converts this 64-bit word array to a 32-bit word array.
-	         *
-	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
-	         *
-	         * @example
-	         *
-	         *     var x32WordArray = x64WordArray.toX32();
-	         */
-	        toX32: function () {
-	            // Shortcuts
-	            var x64Words = this.words;
-	            var x64WordsLength = x64Words.length;
-
-	            // Convert
-	            var x32Words = [];
-	            for (var i = 0; i < x64WordsLength; i++) {
-	                var x64Word = x64Words[i];
-	                x32Words.push(x64Word.high);
-	                x32Words.push(x64Word.low);
-	            }
-
-	            return X32WordArray.create(x32Words, this.sigBytes);
-	        },
-
-	        /**
-	         * Creates a copy of this word array.
-	         *
-	         * @return {X64WordArray} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = x64WordArray.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-
-	            // Clone "words" array
-	            var words = clone.words = this.words.slice(0);
-
-	            // Clone each X64Word object
-	            var wordsLength = words.length;
-	            for (var i = 0; i < wordsLength; i++) {
-	                words[i] = words[i].clone();
-	            }
-
-	            return clone;
-	        }
-	    });
-	}());
-
-
-	(function () {
-	    // Check if typed arrays are supported
-	    if (typeof ArrayBuffer != 'function') {
-	        return;
-	    }
-
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-
-	    // Reference original init
-	    var superInit = WordArray.init;
-
-	    // Augment WordArray.init to handle typed arrays
-	    var subInit = WordArray.init = function (typedArray) {
-	        // Convert buffers to uint8
-	        if (typedArray instanceof ArrayBuffer) {
-	            typedArray = new Uint8Array(typedArray);
-	        }
-
-	        // Convert other array views to uint8
-	        if (
-	            typedArray instanceof Int8Array ||
-	            (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
-	            typedArray instanceof Int16Array ||
-	            typedArray instanceof Uint16Array ||
-	            typedArray instanceof Int32Array ||
-	            typedArray instanceof Uint32Array ||
-	            typedArray instanceof Float32Array ||
-	            typedArray instanceof Float64Array
-	        ) {
-	            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
-	        }
-
-	        // Handle Uint8Array
-	        if (typedArray instanceof Uint8Array) {
-	            // Shortcut
-	            var typedArrayByteLength = typedArray.byteLength;
-
-	            // Extract bytes
-	            var words = [];
-	            for (var i = 0; i < typedArrayByteLength; i++) {
-	                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
-	            }
-
-	            // Initialize this word array
-	            superInit.call(this, words, typedArrayByteLength);
-	        } else {
-	            // Else call normal init
-	            superInit.apply(this, arguments);
-	        }
-	    };
-
-	    subInit.prototype = WordArray;
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * UTF-16 BE encoding strategy.
-	     */
-	    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
-	        /**
-	         * Converts a word array to a UTF-16 BE string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-16 BE string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var utf16Chars = [];
-	            for (var i = 0; i < sigBytes; i += 2) {
-	                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
-	                utf16Chars.push(String.fromCharCode(codePoint));
-	            }
-
-	            return utf16Chars.join('');
-	        },
-
-	        /**
-	         * Converts a UTF-16 BE string to a word array.
-	         *
-	         * @param {string} utf16Str The UTF-16 BE string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
-	         */
-	        parse: function (utf16Str) {
-	            // Shortcut
-	            var utf16StrLength = utf16Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < utf16StrLength; i++) {
-	                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
-	            }
-
-	            return WordArray.create(words, utf16StrLength * 2);
-	        }
-	    };
-
-	    /**
-	     * UTF-16 LE encoding strategy.
-	     */
-	    C_enc.Utf16LE = {
-	        /**
-	         * Converts a word array to a UTF-16 LE string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-16 LE string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var utf16Chars = [];
-	            for (var i = 0; i < sigBytes; i += 2) {
-	                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
-	                utf16Chars.push(String.fromCharCode(codePoint));
-	            }
-
-	            return utf16Chars.join('');
-	        },
-
-	        /**
-	         * Converts a UTF-16 LE string to a word array.
-	         *
-	         * @param {string} utf16Str The UTF-16 LE string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
-	         */
-	        parse: function (utf16Str) {
-	            // Shortcut
-	            var utf16StrLength = utf16Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < utf16StrLength; i++) {
-	                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
-	            }
-
-	            return WordArray.create(words, utf16StrLength * 2);
-	        }
-	    };
-
-	    function swapEndian(word) {
-	        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
-	    }
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * Base64 encoding strategy.
-	     */
-	    var Base64 = C_enc.Base64 = {
-	        /**
-	         * Converts a word array to a Base64 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The Base64 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-	            var map = this._map;
-
-	            // Clamp excess bits
-	            wordArray.clamp();
-
-	            // Convert
-	            var base64Chars = [];
-	            for (var i = 0; i < sigBytes; i += 3) {
-	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
-	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
-	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
-
-	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
-
-	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
-	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
-	                }
-	            }
-
-	            // Add padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                while (base64Chars.length % 4) {
-	                    base64Chars.push(paddingChar);
-	                }
-	            }
-
-	            return base64Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Base64 string to a word array.
-	         *
-	         * @param {string} base64Str The Base64 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
-	         */
-	        parse: function (base64Str) {
-	            // Shortcuts
-	            var base64StrLength = base64Str.length;
-	            var map = this._map;
-	            var reverseMap = this._reverseMap;
-
-	            if (!reverseMap) {
-	                    reverseMap = this._reverseMap = [];
-	                    for (var j = 0; j < map.length; j++) {
-	                        reverseMap[map.charCodeAt(j)] = j;
-	                    }
-	            }
-
-	            // Ignore padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                var paddingIndex = base64Str.indexOf(paddingChar);
-	                if (paddingIndex !== -1) {
-	                    base64StrLength = paddingIndex;
-	                }
-	            }
-
-	            // Convert
-	            return parseLoop(base64Str, base64StrLength, reverseMap);
-
-	        },
-
-	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-	    };
-
-	    function parseLoop(base64Str, base64StrLength, reverseMap) {
-	      var words = [];
-	      var nBytes = 0;
-	      for (var i = 0; i < base64StrLength; i++) {
-	          if (i % 4) {
-	              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
-	              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
-	              var bitsCombined = bits1 | bits2;
-	              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
-	              nBytes++;
-	          }
-	      }
-	      return WordArray.create(words, nBytes);
-	    }
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * Base64url encoding strategy.
-	     */
-	    var Base64url = C_enc.Base64url = {
-	        /**
-	         * Converts a word array to a Base64url string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @param {boolean} urlSafe Whether to use url safe
-	         *
-	         * @return {string} The Base64url string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
-	         */
-	        stringify: function (wordArray, urlSafe) {
-	            if (urlSafe === undefined) {
-	                urlSafe = true
-	            }
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-	            var map = urlSafe ? this._safe_map : this._map;
-
-	            // Clamp excess bits
-	            wordArray.clamp();
-
-	            // Convert
-	            var base64Chars = [];
-	            for (var i = 0; i < sigBytes; i += 3) {
-	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
-	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
-	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
-
-	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
-
-	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
-	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
-	                }
-	            }
-
-	            // Add padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                while (base64Chars.length % 4) {
-	                    base64Chars.push(paddingChar);
-	                }
-	            }
-
-	            return base64Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Base64url string to a word array.
-	         *
-	         * @param {string} base64Str The Base64url string.
-	         *
-	         * @param {boolean} urlSafe Whether to use url safe
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);
-	         */
-	        parse: function (base64Str, urlSafe) {
-	            if (urlSafe === undefined) {
-	                urlSafe = true
-	            }
-
-	            // Shortcuts
-	            var base64StrLength = base64Str.length;
-	            var map = urlSafe ? this._safe_map : this._map;
-	            var reverseMap = this._reverseMap;
-
-	            if (!reverseMap) {
-	                reverseMap = this._reverseMap = [];
-	                for (var j = 0; j < map.length; j++) {
-	                    reverseMap[map.charCodeAt(j)] = j;
-	                }
-	            }
-
-	            // Ignore padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                var paddingIndex = base64Str.indexOf(paddingChar);
-	                if (paddingIndex !== -1) {
-	                    base64StrLength = paddingIndex;
-	                }
-	            }
-
-	            // Convert
-	            return parseLoop(base64Str, base64StrLength, reverseMap);
-
-	        },
-
-	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
-	        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
-	    };
-
-	    function parseLoop(base64Str, base64StrLength, reverseMap) {
-	        var words = [];
-	        var nBytes = 0;
-	        for (var i = 0; i < base64StrLength; i++) {
-	            if (i % 4) {
-	                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
-	                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
-	                var bitsCombined = bits1 | bits2;
-	                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
-	                nBytes++;
-	            }
-	        }
-	        return WordArray.create(words, nBytes);
-	    }
-	}());
-
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Constants table
-	    var T = [];
-
-	    // Compute constants
-	    (function () {
-	        for (var i = 0; i < 64; i++) {
-	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
-	        }
-	    }());
-
-	    /**
-	     * MD5 hash algorithm.
-	     */
-	    var MD5 = C_algo.MD5 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0x67452301, 0xefcdab89,
-	                0x98badcfe, 0x10325476
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Swap endian
-	            for (var i = 0; i < 16; i++) {
-	                // Shortcuts
-	                var offset_i = offset + i;
-	                var M_offset_i = M[offset_i];
-
-	                M[offset_i] = (
-	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
-	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-	                );
-	            }
-
-	            // Shortcuts
-	            var H = this._hash.words;
-
-	            var M_offset_0  = M[offset + 0];
-	            var M_offset_1  = M[offset + 1];
-	            var M_offset_2  = M[offset + 2];
-	            var M_offset_3  = M[offset + 3];
-	            var M_offset_4  = M[offset + 4];
-	            var M_offset_5  = M[offset + 5];
-	            var M_offset_6  = M[offset + 6];
-	            var M_offset_7  = M[offset + 7];
-	            var M_offset_8  = M[offset + 8];
-	            var M_offset_9  = M[offset + 9];
-	            var M_offset_10 = M[offset + 10];
-	            var M_offset_11 = M[offset + 11];
-	            var M_offset_12 = M[offset + 12];
-	            var M_offset_13 = M[offset + 13];
-	            var M_offset_14 = M[offset + 14];
-	            var M_offset_15 = M[offset + 15];
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-
-	            // Computation
-	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
-	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
-	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
-	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
-	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
-	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
-	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
-	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
-	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
-	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
-	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
-	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
-	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
-	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
-	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
-	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
-
-	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
-	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
-	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
-	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
-	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
-	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
-	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
-	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
-	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
-	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
-	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
-	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
-	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
-	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
-	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
-	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
-
-	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
-	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
-	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
-	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
-	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
-	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
-	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
-	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
-	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
-	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
-	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
-	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
-	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
-	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
-	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
-	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
-
-	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
-	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
-	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
-	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
-	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
-	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
-	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
-	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
-	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
-	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
-	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
-	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
-	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
-	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
-	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
-	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-
-	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
-	            var nBitsTotalL = nBitsTotal;
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
-	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
-	            );
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
-	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
-	            );
-
-	            data.sigBytes = (dataWords.length + 1) * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var hash = this._hash;
-	            var H = hash.words;
-
-	            // Swap endian
-	            for (var i = 0; i < 4; i++) {
-	                // Shortcut
-	                var H_i = H[i];
-
-	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    function FF(a, b, c, d, x, s, t) {
-	        var n = a + ((b & c) | (~b & d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function GG(a, b, c, d, x, s, t) {
-	        var n = a + ((b & d) | (c & ~d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function HH(a, b, c, d, x, s, t) {
-	        var n = a + (b ^ c ^ d) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function II(a, b, c, d, x, s, t) {
-	        var n = a + (c ^ (b | ~d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.MD5('message');
-	     *     var hash = CryptoJS.MD5(wordArray);
-	     */
-	    C.MD5 = Hasher._createHelper(MD5);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacMD5(message, key);
-	     */
-	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Reusable object
-	    var W = [];
-
-	    /**
-	     * SHA-1 hash algorithm.
-	     */
-	    var SHA1 = C_algo.SHA1 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0x67452301, 0xefcdab89,
-	                0x98badcfe, 0x10325476,
-	                0xc3d2e1f0
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var H = this._hash.words;
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-	            var e = H[4];
-
-	            // Computation
-	            for (var i = 0; i < 80; i++) {
-	                if (i < 16) {
-	                    W[i] = M[offset + i] | 0;
-	                } else {
-	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
-	                    W[i] = (n << 1) | (n >>> 31);
-	                }
-
-	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
-	                if (i < 20) {
-	                    t += ((b & c) | (~b & d)) + 0x5a827999;
-	                } else if (i < 40) {
-	                    t += (b ^ c ^ d) + 0x6ed9eba1;
-	                } else if (i < 60) {
-	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
-	                } else /* if (i < 80) */ {
-	                    t += (b ^ c ^ d) - 0x359d3e2a;
-	                }
-
-	                e = d;
-	                d = c;
-	                c = (b << 30) | (b >>> 2);
-	                b = a;
-	                a = t;
-	            }
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	            H[4] = (H[4] + e) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Return final computed hash
-	            return this._hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA1('message');
-	     *     var hash = CryptoJS.SHA1(wordArray);
-	     */
-	    C.SHA1 = Hasher._createHelper(SHA1);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA1(message, key);
-	     */
-	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
-	}());
-
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Initialization and round constants tables
-	    var H = [];
-	    var K = [];
-
-	    // Compute constants
-	    (function () {
-	        function isPrime(n) {
-	            var sqrtN = Math.sqrt(n);
-	            for (var factor = 2; factor <= sqrtN; factor++) {
-	                if (!(n % factor)) {
-	                    return false;
-	                }
-	            }
-
-	            return true;
-	        }
-
-	        function getFractionalBits(n) {
-	            return ((n - (n | 0)) * 0x100000000) | 0;
-	        }
-
-	        var n = 2;
-	        var nPrime = 0;
-	        while (nPrime < 64) {
-	            if (isPrime(n)) {
-	                if (nPrime < 8) {
-	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
-	                }
-	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
-
-	                nPrime++;
-	            }
-
-	            n++;
-	        }
-	    }());
-
-	    // Reusable object
-	    var W = [];
-
-	    /**
-	     * SHA-256 hash algorithm.
-	     */
-	    var SHA256 = C_algo.SHA256 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init(H.slice(0));
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var H = this._hash.words;
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-	            var e = H[4];
-	            var f = H[5];
-	            var g = H[6];
-	            var h = H[7];
-
-	            // Computation
-	            for (var i = 0; i < 64; i++) {
-	                if (i < 16) {
-	                    W[i] = M[offset + i] | 0;
-	                } else {
-	                    var gamma0x = W[i - 15];
-	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
-	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
-	                                   (gamma0x >>> 3);
-
-	                    var gamma1x = W[i - 2];
-	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
-	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
-	                                   (gamma1x >>> 10);
-
-	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
-	                }
-
-	                var ch  = (e & f) ^ (~e & g);
-	                var maj = (a & b) ^ (a & c) ^ (b & c);
-
-	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
-	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
-
-	                var t1 = h + sigma1 + ch + K[i] + W[i];
-	                var t2 = sigma0 + maj;
-
-	                h = g;
-	                g = f;
-	                f = e;
-	                e = (d + t1) | 0;
-	                d = c;
-	                c = b;
-	                b = a;
-	                a = (t1 + t2) | 0;
-	            }
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	            H[4] = (H[4] + e) | 0;
-	            H[5] = (H[5] + f) | 0;
-	            H[6] = (H[6] + g) | 0;
-	            H[7] = (H[7] + h) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Return final computed hash
-	            return this._hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA256('message');
-	     *     var hash = CryptoJS.SHA256(wordArray);
-	     */
-	    C.SHA256 = Hasher._createHelper(SHA256);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA256(message, key);
-	     */
-	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var SHA256 = C_algo.SHA256;
-
-	    /**
-	     * SHA-224 hash algorithm.
-	     */
-	    var SHA224 = C_algo.SHA224 = SHA256.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
-	                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
-	            ]);
-	        },
-
-	        _doFinalize: function () {
-	            var hash = SHA256._doFinalize.call(this);
-
-	            hash.sigBytes -= 4;
-
-	            return hash;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA224('message');
-	     *     var hash = CryptoJS.SHA224(wordArray);
-	     */
-	    C.SHA224 = SHA256._createHelper(SHA224);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA224(message, key);
-	     */
-	    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Hasher = C_lib.Hasher;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var X64WordArray = C_x64.WordArray;
-	    var C_algo = C.algo;
-
-	    function X64Word_create() {
-	        return X64Word.create.apply(X64Word, arguments);
-	    }
-
-	    // Constants
-	    var K = [
-	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
-	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
-	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
-	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
-	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
-	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
-	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
-	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
-	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
-	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
-	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
-	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
-	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
-	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
-	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
-	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
-	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
-	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
-	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
-	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
-	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
-	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
-	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
-	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
-	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
-	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
-	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
-	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
-	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
-	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
-	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
-	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
-	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
-	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
-	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
-	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
-	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
-	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
-	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
-	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
-	    ];
-
-	    // Reusable objects
-	    var W = [];
-	    (function () {
-	        for (var i = 0; i < 80; i++) {
-	            W[i] = X64Word_create();
-	        }
-	    }());
-
-	    /**
-	     * SHA-512 hash algorithm.
-	     */
-	    var SHA512 = C_algo.SHA512 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new X64WordArray.init([
-	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
-	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
-	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
-	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcuts
-	            var H = this._hash.words;
-
-	            var H0 = H[0];
-	            var H1 = H[1];
-	            var H2 = H[2];
-	            var H3 = H[3];
-	            var H4 = H[4];
-	            var H5 = H[5];
-	            var H6 = H[6];
-	            var H7 = H[7];
-
-	            var H0h = H0.high;
-	            var H0l = H0.low;
-	            var H1h = H1.high;
-	            var H1l = H1.low;
-	            var H2h = H2.high;
-	            var H2l = H2.low;
-	            var H3h = H3.high;
-	            var H3l = H3.low;
-	            var H4h = H4.high;
-	            var H4l = H4.low;
-	            var H5h = H5.high;
-	            var H5l = H5.low;
-	            var H6h = H6.high;
-	            var H6l = H6.low;
-	            var H7h = H7.high;
-	            var H7l = H7.low;
-
-	            // Working variables
-	            var ah = H0h;
-	            var al = H0l;
-	            var bh = H1h;
-	            var bl = H1l;
-	            var ch = H2h;
-	            var cl = H2l;
-	            var dh = H3h;
-	            var dl = H3l;
-	            var eh = H4h;
-	            var el = H4l;
-	            var fh = H5h;
-	            var fl = H5l;
-	            var gh = H6h;
-	            var gl = H6l;
-	            var hh = H7h;
-	            var hl = H7l;
-
-	            // Rounds
-	            for (var i = 0; i < 80; i++) {
-	                var Wil;
-	                var Wih;
-
-	                // Shortcut
-	                var Wi = W[i];
-
-	                // Extend message
-	                if (i < 16) {
-	                    Wih = Wi.high = M[offset + i * 2]     | 0;
-	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
-	                } else {
-	                    // Gamma0
-	                    var gamma0x  = W[i - 15];
-	                    var gamma0xh = gamma0x.high;
-	                    var gamma0xl = gamma0x.low;
-	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
-	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
-
-	                    // Gamma1
-	                    var gamma1x  = W[i - 2];
-	                    var gamma1xh = gamma1x.high;
-	                    var gamma1xl = gamma1x.low;
-	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
-	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
-
-	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
-	                    var Wi7  = W[i - 7];
-	                    var Wi7h = Wi7.high;
-	                    var Wi7l = Wi7.low;
-
-	                    var Wi16  = W[i - 16];
-	                    var Wi16h = Wi16.high;
-	                    var Wi16l = Wi16.low;
-
-	                    Wil = gamma0l + Wi7l;
-	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
-	                    Wil = Wil + gamma1l;
-	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
-	                    Wil = Wil + Wi16l;
-	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
-
-	                    Wi.high = Wih;
-	                    Wi.low  = Wil;
-	                }
-
-	                var chh  = (eh & fh) ^ (~eh & gh);
-	                var chl  = (el & fl) ^ (~el & gl);
-	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
-	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
-
-	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
-	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
-	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
-	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
-
-	                // t1 = h + sigma1 + ch + K[i] + W[i]
-	                var Ki  = K[i];
-	                var Kih = Ki.high;
-	                var Kil = Ki.low;
-
-	                var t1l = hl + sigma1l;
-	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
-	                var t1l = t1l + chl;
-	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
-	                var t1l = t1l + Kil;
-	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
-	                var t1l = t1l + Wil;
-	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
-
-	                // t2 = sigma0 + maj
-	                var t2l = sigma0l + majl;
-	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
-
-	                // Update working variables
-	                hh = gh;
-	                hl = gl;
-	                gh = fh;
-	                gl = fl;
-	                fh = eh;
-	                fl = el;
-	                el = (dl + t1l) | 0;
-	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
-	                dh = ch;
-	                dl = cl;
-	                ch = bh;
-	                cl = bl;
-	                bh = ah;
-	                bl = al;
-	                al = (t1l + t2l) | 0;
-	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
-	            }
-
-	            // Intermediate hash value
-	            H0l = H0.low  = (H0l + al);
-	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
-	            H1l = H1.low  = (H1l + bl);
-	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
-	            H2l = H2.low  = (H2l + cl);
-	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
-	            H3l = H3.low  = (H3l + dl);
-	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
-	            H4l = H4.low  = (H4l + el);
-	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
-	            H5l = H5.low  = (H5l + fl);
-	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
-	            H6l = H6.low  = (H6l + gl);
-	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
-	            H7l = H7.low  = (H7l + hl);
-	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Convert hash to 32-bit word array before returning
-	            var hash = this._hash.toX32();
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        },
-
-	        blockSize: 1024/32
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA512('message');
-	     *     var hash = CryptoJS.SHA512(wordArray);
-	     */
-	    C.SHA512 = Hasher._createHelper(SHA512);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA512(message, key);
-	     */
-	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var X64WordArray = C_x64.WordArray;
-	    var C_algo = C.algo;
-	    var SHA512 = C_algo.SHA512;
-
-	    /**
-	     * SHA-384 hash algorithm.
-	     */
-	    var SHA384 = C_algo.SHA384 = SHA512.extend({
-	        _doReset: function () {
-	            this._hash = new X64WordArray.init([
-	                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
-	                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
-	                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
-	                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
-	            ]);
-	        },
-
-	        _doFinalize: function () {
-	            var hash = SHA512._doFinalize.call(this);
-
-	            hash.sigBytes -= 16;
-
-	            return hash;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA384('message');
-	     *     var hash = CryptoJS.SHA384(wordArray);
-	     */
-	    C.SHA384 = SHA512._createHelper(SHA384);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA384(message, key);
-	     */
-	    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
-	}());
-
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var C_algo = C.algo;
-
-	    // Constants tables
-	    var RHO_OFFSETS = [];
-	    var PI_INDEXES  = [];
-	    var ROUND_CONSTANTS = [];
-
-	    // Compute Constants
-	    (function () {
-	        // Compute rho offset constants
-	        var x = 1, y = 0;
-	        for (var t = 0; t < 24; t++) {
-	            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
-
-	            var newX = y % 5;
-	            var newY = (2 * x + 3 * y) % 5;
-	            x = newX;
-	            y = newY;
-	        }
-
-	        // Compute pi index constants
-	        for (var x = 0; x < 5; x++) {
-	            for (var y = 0; y < 5; y++) {
-	                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
-	            }
-	        }
-
-	        // Compute round constants
-	        var LFSR = 0x01;
-	        for (var i = 0; i < 24; i++) {
-	            var roundConstantMsw = 0;
-	            var roundConstantLsw = 0;
-
-	            for (var j = 0; j < 7; j++) {
-	                if (LFSR & 0x01) {
-	                    var bitPosition = (1 << j) - 1;
-	                    if (bitPosition < 32) {
-	                        roundConstantLsw ^= 1 << bitPosition;
-	                    } else /* if (bitPosition >= 32) */ {
-	                        roundConstantMsw ^= 1 << (bitPosition - 32);
-	                    }
-	                }
-
-	                // Compute next LFSR
-	                if (LFSR & 0x80) {
-	                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
-	                    LFSR = (LFSR << 1) ^ 0x71;
-	                } else {
-	                    LFSR <<= 1;
-	                }
-	            }
-
-	            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
-	        }
-	    }());
-
-	    // Reusable objects for temporary values
-	    var T = [];
-	    (function () {
-	        for (var i = 0; i < 25; i++) {
-	            T[i] = X64Word.create();
-	        }
-	    }());
-
-	    /**
-	     * SHA-3 hash algorithm.
-	     */
-	    var SHA3 = C_algo.SHA3 = Hasher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} outputLength
-	         *   The desired number of bits in the output hash.
-	         *   Only values permitted are: 224, 256, 384, 512.
-	         *   Default: 512
-	         */
-	        cfg: Hasher.cfg.extend({
-	            outputLength: 512
-	        }),
-
-	        _doReset: function () {
-	            var state = this._state = []
-	            for (var i = 0; i < 25; i++) {
-	                state[i] = new X64Word.init();
-	            }
-
-	            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcuts
-	            var state = this._state;
-	            var nBlockSizeLanes = this.blockSize / 2;
-
-	            // Absorb
-	            for (var i = 0; i < nBlockSizeLanes; i++) {
-	                // Shortcuts
-	                var M2i  = M[offset + 2 * i];
-	                var M2i1 = M[offset + 2 * i + 1];
-
-	                // Swap endian
-	                M2i = (
-	                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
-	                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
-	                );
-	                M2i1 = (
-	                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
-	                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
-	                );
-
-	                // Absorb message into state
-	                var lane = state[i];
-	                lane.high ^= M2i1;
-	                lane.low  ^= M2i;
-	            }
-
-	            // Rounds
-	            for (var round = 0; round < 24; round++) {
-	                // Theta
-	                for (var x = 0; x < 5; x++) {
-	                    // Mix column lanes
-	                    var tMsw = 0, tLsw = 0;
-	                    for (var y = 0; y < 5; y++) {
-	                        var lane = state[x + 5 * y];
-	                        tMsw ^= lane.high;
-	                        tLsw ^= lane.low;
-	                    }
-
-	                    // Temporary values
-	                    var Tx = T[x];
-	                    Tx.high = tMsw;
-	                    Tx.low  = tLsw;
-	                }
-	                for (var x = 0; x < 5; x++) {
-	                    // Shortcuts
-	                    var Tx4 = T[(x + 4) % 5];
-	                    var Tx1 = T[(x + 1) % 5];
-	                    var Tx1Msw = Tx1.high;
-	                    var Tx1Lsw = Tx1.low;
-
-	                    // Mix surrounding columns
-	                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
-	                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
-	                    for (var y = 0; y < 5; y++) {
-	                        var lane = state[x + 5 * y];
-	                        lane.high ^= tMsw;
-	                        lane.low  ^= tLsw;
-	                    }
-	                }
-
-	                // Rho Pi
-	                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
-	                    var tMsw;
-	                    var tLsw;
-
-	                    // Shortcuts
-	                    var lane = state[laneIndex];
-	                    var laneMsw = lane.high;
-	                    var laneLsw = lane.low;
-	                    var rhoOffset = RHO_OFFSETS[laneIndex];
-
-	                    // Rotate lanes
-	                    if (rhoOffset < 32) {
-	                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
-	                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
-	                    } else /* if (rhoOffset >= 32) */ {
-	                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
-	                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
-	                    }
-
-	                    // Transpose lanes
-	                    var TPiLane = T[PI_INDEXES[laneIndex]];
-	                    TPiLane.high = tMsw;
-	                    TPiLane.low  = tLsw;
-	                }
-
-	                // Rho pi at x = y = 0
-	                var T0 = T[0];
-	                var state0 = state[0];
-	                T0.high = state0.high;
-	                T0.low  = state0.low;
-
-	                // Chi
-	                for (var x = 0; x < 5; x++) {
-	                    for (var y = 0; y < 5; y++) {
-	                        // Shortcuts
-	                        var laneIndex = x + 5 * y;
-	                        var lane = state[laneIndex];
-	                        var TLane = T[laneIndex];
-	                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];
-	                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];
-
-	                        // Mix rows
-	                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
-	                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
-	                    }
-	                }
-
-	                // Iota
-	                var lane = state[0];
-	                var roundConstant = ROUND_CONSTANTS[round];
-	                lane.high ^= roundConstant.high;
-	                lane.low  ^= roundConstant.low;
-	            }
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-	            var blockSizeBits = this.blockSize * 32;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
-	            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var state = this._state;
-	            var outputLengthBytes = this.cfg.outputLength / 8;
-	            var outputLengthLanes = outputLengthBytes / 8;
-
-	            // Squeeze
-	            var hashWords = [];
-	            for (var i = 0; i < outputLengthLanes; i++) {
-	                // Shortcuts
-	                var lane = state[i];
-	                var laneMsw = lane.high;
-	                var laneLsw = lane.low;
-
-	                // Swap endian
-	                laneMsw = (
-	                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
-	                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
-	                );
-	                laneLsw = (
-	                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
-	                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
-	                );
-
-	                // Squeeze state to retrieve hash
-	                hashWords.push(laneLsw);
-	                hashWords.push(laneMsw);
-	            }
-
-	            // Return final computed hash
-	            return new WordArray.init(hashWords, outputLengthBytes);
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-
-	            var state = clone._state = this._state.slice(0);
-	            for (var i = 0; i < 25; i++) {
-	                state[i] = state[i].clone();
-	            }
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA3('message');
-	     *     var hash = CryptoJS.SHA3(wordArray);
-	     */
-	    C.SHA3 = Hasher._createHelper(SHA3);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA3(message, key);
-	     */
-	    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
-	}(Math));
-
-
-	/** @preserve
-	(c) 2012 by Cédric Mesnil. All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	*/
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Constants table
-	    var _zl = WordArray.create([
-	        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-	        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
-	        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
-	        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
-	        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
-	    var _zr = WordArray.create([
-	        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
-	        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
-	        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
-	        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
-	        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
-	    var _sl = WordArray.create([
-	         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
-	        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
-	        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
-	          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
-	        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
-	    var _sr = WordArray.create([
-	        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
-	        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
-	        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
-	        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
-	        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
-
-	    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
-	    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
-
-	    /**
-	     * RIPEMD160 hash algorithm.
-	     */
-	    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-
-	            // Swap endian
-	            for (var i = 0; i < 16; i++) {
-	                // Shortcuts
-	                var offset_i = offset + i;
-	                var M_offset_i = M[offset_i];
-
-	                // Swap
-	                M[offset_i] = (
-	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
-	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-	                );
-	            }
-	            // Shortcut
-	            var H  = this._hash.words;
-	            var hl = _hl.words;
-	            var hr = _hr.words;
-	            var zl = _zl.words;
-	            var zr = _zr.words;
-	            var sl = _sl.words;
-	            var sr = _sr.words;
-
-	            // Working variables
-	            var al, bl, cl, dl, el;
-	            var ar, br, cr, dr, er;
-
-	            ar = al = H[0];
-	            br = bl = H[1];
-	            cr = cl = H[2];
-	            dr = dl = H[3];
-	            er = el = H[4];
-	            // Computation
-	            var t;
-	            for (var i = 0; i < 80; i += 1) {
-	                t = (al +  M[offset+zl[i]])|0;
-	                if (i<16){
-		            t +=  f1(bl,cl,dl) + hl[0];
-	                } else if (i<32) {
-		            t +=  f2(bl,cl,dl) + hl[1];
-	                } else if (i<48) {
-		            t +=  f3(bl,cl,dl) + hl[2];
-	                } else if (i<64) {
-		            t +=  f4(bl,cl,dl) + hl[3];
-	                } else {// if (i<80) {
-		            t +=  f5(bl,cl,dl) + hl[4];
-	                }
-	                t = t|0;
-	                t =  rotl(t,sl[i]);
-	                t = (t+el)|0;
-	                al = el;
-	                el = dl;
-	                dl = rotl(cl, 10);
-	                cl = bl;
-	                bl = t;
-
-	                t = (ar + M[offset+zr[i]])|0;
-	                if (i<16){
-		            t +=  f5(br,cr,dr) + hr[0];
-	                } else if (i<32) {
-		            t +=  f4(br,cr,dr) + hr[1];
-	                } else if (i<48) {
-		            t +=  f3(br,cr,dr) + hr[2];
-	                } else if (i<64) {
-		            t +=  f2(br,cr,dr) + hr[3];
-	                } else {// if (i<80) {
-		            t +=  f1(br,cr,dr) + hr[4];
-	                }
-	                t = t|0;
-	                t =  rotl(t,sr[i]) ;
-	                t = (t+er)|0;
-	                ar = er;
-	                er = dr;
-	                dr = rotl(cr, 10);
-	                cr = br;
-	                br = t;
-	            }
-	            // Intermediate hash value
-	            t    = (H[1] + cl + dr)|0;
-	            H[1] = (H[2] + dl + er)|0;
-	            H[2] = (H[3] + el + ar)|0;
-	            H[3] = (H[4] + al + br)|0;
-	            H[4] = (H[0] + bl + cr)|0;
-	            H[0] =  t;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
-	                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
-	            );
-	            data.sigBytes = (dataWords.length + 1) * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var hash = this._hash;
-	            var H = hash.words;
-
-	            // Swap endian
-	            for (var i = 0; i < 5; i++) {
-	                // Shortcut
-	                var H_i = H[i];
-
-	                // Swap
-	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-
-	    function f1(x, y, z) {
-	        return ((x) ^ (y) ^ (z));
-
-	    }
-
-	    function f2(x, y, z) {
-	        return (((x)&(y)) | ((~x)&(z)));
-	    }
-
-	    function f3(x, y, z) {
-	        return (((x) | (~(y))) ^ (z));
-	    }
-
-	    function f4(x, y, z) {
-	        return (((x) & (z)) | ((y)&(~(z))));
-	    }
-
-	    function f5(x, y, z) {
-	        return ((x) ^ ((y) |(~(z))));
-
-	    }
-
-	    function rotl(x,n) {
-	        return (x<<n) | (x>>>(32-n));
-	    }
-
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.RIPEMD160('message');
-	     *     var hash = CryptoJS.RIPEMD160(wordArray);
-	     */
-	    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
-	     */
-	    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var C_enc = C.enc;
-	    var Utf8 = C_enc.Utf8;
-	    var C_algo = C.algo;
-
-	    /**
-	     * HMAC algorithm.
-	     */
-	    var HMAC = C_algo.HMAC = Base.extend({
-	        /**
-	         * Initializes a newly created HMAC.
-	         *
-	         * @param {Hasher} hasher The hash algorithm to use.
-	         * @param {WordArray|string} key The secret key.
-	         *
-	         * @example
-	         *
-	         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
-	         */
-	        init: function (hasher, key) {
-	            // Init hasher
-	            hasher = this._hasher = new hasher.init();
-
-	            // Convert string to WordArray, else assume WordArray already
-	            if (typeof key == 'string') {
-	                key = Utf8.parse(key);
-	            }
-
-	            // Shortcuts
-	            var hasherBlockSize = hasher.blockSize;
-	            var hasherBlockSizeBytes = hasherBlockSize * 4;
-
-	            // Allow arbitrary length keys
-	            if (key.sigBytes > hasherBlockSizeBytes) {
-	                key = hasher.finalize(key);
-	            }
-
-	            // Clamp excess bits
-	            key.clamp();
-
-	            // Clone key for inner and outer pads
-	            var oKey = this._oKey = key.clone();
-	            var iKey = this._iKey = key.clone();
-
-	            // Shortcuts
-	            var oKeyWords = oKey.words;
-	            var iKeyWords = iKey.words;
-
-	            // XOR keys with pad constants
-	            for (var i = 0; i < hasherBlockSize; i++) {
-	                oKeyWords[i] ^= 0x5c5c5c5c;
-	                iKeyWords[i] ^= 0x36363636;
-	            }
-	            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this HMAC to its initial state.
-	         *
-	         * @example
-	         *
-	         *     hmacHasher.reset();
-	         */
-	        reset: function () {
-	            // Shortcut
-	            var hasher = this._hasher;
-
-	            // Reset
-	            hasher.reset();
-	            hasher.update(this._iKey);
-	        },
-
-	        /**
-	         * Updates this HMAC with a message.
-	         *
-	         * @param {WordArray|string} messageUpdate The message to append.
-	         *
-	         * @return {HMAC} This HMAC instance.
-	         *
-	         * @example
-	         *
-	         *     hmacHasher.update('message');
-	         *     hmacHasher.update(wordArray);
-	         */
-	        update: function (messageUpdate) {
-	            this._hasher.update(messageUpdate);
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Finalizes the HMAC computation.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
-	         *
-	         * @return {WordArray} The HMAC.
-	         *
-	         * @example
-	         *
-	         *     var hmac = hmacHasher.finalize();
-	         *     var hmac = hmacHasher.finalize('message');
-	         *     var hmac = hmacHasher.finalize(wordArray);
-	         */
-	        finalize: function (messageUpdate) {
-	            // Shortcut
-	            var hasher = this._hasher;
-
-	            // Compute HMAC
-	            var innerHash = hasher.finalize(messageUpdate);
-	            hasher.reset();
-	            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
-
-	            return hmac;
-	        }
-	    });
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var SHA256 = C_algo.SHA256;
-	    var HMAC = C_algo.HMAC;
-
-	    /**
-	     * Password-Based Key Derivation Function 2 algorithm.
-	     */
-	    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
-	         * @property {Hasher} hasher The hasher to use. Default: SHA256
-	         * @property {number} iterations The number of iterations to perform. Default: 250000
-	         */
-	        cfg: Base.extend({
-	            keySize: 128/32,
-	            hasher: SHA256,
-	            iterations: 250000
-	        }),
-
-	        /**
-	         * Initializes a newly created key derivation function.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
-	         *
-	         * @example
-	         *
-	         *     var kdf = CryptoJS.algo.PBKDF2.create();
-	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
-	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
-	         */
-	        init: function (cfg) {
-	            this.cfg = this.cfg.extend(cfg);
-	        },
-
-	        /**
-	         * Computes the Password-Based Key Derivation Function 2.
-	         *
-	         * @param {WordArray|string} password The password.
-	         * @param {WordArray|string} salt A salt.
-	         *
-	         * @return {WordArray} The derived key.
-	         *
-	         * @example
-	         *
-	         *     var key = kdf.compute(password, salt);
-	         */
-	        compute: function (password, salt) {
-	            // Shortcut
-	            var cfg = this.cfg;
-
-	            // Init HMAC
-	            var hmac = HMAC.create(cfg.hasher, password);
-
-	            // Initial values
-	            var derivedKey = WordArray.create();
-	            var blockIndex = WordArray.create([0x00000001]);
-
-	            // Shortcuts
-	            var derivedKeyWords = derivedKey.words;
-	            var blockIndexWords = blockIndex.words;
-	            var keySize = cfg.keySize;
-	            var iterations = cfg.iterations;
-
-	            // Generate key
-	            while (derivedKeyWords.length < keySize) {
-	                var block = hmac.update(salt).finalize(blockIndex);
-	                hmac.reset();
-
-	                // Shortcuts
-	                var blockWords = block.words;
-	                var blockWordsLength = blockWords.length;
-
-	                // Iterations
-	                var intermediate = block;
-	                for (var i = 1; i < iterations; i++) {
-	                    intermediate = hmac.finalize(intermediate);
-	                    hmac.reset();
-
-	                    // Shortcut
-	                    var intermediateWords = intermediate.words;
-
-	                    // XOR intermediate with block
-	                    for (var j = 0; j < blockWordsLength; j++) {
-	                        blockWords[j] ^= intermediateWords[j];
-	                    }
-	                }
-
-	                derivedKey.concat(block);
-	                blockIndexWords[0]++;
-	            }
-	            derivedKey.sigBytes = keySize * 4;
-
-	            return derivedKey;
-	        }
-	    });
-
-	    /**
-	     * Computes the Password-Based Key Derivation Function 2.
-	     *
-	     * @param {WordArray|string} password The password.
-	     * @param {WordArray|string} salt A salt.
-	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
-	     *
-	     * @return {WordArray} The derived key.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var key = CryptoJS.PBKDF2(password, salt);
-	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
-	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
-	     */
-	    C.PBKDF2 = function (password, salt, cfg) {
-	        return PBKDF2.create(cfg).compute(password, salt);
-	    };
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var MD5 = C_algo.MD5;
-
-	    /**
-	     * This key derivation function is meant to conform with EVP_BytesToKey.
-	     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
-	     */
-	    var EvpKDF = C_algo.EvpKDF = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
-	         * @property {Hasher} hasher The hash algorithm to use. Default: MD5
-	         * @property {number} iterations The number of iterations to perform. Default: 1
-	         */
-	        cfg: Base.extend({
-	            keySize: 128/32,
-	            hasher: MD5,
-	            iterations: 1
-	        }),
-
-	        /**
-	         * Initializes a newly created key derivation function.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
-	         *
-	         * @example
-	         *
-	         *     var kdf = CryptoJS.algo.EvpKDF.create();
-	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
-	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
-	         */
-	        init: function (cfg) {
-	            this.cfg = this.cfg.extend(cfg);
-	        },
-
-	        /**
-	         * Derives a key from a password.
-	         *
-	         * @param {WordArray|string} password The password.
-	         * @param {WordArray|string} salt A salt.
-	         *
-	         * @return {WordArray} The derived key.
-	         *
-	         * @example
-	         *
-	         *     var key = kdf.compute(password, salt);
-	         */
-	        compute: function (password, salt) {
-	            var block;
-
-	            // Shortcut
-	            var cfg = this.cfg;
-
-	            // Init hasher
-	            var hasher = cfg.hasher.create();
-
-	            // Initial values
-	            var derivedKey = WordArray.create();
-
-	            // Shortcuts
-	            var derivedKeyWords = derivedKey.words;
-	            var keySize = cfg.keySize;
-	            var iterations = cfg.iterations;
-
-	            // Generate key
-	            while (derivedKeyWords.length < keySize) {
-	                if (block) {
-	                    hasher.update(block);
-	                }
-	                block = hasher.update(password).finalize(salt);
-	                hasher.reset();
-
-	                // Iterations
-	                for (var i = 1; i < iterations; i++) {
-	                    block = hasher.finalize(block);
-	                    hasher.reset();
-	                }
-
-	                derivedKey.concat(block);
-	            }
-	            derivedKey.sigBytes = keySize * 4;
-
-	            return derivedKey;
-	        }
-	    });
-
-	    /**
-	     * Derives a key from a password.
-	     *
-	     * @param {WordArray|string} password The password.
-	     * @param {WordArray|string} salt A salt.
-	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
-	     *
-	     * @return {WordArray} The derived key.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var key = CryptoJS.EvpKDF(password, salt);
-	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
-	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
-	     */
-	    C.EvpKDF = function (password, salt, cfg) {
-	        return EvpKDF.create(cfg).compute(password, salt);
-	    };
-	}());
-
-
-	/**
-	 * Cipher core components.
-	 */
-	CryptoJS.lib.Cipher || (function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
-	    var C_enc = C.enc;
-	    var Utf8 = C_enc.Utf8;
-	    var Base64 = C_enc.Base64;
-	    var C_algo = C.algo;
-	    var EvpKDF = C_algo.EvpKDF;
-
-	    /**
-	     * Abstract base cipher template.
-	     *
-	     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
-	     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
-	     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
-	     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
-	     */
-	    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {WordArray} iv The IV to use for this operation.
-	         */
-	        cfg: Base.extend(),
-
-	        /**
-	         * Creates this cipher in encryption mode.
-	         *
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {Cipher} A cipher instance.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
-	         */
-	        createEncryptor: function (key, cfg) {
-	            return this.create(this._ENC_XFORM_MODE, key, cfg);
-	        },
-
-	        /**
-	         * Creates this cipher in decryption mode.
-	         *
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {Cipher} A cipher instance.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
-	         */
-	        createDecryptor: function (key, cfg) {
-	            return this.create(this._DEC_XFORM_MODE, key, cfg);
-	        },
-
-	        /**
-	         * Initializes a newly created cipher.
-	         *
-	         * @param {number} xformMode Either the encryption or decryption transormation mode constant.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
-	         */
-	        init: function (xformMode, key, cfg) {
-	            // Apply config defaults
-	            this.cfg = this.cfg.extend(cfg);
-
-	            // Store transform mode and key
-	            this._xformMode = xformMode;
-	            this._key = key;
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this cipher to its initial state.
-	         *
-	         * @example
-	         *
-	         *     cipher.reset();
-	         */
-	        reset: function () {
-	            // Reset data buffer
-	            BufferedBlockAlgorithm.reset.call(this);
-
-	            // Perform concrete-cipher logic
-	            this._doReset();
-	        },
-
-	        /**
-	         * Adds data to be encrypted or decrypted.
-	         *
-	         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
-	         *
-	         * @return {WordArray} The data after processing.
-	         *
-	         * @example
-	         *
-	         *     var encrypted = cipher.process('data');
-	         *     var encrypted = cipher.process(wordArray);
-	         */
-	        process: function (dataUpdate) {
-	            // Append
-	            this._append(dataUpdate);
-
-	            // Process available blocks
-	            return this._process();
-	        },
-
-	        /**
-	         * Finalizes the encryption or decryption process.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
-	         *
-	         * @return {WordArray} The data after final processing.
-	         *
-	         * @example
-	         *
-	         *     var encrypted = cipher.finalize();
-	         *     var encrypted = cipher.finalize('data');
-	         *     var encrypted = cipher.finalize(wordArray);
-	         */
-	        finalize: function (dataUpdate) {
-	            // Final data update
-	            if (dataUpdate) {
-	                this._append(dataUpdate);
-	            }
-
-	            // Perform concrete-cipher logic
-	            var finalProcessedData = this._doFinalize();
-
-	            return finalProcessedData;
-	        },
-
-	        keySize: 128/32,
-
-	        ivSize: 128/32,
-
-	        _ENC_XFORM_MODE: 1,
-
-	        _DEC_XFORM_MODE: 2,
-
-	        /**
-	         * Creates shortcut functions to a cipher's object interface.
-	         *
-	         * @param {Cipher} cipher The cipher to create a helper for.
-	         *
-	         * @return {Object} An object with encrypt and decrypt shortcut functions.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
-	         */
-	        _createHelper: (function () {
-	            function selectCipherStrategy(key) {
-	                if (typeof key == 'string') {
-	                    return PasswordBasedCipher;
-	                } else {
-	                    return SerializableCipher;
-	                }
-	            }
-
-	            return function (cipher) {
-	                return {
-	                    encrypt: function (message, key, cfg) {
-	                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
-	                    },
-
-	                    decrypt: function (ciphertext, key, cfg) {
-	                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
-	                    }
-	                };
-	            };
-	        }())
-	    });
-
-	    /**
-	     * Abstract base stream cipher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
-	     */
-	    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
-	        _doFinalize: function () {
-	            // Process partial blocks
-	            var finalProcessedBlocks = this._process(!!'flush');
-
-	            return finalProcessedBlocks;
-	        },
-
-	        blockSize: 1
-	    });
-
-	    /**
-	     * Mode namespace.
-	     */
-	    var C_mode = C.mode = {};
-
-	    /**
-	     * Abstract base block cipher mode template.
-	     */
-	    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
-	        /**
-	         * Creates this mode for encryption.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
-	         */
-	        createEncryptor: function (cipher, iv) {
-	            return this.Encryptor.create(cipher, iv);
-	        },
-
-	        /**
-	         * Creates this mode for decryption.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
-	         */
-	        createDecryptor: function (cipher, iv) {
-	            return this.Decryptor.create(cipher, iv);
-	        },
-
-	        /**
-	         * Initializes a newly created mode.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
-	         */
-	        init: function (cipher, iv) {
-	            this._cipher = cipher;
-	            this._iv = iv;
-	        }
-	    });
-
-	    /**
-	     * Cipher Block Chaining mode.
-	     */
-	    var CBC = C_mode.CBC = (function () {
-	        /**
-	         * Abstract base CBC mode.
-	         */
-	        var CBC = BlockCipherMode.extend();
-
-	        /**
-	         * CBC encryptor.
-	         */
-	        CBC.Encryptor = CBC.extend({
-	            /**
-	             * Processes the data block at offset.
-	             *
-	             * @param {Array} words The data words to operate on.
-	             * @param {number} offset The offset where the block starts.
-	             *
-	             * @example
-	             *
-	             *     mode.processBlock(data.words, offset);
-	             */
-	            processBlock: function (words, offset) {
-	                // Shortcuts
-	                var cipher = this._cipher;
-	                var blockSize = cipher.blockSize;
-
-	                // XOR and encrypt
-	                xorBlock.call(this, words, offset, blockSize);
-	                cipher.encryptBlock(words, offset);
-
-	                // Remember this block to use with next block
-	                this._prevBlock = words.slice(offset, offset + blockSize);
-	            }
-	        });
-
-	        /**
-	         * CBC decryptor.
-	         */
-	        CBC.Decryptor = CBC.extend({
-	            /**
-	             * Processes the data block at offset.
-	             *
-	             * @param {Array} words The data words to operate on.
-	             * @param {number} offset The offset where the block starts.
-	             *
-	             * @example
-	             *
-	             *     mode.processBlock(data.words, offset);
-	             */
-	            processBlock: function (words, offset) {
-	                // Shortcuts
-	                var cipher = this._cipher;
-	                var blockSize = cipher.blockSize;
-
-	                // Remember this block to use with next block
-	                var thisBlock = words.slice(offset, offset + blockSize);
-
-	                // Decrypt and XOR
-	                cipher.decryptBlock(words, offset);
-	                xorBlock.call(this, words, offset, blockSize);
-
-	                // This block becomes the previous block
-	                this._prevBlock = thisBlock;
-	            }
-	        });
-
-	        function xorBlock(words, offset, blockSize) {
-	            var block;
-
-	            // Shortcut
-	            var iv = this._iv;
-
-	            // Choose mixing block
-	            if (iv) {
-	                block = iv;
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            } else {
-	                block = this._prevBlock;
-	            }
-
-	            // XOR blocks
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= block[i];
-	            }
-	        }
-
-	        return CBC;
-	    }());
-
-	    /**
-	     * Padding namespace.
-	     */
-	    var C_pad = C.pad = {};
-
-	    /**
-	     * PKCS #5/7 padding strategy.
-	     */
-	    var Pkcs7 = C_pad.Pkcs7 = {
-	        /**
-	         * Pads data using the algorithm defined in PKCS #5/7.
-	         *
-	         * @param {WordArray} data The data to pad.
-	         * @param {number} blockSize The multiple that the data should be padded to.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
-	         */
-	        pad: function (data, blockSize) {
-	            // Shortcut
-	            var blockSizeBytes = blockSize * 4;
-
-	            // Count padding bytes
-	            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
-
-	            // Create padding word
-	            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
-
-	            // Create padding
-	            var paddingWords = [];
-	            for (var i = 0; i < nPaddingBytes; i += 4) {
-	                paddingWords.push(paddingWord);
-	            }
-	            var padding = WordArray.create(paddingWords, nPaddingBytes);
-
-	            // Add padding
-	            data.concat(padding);
-	        },
-
-	        /**
-	         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
-	         *
-	         * @param {WordArray} data The data to unpad.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     CryptoJS.pad.Pkcs7.unpad(wordArray);
-	         */
-	        unpad: function (data) {
-	            // Get number of padding bytes from last byte
-	            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	            // Remove padding
-	            data.sigBytes -= nPaddingBytes;
-	        }
-	    };
-
-	    /**
-	     * Abstract base block cipher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
-	     */
-	    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {Mode} mode The block mode to use. Default: CBC
-	         * @property {Padding} padding The padding strategy to use. Default: Pkcs7
-	         */
-	        cfg: Cipher.cfg.extend({
-	            mode: CBC,
-	            padding: Pkcs7
-	        }),
-
-	        reset: function () {
-	            var modeCreator;
-
-	            // Reset cipher
-	            Cipher.reset.call(this);
-
-	            // Shortcuts
-	            var cfg = this.cfg;
-	            var iv = cfg.iv;
-	            var mode = cfg.mode;
-
-	            // Reset block mode
-	            if (this._xformMode == this._ENC_XFORM_MODE) {
-	                modeCreator = mode.createEncryptor;
-	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-	                modeCreator = mode.createDecryptor;
-	                // Keep at least one block in the buffer for unpadding
-	                this._minBufferSize = 1;
-	            }
-
-	            if (this._mode && this._mode.__creator == modeCreator) {
-	                this._mode.init(this, iv && iv.words);
-	            } else {
-	                this._mode = modeCreator.call(mode, this, iv && iv.words);
-	                this._mode.__creator = modeCreator;
-	            }
-	        },
-
-	        _doProcessBlock: function (words, offset) {
-	            this._mode.processBlock(words, offset);
-	        },
-
-	        _doFinalize: function () {
-	            var finalProcessedBlocks;
-
-	            // Shortcut
-	            var padding = this.cfg.padding;
-
-	            // Finalize
-	            if (this._xformMode == this._ENC_XFORM_MODE) {
-	                // Pad data
-	                padding.pad(this._data, this.blockSize);
-
-	                // Process final blocks
-	                finalProcessedBlocks = this._process(!!'flush');
-	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-	                // Process final blocks
-	                finalProcessedBlocks = this._process(!!'flush');
-
-	                // Unpad data
-	                padding.unpad(finalProcessedBlocks);
-	            }
-
-	            return finalProcessedBlocks;
-	        },
-
-	        blockSize: 128/32
-	    });
-
-	    /**
-	     * A collection of cipher parameters.
-	     *
-	     * @property {WordArray} ciphertext The raw ciphertext.
-	     * @property {WordArray} key The key to this ciphertext.
-	     * @property {WordArray} iv The IV used in the ciphering operation.
-	     * @property {WordArray} salt The salt used with a key derivation function.
-	     * @property {Cipher} algorithm The cipher algorithm.
-	     * @property {Mode} mode The block mode used in the ciphering operation.
-	     * @property {Padding} padding The padding scheme used in the ciphering operation.
-	     * @property {number} blockSize The block size of the cipher.
-	     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
-	     */
-	    var CipherParams = C_lib.CipherParams = Base.extend({
-	        /**
-	         * Initializes a newly created cipher params object.
-	         *
-	         * @param {Object} cipherParams An object with any of the possible cipher parameters.
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.lib.CipherParams.create({
-	         *         ciphertext: ciphertextWordArray,
-	         *         key: keyWordArray,
-	         *         iv: ivWordArray,
-	         *         salt: saltWordArray,
-	         *         algorithm: CryptoJS.algo.AES,
-	         *         mode: CryptoJS.mode.CBC,
-	         *         padding: CryptoJS.pad.PKCS7,
-	         *         blockSize: 4,
-	         *         formatter: CryptoJS.format.OpenSSL
-	         *     });
-	         */
-	        init: function (cipherParams) {
-	            this.mixIn(cipherParams);
-	        },
-
-	        /**
-	         * Converts this cipher params object to a string.
-	         *
-	         * @param {Format} formatter (Optional) The formatting strategy to use.
-	         *
-	         * @return {string} The stringified cipher params.
-	         *
-	         * @throws Error If neither the formatter nor the default formatter is set.
-	         *
-	         * @example
-	         *
-	         *     var string = cipherParams + '';
-	         *     var string = cipherParams.toString();
-	         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
-	         */
-	        toString: function (formatter) {
-	            return (formatter || this.formatter).stringify(this);
-	        }
-	    });
-
-	    /**
-	     * Format namespace.
-	     */
-	    var C_format = C.format = {};
-
-	    /**
-	     * OpenSSL formatting strategy.
-	     */
-	    var OpenSSLFormatter = C_format.OpenSSL = {
-	        /**
-	         * Converts a cipher params object to an OpenSSL-compatible string.
-	         *
-	         * @param {CipherParams} cipherParams The cipher params object.
-	         *
-	         * @return {string} The OpenSSL-compatible string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
-	         */
-	        stringify: function (cipherParams) {
-	            var wordArray;
-
-	            // Shortcuts
-	            var ciphertext = cipherParams.ciphertext;
-	            var salt = cipherParams.salt;
-
-	            // Format
-	            if (salt) {
-	                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
-	            } else {
-	                wordArray = ciphertext;
-	            }
-
-	            return wordArray.toString(Base64);
-	        },
-
-	        /**
-	         * Converts an OpenSSL-compatible string to a cipher params object.
-	         *
-	         * @param {string} openSSLStr The OpenSSL-compatible string.
-	         *
-	         * @return {CipherParams} The cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
-	         */
-	        parse: function (openSSLStr) {
-	            var salt;
-
-	            // Parse base64
-	            var ciphertext = Base64.parse(openSSLStr);
-
-	            // Shortcut
-	            var ciphertextWords = ciphertext.words;
-
-	            // Test for salt
-	            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
-	                // Extract salt
-	                salt = WordArray.create(ciphertextWords.slice(2, 4));
-
-	                // Remove salt from ciphertext
-	                ciphertextWords.splice(0, 4);
-	                ciphertext.sigBytes -= 16;
-	            }
-
-	            return CipherParams.create({ ciphertext: ciphertext, salt: salt });
-	        }
-	    };
-
-	    /**
-	     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
-	     */
-	    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
-	         */
-	        cfg: Base.extend({
-	            format: OpenSSLFormatter
-	        }),
-
-	        /**
-	         * Encrypts a message.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {WordArray|string} message The message to encrypt.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {CipherParams} A cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         */
-	        encrypt: function (cipher, message, key, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Encrypt
-	            var encryptor = cipher.createEncryptor(key, cfg);
-	            var ciphertext = encryptor.finalize(message);
-
-	            // Shortcut
-	            var cipherCfg = encryptor.cfg;
-
-	            // Create and return serializable cipher params
-	            return CipherParams.create({
-	                ciphertext: ciphertext,
-	                key: key,
-	                iv: cipherCfg.iv,
-	                algorithm: cipher,
-	                mode: cipherCfg.mode,
-	                padding: cipherCfg.padding,
-	                blockSize: cipher.blockSize,
-	                formatter: cfg.format
-	            });
-	        },
-
-	        /**
-	         * Decrypts serialized ciphertext.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {WordArray} The plaintext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         */
-	        decrypt: function (cipher, ciphertext, key, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Convert string to CipherParams
-	            ciphertext = this._parse(ciphertext, cfg.format);
-
-	            // Decrypt
-	            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
-
-	            return plaintext;
-	        },
-
-	        /**
-	         * Converts serialized ciphertext to CipherParams,
-	         * else assumed CipherParams already and returns ciphertext unchanged.
-	         *
-	         * @param {CipherParams|string} ciphertext The ciphertext.
-	         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
-	         *
-	         * @return {CipherParams} The unserialized ciphertext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
-	         */
-	        _parse: function (ciphertext, format) {
-	            if (typeof ciphertext == 'string') {
-	                return format.parse(ciphertext, this);
-	            } else {
-	                return ciphertext;
-	            }
-	        }
-	    });
-
-	    /**
-	     * Key derivation function namespace.
-	     */
-	    var C_kdf = C.kdf = {};
-
-	    /**
-	     * OpenSSL key derivation function.
-	     */
-	    var OpenSSLKdf = C_kdf.OpenSSL = {
-	        /**
-	         * Derives a key and IV from a password.
-	         *
-	         * @param {string} password The password to derive from.
-	         * @param {number} keySize The size in words of the key to generate.
-	         * @param {number} ivSize The size in words of the IV to generate.
-	         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
-	         *
-	         * @return {CipherParams} A cipher params object with the key, IV, and salt.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
-	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
-	         */
-	        execute: function (password, keySize, ivSize, salt, hasher) {
-	            // Generate random salt
-	            if (!salt) {
-	                salt = WordArray.random(64/8);
-	            }
-
-	            // Derive key and IV
-	            if (!hasher) {
-	                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
-	            } else {
-	                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
-	            }
-
-
-	            // Separate key and IV
-	            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
-	            key.sigBytes = keySize * 4;
-
-	            // Return params
-	            return CipherParams.create({ key: key, iv: iv, salt: salt });
-	        }
-	    };
-
-	    /**
-	     * A serializable cipher wrapper that derives the key from a password,
-	     * and returns ciphertext as a serializable cipher params object.
-	     */
-	    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
-	         */
-	        cfg: SerializableCipher.cfg.extend({
-	            kdf: OpenSSLKdf
-	        }),
-
-	        /**
-	         * Encrypts a message using a password.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {WordArray|string} message The message to encrypt.
-	         * @param {string} password The password.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {CipherParams} A cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
-	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
-	         */
-	        encrypt: function (cipher, message, password, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Derive key and other params
-	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);
-
-	            // Add IV to config
-	            cfg.iv = derivedParams.iv;
-
-	            // Encrypt
-	            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
-
-	            // Mix in derived params
-	            ciphertext.mixIn(derivedParams);
-
-	            return ciphertext;
-	        },
-
-	        /**
-	         * Decrypts serialized ciphertext using a password.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
-	         * @param {string} password The password.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {WordArray} The plaintext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
-	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
-	         */
-	        decrypt: function (cipher, ciphertext, password, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Convert string to CipherParams
-	            ciphertext = this._parse(ciphertext, cfg.format);
-
-	            // Derive key and other params
-	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);
-
-	            // Add IV to config
-	            cfg.iv = derivedParams.iv;
-
-	            // Decrypt
-	            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
-
-	            return plaintext;
-	        }
-	    });
-	}());
-
-
-	/**
-	 * Cipher Feedback block mode.
-	 */
-	CryptoJS.mode.CFB = (function () {
-	    var CFB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    CFB.Encryptor = CFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher;
-	            var blockSize = cipher.blockSize;
-
-	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
-
-	            // Remember this block to use with next block
-	            this._prevBlock = words.slice(offset, offset + blockSize);
-	        }
-	    });
-
-	    CFB.Decryptor = CFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher;
-	            var blockSize = cipher.blockSize;
-
-	            // Remember this block to use with next block
-	            var thisBlock = words.slice(offset, offset + blockSize);
-
-	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
-
-	            // This block becomes the previous block
-	            this._prevBlock = thisBlock;
-	        }
-	    });
-
-	    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
-	        var keystream;
-
-	        // Shortcut
-	        var iv = this._iv;
-
-	        // Generate keystream
-	        if (iv) {
-	            keystream = iv.slice(0);
-
-	            // Remove IV for subsequent blocks
-	            this._iv = undefined;
-	        } else {
-	            keystream = this._prevBlock;
-	        }
-	        cipher.encryptBlock(keystream, 0);
-
-	        // Encrypt
-	        for (var i = 0; i < blockSize; i++) {
-	            words[offset + i] ^= keystream[i];
-	        }
-	    }
-
-	    return CFB;
-	}());
-
-
-	/**
-	 * Counter block mode.
-	 */
-	CryptoJS.mode.CTR = (function () {
-	    var CTR = CryptoJS.lib.BlockCipherMode.extend();
-
-	    var Encryptor = CTR.Encryptor = CTR.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var counter = this._counter;
-
-	            // Generate keystream
-	            if (iv) {
-	                counter = this._counter = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-	            var keystream = counter.slice(0);
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Increment counter
-	            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    CTR.Decryptor = Encryptor;
-
-	    return CTR;
-	}());
-
-
-	/** @preserve
-	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
-	 * derived from CryptoJS.mode.CTR
-	 * Jan Hruby jhruby.web@gmail.com
-	 */
-	CryptoJS.mode.CTRGladman = (function () {
-	    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
-
-		function incWord(word)
-		{
-			if (((word >> 24) & 0xff) === 0xff) { //overflow
-			var b1 = (word >> 16)&0xff;
-			var b2 = (word >> 8)&0xff;
-			var b3 = word & 0xff;
-
-			if (b1 === 0xff) // overflow b1
-			{
-			b1 = 0;
-			if (b2 === 0xff)
-			{
-				b2 = 0;
-				if (b3 === 0xff)
-				{
-					b3 = 0;
-				}
-				else
-				{
-					++b3;
-				}
-			}
-			else
-			{
-				++b2;
-			}
-			}
-			else
-			{
-			++b1;
-			}
-
-			word = 0;
-			word += (b1 << 16);
-			word += (b2 << 8);
-			word += b3;
-			}
-			else
-			{
-			word += (0x01 << 24);
-			}
-			return word;
-		}
-
-		function incCounter(counter)
-		{
-			if ((counter[0] = incWord(counter[0])) === 0)
-			{
-				// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
-				counter[1] = incWord(counter[1]);
-			}
-			return counter;
-		}
-
-	    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var counter = this._counter;
-
-	            // Generate keystream
-	            if (iv) {
-	                counter = this._counter = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-
-				incCounter(counter);
-
-				var keystream = counter.slice(0);
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    CTRGladman.Decryptor = Encryptor;
-
-	    return CTRGladman;
-	}());
-
-
-
-
-	/**
-	 * Output Feedback block mode.
-	 */
-	CryptoJS.mode.OFB = (function () {
-	    var OFB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    var Encryptor = OFB.Encryptor = OFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var keystream = this._keystream;
-
-	            // Generate keystream
-	            if (iv) {
-	                keystream = this._keystream = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    OFB.Decryptor = Encryptor;
-
-	    return OFB;
-	}());
-
-
-	/**
-	 * Electronic Codebook block mode.
-	 */
-	CryptoJS.mode.ECB = (function () {
-	    var ECB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    ECB.Encryptor = ECB.extend({
-	        processBlock: function (words, offset) {
-	            this._cipher.encryptBlock(words, offset);
-	        }
-	    });
-
-	    ECB.Decryptor = ECB.extend({
-	        processBlock: function (words, offset) {
-	            this._cipher.decryptBlock(words, offset);
-	        }
-	    });
-
-	    return ECB;
-	}());
-
-
-	/**
-	 * ANSI X.923 padding strategy.
-	 */
-	CryptoJS.pad.AnsiX923 = {
-	    pad: function (data, blockSize) {
-	        // Shortcuts
-	        var dataSigBytes = data.sigBytes;
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Count padding bytes
-	        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
-
-	        // Compute last byte position
-	        var lastBytePos = dataSigBytes + nPaddingBytes - 1;
-
-	        // Pad
-	        data.clamp();
-	        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
-	        data.sigBytes += nPaddingBytes;
-	    },
-
-	    unpad: function (data) {
-	        // Get number of padding bytes from last byte
-	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	        // Remove padding
-	        data.sigBytes -= nPaddingBytes;
-	    }
-	};
-
-
-	/**
-	 * ISO 10126 padding strategy.
-	 */
-	CryptoJS.pad.Iso10126 = {
-	    pad: function (data, blockSize) {
-	        // Shortcut
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Count padding bytes
-	        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
-
-	        // Pad
-	        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
-	             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
-	    },
-
-	    unpad: function (data) {
-	        // Get number of padding bytes from last byte
-	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	        // Remove padding
-	        data.sigBytes -= nPaddingBytes;
-	    }
-	};
-
-
-	/**
-	 * ISO/IEC 9797-1 Padding Method 2.
-	 */
-	CryptoJS.pad.Iso97971 = {
-	    pad: function (data, blockSize) {
-	        // Add 0x80 byte
-	        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
-
-	        // Zero pad the rest
-	        CryptoJS.pad.ZeroPadding.pad(data, blockSize);
-	    },
-
-	    unpad: function (data) {
-	        // Remove zero padding
-	        CryptoJS.pad.ZeroPadding.unpad(data);
-
-	        // Remove one more byte -- the 0x80 byte
-	        data.sigBytes--;
-	    }
-	};
-
-
-	/**
-	 * Zero padding strategy.
-	 */
-	CryptoJS.pad.ZeroPadding = {
-	    pad: function (data, blockSize) {
-	        // Shortcut
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Pad
-	        data.clamp();
-	        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
-	    },
-
-	    unpad: function (data) {
-	        // Shortcut
-	        var dataWords = data.words;
-
-	        // Unpad
-	        var i = data.sigBytes - 1;
-	        for (var i = data.sigBytes - 1; i >= 0; i--) {
-	            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-	                data.sigBytes = i + 1;
-	                break;
-	            }
-	        }
-	    }
-	};
-
-
-	/**
-	 * A noop padding strategy.
-	 */
-	CryptoJS.pad.NoPadding = {
-	    pad: function () {
-	    },
-
-	    unpad: function () {
-	    }
-	};
-
-
-	(function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var CipherParams = C_lib.CipherParams;
-	    var C_enc = C.enc;
-	    var Hex = C_enc.Hex;
-	    var C_format = C.format;
-
-	    var HexFormatter = C_format.Hex = {
-	        /**
-	         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
-	         *
-	         * @param {CipherParams} cipherParams The cipher params object.
-	         *
-	         * @return {string} The hexadecimally encoded string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
-	         */
-	        stringify: function (cipherParams) {
-	            return cipherParams.ciphertext.toString(Hex);
-	        },
-
-	        /**
-	         * Converts a hexadecimally encoded ciphertext string to a cipher params object.
-	         *
-	         * @param {string} input The hexadecimally encoded string.
-	         *
-	         * @return {CipherParams} The cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
-	         */
-	        parse: function (input) {
-	            var ciphertext = Hex.parse(input);
-	            return CipherParams.create({ ciphertext: ciphertext });
-	        }
-	    };
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    // Lookup tables
-	    var SBOX = [];
-	    var INV_SBOX = [];
-	    var SUB_MIX_0 = [];
-	    var SUB_MIX_1 = [];
-	    var SUB_MIX_2 = [];
-	    var SUB_MIX_3 = [];
-	    var INV_SUB_MIX_0 = [];
-	    var INV_SUB_MIX_1 = [];
-	    var INV_SUB_MIX_2 = [];
-	    var INV_SUB_MIX_3 = [];
-
-	    // Compute lookup tables
-	    (function () {
-	        // Compute double table
-	        var d = [];
-	        for (var i = 0; i < 256; i++) {
-	            if (i < 128) {
-	                d[i] = i << 1;
-	            } else {
-	                d[i] = (i << 1) ^ 0x11b;
-	            }
-	        }
-
-	        // Walk GF(2^8)
-	        var x = 0;
-	        var xi = 0;
-	        for (var i = 0; i < 256; i++) {
-	            // Compute sbox
-	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
-	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
-	            SBOX[x] = sx;
-	            INV_SBOX[sx] = x;
-
-	            // Compute multiplication
-	            var x2 = d[x];
-	            var x4 = d[x2];
-	            var x8 = d[x4];
-
-	            // Compute sub bytes, mix columns tables
-	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
-	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
-	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
-	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
-	            SUB_MIX_3[x] = t;
-
-	            // Compute inv sub bytes, inv mix columns tables
-	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
-	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
-	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
-	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
-	            INV_SUB_MIX_3[sx] = t;
-
-	            // Compute next counter
-	            if (!x) {
-	                x = xi = 1;
-	            } else {
-	                x = x2 ^ d[d[d[x8 ^ x2]]];
-	                xi ^= d[d[xi]];
-	            }
-	        }
-	    }());
-
-	    // Precomputed Rcon lookup
-	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-
-	    /**
-	     * AES block cipher algorithm.
-	     */
-	    var AES = C_algo.AES = BlockCipher.extend({
-	        _doReset: function () {
-	            var t;
-
-	            // Skip reset of nRounds has been set before and key did not change
-	            if (this._nRounds && this._keyPriorReset === this._key) {
-	                return;
-	            }
-
-	            // Shortcuts
-	            var key = this._keyPriorReset = this._key;
-	            var keyWords = key.words;
-	            var keySize = key.sigBytes / 4;
-
-	            // Compute number of rounds
-	            var nRounds = this._nRounds = keySize + 6;
-
-	            // Compute number of key schedule rows
-	            var ksRows = (nRounds + 1) * 4;
-
-	            // Compute key schedule
-	            var keySchedule = this._keySchedule = [];
-	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
-	                if (ksRow < keySize) {
-	                    keySchedule[ksRow] = keyWords[ksRow];
-	                } else {
-	                    t = keySchedule[ksRow - 1];
-
-	                    if (!(ksRow % keySize)) {
-	                        // Rot word
-	                        t = (t << 8) | (t >>> 24);
-
-	                        // Sub word
-	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
-
-	                        // Mix Rcon
-	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
-	                    } else if (keySize > 6 && ksRow % keySize == 4) {
-	                        // Sub word
-	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
-	                    }
-
-	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
-	                }
-	            }
-
-	            // Compute inv key schedule
-	            var invKeySchedule = this._invKeySchedule = [];
-	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
-	                var ksRow = ksRows - invKsRow;
-
-	                if (invKsRow % 4) {
-	                    var t = keySchedule[ksRow];
-	                } else {
-	                    var t = keySchedule[ksRow - 4];
-	                }
-
-	                if (invKsRow < 4 || ksRow <= 4) {
-	                    invKeySchedule[invKsRow] = t;
-	                } else {
-	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
-	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
-	                }
-	            }
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            // Swap 2nd and 4th rows
-	            var t = M[offset + 1];
-	            M[offset + 1] = M[offset + 3];
-	            M[offset + 3] = t;
-
-	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
-
-	            // Inv swap 2nd and 4th rows
-	            var t = M[offset + 1];
-	            M[offset + 1] = M[offset + 3];
-	            M[offset + 3] = t;
-	        },
-
-	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
-	            // Shortcut
-	            var nRounds = this._nRounds;
-
-	            // Get input, add round key
-	            var s0 = M[offset]     ^ keySchedule[0];
-	            var s1 = M[offset + 1] ^ keySchedule[1];
-	            var s2 = M[offset + 2] ^ keySchedule[2];
-	            var s3 = M[offset + 3] ^ keySchedule[3];
-
-	            // Key schedule row counter
-	            var ksRow = 4;
-
-	            // Rounds
-	            for (var round = 1; round < nRounds; round++) {
-	                // Shift rows, sub bytes, mix columns, add round key
-	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
-	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
-	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
-	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
-
-	                // Update state
-	                s0 = t0;
-	                s1 = t1;
-	                s2 = t2;
-	                s3 = t3;
-	            }
-
-	            // Shift rows, sub bytes, add round key
-	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
-	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
-	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
-	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
-
-	            // Set output
-	            M[offset]     = t0;
-	            M[offset + 1] = t1;
-	            M[offset + 2] = t2;
-	            M[offset + 3] = t3;
-	        },
-
-	        keySize: 256/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.AES = BlockCipher._createHelper(AES);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    // Permuted Choice 1 constants
-	    var PC1 = [
-	        57, 49, 41, 33, 25, 17, 9,  1,
-	        58, 50, 42, 34, 26, 18, 10, 2,
-	        59, 51, 43, 35, 27, 19, 11, 3,
-	        60, 52, 44, 36, 63, 55, 47, 39,
-	        31, 23, 15, 7,  62, 54, 46, 38,
-	        30, 22, 14, 6,  61, 53, 45, 37,
-	        29, 21, 13, 5,  28, 20, 12, 4
-	    ];
-
-	    // Permuted Choice 2 constants
-	    var PC2 = [
-	        14, 17, 11, 24, 1,  5,
-	        3,  28, 15, 6,  21, 10,
-	        23, 19, 12, 4,  26, 8,
-	        16, 7,  27, 20, 13, 2,
-	        41, 52, 31, 37, 47, 55,
-	        30, 40, 51, 45, 33, 48,
-	        44, 49, 39, 56, 34, 53,
-	        46, 42, 50, 36, 29, 32
-	    ];
-
-	    // Cumulative bit shift constants
-	    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
-
-	    // SBOXes and round permutation constants
-	    var SBOX_P = [
-	        {
-	            0x0: 0x808200,
-	            0x10000000: 0x8000,
-	            0x20000000: 0x808002,
-	            0x30000000: 0x2,
-	            0x40000000: 0x200,
-	            0x50000000: 0x808202,
-	            0x60000000: 0x800202,
-	            0x70000000: 0x800000,
-	            0x80000000: 0x202,
-	            0x90000000: 0x800200,
-	            0xa0000000: 0x8200,
-	            0xb0000000: 0x808000,
-	            0xc0000000: 0x8002,
-	            0xd0000000: 0x800002,
-	            0xe0000000: 0x0,
-	            0xf0000000: 0x8202,
-	            0x8000000: 0x0,
-	            0x18000000: 0x808202,
-	            0x28000000: 0x8202,
-	            0x38000000: 0x8000,
-	            0x48000000: 0x808200,
-	            0x58000000: 0x200,
-	            0x68000000: 0x808002,
-	            0x78000000: 0x2,
-	            0x88000000: 0x800200,
-	            0x98000000: 0x8200,
-	            0xa8000000: 0x808000,
-	            0xb8000000: 0x800202,
-	            0xc8000000: 0x800002,
-	            0xd8000000: 0x8002,
-	            0xe8000000: 0x202,
-	            0xf8000000: 0x800000,
-	            0x1: 0x8000,
-	            0x10000001: 0x2,
-	            0x20000001: 0x808200,
-	            0x30000001: 0x800000,
-	            0x40000001: 0x808002,
-	            0x50000001: 0x8200,
-	            0x60000001: 0x200,
-	            0x70000001: 0x800202,
-	            0x80000001: 0x808202,
-	            0x90000001: 0x808000,
-	            0xa0000001: 0x800002,
-	            0xb0000001: 0x8202,
-	            0xc0000001: 0x202,
-	            0xd0000001: 0x800200,
-	            0xe0000001: 0x8002,
-	            0xf0000001: 0x0,
-	            0x8000001: 0x808202,
-	            0x18000001: 0x808000,
-	            0x28000001: 0x800000,
-	            0x38000001: 0x200,
-	            0x48000001: 0x8000,
-	            0x58000001: 0x800002,
-	            0x68000001: 0x2,
-	            0x78000001: 0x8202,
-	            0x88000001: 0x8002,
-	            0x98000001: 0x800202,
-	            0xa8000001: 0x202,
-	            0xb8000001: 0x808200,
-	            0xc8000001: 0x800200,
-	            0xd8000001: 0x0,
-	            0xe8000001: 0x8200,
-	            0xf8000001: 0x808002
-	        },
-	        {
-	            0x0: 0x40084010,
-	            0x1000000: 0x4000,
-	            0x2000000: 0x80000,
-	            0x3000000: 0x40080010,
-	            0x4000000: 0x40000010,
-	            0x5000000: 0x40084000,
-	            0x6000000: 0x40004000,
-	            0x7000000: 0x10,
-	            0x8000000: 0x84000,
-	            0x9000000: 0x40004010,
-	            0xa000000: 0x40000000,
-	            0xb000000: 0x84010,
-	            0xc000000: 0x80010,
-	            0xd000000: 0x0,
-	            0xe000000: 0x4010,
-	            0xf000000: 0x40080000,
-	            0x800000: 0x40004000,
-	            0x1800000: 0x84010,
-	            0x2800000: 0x10,
-	            0x3800000: 0x40004010,
-	            0x4800000: 0x40084010,
-	            0x5800000: 0x40000000,
-	            0x6800000: 0x80000,
-	            0x7800000: 0x40080010,
-	            0x8800000: 0x80010,
-	            0x9800000: 0x0,
-	            0xa800000: 0x4000,
-	            0xb800000: 0x40080000,
-	            0xc800000: 0x40000010,
-	            0xd800000: 0x84000,
-	            0xe800000: 0x40084000,
-	            0xf800000: 0x4010,
-	            0x10000000: 0x0,
-	            0x11000000: 0x40080010,
-	            0x12000000: 0x40004010,
-	            0x13000000: 0x40084000,
-	            0x14000000: 0x40080000,
-	            0x15000000: 0x10,
-	            0x16000000: 0x84010,
-	            0x17000000: 0x4000,
-	            0x18000000: 0x4010,
-	            0x19000000: 0x80000,
-	            0x1a000000: 0x80010,
-	            0x1b000000: 0x40000010,
-	            0x1c000000: 0x84000,
-	            0x1d000000: 0x40004000,
-	            0x1e000000: 0x40000000,
-	            0x1f000000: 0x40084010,
-	            0x10800000: 0x84010,
-	            0x11800000: 0x80000,
-	            0x12800000: 0x40080000,
-	            0x13800000: 0x4000,
-	            0x14800000: 0x40004000,
-	            0x15800000: 0x40084010,
-	            0x16800000: 0x10,
-	            0x17800000: 0x40000000,
-	            0x18800000: 0x40084000,
-	            0x19800000: 0x40000010,
-	            0x1a800000: 0x40004010,
-	            0x1b800000: 0x80010,
-	            0x1c800000: 0x0,
-	            0x1d800000: 0x4010,
-	            0x1e800000: 0x40080010,
-	            0x1f800000: 0x84000
-	        },
-	        {
-	            0x0: 0x104,
-	            0x100000: 0x0,
-	            0x200000: 0x4000100,
-	            0x300000: 0x10104,
-	            0x400000: 0x10004,
-	            0x500000: 0x4000004,
-	            0x600000: 0x4010104,
-	            0x700000: 0x4010000,
-	            0x800000: 0x4000000,
-	            0x900000: 0x4010100,
-	            0xa00000: 0x10100,
-	            0xb00000: 0x4010004,
-	            0xc00000: 0x4000104,
-	            0xd00000: 0x10000,
-	            0xe00000: 0x4,
-	            0xf00000: 0x100,
-	            0x80000: 0x4010100,
-	            0x180000: 0x4010004,
-	            0x280000: 0x0,
-	            0x380000: 0x4000100,
-	            0x480000: 0x4000004,
-	            0x580000: 0x10000,
-	            0x680000: 0x10004,
-	            0x780000: 0x104,
-	            0x880000: 0x4,
-	            0x980000: 0x100,
-	            0xa80000: 0x4010000,
-	            0xb80000: 0x10104,
-	            0xc80000: 0x10100,
-	            0xd80000: 0x4000104,
-	            0xe80000: 0x4010104,
-	            0xf80000: 0x4000000,
-	            0x1000000: 0x4010100,
-	            0x1100000: 0x10004,
-	            0x1200000: 0x10000,
-	            0x1300000: 0x4000100,
-	            0x1400000: 0x100,
-	            0x1500000: 0x4010104,
-	            0x1600000: 0x4000004,
-	            0x1700000: 0x0,
-	            0x1800000: 0x4000104,
-	            0x1900000: 0x4000000,
-	            0x1a00000: 0x4,
-	            0x1b00000: 0x10100,
-	            0x1c00000: 0x4010000,
-	            0x1d00000: 0x104,
-	            0x1e00000: 0x10104,
-	            0x1f00000: 0x4010004,
-	            0x1080000: 0x4000000,
-	            0x1180000: 0x104,
-	            0x1280000: 0x4010100,
-	            0x1380000: 0x0,
-	            0x1480000: 0x10004,
-	            0x1580000: 0x4000100,
-	            0x1680000: 0x100,
-	            0x1780000: 0x4010004,
-	            0x1880000: 0x10000,
-	            0x1980000: 0x4010104,
-	            0x1a80000: 0x10104,
-	            0x1b80000: 0x4000004,
-	            0x1c80000: 0x4000104,
-	            0x1d80000: 0x4010000,
-	            0x1e80000: 0x4,
-	            0x1f80000: 0x10100
-	        },
-	        {
-	            0x0: 0x80401000,
-	            0x10000: 0x80001040,
-	            0x20000: 0x401040,
-	            0x30000: 0x80400000,
-	            0x40000: 0x0,
-	            0x50000: 0x401000,
-	            0x60000: 0x80000040,
-	            0x70000: 0x400040,
-	            0x80000: 0x80000000,
-	            0x90000: 0x400000,
-	            0xa0000: 0x40,
-	            0xb0000: 0x80001000,
-	            0xc0000: 0x80400040,
-	            0xd0000: 0x1040,
-	            0xe0000: 0x1000,
-	            0xf0000: 0x80401040,
-	            0x8000: 0x80001040,
-	            0x18000: 0x40,
-	            0x28000: 0x80400040,
-	            0x38000: 0x80001000,
-	            0x48000: 0x401000,
-	            0x58000: 0x80401040,
-	            0x68000: 0x0,
-	            0x78000: 0x80400000,
-	            0x88000: 0x1000,
-	            0x98000: 0x80401000,
-	            0xa8000: 0x400000,
-	            0xb8000: 0x1040,
-	            0xc8000: 0x80000000,
-	            0xd8000: 0x400040,
-	            0xe8000: 0x401040,
-	            0xf8000: 0x80000040,
-	            0x100000: 0x400040,
-	            0x110000: 0x401000,
-	            0x120000: 0x80000040,
-	            0x130000: 0x0,
-	            0x140000: 0x1040,
-	            0x150000: 0x80400040,
-	            0x160000: 0x80401000,
-	            0x170000: 0x80001040,
-	            0x180000: 0x80401040,
-	            0x190000: 0x80000000,
-	            0x1a0000: 0x80400000,
-	            0x1b0000: 0x401040,
-	            0x1c0000: 0x80001000,
-	            0x1d0000: 0x400000,
-	            0x1e0000: 0x40,
-	            0x1f0000: 0x1000,
-	            0x108000: 0x80400000,
-	            0x118000: 0x80401040,
-	            0x128000: 0x0,
-	            0x138000: 0x401000,
-	            0x148000: 0x400040,
-	            0x158000: 0x80000000,
-	            0x168000: 0x80001040,
-	            0x178000: 0x40,
-	            0x188000: 0x80000040,
-	            0x198000: 0x1000,
-	            0x1a8000: 0x80001000,
-	            0x1b8000: 0x80400040,
-	            0x1c8000: 0x1040,
-	            0x1d8000: 0x80401000,
-	            0x1e8000: 0x400000,
-	            0x1f8000: 0x401040
-	        },
-	        {
-	            0x0: 0x80,
-	            0x1000: 0x1040000,
-	            0x2000: 0x40000,
-	            0x3000: 0x20000000,
-	            0x4000: 0x20040080,
-	            0x5000: 0x1000080,
-	            0x6000: 0x21000080,
-	            0x7000: 0x40080,
-	            0x8000: 0x1000000,
-	            0x9000: 0x20040000,
-	            0xa000: 0x20000080,
-	            0xb000: 0x21040080,
-	            0xc000: 0x21040000,
-	            0xd000: 0x0,
-	            0xe000: 0x1040080,
-	            0xf000: 0x21000000,
-	            0x800: 0x1040080,
-	            0x1800: 0x21000080,
-	            0x2800: 0x80,
-	            0x3800: 0x1040000,
-	            0x4800: 0x40000,
-	            0x5800: 0x20040080,
-	            0x6800: 0x21040000,
-	            0x7800: 0x20000000,
-	            0x8800: 0x20040000,
-	            0x9800: 0x0,
-	            0xa800: 0x21040080,
-	            0xb800: 0x1000080,
-	            0xc800: 0x20000080,
-	            0xd800: 0x21000000,
-	            0xe800: 0x1000000,
-	            0xf800: 0x40080,
-	            0x10000: 0x40000,
-	            0x11000: 0x80,
-	            0x12000: 0x20000000,
-	            0x13000: 0x21000080,
-	            0x14000: 0x1000080,
-	            0x15000: 0x21040000,
-	            0x16000: 0x20040080,
-	            0x17000: 0x1000000,
-	            0x18000: 0x21040080,
-	            0x19000: 0x21000000,
-	            0x1a000: 0x1040000,
-	            0x1b000: 0x20040000,
-	            0x1c000: 0x40080,
-	            0x1d000: 0x20000080,
-	            0x1e000: 0x0,
-	            0x1f000: 0x1040080,
-	            0x10800: 0x21000080,
-	            0x11800: 0x1000000,
-	            0x12800: 0x1040000,
-	            0x13800: 0x20040080,
-	            0x14800: 0x20000000,
-	            0x15800: 0x1040080,
-	            0x16800: 0x80,
-	            0x17800: 0x21040000,
-	            0x18800: 0x40080,
-	            0x19800: 0x21040080,
-	            0x1a800: 0x0,
-	            0x1b800: 0x21000000,
-	            0x1c800: 0x1000080,
-	            0x1d800: 0x40000,
-	            0x1e800: 0x20040000,
-	            0x1f800: 0x20000080
-	        },
-	        {
-	            0x0: 0x10000008,
-	            0x100: 0x2000,
-	            0x200: 0x10200000,
-	            0x300: 0x10202008,
-	            0x400: 0x10002000,
-	            0x500: 0x200000,
-	            0x600: 0x200008,
-	            0x700: 0x10000000,
-	            0x800: 0x0,
-	            0x900: 0x10002008,
-	            0xa00: 0x202000,
-	            0xb00: 0x8,
-	            0xc00: 0x10200008,
-	            0xd00: 0x202008,
-	            0xe00: 0x2008,
-	            0xf00: 0x10202000,
-	            0x80: 0x10200000,
-	            0x180: 0x10202008,
-	            0x280: 0x8,
-	            0x380: 0x200000,
-	            0x480: 0x202008,
-	            0x580: 0x10000008,
-	            0x680: 0x10002000,
-	            0x780: 0x2008,
-	            0x880: 0x200008,
-	            0x980: 0x2000,
-	            0xa80: 0x10002008,
-	            0xb80: 0x10200008,
-	            0xc80: 0x0,
-	            0xd80: 0x10202000,
-	            0xe80: 0x202000,
-	            0xf80: 0x10000000,
-	            0x1000: 0x10002000,
-	            0x1100: 0x10200008,
-	            0x1200: 0x10202008,
-	            0x1300: 0x2008,
-	            0x1400: 0x200000,
-	            0x1500: 0x10000000,
-	            0x1600: 0x10000008,
-	            0x1700: 0x202000,
-	            0x1800: 0x202008,
-	            0x1900: 0x0,
-	            0x1a00: 0x8,
-	            0x1b00: 0x10200000,
-	            0x1c00: 0x2000,
-	            0x1d00: 0x10002008,
-	            0x1e00: 0x10202000,
-	            0x1f00: 0x200008,
-	            0x1080: 0x8,
-	            0x1180: 0x202000,
-	            0x1280: 0x200000,
-	            0x1380: 0x10000008,
-	            0x1480: 0x10002000,
-	            0x1580: 0x2008,
-	            0x1680: 0x10202008,
-	            0x1780: 0x10200000,
-	            0x1880: 0x10202000,
-	            0x1980: 0x10200008,
-	            0x1a80: 0x2000,
-	            0x1b80: 0x202008,
-	            0x1c80: 0x200008,
-	            0x1d80: 0x0,
-	            0x1e80: 0x10000000,
-	            0x1f80: 0x10002008
-	        },
-	        {
-	            0x0: 0x100000,
-	            0x10: 0x2000401,
-	            0x20: 0x400,
-	            0x30: 0x100401,
-	            0x40: 0x2100401,
-	            0x50: 0x0,
-	            0x60: 0x1,
-	            0x70: 0x2100001,
-	            0x80: 0x2000400,
-	            0x90: 0x100001,
-	            0xa0: 0x2000001,
-	            0xb0: 0x2100400,
-	            0xc0: 0x2100000,
-	            0xd0: 0x401,
-	            0xe0: 0x100400,
-	            0xf0: 0x2000000,
-	            0x8: 0x2100001,
-	            0x18: 0x0,
-	            0x28: 0x2000401,
-	            0x38: 0x2100400,
-	            0x48: 0x100000,
-	            0x58: 0x2000001,
-	            0x68: 0x2000000,
-	            0x78: 0x401,
-	            0x88: 0x100401,
-	            0x98: 0x2000400,
-	            0xa8: 0x2100000,
-	            0xb8: 0x100001,
-	            0xc8: 0x400,
-	            0xd8: 0x2100401,
-	            0xe8: 0x1,
-	            0xf8: 0x100400,
-	            0x100: 0x2000000,
-	            0x110: 0x100000,
-	            0x120: 0x2000401,
-	            0x130: 0x2100001,
-	            0x140: 0x100001,
-	            0x150: 0x2000400,
-	            0x160: 0x2100400,
-	            0x170: 0x100401,
-	            0x180: 0x401,
-	            0x190: 0x2100401,
-	            0x1a0: 0x100400,
-	            0x1b0: 0x1,
-	            0x1c0: 0x0,
-	            0x1d0: 0x2100000,
-	            0x1e0: 0x2000001,
-	            0x1f0: 0x400,
-	            0x108: 0x100400,
-	            0x118: 0x2000401,
-	            0x128: 0x2100001,
-	            0x138: 0x1,
-	            0x148: 0x2000000,
-	            0x158: 0x100000,
-	            0x168: 0x401,
-	            0x178: 0x2100400,
-	            0x188: 0x2000001,
-	            0x198: 0x2100000,
-	            0x1a8: 0x0,
-	            0x1b8: 0x2100401,
-	            0x1c8: 0x100401,
-	            0x1d8: 0x400,
-	            0x1e8: 0x2000400,
-	            0x1f8: 0x100001
-	        },
-	        {
-	            0x0: 0x8000820,
-	            0x1: 0x20000,
-	            0x2: 0x8000000,
-	            0x3: 0x20,
-	            0x4: 0x20020,
-	            0x5: 0x8020820,
-	            0x6: 0x8020800,
-	            0x7: 0x800,
-	            0x8: 0x8020000,
-	            0x9: 0x8000800,
-	            0xa: 0x20800,
-	            0xb: 0x8020020,
-	            0xc: 0x820,
-	            0xd: 0x0,
-	            0xe: 0x8000020,
-	            0xf: 0x20820,
-	            0x80000000: 0x800,
-	            0x80000001: 0x8020820,
-	            0x80000002: 0x8000820,
-	            0x80000003: 0x8000000,
-	            0x80000004: 0x8020000,
-	            0x80000005: 0x20800,
-	            0x80000006: 0x20820,
-	            0x80000007: 0x20,
-	            0x80000008: 0x8000020,
-	            0x80000009: 0x820,
-	            0x8000000a: 0x20020,
-	            0x8000000b: 0x8020800,
-	            0x8000000c: 0x0,
-	            0x8000000d: 0x8020020,
-	            0x8000000e: 0x8000800,
-	            0x8000000f: 0x20000,
-	            0x10: 0x20820,
-	            0x11: 0x8020800,
-	            0x12: 0x20,
-	            0x13: 0x800,
-	            0x14: 0x8000800,
-	            0x15: 0x8000020,
-	            0x16: 0x8020020,
-	            0x17: 0x20000,
-	            0x18: 0x0,
-	            0x19: 0x20020,
-	            0x1a: 0x8020000,
-	            0x1b: 0x8000820,
-	            0x1c: 0x8020820,
-	            0x1d: 0x20800,
-	            0x1e: 0x820,
-	            0x1f: 0x8000000,
-	            0x80000010: 0x20000,
-	            0x80000011: 0x800,
-	            0x80000012: 0x8020020,
-	            0x80000013: 0x20820,
-	            0x80000014: 0x20,
-	            0x80000015: 0x8020000,
-	            0x80000016: 0x8000000,
-	            0x80000017: 0x8000820,
-	            0x80000018: 0x8020820,
-	            0x80000019: 0x8000020,
-	            0x8000001a: 0x8000800,
-	            0x8000001b: 0x0,
-	            0x8000001c: 0x20800,
-	            0x8000001d: 0x820,
-	            0x8000001e: 0x20020,
-	            0x8000001f: 0x8020800
-	        }
-	    ];
-
-	    // Masks that select the SBOX input
-	    var SBOX_MASK = [
-	        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
-	        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
-	    ];
-
-	    /**
-	     * DES block cipher algorithm.
-	     */
-	    var DES = C_algo.DES = BlockCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-
-	            // Select 56 bits according to PC1
-	            var keyBits = [];
-	            for (var i = 0; i < 56; i++) {
-	                var keyBitPos = PC1[i] - 1;
-	                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
-	            }
-
-	            // Assemble 16 subkeys
-	            var subKeys = this._subKeys = [];
-	            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
-	                // Create subkey
-	                var subKey = subKeys[nSubKey] = [];
-
-	                // Shortcut
-	                var bitShift = BIT_SHIFTS[nSubKey];
-
-	                // Select 48 bits according to PC2
-	                for (var i = 0; i < 24; i++) {
-	                    // Select from the left 28 key bits
-	                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
-
-	                    // Select from the right 28 key bits
-	                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
-	                }
-
-	                // Since each subkey is applied to an expanded 32-bit input,
-	                // the subkey can be broken into 8 values scaled to 32-bits,
-	                // which allows the key to be used without expansion
-	                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
-	                for (var i = 1; i < 7; i++) {
-	                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
-	                }
-	                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
-	            }
-
-	            // Compute inverse subkeys
-	            var invSubKeys = this._invSubKeys = [];
-	            for (var i = 0; i < 16; i++) {
-	                invSubKeys[i] = subKeys[15 - i];
-	            }
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._subKeys);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._invSubKeys);
-	        },
-
-	        _doCryptBlock: function (M, offset, subKeys) {
-	            // Get input
-	            this._lBlock = M[offset];
-	            this._rBlock = M[offset + 1];
-
-	            // Initial permutation
-	            exchangeLR.call(this, 4,  0x0f0f0f0f);
-	            exchangeLR.call(this, 16, 0x0000ffff);
-	            exchangeRL.call(this, 2,  0x33333333);
-	            exchangeRL.call(this, 8,  0x00ff00ff);
-	            exchangeLR.call(this, 1,  0x55555555);
-
-	            // Rounds
-	            for (var round = 0; round < 16; round++) {
-	                // Shortcuts
-	                var subKey = subKeys[round];
-	                var lBlock = this._lBlock;
-	                var rBlock = this._rBlock;
-
-	                // Feistel function
-	                var f = 0;
-	                for (var i = 0; i < 8; i++) {
-	                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
-	                }
-	                this._lBlock = rBlock;
-	                this._rBlock = lBlock ^ f;
-	            }
-
-	            // Undo swap from last round
-	            var t = this._lBlock;
-	            this._lBlock = this._rBlock;
-	            this._rBlock = t;
-
-	            // Final permutation
-	            exchangeLR.call(this, 1,  0x55555555);
-	            exchangeRL.call(this, 8,  0x00ff00ff);
-	            exchangeRL.call(this, 2,  0x33333333);
-	            exchangeLR.call(this, 16, 0x0000ffff);
-	            exchangeLR.call(this, 4,  0x0f0f0f0f);
-
-	            // Set output
-	            M[offset] = this._lBlock;
-	            M[offset + 1] = this._rBlock;
-	        },
-
-	        keySize: 64/32,
-
-	        ivSize: 64/32,
-
-	        blockSize: 64/32
-	    });
-
-	    // Swap bits across the left and right words
-	    function exchangeLR(offset, mask) {
-	        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
-	        this._rBlock ^= t;
-	        this._lBlock ^= t << offset;
-	    }
-
-	    function exchangeRL(offset, mask) {
-	        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
-	        this._lBlock ^= t;
-	        this._rBlock ^= t << offset;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.DES = BlockCipher._createHelper(DES);
-
-	    /**
-	     * Triple-DES block cipher algorithm.
-	     */
-	    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-	            // Make sure the key length is valid (64, 128 or >= 192 bit)
-	            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
-	                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
-	            }
-
-	            // Extend the key according to the keying options defined in 3DES standard
-	            var key1 = keyWords.slice(0, 2);
-	            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
-	            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
-
-	            // Create DES instances
-	            this._des1 = DES.createEncryptor(WordArray.create(key1));
-	            this._des2 = DES.createEncryptor(WordArray.create(key2));
-	            this._des3 = DES.createEncryptor(WordArray.create(key3));
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._des1.encryptBlock(M, offset);
-	            this._des2.decryptBlock(M, offset);
-	            this._des3.encryptBlock(M, offset);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            this._des3.decryptBlock(M, offset);
-	            this._des2.encryptBlock(M, offset);
-	            this._des1.decryptBlock(M, offset);
-	        },
-
-	        keySize: 192/32,
-
-	        ivSize: 64/32,
-
-	        blockSize: 64/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.TripleDES = BlockCipher._createHelper(TripleDES);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    /**
-	     * RC4 stream cipher algorithm.
-	     */
-	    var RC4 = C_algo.RC4 = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-	            var keySigBytes = key.sigBytes;
-
-	            // Init sbox
-	            var S = this._S = [];
-	            for (var i = 0; i < 256; i++) {
-	                S[i] = i;
-	            }
-
-	            // Key setup
-	            for (var i = 0, j = 0; i < 256; i++) {
-	                var keyByteIndex = i % keySigBytes;
-	                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
-
-	                j = (j + S[i] + keyByte) % 256;
-
-	                // Swap
-	                var t = S[i];
-	                S[i] = S[j];
-	                S[j] = t;
-	            }
-
-	            // Counters
-	            this._i = this._j = 0;
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            M[offset] ^= generateKeystreamWord.call(this);
-	        },
-
-	        keySize: 256/32,
-
-	        ivSize: 0
-	    });
-
-	    function generateKeystreamWord() {
-	        // Shortcuts
-	        var S = this._S;
-	        var i = this._i;
-	        var j = this._j;
-
-	        // Generate keystream word
-	        var keystreamWord = 0;
-	        for (var n = 0; n < 4; n++) {
-	            i = (i + 1) % 256;
-	            j = (j + S[i]) % 256;
-
-	            // Swap
-	            var t = S[i];
-	            S[i] = S[j];
-	            S[j] = t;
-
-	            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
-	        }
-
-	        // Update counters
-	        this._i = i;
-	        this._j = j;
-
-	        return keystreamWord;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RC4 = StreamCipher._createHelper(RC4);
-
-	    /**
-	     * Modified RC4 stream cipher algorithm.
-	     */
-	    var RC4Drop = C_algo.RC4Drop = RC4.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} drop The number of keystream words to drop. Default 192
-	         */
-	        cfg: RC4.cfg.extend({
-	            drop: 192
-	        }),
-
-	        _doReset: function () {
-	            RC4._doReset.call(this);
-
-	            // Drop
-	            for (var i = this.cfg.drop; i > 0; i--) {
-	                generateKeystreamWord.call(this);
-	            }
-	        }
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    // Reusable objects
-	    var S  = [];
-	    var C_ = [];
-	    var G  = [];
-
-	    /**
-	     * Rabbit stream cipher algorithm
-	     */
-	    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var K = this._key.words;
-	            var iv = this.cfg.iv;
-
-	            // Swap endian
-	            for (var i = 0; i < 4; i++) {
-	                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
-	                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Generate initial state values
-	            var X = this._X = [
-	                K[0], (K[3] << 16) | (K[2] >>> 16),
-	                K[1], (K[0] << 16) | (K[3] >>> 16),
-	                K[2], (K[1] << 16) | (K[0] >>> 16),
-	                K[3], (K[2] << 16) | (K[1] >>> 16)
-	            ];
-
-	            // Generate initial counter values
-	            var C = this._C = [
-	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
-	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
-	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
-	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-	            ];
-
-	            // Carry bit
-	            this._b = 0;
-
-	            // Iterate the system four times
-	            for (var i = 0; i < 4; i++) {
-	                nextState.call(this);
-	            }
-
-	            // Modify the counters
-	            for (var i = 0; i < 8; i++) {
-	                C[i] ^= X[(i + 4) & 7];
-	            }
-
-	            // IV setup
-	            if (iv) {
-	                // Shortcuts
-	                var IV = iv.words;
-	                var IV_0 = IV[0];
-	                var IV_1 = IV[1];
-
-	                // Generate four subvectors
-	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
-
-	                // Modify counter values
-	                C[0] ^= i0;
-	                C[1] ^= i1;
-	                C[2] ^= i2;
-	                C[3] ^= i3;
-	                C[4] ^= i0;
-	                C[5] ^= i1;
-	                C[6] ^= i2;
-	                C[7] ^= i3;
-
-	                // Iterate the system four times
-	                for (var i = 0; i < 4; i++) {
-	                    nextState.call(this);
-	                }
-	            }
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var X = this._X;
-
-	            // Iterate the system
-	            nextState.call(this);
-
-	            // Generate four keystream words
-	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
-
-	            for (var i = 0; i < 4; i++) {
-	                // Swap endian
-	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
-
-	                // Encrypt
-	                M[offset + i] ^= S[i];
-	            }
-	        },
-
-	        blockSize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    function nextState() {
-	        // Shortcuts
-	        var X = this._X;
-	        var C = this._C;
-
-	        // Save old counter values
-	        for (var i = 0; i < 8; i++) {
-	            C_[i] = C[i];
-	        }
-
-	        // Calculate new counter values
-	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
-
-	        // Calculate the g-values
-	        for (var i = 0; i < 8; i++) {
-	            var gx = X[i] + C[i];
-
-	            // Construct high and low argument for squaring
-	            var ga = gx & 0xffff;
-	            var gb = gx >>> 16;
-
-	            // Calculate high and low result of squaring
-	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
-
-	            // High XOR low
-	            G[i] = gh ^ gl;
-	        }
-
-	        // Calculate new state values
-	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
-	     */
-	    C.Rabbit = StreamCipher._createHelper(Rabbit);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    // Reusable objects
-	    var S  = [];
-	    var C_ = [];
-	    var G  = [];
-
-	    /**
-	     * Rabbit stream cipher algorithm.
-	     *
-	     * This is a legacy version that neglected to convert the key to little-endian.
-	     * This error doesn't affect the cipher's security,
-	     * but it does affect its compatibility with other implementations.
-	     */
-	    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var K = this._key.words;
-	            var iv = this.cfg.iv;
-
-	            // Generate initial state values
-	            var X = this._X = [
-	                K[0], (K[3] << 16) | (K[2] >>> 16),
-	                K[1], (K[0] << 16) | (K[3] >>> 16),
-	                K[2], (K[1] << 16) | (K[0] >>> 16),
-	                K[3], (K[2] << 16) | (K[1] >>> 16)
-	            ];
-
-	            // Generate initial counter values
-	            var C = this._C = [
-	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
-	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
-	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
-	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-	            ];
-
-	            // Carry bit
-	            this._b = 0;
-
-	            // Iterate the system four times
-	            for (var i = 0; i < 4; i++) {
-	                nextState.call(this);
-	            }
-
-	            // Modify the counters
-	            for (var i = 0; i < 8; i++) {
-	                C[i] ^= X[(i + 4) & 7];
-	            }
-
-	            // IV setup
-	            if (iv) {
-	                // Shortcuts
-	                var IV = iv.words;
-	                var IV_0 = IV[0];
-	                var IV_1 = IV[1];
-
-	                // Generate four subvectors
-	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
-
-	                // Modify counter values
-	                C[0] ^= i0;
-	                C[1] ^= i1;
-	                C[2] ^= i2;
-	                C[3] ^= i3;
-	                C[4] ^= i0;
-	                C[5] ^= i1;
-	                C[6] ^= i2;
-	                C[7] ^= i3;
-
-	                // Iterate the system four times
-	                for (var i = 0; i < 4; i++) {
-	                    nextState.call(this);
-	                }
-	            }
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var X = this._X;
-
-	            // Iterate the system
-	            nextState.call(this);
-
-	            // Generate four keystream words
-	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
-
-	            for (var i = 0; i < 4; i++) {
-	                // Swap endian
-	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
-
-	                // Encrypt
-	                M[offset + i] ^= S[i];
-	            }
-	        },
-
-	        blockSize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    function nextState() {
-	        // Shortcuts
-	        var X = this._X;
-	        var C = this._C;
-
-	        // Save old counter values
-	        for (var i = 0; i < 8; i++) {
-	            C_[i] = C[i];
-	        }
-
-	        // Calculate new counter values
-	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
-
-	        // Calculate the g-values
-	        for (var i = 0; i < 8; i++) {
-	            var gx = X[i] + C[i];
-
-	            // Construct high and low argument for squaring
-	            var ga = gx & 0xffff;
-	            var gb = gx >>> 16;
-
-	            // Calculate high and low result of squaring
-	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
-
-	            // High XOR low
-	            G[i] = gh ^ gl;
-	        }
-
-	        // Calculate new state values
-	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    const N = 16;
-
-	    //Origin pbox and sbox, derived from PI
-	    const ORIG_P = [
-	        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
-	        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
-	        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
-	        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
-	        0x9216D5D9, 0x8979FB1B
-	    ];
-
-	    const ORIG_S = [
-	        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
-	            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
-	            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
-	            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
-	            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
-	            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
-	            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
-	            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
-	            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
-	            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
-	            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
-	            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
-	            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
-	            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
-	            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
-	            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
-	            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
-	            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
-	            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
-	            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
-	            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
-	            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
-	            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
-	            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
-	            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
-	            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
-	            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
-	            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
-	            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
-	            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
-	            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
-	            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
-	            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
-	            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
-	            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
-	            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
-	            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
-	            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
-	            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
-	            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
-	            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
-	            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
-	            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
-	            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
-	            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
-	            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
-	            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
-	            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
-	            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
-	            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
-	            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
-	            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
-	            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
-	            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
-	            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
-	            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
-	            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
-	            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
-	            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
-	            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
-	            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
-	            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
-	            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
-	            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],
-	        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
-	            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
-	            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
-	            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
-	            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
-	            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
-	            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
-	            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
-	            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
-	            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
-	            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
-	            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
-	            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
-	            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
-	            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
-	            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
-	            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
-	            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
-	            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
-	            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
-	            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
-	            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
-	            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
-	            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
-	            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
-	            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
-	            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
-	            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
-	            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
-	            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
-	            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
-	            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
-	            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
-	            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
-	            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
-	            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
-	            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
-	            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
-	            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
-	            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
-	            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
-	            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
-	            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
-	            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
-	            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
-	            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
-	            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
-	            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
-	            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
-	            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
-	            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
-	            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
-	            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
-	            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
-	            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
-	            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
-	            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
-	            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
-	            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
-	            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
-	            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
-	            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
-	            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
-	            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],
-	        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
-	            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
-	            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
-	            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
-	            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
-	            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
-	            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
-	            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
-	            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
-	            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
-	            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
-	            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
-	            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
-	            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
-	            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
-	            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
-	            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
-	            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
-	            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
-	            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
-	            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
-	            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
-	            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
-	            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
-	            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
-	            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
-	            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
-	            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
-	            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
-	            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
-	            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
-	            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
-	            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
-	            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
-	            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
-	            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
-	            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
-	            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
-	            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
-	            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
-	            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
-	            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
-	            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
-	            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
-	            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
-	            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
-	            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
-	            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
-	            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
-	            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
-	            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
-	            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
-	            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
-	            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
-	            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
-	            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
-	            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
-	            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
-	            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
-	            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
-	            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
-	            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
-	            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
-	            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],
-	        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
-	            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
-	            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
-	            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
-	            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
-	            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
-	            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
-	            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
-	            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
-	            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
-	            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
-	            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
-	            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
-	            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
-	            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
-	            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
-	            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
-	            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
-	            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
-	            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
-	            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
-	            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
-	            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
-	            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
-	            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
-	            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
-	            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
-	            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
-	            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
-	            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
-	            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
-	            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
-	            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
-	            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
-	            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
-	            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
-	            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
-	            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
-	            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
-	            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
-	            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
-	            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
-	            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
-	            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
-	            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
-	            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
-	            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
-	            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
-	            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
-	            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
-	            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
-	            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
-	            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
-	            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
-	            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
-	            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
-	            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
-	            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
-	            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
-	            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
-	            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
-	            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
-	            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
-	            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]
-	    ];
-
-	    var BLOWFISH_CTX = {
-	        pbox: [],
-	        sbox: []
-	    }
-
-	    function F(ctx, x){
-	        let a = (x >> 24) & 0xFF;
-	        let b = (x >> 16) & 0xFF;
-	        let c = (x >> 8) & 0xFF;
-	        let d = x & 0xFF;
-
-	        let y = ctx.sbox[0][a] + ctx.sbox[1][b];
-	        y = y ^ ctx.sbox[2][c];
-	        y = y + ctx.sbox[3][d];
-
-	        return y;
-	    }
-
-	    function BlowFish_Encrypt(ctx, left, right){
-	        let Xl = left;
-	        let Xr = right;
-	        let temp;
-
-	        for(let i = 0; i < N; ++i){
-	            Xl = Xl ^ ctx.pbox[i];
-	            Xr = F(ctx, Xl) ^ Xr;
-
-	            temp = Xl;
-	            Xl = Xr;
-	            Xr = temp;
-	        }
-
-	        temp = Xl;
-	        Xl = Xr;
-	        Xr = temp;
-
-	        Xr = Xr ^ ctx.pbox[N];
-	        Xl = Xl ^ ctx.pbox[N + 1];
-
-	        return {left: Xl, right: Xr};
-	    }
-
-	    function BlowFish_Decrypt(ctx, left, right){
-	        let Xl = left;
-	        let Xr = right;
-	        let temp;
-
-	        for(let i = N + 1; i > 1; --i){
-	            Xl = Xl ^ ctx.pbox[i];
-	            Xr = F(ctx, Xl) ^ Xr;
-
-	            temp = Xl;
-	            Xl = Xr;
-	            Xr = temp;
-	        }
-
-	        temp = Xl;
-	        Xl = Xr;
-	        Xr = temp;
-
-	        Xr = Xr ^ ctx.pbox[1];
-	        Xl = Xl ^ ctx.pbox[0];
-
-	        return {left: Xl, right: Xr};
-	    }
-
-	    /**
-	     * Initialization ctx's pbox and sbox.
-	     *
-	     * @param {Object} ctx The object has pbox and sbox.
-	     * @param {Array} key An array of 32-bit words.
-	     * @param {int} keysize The length of the key.
-	     *
-	     * @example
-	     *
-	     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);
-	     */
-	    function BlowFishInit(ctx, key, keysize)
-	    {
-	        for(let Row = 0; Row < 4; Row++)
-	        {
-	            ctx.sbox[Row] = [];
-	            for(let Col = 0; Col < 256; Col++)
-	            {
-	                ctx.sbox[Row][Col] = ORIG_S[Row][Col];
-	            }
-	        }
-
-	        let keyIndex = 0;
-	        for(let index = 0; index < N + 2; index++)
-	        {
-	            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];
-	            keyIndex++;
-	            if(keyIndex >= keysize)
-	            {
-	                keyIndex = 0;
-	            }
-	        }
-
-	        let Data1 = 0;
-	        let Data2 = 0;
-	        let res = 0;
-	        for(let i = 0; i < N + 2; i += 2)
-	        {
-	            res = BlowFish_Encrypt(ctx, Data1, Data2);
-	            Data1 = res.left;
-	            Data2 = res.right;
-	            ctx.pbox[i] = Data1;
-	            ctx.pbox[i + 1] = Data2;
-	        }
-
-	        for(let i = 0; i < 4; i++)
-	        {
-	            for(let j = 0; j < 256; j += 2)
-	            {
-	                res = BlowFish_Encrypt(ctx, Data1, Data2);
-	                Data1 = res.left;
-	                Data2 = res.right;
-	                ctx.sbox[i][j] = Data1;
-	                ctx.sbox[i][j + 1] = Data2;
-	            }
-	        }
-
-	        return true;
-	    }
-
-	    /**
-	     * Blowfish block cipher algorithm.
-	     */
-	    var Blowfish = C_algo.Blowfish = BlockCipher.extend({
-	        _doReset: function () {
-	            // Skip reset of nRounds has been set before and key did not change
-	            if (this._keyPriorReset === this._key) {
-	                return;
-	            }
-
-	            // Shortcuts
-	            var key = this._keyPriorReset = this._key;
-	            var keyWords = key.words;
-	            var keySize = key.sigBytes / 4;
-
-	            //Initialization pbox and sbox
-	            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
-	            M[offset] = res.left;
-	            M[offset + 1] = res.right;
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
-	            M[offset] = res.left;
-	            M[offset + 1] = res.right;
-	        },
-
-	        blockSize: 64/32,
-
-	        keySize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);
-	     */
-	    C.Blowfish = BlockCipher._createHelper(Blowfish);
-	}());
-
-
-	return CryptoJS;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/docs/QuickStartGuide.wiki b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/docs/QuickStartGuide.wiki
deleted file mode 100644
index 2bee35d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/docs/QuickStartGuide.wiki
+++ /dev/null
@@ -1,470 +0,0 @@
-<wiki:toc/>
-
-----
-
-= Quick-start Guide =
-
-== Hashers ==
-
-=== The Hasher Algorithms ===
-
-==== MD5 ====
-
-MD5 is a widely used hash function. It's been used in a variety of security applications and is also commonly used to check the integrity of files. Though, MD5 is not collision resistant, and it isn't suitable for applications like SSL certificates or digital signatures that rely on this property.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/md5.js"></script>
-<script>
-    var hash = CryptoJS.MD5("Message");
-</script>
-}}}
-
-==== SHA-1 ====
-
-The SHA hash functions were designed by the National Security Agency (NSA). SHA-1 is the most established of the existing SHA hash functions, and it's used in a variety of security applications and protocols. Though, SHA-1's collision resistance has been weakening as new attacks are discovered or improved.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha1.js"></script>
-<script>
-    var hash = CryptoJS.SHA1("Message");
-</script>
-}}}
-
-==== SHA-2 ====
-
-SHA-256 is one of the four variants in the SHA-2 set. It isn't as widely used as SHA-1, though it appears to provide much better security.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
-<script>
-    var hash = CryptoJS.SHA256("Message");
-</script>
-}}}
-
-SHA-512 is largely identical to SHA-256 but operates on 64-bit words rather than 32.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha512.js"></script>
-<script>
-    var hash = CryptoJS.SHA512("Message");
-</script>
-}}}
-
-CryptoJS also supports SHA-224 and SHA-384, which are largely identical but truncated versions of SHA-256 and SHA-512 respectively.
-
-==== SHA-3 ====
-
-SHA-3 is the winner of a five-year competition to select a new cryptographic hash algorithm where 64 competing designs were evaluated.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha3.js"></script>
-<script>
-    var hash = CryptoJS.SHA3("Message");
-</script>
-}}}
-
-SHA-3 can be configured to output hash lengths of one of 224, 256, 384, or 512 bits. The default is 512 bits.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha3.js"></script>
-<script>
-    var hash = CryptoJS.SHA3("Message", { outputLength: 512 });
-    var hash = CryptoJS.SHA3("Message", { outputLength: 384 });
-    var hash = CryptoJS.SHA3("Message", { outputLength: 256 });
-    var hash = CryptoJS.SHA3("Message", { outputLength: 224 });
-</script>
-}}}
-
-==== RIPEMD-160 ====
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/ripemd160.js"></script>
-<script>
-    var hash = CryptoJS.RIPEMD160("Message");
-</script>
-}}}
-
-=== The Hasher Input ===
-
-The hash algorithms accept either strings or instances of CryptoJS.lib.WordArray. A WordArray object represents an array of 32-bit words. When you pass a string, it's automatically converted to a WordArray encoded as UTF-8.
-
-=== The Hasher Output ===
-
-The hash you get back isn't a string yet. It's a WordArray object. When you use a WordArray object in a string context, it's automatically converted to a hex string.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
-<script>
-    var hash = CryptoJS.SHA256("Message");
-
-    alert(typeof hash); // object
-
-    alert(hash); // 2f77668a9dfbf8d5848b9eeb4a7145ca94c6ed9236e4a773f6dcafa5132b2f91
-</script>
-}}}
-
-You can convert a WordArray object to other formats by explicitly calling the toString method and passing an encoder.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/enc-base64-min.js"></script>
-<script>
-    var hash = CryptoJS.SHA256("Message");
-
-    alert(hash.toString(CryptoJS.enc.Base64)); // L3dmip37+NWEi57rSnFFypTG7ZI25Kdz9tyvpRMrL5E=
-
-    alert(hash.toString(CryptoJS.enc.Latin1)); // /wf��ûøÕ���ëJqEÊ�Æí�6ä§söܯ¥+/�
-
-    alert(hash.toString(CryptoJS.enc.Hex)); // 2f77668a9dfbf8d5848b9eeb4a7145ca94c6ed9236e4a773f6dcafa5132b2f91
-</script>
-}}}
-
-=== Progressive Hashing ===
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
-<script>
-    var sha256 = CryptoJS.algo.SHA256.create();
-
-    sha256.update("Message Part 1");
-    sha256.update("Message Part 2");
-    sha256.update("Message Part 3");
-
-    var hash = sha256.finalize();
-</script>
-}}}
-
-== HMAC ==
-
-Keyed-hash message authentication codes (HMAC) is a mechanism for message authentication using cryptographic hash functions.
-
-HMAC can be used in combination with any iterated cryptographic hash function.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-md5.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha1.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha256.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha512.js"></script>
-<script>
-    var hash = CryptoJS.HmacMD5("Message", "Secret Passphrase");
-    var hash = CryptoJS.HmacSHA1("Message", "Secret Passphrase");
-    var hash = CryptoJS.HmacSHA256("Message", "Secret Passphrase");
-    var hash = CryptoJS.HmacSHA512("Message", "Secret Passphrase");
-</script>
-}}}
-
-=== Progressive HMAC Hashing ===
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha256.js"></script>
-<script>
-    var hmac = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, "Secret Passphrase");
-
-    hmac.update("Message Part 1");
-    hmac.update("Message Part 2");
-    hmac.update("Message Part 3");
-
-    var hash = hmac.finalize();
-</script>
-}}}
-
-== PBKDF2 ==
-
-PBKDF2 is a password-based key derivation function. In many applications of cryptography, user security is ultimately dependent on a password, and because a password usually can't be used directly as a cryptographic key, some processing is required.
-
-A salt provides a large set of keys for any given password, and an iteration count increases the cost of producing keys from a password, thereby also increasing the difficulty of attack.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/pbkdf2.js"></script>
-<script>
-    var salt = CryptoJS.lib.WordArray.random(128/8);
-
-    var key128Bits = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 128/32 });
-    var key256Bits = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 256/32 });
-    var key512Bits = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 512/32 });
-
-    var key512Bits1000Iterations = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 512/32, iterations: 1000 });
-</script>
-}}}
-
-== Ciphers ==
-
-=== The Cipher Algorithms ===
-
-==== AES ====
-
-The Advanced Encryption Standard (AES) is a U.S. Federal Information Processing Standard (FIPS). It was selected after a 5-year process where 15 competing designs were evaluated.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script>
-    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase");
-
-    var decrypted = CryptoJS.AES.decrypt(encrypted, "Secret Passphrase");
-</script>
-}}}
-
-CryptoJS supports AES-128, AES-192, and AES-256. It will pick the variant by the size of the key you pass in. If you use a passphrase, then it will generate a 256-bit key.
-
-==== DES, Triple DES ====
-
-DES is a previously dominant algorithm for encryption, and was published as an official Federal Information Processing Standard (FIPS). DES is now considered to be insecure due to the small key size.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/tripledes.js"></script>
-<script>
-    var encrypted = CryptoJS.DES.encrypt("Message", "Secret Passphrase");
-
-    var decrypted = CryptoJS.DES.decrypt(encrypted, "Secret Passphrase");
-</script>
-}}}
-
-Triple DES applies DES three times to each block to increase the key size. The algorithm is believed to be secure in this form.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/tripledes.js"></script>
-<script>
-    var encrypted = CryptoJS.TripleDES.encrypt("Message", "Secret Passphrase");
-
-    var decrypted = CryptoJS.TripleDES.decrypt(encrypted, "Secret Passphrase");
-</script>
-}}}
-
-==== Rabbit ====
-
-Rabbit is a high-performance stream cipher and a finalist in the eSTREAM Portfolio. It is one of the four designs selected after a 3 1/2-year process where 22 designs were evaluated.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/rabbit.js"></script>
-<script>
-    var encrypted = CryptoJS.Rabbit.encrypt("Message", "Secret Passphrase");
-
-    var decrypted = CryptoJS.Rabbit.decrypt(encrypted, "Secret Passphrase");
-</script>
-}}}
-
-==== RC4, RC4Drop ====
-
-RC4 is a widely-used stream cipher. It's used in popular protocols such as SSL and WEP. Although remarkable for its simplicity and speed, the algorithm's history doesn't inspire confidence in its security.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/rc4.js"></script>
-<script>
-    var encrypted = CryptoJS.RC4.encrypt("Message", "Secret Passphrase");
-
-    var decrypted = CryptoJS.RC4.decrypt(encrypted, "Secret Passphrase");
-</script>
-}}}
-
-It was discovered that the first few bytes of keystream are strongly non-random and leak information about the key. We can defend against this attack by discarding the initial portion of the keystream. This modified algorithm is traditionally called RC4-drop.
-
-By default, 192 words (768 bytes) are dropped, but you can configure the algorithm to drop any number of words.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/rc4.js"></script>
-<script>
-    var encrypted = CryptoJS.RC4Drop.encrypt("Message", "Secret Passphrase");
-
-    var encrypted = CryptoJS.RC4Drop.encrypt("Message", "Secret Passphrase", { drop: 3072/4 });
-
-    var decrypted = CryptoJS.RC4Drop.decrypt(encrypted, "Secret Passphrase", { drop: 3072/4 });
-</script>
-}}}
-
-=== Custom Key and IV ===
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script>
-    var key = CryptoJS.enc.Hex.parse('000102030405060708090a0b0c0d0e0f');
-    var iv  = CryptoJS.enc.Hex.parse('101112131415161718191a1b1c1d1e1f');
-
-    var encrypted = CryptoJS.AES.encrypt("Message", key, { iv: iv });
-</script>
-}}}
-
-=== Block Modes and Padding ===
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/mode-cfb-min.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/pad-ansix923-min.js"></script>
-<script>
-    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase", { mode: CryptoJS.mode.CFB, padding: CryptoJS.pad.AnsiX923 });
-</script>
-}}}
-
-CryptoJS supports the following modes:
-
-  * CBC (the default)
-  * CFB
-  * CTR
-  * OFB
-  * ECB
-
-And CryptoJS supports the following padding schemes:
-
-  * Pkcs7 (the default)
-  * Iso97971
-  * AnsiX923
-  * Iso10126
-  * ZeroPadding
-  * NoPadding
-
-=== The Cipher Input ===
-
-For the plaintext message, the cipher algorithms accept either strings or instances of CryptoJS.lib.WordArray.
-
-For the key, when you pass a string, it's treated as a passphrase and used to derive an actual key and IV. Or you can pass a WordArray that represents the actual key. If you pass the actual key, you must also pass the actual IV.
-
-For the ciphertext, the cipher algorithms accept either strings or instances of CryptoJS.lib.CipherParams. A CipherParams object represents a collection of parameters such as the IV, a salt, and the raw ciphertext itself. When you pass a string, it's automatically converted to a CipherParams object according to a configurable format strategy.
-
-=== The Cipher Output ===
-
-The plaintext you get back after decryption is a WordArray object. See Hashers' Output for more detail.
-
-The ciphertext you get back after encryption isn't a string yet. It's a CipherParams object. A CipherParams object gives you access to all the parameters used during encryption. When you use a CipherParams object in a string context, it's automatically converted to a string according to a format strategy. The default is an OpenSSL-compatible format.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script>
-    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase");
-
-    alert(encrypted.key);        // 74eb593087a982e2a6f5dded54ecd96d1fd0f3d44a58728cdcd40c55227522223
-    alert(encrypted.iv);         // 7781157e2629b094f0e3dd48c4d786115
-    alert(encrypted.salt);       // 7a25f9132ec6a8b34
-    alert(encrypted.ciphertext); // 73e54154a15d1beeb509d9e12f1e462a0
-
-    alert(encrypted);            // U2FsdGVkX1+iX5Ey7GqLND5UFUoV0b7rUJ2eEvHkYqA=
-</script>
-}}}
-
-You can define your own formats in order to be compatible with other crypto implementations. A format is an object with two methods—stringify and parse—that converts between CipherParams objects and ciphertext strings.
-
-Here's how you might write a JSON formatter:
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script>
-    var JsonFormatter = {
-        stringify: function (cipherParams) {
-            // create json object with ciphertext
-            var jsonObj = {
-                ct: cipherParams.ciphertext.toString(CryptoJS.enc.Base64)
-            };
-
-            // optionally add iv and salt
-            if (cipherParams.iv) {
-                jsonObj.iv = cipherParams.iv.toString();
-            }
-            if (cipherParams.salt) {
-                jsonObj.s = cipherParams.salt.toString();
-            }
-
-            // stringify json object
-            return JSON.stringify(jsonObj);
-        },
-
-        parse: function (jsonStr) {
-            // parse json string
-            var jsonObj = JSON.parse(jsonStr);
-
-            // extract ciphertext from json object, and create cipher params object
-            var cipherParams = CryptoJS.lib.CipherParams.create({
-                ciphertext: CryptoJS.enc.Base64.parse(jsonObj.ct)
-            });
-
-            // optionally extract iv and salt
-            if (jsonObj.iv) {
-                cipherParams.iv = CryptoJS.enc.Hex.parse(jsonObj.iv)
-            }
-            if (jsonObj.s) {
-                cipherParams.salt = CryptoJS.enc.Hex.parse(jsonObj.s)
-            }
-
-            return cipherParams;
-        }
-    };
-
-    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase", { format: JsonFormatter });
-
-    alert(encrypted); // {"ct":"tZ4MsEnfbcDOwqau68aOrQ==","iv":"8a8c8fd8fe33743d3638737ea4a00698","s":"ba06373c8f57179c"}
-
-    var decrypted = CryptoJS.AES.decrypt(encrypted, "Secret Passphrase", { format: JsonFormatter });
-
-    alert(decrypted.toString(CryptoJS.enc.Utf8)); // Message
-</script>
-}}}
-
-=== Progressive Ciphering ===
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script>
-    var key = CryptoJS.enc.Hex.parse('000102030405060708090a0b0c0d0e0f');
-    var iv  = CryptoJS.enc.Hex.parse('101112131415161718191a1b1c1d1e1f');
-
-    var aesEncryptor = CryptoJS.algo.AES.createEncryptor(key, { iv: iv });
-
-    var ciphertextPart1 = aesEncryptor.process("Message Part 1");
-    var ciphertextPart2 = aesEncryptor.process("Message Part 2");
-    var ciphertextPart3 = aesEncryptor.process("Message Part 3");
-    var ciphertextPart4 = aesEncryptor.finalize();
-
-    var aesDecryptor = CryptoJS.algo.AES.createDecryptor(key, { iv: iv });
-
-    var plaintextPart1 = aesDecryptor.process(ciphertextPart1);
-    var plaintextPart2 = aesDecryptor.process(ciphertextPart2);
-    var plaintextPart3 = aesDecryptor.process(ciphertextPart3);
-    var plaintextPart4 = aesDecryptor.process(ciphertextPart4);
-    var plaintextPart5 = aesDecryptor.finalize();
-</script>
-}}}
-
-=== Interoperability ===
-
-==== With OpenSSL ====
-
-Encrypt with OpenSSL:
-
-{{{
-openssl enc -aes-256-cbc -in infile -out outfile -pass pass:"Secret Passphrase" -e -base64
-}}}
-
-Decrypt with CryptoJS:
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
-<script>
-    var decrypted = CryptoJS.AES.decrypt(openSSLEncrypted, "Secret Passphrase");
-</script>
-}}}
-
-== Encoders ==
-
-CryptoJS can convert from encoding formats such as Base64, Latin1 or Hex to WordArray objects and vica versa.
-
-{{{
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/core-min.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/enc-utf16-min.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/enc-base64-min.js"></script>
-<script>
-    var words  = CryptoJS.enc.Base64.parse('SGVsbG8sIFdvcmxkIQ==');
-    var base64 = CryptoJS.enc.Base64.stringify(words);
-
-    var words  = CryptoJS.enc.Latin1.parse('Hello, World!');
-    var latin1 = CryptoJS.enc.Latin1.stringify(words);
-
-    var words = CryptoJS.enc.Hex.parse('48656c6c6f2c20576f726c6421');
-    var hex   = CryptoJS.enc.Hex.stringify(words);
-
-    var words = CryptoJS.enc.Utf8.parse('𤭢');
-    var utf8  = CryptoJS.enc.Utf8.stringify(words);
-
-    var words = CryptoJS.enc.Utf16.parse('Hello, World!');
-    var utf16 = CryptoJS.enc.Utf16.stringify(words);
-
-    var words = CryptoJS.enc.Utf16LE.parse('Hello, World!');
-    var utf16 = CryptoJS.enc.Utf16LE.stringify(words);
-</script>
-}}}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-base64.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-base64.js
deleted file mode 100644
index 0ffcd53..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-base64.js
+++ /dev/null
@@ -1,136 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * Base64 encoding strategy.
-	     */
-	    var Base64 = C_enc.Base64 = {
-	        /**
-	         * Converts a word array to a Base64 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The Base64 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-	            var map = this._map;
-
-	            // Clamp excess bits
-	            wordArray.clamp();
-
-	            // Convert
-	            var base64Chars = [];
-	            for (var i = 0; i < sigBytes; i += 3) {
-	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
-	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
-	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
-
-	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
-
-	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
-	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
-	                }
-	            }
-
-	            // Add padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                while (base64Chars.length % 4) {
-	                    base64Chars.push(paddingChar);
-	                }
-	            }
-
-	            return base64Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Base64 string to a word array.
-	         *
-	         * @param {string} base64Str The Base64 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
-	         */
-	        parse: function (base64Str) {
-	            // Shortcuts
-	            var base64StrLength = base64Str.length;
-	            var map = this._map;
-	            var reverseMap = this._reverseMap;
-
-	            if (!reverseMap) {
-	                    reverseMap = this._reverseMap = [];
-	                    for (var j = 0; j < map.length; j++) {
-	                        reverseMap[map.charCodeAt(j)] = j;
-	                    }
-	            }
-
-	            // Ignore padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                var paddingIndex = base64Str.indexOf(paddingChar);
-	                if (paddingIndex !== -1) {
-	                    base64StrLength = paddingIndex;
-	                }
-	            }
-
-	            // Convert
-	            return parseLoop(base64Str, base64StrLength, reverseMap);
-
-	        },
-
-	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-	    };
-
-	    function parseLoop(base64Str, base64StrLength, reverseMap) {
-	      var words = [];
-	      var nBytes = 0;
-	      for (var i = 0; i < base64StrLength; i++) {
-	          if (i % 4) {
-	              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
-	              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
-	              var bitsCombined = bits1 | bits2;
-	              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
-	              nBytes++;
-	          }
-	      }
-	      return WordArray.create(words, nBytes);
-	    }
-	}());
-
-
-	return CryptoJS.enc.Base64;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-base64url.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-base64url.js
deleted file mode 100644
index af682e3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-base64url.js
+++ /dev/null
@@ -1,148 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * Base64url encoding strategy.
-	     */
-	    var Base64url = C_enc.Base64url = {
-	        /**
-	         * Converts a word array to a Base64url string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @param {boolean} urlSafe Whether to use url safe
-	         *
-	         * @return {string} The Base64url string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
-	         */
-	        stringify: function (wordArray, urlSafe) {
-	            if (urlSafe === undefined) {
-	                urlSafe = true
-	            }
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-	            var map = urlSafe ? this._safe_map : this._map;
-
-	            // Clamp excess bits
-	            wordArray.clamp();
-
-	            // Convert
-	            var base64Chars = [];
-	            for (var i = 0; i < sigBytes; i += 3) {
-	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
-	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
-	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
-
-	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
-
-	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
-	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
-	                }
-	            }
-
-	            // Add padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                while (base64Chars.length % 4) {
-	                    base64Chars.push(paddingChar);
-	                }
-	            }
-
-	            return base64Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Base64url string to a word array.
-	         *
-	         * @param {string} base64Str The Base64url string.
-	         *
-	         * @param {boolean} urlSafe Whether to use url safe
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);
-	         */
-	        parse: function (base64Str, urlSafe) {
-	            if (urlSafe === undefined) {
-	                urlSafe = true
-	            }
-
-	            // Shortcuts
-	            var base64StrLength = base64Str.length;
-	            var map = urlSafe ? this._safe_map : this._map;
-	            var reverseMap = this._reverseMap;
-
-	            if (!reverseMap) {
-	                reverseMap = this._reverseMap = [];
-	                for (var j = 0; j < map.length; j++) {
-	                    reverseMap[map.charCodeAt(j)] = j;
-	                }
-	            }
-
-	            // Ignore padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                var paddingIndex = base64Str.indexOf(paddingChar);
-	                if (paddingIndex !== -1) {
-	                    base64StrLength = paddingIndex;
-	                }
-	            }
-
-	            // Convert
-	            return parseLoop(base64Str, base64StrLength, reverseMap);
-
-	        },
-
-	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
-	        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
-	    };
-
-	    function parseLoop(base64Str, base64StrLength, reverseMap) {
-	        var words = [];
-	        var nBytes = 0;
-	        for (var i = 0; i < base64StrLength; i++) {
-	            if (i % 4) {
-	                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
-	                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
-	                var bitsCombined = bits1 | bits2;
-	                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
-	                nBytes++;
-	            }
-	        }
-	        return WordArray.create(words, nBytes);
-	    }
-	}());
-
-
-	return CryptoJS.enc.Base64url;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-hex.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-hex.js
deleted file mode 100644
index 88161ff..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-hex.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.enc.Hex;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-latin1.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-latin1.js
deleted file mode 100644
index ade56dc..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-latin1.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.enc.Latin1;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-utf16.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-utf16.js
deleted file mode 100644
index 7de6245..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-utf16.js
+++ /dev/null
@@ -1,149 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * UTF-16 BE encoding strategy.
-	     */
-	    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
-	        /**
-	         * Converts a word array to a UTF-16 BE string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-16 BE string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var utf16Chars = [];
-	            for (var i = 0; i < sigBytes; i += 2) {
-	                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
-	                utf16Chars.push(String.fromCharCode(codePoint));
-	            }
-
-	            return utf16Chars.join('');
-	        },
-
-	        /**
-	         * Converts a UTF-16 BE string to a word array.
-	         *
-	         * @param {string} utf16Str The UTF-16 BE string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
-	         */
-	        parse: function (utf16Str) {
-	            // Shortcut
-	            var utf16StrLength = utf16Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < utf16StrLength; i++) {
-	                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
-	            }
-
-	            return WordArray.create(words, utf16StrLength * 2);
-	        }
-	    };
-
-	    /**
-	     * UTF-16 LE encoding strategy.
-	     */
-	    C_enc.Utf16LE = {
-	        /**
-	         * Converts a word array to a UTF-16 LE string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-16 LE string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var utf16Chars = [];
-	            for (var i = 0; i < sigBytes; i += 2) {
-	                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
-	                utf16Chars.push(String.fromCharCode(codePoint));
-	            }
-
-	            return utf16Chars.join('');
-	        },
-
-	        /**
-	         * Converts a UTF-16 LE string to a word array.
-	         *
-	         * @param {string} utf16Str The UTF-16 LE string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
-	         */
-	        parse: function (utf16Str) {
-	            // Shortcut
-	            var utf16StrLength = utf16Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < utf16StrLength; i++) {
-	                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
-	            }
-
-	            return WordArray.create(words, utf16StrLength * 2);
-	        }
-	    };
-
-	    function swapEndian(word) {
-	        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
-	    }
-	}());
-
-
-	return CryptoJS.enc.Utf16;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-utf8.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-utf8.js
deleted file mode 100644
index e7a251d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/enc-utf8.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.enc.Utf8;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/evpkdf.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/evpkdf.js
deleted file mode 100644
index 578974a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/evpkdf.js
+++ /dev/null
@@ -1,134 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./sha1", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var MD5 = C_algo.MD5;
-
-	    /**
-	     * This key derivation function is meant to conform with EVP_BytesToKey.
-	     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
-	     */
-	    var EvpKDF = C_algo.EvpKDF = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
-	         * @property {Hasher} hasher The hash algorithm to use. Default: MD5
-	         * @property {number} iterations The number of iterations to perform. Default: 1
-	         */
-	        cfg: Base.extend({
-	            keySize: 128/32,
-	            hasher: MD5,
-	            iterations: 1
-	        }),
-
-	        /**
-	         * Initializes a newly created key derivation function.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
-	         *
-	         * @example
-	         *
-	         *     var kdf = CryptoJS.algo.EvpKDF.create();
-	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
-	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
-	         */
-	        init: function (cfg) {
-	            this.cfg = this.cfg.extend(cfg);
-	        },
-
-	        /**
-	         * Derives a key from a password.
-	         *
-	         * @param {WordArray|string} password The password.
-	         * @param {WordArray|string} salt A salt.
-	         *
-	         * @return {WordArray} The derived key.
-	         *
-	         * @example
-	         *
-	         *     var key = kdf.compute(password, salt);
-	         */
-	        compute: function (password, salt) {
-	            var block;
-
-	            // Shortcut
-	            var cfg = this.cfg;
-
-	            // Init hasher
-	            var hasher = cfg.hasher.create();
-
-	            // Initial values
-	            var derivedKey = WordArray.create();
-
-	            // Shortcuts
-	            var derivedKeyWords = derivedKey.words;
-	            var keySize = cfg.keySize;
-	            var iterations = cfg.iterations;
-
-	            // Generate key
-	            while (derivedKeyWords.length < keySize) {
-	                if (block) {
-	                    hasher.update(block);
-	                }
-	                block = hasher.update(password).finalize(salt);
-	                hasher.reset();
-
-	                // Iterations
-	                for (var i = 1; i < iterations; i++) {
-	                    block = hasher.finalize(block);
-	                    hasher.reset();
-	                }
-
-	                derivedKey.concat(block);
-	            }
-	            derivedKey.sigBytes = keySize * 4;
-
-	            return derivedKey;
-	        }
-	    });
-
-	    /**
-	     * Derives a key from a password.
-	     *
-	     * @param {WordArray|string} password The password.
-	     * @param {WordArray|string} salt A salt.
-	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
-	     *
-	     * @return {WordArray} The derived key.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var key = CryptoJS.EvpKDF(password, salt);
-	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
-	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
-	     */
-	    C.EvpKDF = function (password, salt, cfg) {
-	        return EvpKDF.create(cfg).compute(password, salt);
-	    };
-	}());
-
-
-	return CryptoJS.EvpKDF;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/format-hex.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/format-hex.js
deleted file mode 100644
index 2e9a861..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/format-hex.js
+++ /dev/null
@@ -1,66 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var CipherParams = C_lib.CipherParams;
-	    var C_enc = C.enc;
-	    var Hex = C_enc.Hex;
-	    var C_format = C.format;
-
-	    var HexFormatter = C_format.Hex = {
-	        /**
-	         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
-	         *
-	         * @param {CipherParams} cipherParams The cipher params object.
-	         *
-	         * @return {string} The hexadecimally encoded string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
-	         */
-	        stringify: function (cipherParams) {
-	            return cipherParams.ciphertext.toString(Hex);
-	        },
-
-	        /**
-	         * Converts a hexadecimally encoded ciphertext string to a cipher params object.
-	         *
-	         * @param {string} input The hexadecimally encoded string.
-	         *
-	         * @return {CipherParams} The cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
-	         */
-	        parse: function (input) {
-	            var ciphertext = Hex.parse(input);
-	            return CipherParams.create({ ciphertext: ciphertext });
-	        }
-	    };
-	}());
-
-
-	return CryptoJS.format.Hex;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/format-openssl.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/format-openssl.js
deleted file mode 100644
index 3373edc..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/format-openssl.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.format.OpenSSL;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-md5.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-md5.js
deleted file mode 100644
index ad7a90a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-md5.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./md5"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./md5", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacMD5;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-ripemd160.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-ripemd160.js
deleted file mode 100644
index 73d55a7..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-ripemd160.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./ripemd160"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./ripemd160", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacRIPEMD160;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha1.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha1.js
deleted file mode 100644
index 0b570cb..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha1.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./sha1", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacSHA1;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha224.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha224.js
deleted file mode 100644
index 3778863..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha224.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./sha256"), require("./sha224"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./sha256", "./sha224", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacSHA224;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha256.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha256.js
deleted file mode 100644
index 33b0c9f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha256.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./sha256"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./sha256", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacSHA256;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha3.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha3.js
deleted file mode 100644
index 1248804..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha3.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha3"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core", "./sha3", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacSHA3;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha384.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha384.js
deleted file mode 100644
index 0036e2b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha384.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"), require("./sha384"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core", "./sha512", "./sha384", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacSHA384;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha512.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha512.js
deleted file mode 100644
index c1005b6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac-sha512.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core", "./sha512", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.HmacSHA512;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac.js
deleted file mode 100644
index 8c09851..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/hmac.js
+++ /dev/null
@@ -1,143 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var C_enc = C.enc;
-	    var Utf8 = C_enc.Utf8;
-	    var C_algo = C.algo;
-
-	    /**
-	     * HMAC algorithm.
-	     */
-	    var HMAC = C_algo.HMAC = Base.extend({
-	        /**
-	         * Initializes a newly created HMAC.
-	         *
-	         * @param {Hasher} hasher The hash algorithm to use.
-	         * @param {WordArray|string} key The secret key.
-	         *
-	         * @example
-	         *
-	         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
-	         */
-	        init: function (hasher, key) {
-	            // Init hasher
-	            hasher = this._hasher = new hasher.init();
-
-	            // Convert string to WordArray, else assume WordArray already
-	            if (typeof key == 'string') {
-	                key = Utf8.parse(key);
-	            }
-
-	            // Shortcuts
-	            var hasherBlockSize = hasher.blockSize;
-	            var hasherBlockSizeBytes = hasherBlockSize * 4;
-
-	            // Allow arbitrary length keys
-	            if (key.sigBytes > hasherBlockSizeBytes) {
-	                key = hasher.finalize(key);
-	            }
-
-	            // Clamp excess bits
-	            key.clamp();
-
-	            // Clone key for inner and outer pads
-	            var oKey = this._oKey = key.clone();
-	            var iKey = this._iKey = key.clone();
-
-	            // Shortcuts
-	            var oKeyWords = oKey.words;
-	            var iKeyWords = iKey.words;
-
-	            // XOR keys with pad constants
-	            for (var i = 0; i < hasherBlockSize; i++) {
-	                oKeyWords[i] ^= 0x5c5c5c5c;
-	                iKeyWords[i] ^= 0x36363636;
-	            }
-	            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this HMAC to its initial state.
-	         *
-	         * @example
-	         *
-	         *     hmacHasher.reset();
-	         */
-	        reset: function () {
-	            // Shortcut
-	            var hasher = this._hasher;
-
-	            // Reset
-	            hasher.reset();
-	            hasher.update(this._iKey);
-	        },
-
-	        /**
-	         * Updates this HMAC with a message.
-	         *
-	         * @param {WordArray|string} messageUpdate The message to append.
-	         *
-	         * @return {HMAC} This HMAC instance.
-	         *
-	         * @example
-	         *
-	         *     hmacHasher.update('message');
-	         *     hmacHasher.update(wordArray);
-	         */
-	        update: function (messageUpdate) {
-	            this._hasher.update(messageUpdate);
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Finalizes the HMAC computation.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
-	         *
-	         * @return {WordArray} The HMAC.
-	         *
-	         * @example
-	         *
-	         *     var hmac = hmacHasher.finalize();
-	         *     var hmac = hmacHasher.finalize('message');
-	         *     var hmac = hmacHasher.finalize(wordArray);
-	         */
-	        finalize: function (messageUpdate) {
-	            // Shortcut
-	            var hasher = this._hasher;
-
-	            // Compute HMAC
-	            var innerHash = hasher.finalize(messageUpdate);
-	            hasher.reset();
-	            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
-
-	            return hmac;
-	        }
-	    });
-	}());
-
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/index.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/index.js
deleted file mode 100644
index b696646..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./lib-typedarrays"), require("./enc-utf16"), require("./enc-base64"), require("./enc-base64url"), require("./md5"), require("./sha1"), require("./sha256"), require("./sha224"), require("./sha512"), require("./sha384"), require("./sha3"), require("./ripemd160"), require("./hmac"), require("./pbkdf2"), require("./evpkdf"), require("./cipher-core"), require("./mode-cfb"), require("./mode-ctr"), require("./mode-ctr-gladman"), require("./mode-ofb"), require("./mode-ecb"), require("./pad-ansix923"), require("./pad-iso10126"), require("./pad-iso97971"), require("./pad-zeropadding"), require("./pad-nopadding"), require("./format-hex"), require("./aes"), require("./tripledes"), require("./rc4"), require("./rabbit"), require("./rabbit-legacy"), require("./blowfish"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core", "./lib-typedarrays", "./enc-utf16", "./enc-base64", "./enc-base64url", "./md5", "./sha1", "./sha256", "./sha224", "./sha512", "./sha384", "./sha3", "./ripemd160", "./hmac", "./pbkdf2", "./evpkdf", "./cipher-core", "./mode-cfb", "./mode-ctr", "./mode-ctr-gladman", "./mode-ofb", "./mode-ecb", "./pad-ansix923", "./pad-iso10126", "./pad-iso97971", "./pad-zeropadding", "./pad-nopadding", "./format-hex", "./aes", "./tripledes", "./rc4", "./rabbit", "./rabbit-legacy", "./blowfish"], factory);
-	}
-	else {
-		// Global (browser)
-		root.CryptoJS = factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/lib-typedarrays.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/lib-typedarrays.js
deleted file mode 100644
index 264b210..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/lib-typedarrays.js
+++ /dev/null
@@ -1,76 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Check if typed arrays are supported
-	    if (typeof ArrayBuffer != 'function') {
-	        return;
-	    }
-
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-
-	    // Reference original init
-	    var superInit = WordArray.init;
-
-	    // Augment WordArray.init to handle typed arrays
-	    var subInit = WordArray.init = function (typedArray) {
-	        // Convert buffers to uint8
-	        if (typedArray instanceof ArrayBuffer) {
-	            typedArray = new Uint8Array(typedArray);
-	        }
-
-	        // Convert other array views to uint8
-	        if (
-	            typedArray instanceof Int8Array ||
-	            (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
-	            typedArray instanceof Int16Array ||
-	            typedArray instanceof Uint16Array ||
-	            typedArray instanceof Int32Array ||
-	            typedArray instanceof Uint32Array ||
-	            typedArray instanceof Float32Array ||
-	            typedArray instanceof Float64Array
-	        ) {
-	            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
-	        }
-
-	        // Handle Uint8Array
-	        if (typedArray instanceof Uint8Array) {
-	            // Shortcut
-	            var typedArrayByteLength = typedArray.byteLength;
-
-	            // Extract bytes
-	            var words = [];
-	            for (var i = 0; i < typedArrayByteLength; i++) {
-	                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
-	            }
-
-	            // Initialize this word array
-	            superInit.call(this, words, typedArrayByteLength);
-	        } else {
-	            // Else call normal init
-	            superInit.apply(this, arguments);
-	        }
-	    };
-
-	    subInit.prototype = WordArray;
-	}());
-
-
-	return CryptoJS.lib.WordArray;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/md5.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/md5.js
deleted file mode 100644
index 72fce03..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/md5.js
+++ /dev/null
@@ -1,268 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Constants table
-	    var T = [];
-
-	    // Compute constants
-	    (function () {
-	        for (var i = 0; i < 64; i++) {
-	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
-	        }
-	    }());
-
-	    /**
-	     * MD5 hash algorithm.
-	     */
-	    var MD5 = C_algo.MD5 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0x67452301, 0xefcdab89,
-	                0x98badcfe, 0x10325476
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Swap endian
-	            for (var i = 0; i < 16; i++) {
-	                // Shortcuts
-	                var offset_i = offset + i;
-	                var M_offset_i = M[offset_i];
-
-	                M[offset_i] = (
-	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
-	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-	                );
-	            }
-
-	            // Shortcuts
-	            var H = this._hash.words;
-
-	            var M_offset_0  = M[offset + 0];
-	            var M_offset_1  = M[offset + 1];
-	            var M_offset_2  = M[offset + 2];
-	            var M_offset_3  = M[offset + 3];
-	            var M_offset_4  = M[offset + 4];
-	            var M_offset_5  = M[offset + 5];
-	            var M_offset_6  = M[offset + 6];
-	            var M_offset_7  = M[offset + 7];
-	            var M_offset_8  = M[offset + 8];
-	            var M_offset_9  = M[offset + 9];
-	            var M_offset_10 = M[offset + 10];
-	            var M_offset_11 = M[offset + 11];
-	            var M_offset_12 = M[offset + 12];
-	            var M_offset_13 = M[offset + 13];
-	            var M_offset_14 = M[offset + 14];
-	            var M_offset_15 = M[offset + 15];
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-
-	            // Computation
-	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
-	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
-	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
-	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
-	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
-	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
-	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
-	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
-	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
-	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
-	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
-	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
-	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
-	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
-	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
-	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
-
-	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
-	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
-	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
-	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
-	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
-	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
-	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
-	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
-	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
-	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
-	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
-	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
-	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
-	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
-	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
-	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
-
-	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
-	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
-	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
-	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
-	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
-	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
-	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
-	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
-	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
-	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
-	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
-	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
-	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
-	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
-	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
-	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
-
-	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
-	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
-	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
-	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
-	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
-	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
-	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
-	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
-	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
-	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
-	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
-	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
-	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
-	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
-	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
-	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-
-	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
-	            var nBitsTotalL = nBitsTotal;
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
-	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
-	            );
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
-	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
-	            );
-
-	            data.sigBytes = (dataWords.length + 1) * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var hash = this._hash;
-	            var H = hash.words;
-
-	            // Swap endian
-	            for (var i = 0; i < 4; i++) {
-	                // Shortcut
-	                var H_i = H[i];
-
-	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    function FF(a, b, c, d, x, s, t) {
-	        var n = a + ((b & c) | (~b & d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function GG(a, b, c, d, x, s, t) {
-	        var n = a + ((b & d) | (c & ~d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function HH(a, b, c, d, x, s, t) {
-	        var n = a + (b ^ c ^ d) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function II(a, b, c, d, x, s, t) {
-	        var n = a + (c ^ (b | ~d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.MD5('message');
-	     *     var hash = CryptoJS.MD5(wordArray);
-	     */
-	    C.MD5 = Hasher._createHelper(MD5);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacMD5(message, key);
-	     */
-	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
-	}(Math));
-
-
-	return CryptoJS.MD5;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-cfb.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-cfb.js
deleted file mode 100644
index 444c9cb..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-cfb.js
+++ /dev/null
@@ -1,80 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * Cipher Feedback block mode.
-	 */
-	CryptoJS.mode.CFB = (function () {
-	    var CFB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    CFB.Encryptor = CFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher;
-	            var blockSize = cipher.blockSize;
-
-	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
-
-	            // Remember this block to use with next block
-	            this._prevBlock = words.slice(offset, offset + blockSize);
-	        }
-	    });
-
-	    CFB.Decryptor = CFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher;
-	            var blockSize = cipher.blockSize;
-
-	            // Remember this block to use with next block
-	            var thisBlock = words.slice(offset, offset + blockSize);
-
-	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
-
-	            // This block becomes the previous block
-	            this._prevBlock = thisBlock;
-	        }
-	    });
-
-	    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
-	        var keystream;
-
-	        // Shortcut
-	        var iv = this._iv;
-
-	        // Generate keystream
-	        if (iv) {
-	            keystream = iv.slice(0);
-
-	            // Remove IV for subsequent blocks
-	            this._iv = undefined;
-	        } else {
-	            keystream = this._prevBlock;
-	        }
-	        cipher.encryptBlock(keystream, 0);
-
-	        // Encrypt
-	        for (var i = 0; i < blockSize; i++) {
-	            words[offset + i] ^= keystream[i];
-	        }
-	    }
-
-	    return CFB;
-	}());
-
-
-	return CryptoJS.mode.CFB;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ctr-gladman.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ctr-gladman.js
deleted file mode 100644
index bbc5687..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ctr-gladman.js
+++ /dev/null
@@ -1,116 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/** @preserve
-	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
-	 * derived from CryptoJS.mode.CTR
-	 * Jan Hruby jhruby.web@gmail.com
-	 */
-	CryptoJS.mode.CTRGladman = (function () {
-	    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
-
-		function incWord(word)
-		{
-			if (((word >> 24) & 0xff) === 0xff) { //overflow
-			var b1 = (word >> 16)&0xff;
-			var b2 = (word >> 8)&0xff;
-			var b3 = word & 0xff;
-
-			if (b1 === 0xff) // overflow b1
-			{
-			b1 = 0;
-			if (b2 === 0xff)
-			{
-				b2 = 0;
-				if (b3 === 0xff)
-				{
-					b3 = 0;
-				}
-				else
-				{
-					++b3;
-				}
-			}
-			else
-			{
-				++b2;
-			}
-			}
-			else
-			{
-			++b1;
-			}
-
-			word = 0;
-			word += (b1 << 16);
-			word += (b2 << 8);
-			word += b3;
-			}
-			else
-			{
-			word += (0x01 << 24);
-			}
-			return word;
-		}
-
-		function incCounter(counter)
-		{
-			if ((counter[0] = incWord(counter[0])) === 0)
-			{
-				// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
-				counter[1] = incWord(counter[1]);
-			}
-			return counter;
-		}
-
-	    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var counter = this._counter;
-
-	            // Generate keystream
-	            if (iv) {
-	                counter = this._counter = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-
-				incCounter(counter);
-
-				var keystream = counter.slice(0);
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    CTRGladman.Decryptor = Encryptor;
-
-	    return CTRGladman;
-	}());
-
-
-
-
-	return CryptoJS.mode.CTRGladman;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ctr.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ctr.js
deleted file mode 100644
index c3d470a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ctr.js
+++ /dev/null
@@ -1,58 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * Counter block mode.
-	 */
-	CryptoJS.mode.CTR = (function () {
-	    var CTR = CryptoJS.lib.BlockCipherMode.extend();
-
-	    var Encryptor = CTR.Encryptor = CTR.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var counter = this._counter;
-
-	            // Generate keystream
-	            if (iv) {
-	                counter = this._counter = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-	            var keystream = counter.slice(0);
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Increment counter
-	            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    CTR.Decryptor = Encryptor;
-
-	    return CTR;
-	}());
-
-
-	return CryptoJS.mode.CTR;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ecb.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ecb.js
deleted file mode 100644
index ff06921..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ecb.js
+++ /dev/null
@@ -1,40 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * Electronic Codebook block mode.
-	 */
-	CryptoJS.mode.ECB = (function () {
-	    var ECB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    ECB.Encryptor = ECB.extend({
-	        processBlock: function (words, offset) {
-	            this._cipher.encryptBlock(words, offset);
-	        }
-	    });
-
-	    ECB.Decryptor = ECB.extend({
-	        processBlock: function (words, offset) {
-	            this._cipher.decryptBlock(words, offset);
-	        }
-	    });
-
-	    return ECB;
-	}());
-
-
-	return CryptoJS.mode.ECB;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ofb.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ofb.js
deleted file mode 100644
index c01314c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/mode-ofb.js
+++ /dev/null
@@ -1,54 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * Output Feedback block mode.
-	 */
-	CryptoJS.mode.OFB = (function () {
-	    var OFB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    var Encryptor = OFB.Encryptor = OFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var keystream = this._keystream;
-
-	            // Generate keystream
-	            if (iv) {
-	                keystream = this._keystream = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    OFB.Decryptor = Encryptor;
-
-	    return OFB;
-	}());
-
-
-	return CryptoJS.mode.OFB;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/package.json b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/package.json
deleted file mode 100644
index fe24e65..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/package.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "_from": "crypto-js@4.2.0",
-  "_id": "crypto-js@4.2.0",
-  "_inBundle": false,
-  "_integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
-  "_location": "/crypto-js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "crypto-js@4.2.0",
-    "name": "crypto-js",
-    "escapedName": "crypto-js",
-    "rawSpec": "4.2.0",
-    "saveSpec": null,
-    "fetchSpec": "4.2.0"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-  "_shasum": "4d931639ecdfd12ff80e8186dba6af2c2e856631",
-  "_spec": "crypto-js@4.2.0",
-  "_where": "C:\\Users\\59409\\Documents\\HBuilderProjects\\jinjiuxin-pc\\uniCloud-aliyun\\cloudfunctions\\router",
-  "author": {
-    "name": "Evan Vosberg",
-    "url": "http://github.com/evanvosberg"
-  },
-  "browser": {
-    "crypto": false
-  },
-  "bugs": {
-    "url": "https://github.com/brix/crypto-js/issues"
-  },
-  "bundleDependencies": false,
-  "dependencies": {},
-  "deprecated": false,
-  "description": "JavaScript library of crypto standards.",
-  "homepage": "http://github.com/brix/crypto-js",
-  "keywords": [
-    "security",
-    "crypto",
-    "Hash",
-    "MD5",
-    "SHA1",
-    "SHA-1",
-    "SHA256",
-    "SHA-256",
-    "RC4",
-    "Rabbit",
-    "AES",
-    "DES",
-    "PBKDF2",
-    "HMAC",
-    "OFB",
-    "CFB",
-    "CTR",
-    "CBC",
-    "Base64",
-    "Base64url"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "name": "crypto-js",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/brix/crypto-js.git"
-  },
-  "version": "4.2.0"
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-ansix923.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-ansix923.js
deleted file mode 100644
index f01f21e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-ansix923.js
+++ /dev/null
@@ -1,49 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * ANSI X.923 padding strategy.
-	 */
-	CryptoJS.pad.AnsiX923 = {
-	    pad: function (data, blockSize) {
-	        // Shortcuts
-	        var dataSigBytes = data.sigBytes;
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Count padding bytes
-	        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
-
-	        // Compute last byte position
-	        var lastBytePos = dataSigBytes + nPaddingBytes - 1;
-
-	        // Pad
-	        data.clamp();
-	        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
-	        data.sigBytes += nPaddingBytes;
-	    },
-
-	    unpad: function (data) {
-	        // Get number of padding bytes from last byte
-	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	        // Remove padding
-	        data.sigBytes -= nPaddingBytes;
-	    }
-	};
-
-
-	return CryptoJS.pad.Ansix923;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-iso10126.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-iso10126.js
deleted file mode 100644
index 6e2aefd..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-iso10126.js
+++ /dev/null
@@ -1,44 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * ISO 10126 padding strategy.
-	 */
-	CryptoJS.pad.Iso10126 = {
-	    pad: function (data, blockSize) {
-	        // Shortcut
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Count padding bytes
-	        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
-
-	        // Pad
-	        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
-	             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
-	    },
-
-	    unpad: function (data) {
-	        // Get number of padding bytes from last byte
-	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	        // Remove padding
-	        data.sigBytes -= nPaddingBytes;
-	    }
-	};
-
-
-	return CryptoJS.pad.Iso10126;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-iso97971.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-iso97971.js
deleted file mode 100644
index 41049b4..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-iso97971.js
+++ /dev/null
@@ -1,40 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * ISO/IEC 9797-1 Padding Method 2.
-	 */
-	CryptoJS.pad.Iso97971 = {
-	    pad: function (data, blockSize) {
-	        // Add 0x80 byte
-	        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
-
-	        // Zero pad the rest
-	        CryptoJS.pad.ZeroPadding.pad(data, blockSize);
-	    },
-
-	    unpad: function (data) {
-	        // Remove zero padding
-	        CryptoJS.pad.ZeroPadding.unpad(data);
-
-	        // Remove one more byte -- the 0x80 byte
-	        data.sigBytes--;
-	    }
-	};
-
-
-	return CryptoJS.pad.Iso97971;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-nopadding.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-nopadding.js
deleted file mode 100644
index c7787c9..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-nopadding.js
+++ /dev/null
@@ -1,30 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * A noop padding strategy.
-	 */
-	CryptoJS.pad.NoPadding = {
-	    pad: function () {
-	    },
-
-	    unpad: function () {
-	    }
-	};
-
-
-	return CryptoJS.pad.NoPadding;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-pkcs7.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-pkcs7.js
deleted file mode 100644
index 3555168..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-pkcs7.js
+++ /dev/null
@@ -1,18 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	return CryptoJS.pad.Pkcs7;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-zeropadding.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-zeropadding.js
deleted file mode 100644
index a1a459e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pad-zeropadding.js
+++ /dev/null
@@ -1,47 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/**
-	 * Zero padding strategy.
-	 */
-	CryptoJS.pad.ZeroPadding = {
-	    pad: function (data, blockSize) {
-	        // Shortcut
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Pad
-	        data.clamp();
-	        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
-	    },
-
-	    unpad: function (data) {
-	        // Shortcut
-	        var dataWords = data.words;
-
-	        // Unpad
-	        var i = data.sigBytes - 1;
-	        for (var i = data.sigBytes - 1; i >= 0; i--) {
-	            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-	                data.sigBytes = i + 1;
-	                break;
-	            }
-	        }
-	    }
-	};
-
-
-	return CryptoJS.pad.ZeroPadding;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pbkdf2.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pbkdf2.js
deleted file mode 100644
index 6850934..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/pbkdf2.js
+++ /dev/null
@@ -1,145 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./sha256"), require("./hmac"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./sha256", "./hmac"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var SHA256 = C_algo.SHA256;
-	    var HMAC = C_algo.HMAC;
-
-	    /**
-	     * Password-Based Key Derivation Function 2 algorithm.
-	     */
-	    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
-	         * @property {Hasher} hasher The hasher to use. Default: SHA256
-	         * @property {number} iterations The number of iterations to perform. Default: 250000
-	         */
-	        cfg: Base.extend({
-	            keySize: 128/32,
-	            hasher: SHA256,
-	            iterations: 250000
-	        }),
-
-	        /**
-	         * Initializes a newly created key derivation function.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
-	         *
-	         * @example
-	         *
-	         *     var kdf = CryptoJS.algo.PBKDF2.create();
-	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
-	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
-	         */
-	        init: function (cfg) {
-	            this.cfg = this.cfg.extend(cfg);
-	        },
-
-	        /**
-	         * Computes the Password-Based Key Derivation Function 2.
-	         *
-	         * @param {WordArray|string} password The password.
-	         * @param {WordArray|string} salt A salt.
-	         *
-	         * @return {WordArray} The derived key.
-	         *
-	         * @example
-	         *
-	         *     var key = kdf.compute(password, salt);
-	         */
-	        compute: function (password, salt) {
-	            // Shortcut
-	            var cfg = this.cfg;
-
-	            // Init HMAC
-	            var hmac = HMAC.create(cfg.hasher, password);
-
-	            // Initial values
-	            var derivedKey = WordArray.create();
-	            var blockIndex = WordArray.create([0x00000001]);
-
-	            // Shortcuts
-	            var derivedKeyWords = derivedKey.words;
-	            var blockIndexWords = blockIndex.words;
-	            var keySize = cfg.keySize;
-	            var iterations = cfg.iterations;
-
-	            // Generate key
-	            while (derivedKeyWords.length < keySize) {
-	                var block = hmac.update(salt).finalize(blockIndex);
-	                hmac.reset();
-
-	                // Shortcuts
-	                var blockWords = block.words;
-	                var blockWordsLength = blockWords.length;
-
-	                // Iterations
-	                var intermediate = block;
-	                for (var i = 1; i < iterations; i++) {
-	                    intermediate = hmac.finalize(intermediate);
-	                    hmac.reset();
-
-	                    // Shortcut
-	                    var intermediateWords = intermediate.words;
-
-	                    // XOR intermediate with block
-	                    for (var j = 0; j < blockWordsLength; j++) {
-	                        blockWords[j] ^= intermediateWords[j];
-	                    }
-	                }
-
-	                derivedKey.concat(block);
-	                blockIndexWords[0]++;
-	            }
-	            derivedKey.sigBytes = keySize * 4;
-
-	            return derivedKey;
-	        }
-	    });
-
-	    /**
-	     * Computes the Password-Based Key Derivation Function 2.
-	     *
-	     * @param {WordArray|string} password The password.
-	     * @param {WordArray|string} salt A salt.
-	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
-	     *
-	     * @return {WordArray} The derived key.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var key = CryptoJS.PBKDF2(password, salt);
-	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
-	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
-	     */
-	    C.PBKDF2 = function (password, salt, cfg) {
-	        return PBKDF2.create(cfg).compute(password, salt);
-	    };
-	}());
-
-
-	return CryptoJS.PBKDF2;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rabbit-legacy.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rabbit-legacy.js
deleted file mode 100644
index e118b6b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rabbit-legacy.js
+++ /dev/null
@@ -1,190 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    // Reusable objects
-	    var S  = [];
-	    var C_ = [];
-	    var G  = [];
-
-	    /**
-	     * Rabbit stream cipher algorithm.
-	     *
-	     * This is a legacy version that neglected to convert the key to little-endian.
-	     * This error doesn't affect the cipher's security,
-	     * but it does affect its compatibility with other implementations.
-	     */
-	    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var K = this._key.words;
-	            var iv = this.cfg.iv;
-
-	            // Generate initial state values
-	            var X = this._X = [
-	                K[0], (K[3] << 16) | (K[2] >>> 16),
-	                K[1], (K[0] << 16) | (K[3] >>> 16),
-	                K[2], (K[1] << 16) | (K[0] >>> 16),
-	                K[3], (K[2] << 16) | (K[1] >>> 16)
-	            ];
-
-	            // Generate initial counter values
-	            var C = this._C = [
-	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
-	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
-	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
-	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-	            ];
-
-	            // Carry bit
-	            this._b = 0;
-
-	            // Iterate the system four times
-	            for (var i = 0; i < 4; i++) {
-	                nextState.call(this);
-	            }
-
-	            // Modify the counters
-	            for (var i = 0; i < 8; i++) {
-	                C[i] ^= X[(i + 4) & 7];
-	            }
-
-	            // IV setup
-	            if (iv) {
-	                // Shortcuts
-	                var IV = iv.words;
-	                var IV_0 = IV[0];
-	                var IV_1 = IV[1];
-
-	                // Generate four subvectors
-	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
-
-	                // Modify counter values
-	                C[0] ^= i0;
-	                C[1] ^= i1;
-	                C[2] ^= i2;
-	                C[3] ^= i3;
-	                C[4] ^= i0;
-	                C[5] ^= i1;
-	                C[6] ^= i2;
-	                C[7] ^= i3;
-
-	                // Iterate the system four times
-	                for (var i = 0; i < 4; i++) {
-	                    nextState.call(this);
-	                }
-	            }
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var X = this._X;
-
-	            // Iterate the system
-	            nextState.call(this);
-
-	            // Generate four keystream words
-	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
-
-	            for (var i = 0; i < 4; i++) {
-	                // Swap endian
-	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
-
-	                // Encrypt
-	                M[offset + i] ^= S[i];
-	            }
-	        },
-
-	        blockSize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    function nextState() {
-	        // Shortcuts
-	        var X = this._X;
-	        var C = this._C;
-
-	        // Save old counter values
-	        for (var i = 0; i < 8; i++) {
-	            C_[i] = C[i];
-	        }
-
-	        // Calculate new counter values
-	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
-
-	        // Calculate the g-values
-	        for (var i = 0; i < 8; i++) {
-	            var gx = X[i] + C[i];
-
-	            // Construct high and low argument for squaring
-	            var ga = gx & 0xffff;
-	            var gb = gx >>> 16;
-
-	            // Calculate high and low result of squaring
-	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
-
-	            // High XOR low
-	            G[i] = gh ^ gl;
-	        }
-
-	        // Calculate new state values
-	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
-	}());
-
-
-	return CryptoJS.RabbitLegacy;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rabbit.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rabbit.js
deleted file mode 100644
index 1b06833..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rabbit.js
+++ /dev/null
@@ -1,192 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    // Reusable objects
-	    var S  = [];
-	    var C_ = [];
-	    var G  = [];
-
-	    /**
-	     * Rabbit stream cipher algorithm
-	     */
-	    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var K = this._key.words;
-	            var iv = this.cfg.iv;
-
-	            // Swap endian
-	            for (var i = 0; i < 4; i++) {
-	                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
-	                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Generate initial state values
-	            var X = this._X = [
-	                K[0], (K[3] << 16) | (K[2] >>> 16),
-	                K[1], (K[0] << 16) | (K[3] >>> 16),
-	                K[2], (K[1] << 16) | (K[0] >>> 16),
-	                K[3], (K[2] << 16) | (K[1] >>> 16)
-	            ];
-
-	            // Generate initial counter values
-	            var C = this._C = [
-	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
-	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
-	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
-	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-	            ];
-
-	            // Carry bit
-	            this._b = 0;
-
-	            // Iterate the system four times
-	            for (var i = 0; i < 4; i++) {
-	                nextState.call(this);
-	            }
-
-	            // Modify the counters
-	            for (var i = 0; i < 8; i++) {
-	                C[i] ^= X[(i + 4) & 7];
-	            }
-
-	            // IV setup
-	            if (iv) {
-	                // Shortcuts
-	                var IV = iv.words;
-	                var IV_0 = IV[0];
-	                var IV_1 = IV[1];
-
-	                // Generate four subvectors
-	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
-
-	                // Modify counter values
-	                C[0] ^= i0;
-	                C[1] ^= i1;
-	                C[2] ^= i2;
-	                C[3] ^= i3;
-	                C[4] ^= i0;
-	                C[5] ^= i1;
-	                C[6] ^= i2;
-	                C[7] ^= i3;
-
-	                // Iterate the system four times
-	                for (var i = 0; i < 4; i++) {
-	                    nextState.call(this);
-	                }
-	            }
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var X = this._X;
-
-	            // Iterate the system
-	            nextState.call(this);
-
-	            // Generate four keystream words
-	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
-
-	            for (var i = 0; i < 4; i++) {
-	                // Swap endian
-	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
-
-	                // Encrypt
-	                M[offset + i] ^= S[i];
-	            }
-	        },
-
-	        blockSize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    function nextState() {
-	        // Shortcuts
-	        var X = this._X;
-	        var C = this._C;
-
-	        // Save old counter values
-	        for (var i = 0; i < 8; i++) {
-	            C_[i] = C[i];
-	        }
-
-	        // Calculate new counter values
-	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
-
-	        // Calculate the g-values
-	        for (var i = 0; i < 8; i++) {
-	            var gx = X[i] + C[i];
-
-	            // Construct high and low argument for squaring
-	            var ga = gx & 0xffff;
-	            var gb = gx >>> 16;
-
-	            // Calculate high and low result of squaring
-	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
-
-	            // High XOR low
-	            G[i] = gh ^ gl;
-	        }
-
-	        // Calculate new state values
-	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
-	     */
-	    C.Rabbit = StreamCipher._createHelper(Rabbit);
-	}());
-
-
-	return CryptoJS.Rabbit;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rc4.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rc4.js
deleted file mode 100644
index 0e4bdff..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/rc4.js
+++ /dev/null
@@ -1,139 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    /**
-	     * RC4 stream cipher algorithm.
-	     */
-	    var RC4 = C_algo.RC4 = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-	            var keySigBytes = key.sigBytes;
-
-	            // Init sbox
-	            var S = this._S = [];
-	            for (var i = 0; i < 256; i++) {
-	                S[i] = i;
-	            }
-
-	            // Key setup
-	            for (var i = 0, j = 0; i < 256; i++) {
-	                var keyByteIndex = i % keySigBytes;
-	                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
-
-	                j = (j + S[i] + keyByte) % 256;
-
-	                // Swap
-	                var t = S[i];
-	                S[i] = S[j];
-	                S[j] = t;
-	            }
-
-	            // Counters
-	            this._i = this._j = 0;
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            M[offset] ^= generateKeystreamWord.call(this);
-	        },
-
-	        keySize: 256/32,
-
-	        ivSize: 0
-	    });
-
-	    function generateKeystreamWord() {
-	        // Shortcuts
-	        var S = this._S;
-	        var i = this._i;
-	        var j = this._j;
-
-	        // Generate keystream word
-	        var keystreamWord = 0;
-	        for (var n = 0; n < 4; n++) {
-	            i = (i + 1) % 256;
-	            j = (j + S[i]) % 256;
-
-	            // Swap
-	            var t = S[i];
-	            S[i] = S[j];
-	            S[j] = t;
-
-	            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
-	        }
-
-	        // Update counters
-	        this._i = i;
-	        this._j = j;
-
-	        return keystreamWord;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RC4 = StreamCipher._createHelper(RC4);
-
-	    /**
-	     * Modified RC4 stream cipher algorithm.
-	     */
-	    var RC4Drop = C_algo.RC4Drop = RC4.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} drop The number of keystream words to drop. Default 192
-	         */
-	        cfg: RC4.cfg.extend({
-	            drop: 192
-	        }),
-
-	        _doReset: function () {
-	            RC4._doReset.call(this);
-
-	            // Drop
-	            for (var i = this.cfg.drop; i > 0; i--) {
-	                generateKeystreamWord.call(this);
-	            }
-	        }
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
-	}());
-
-
-	return CryptoJS.RC4;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/ripemd160.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/ripemd160.js
deleted file mode 100644
index 24feb47..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/ripemd160.js
+++ /dev/null
@@ -1,267 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	/** @preserve
-	(c) 2012 by Cédric Mesnil. All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	*/
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Constants table
-	    var _zl = WordArray.create([
-	        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-	        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
-	        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
-	        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
-	        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
-	    var _zr = WordArray.create([
-	        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
-	        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
-	        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
-	        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
-	        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
-	    var _sl = WordArray.create([
-	         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
-	        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
-	        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
-	          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
-	        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
-	    var _sr = WordArray.create([
-	        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
-	        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
-	        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
-	        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
-	        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
-
-	    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
-	    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
-
-	    /**
-	     * RIPEMD160 hash algorithm.
-	     */
-	    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-
-	            // Swap endian
-	            for (var i = 0; i < 16; i++) {
-	                // Shortcuts
-	                var offset_i = offset + i;
-	                var M_offset_i = M[offset_i];
-
-	                // Swap
-	                M[offset_i] = (
-	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
-	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-	                );
-	            }
-	            // Shortcut
-	            var H  = this._hash.words;
-	            var hl = _hl.words;
-	            var hr = _hr.words;
-	            var zl = _zl.words;
-	            var zr = _zr.words;
-	            var sl = _sl.words;
-	            var sr = _sr.words;
-
-	            // Working variables
-	            var al, bl, cl, dl, el;
-	            var ar, br, cr, dr, er;
-
-	            ar = al = H[0];
-	            br = bl = H[1];
-	            cr = cl = H[2];
-	            dr = dl = H[3];
-	            er = el = H[4];
-	            // Computation
-	            var t;
-	            for (var i = 0; i < 80; i += 1) {
-	                t = (al +  M[offset+zl[i]])|0;
-	                if (i<16){
-		            t +=  f1(bl,cl,dl) + hl[0];
-	                } else if (i<32) {
-		            t +=  f2(bl,cl,dl) + hl[1];
-	                } else if (i<48) {
-		            t +=  f3(bl,cl,dl) + hl[2];
-	                } else if (i<64) {
-		            t +=  f4(bl,cl,dl) + hl[3];
-	                } else {// if (i<80) {
-		            t +=  f5(bl,cl,dl) + hl[4];
-	                }
-	                t = t|0;
-	                t =  rotl(t,sl[i]);
-	                t = (t+el)|0;
-	                al = el;
-	                el = dl;
-	                dl = rotl(cl, 10);
-	                cl = bl;
-	                bl = t;
-
-	                t = (ar + M[offset+zr[i]])|0;
-	                if (i<16){
-		            t +=  f5(br,cr,dr) + hr[0];
-	                } else if (i<32) {
-		            t +=  f4(br,cr,dr) + hr[1];
-	                } else if (i<48) {
-		            t +=  f3(br,cr,dr) + hr[2];
-	                } else if (i<64) {
-		            t +=  f2(br,cr,dr) + hr[3];
-	                } else {// if (i<80) {
-		            t +=  f1(br,cr,dr) + hr[4];
-	                }
-	                t = t|0;
-	                t =  rotl(t,sr[i]) ;
-	                t = (t+er)|0;
-	                ar = er;
-	                er = dr;
-	                dr = rotl(cr, 10);
-	                cr = br;
-	                br = t;
-	            }
-	            // Intermediate hash value
-	            t    = (H[1] + cl + dr)|0;
-	            H[1] = (H[2] + dl + er)|0;
-	            H[2] = (H[3] + el + ar)|0;
-	            H[3] = (H[4] + al + br)|0;
-	            H[4] = (H[0] + bl + cr)|0;
-	            H[0] =  t;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
-	                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
-	            );
-	            data.sigBytes = (dataWords.length + 1) * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var hash = this._hash;
-	            var H = hash.words;
-
-	            // Swap endian
-	            for (var i = 0; i < 5; i++) {
-	                // Shortcut
-	                var H_i = H[i];
-
-	                // Swap
-	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-
-	    function f1(x, y, z) {
-	        return ((x) ^ (y) ^ (z));
-
-	    }
-
-	    function f2(x, y, z) {
-	        return (((x)&(y)) | ((~x)&(z)));
-	    }
-
-	    function f3(x, y, z) {
-	        return (((x) | (~(y))) ^ (z));
-	    }
-
-	    function f4(x, y, z) {
-	        return (((x) & (z)) | ((y)&(~(z))));
-	    }
-
-	    function f5(x, y, z) {
-	        return ((x) ^ ((y) |(~(z))));
-
-	    }
-
-	    function rotl(x,n) {
-	        return (x<<n) | (x>>>(32-n));
-	    }
-
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.RIPEMD160('message');
-	     *     var hash = CryptoJS.RIPEMD160(wordArray);
-	     */
-	    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
-	     */
-	    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
-	}(Math));
-
-
-	return CryptoJS.RIPEMD160;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha1.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha1.js
deleted file mode 100644
index 6691149..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha1.js
+++ /dev/null
@@ -1,150 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Reusable object
-	    var W = [];
-
-	    /**
-	     * SHA-1 hash algorithm.
-	     */
-	    var SHA1 = C_algo.SHA1 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0x67452301, 0xefcdab89,
-	                0x98badcfe, 0x10325476,
-	                0xc3d2e1f0
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var H = this._hash.words;
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-	            var e = H[4];
-
-	            // Computation
-	            for (var i = 0; i < 80; i++) {
-	                if (i < 16) {
-	                    W[i] = M[offset + i] | 0;
-	                } else {
-	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
-	                    W[i] = (n << 1) | (n >>> 31);
-	                }
-
-	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
-	                if (i < 20) {
-	                    t += ((b & c) | (~b & d)) + 0x5a827999;
-	                } else if (i < 40) {
-	                    t += (b ^ c ^ d) + 0x6ed9eba1;
-	                } else if (i < 60) {
-	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
-	                } else /* if (i < 80) */ {
-	                    t += (b ^ c ^ d) - 0x359d3e2a;
-	                }
-
-	                e = d;
-	                d = c;
-	                c = (b << 30) | (b >>> 2);
-	                b = a;
-	                a = t;
-	            }
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	            H[4] = (H[4] + e) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Return final computed hash
-	            return this._hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA1('message');
-	     *     var hash = CryptoJS.SHA1(wordArray);
-	     */
-	    C.SHA1 = Hasher._createHelper(SHA1);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA1(message, key);
-	     */
-	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
-	}());
-
-
-	return CryptoJS.SHA1;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha224.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha224.js
deleted file mode 100644
index d8ce988..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha224.js
+++ /dev/null
@@ -1,80 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./sha256"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./sha256"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var SHA256 = C_algo.SHA256;
-
-	    /**
-	     * SHA-224 hash algorithm.
-	     */
-	    var SHA224 = C_algo.SHA224 = SHA256.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
-	                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
-	            ]);
-	        },
-
-	        _doFinalize: function () {
-	            var hash = SHA256._doFinalize.call(this);
-
-	            hash.sigBytes -= 4;
-
-	            return hash;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA224('message');
-	     *     var hash = CryptoJS.SHA224(wordArray);
-	     */
-	    C.SHA224 = SHA256._createHelper(SHA224);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA224(message, key);
-	     */
-	    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
-	}());
-
-
-	return CryptoJS.SHA224;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha256.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha256.js
deleted file mode 100644
index de2d7fc..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha256.js
+++ /dev/null
@@ -1,199 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Initialization and round constants tables
-	    var H = [];
-	    var K = [];
-
-	    // Compute constants
-	    (function () {
-	        function isPrime(n) {
-	            var sqrtN = Math.sqrt(n);
-	            for (var factor = 2; factor <= sqrtN; factor++) {
-	                if (!(n % factor)) {
-	                    return false;
-	                }
-	            }
-
-	            return true;
-	        }
-
-	        function getFractionalBits(n) {
-	            return ((n - (n | 0)) * 0x100000000) | 0;
-	        }
-
-	        var n = 2;
-	        var nPrime = 0;
-	        while (nPrime < 64) {
-	            if (isPrime(n)) {
-	                if (nPrime < 8) {
-	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
-	                }
-	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
-
-	                nPrime++;
-	            }
-
-	            n++;
-	        }
-	    }());
-
-	    // Reusable object
-	    var W = [];
-
-	    /**
-	     * SHA-256 hash algorithm.
-	     */
-	    var SHA256 = C_algo.SHA256 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init(H.slice(0));
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var H = this._hash.words;
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-	            var e = H[4];
-	            var f = H[5];
-	            var g = H[6];
-	            var h = H[7];
-
-	            // Computation
-	            for (var i = 0; i < 64; i++) {
-	                if (i < 16) {
-	                    W[i] = M[offset + i] | 0;
-	                } else {
-	                    var gamma0x = W[i - 15];
-	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
-	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
-	                                   (gamma0x >>> 3);
-
-	                    var gamma1x = W[i - 2];
-	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
-	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
-	                                   (gamma1x >>> 10);
-
-	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
-	                }
-
-	                var ch  = (e & f) ^ (~e & g);
-	                var maj = (a & b) ^ (a & c) ^ (b & c);
-
-	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
-	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
-
-	                var t1 = h + sigma1 + ch + K[i] + W[i];
-	                var t2 = sigma0 + maj;
-
-	                h = g;
-	                g = f;
-	                f = e;
-	                e = (d + t1) | 0;
-	                d = c;
-	                c = b;
-	                b = a;
-	                a = (t1 + t2) | 0;
-	            }
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	            H[4] = (H[4] + e) | 0;
-	            H[5] = (H[5] + f) | 0;
-	            H[6] = (H[6] + g) | 0;
-	            H[7] = (H[7] + h) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Return final computed hash
-	            return this._hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA256('message');
-	     *     var hash = CryptoJS.SHA256(wordArray);
-	     */
-	    C.SHA256 = Hasher._createHelper(SHA256);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA256(message, key);
-	     */
-	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
-	}(Math));
-
-
-	return CryptoJS.SHA256;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha3.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha3.js
deleted file mode 100644
index 34ad86c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha3.js
+++ /dev/null
@@ -1,326 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var C_algo = C.algo;
-
-	    // Constants tables
-	    var RHO_OFFSETS = [];
-	    var PI_INDEXES  = [];
-	    var ROUND_CONSTANTS = [];
-
-	    // Compute Constants
-	    (function () {
-	        // Compute rho offset constants
-	        var x = 1, y = 0;
-	        for (var t = 0; t < 24; t++) {
-	            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
-
-	            var newX = y % 5;
-	            var newY = (2 * x + 3 * y) % 5;
-	            x = newX;
-	            y = newY;
-	        }
-
-	        // Compute pi index constants
-	        for (var x = 0; x < 5; x++) {
-	            for (var y = 0; y < 5; y++) {
-	                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
-	            }
-	        }
-
-	        // Compute round constants
-	        var LFSR = 0x01;
-	        for (var i = 0; i < 24; i++) {
-	            var roundConstantMsw = 0;
-	            var roundConstantLsw = 0;
-
-	            for (var j = 0; j < 7; j++) {
-	                if (LFSR & 0x01) {
-	                    var bitPosition = (1 << j) - 1;
-	                    if (bitPosition < 32) {
-	                        roundConstantLsw ^= 1 << bitPosition;
-	                    } else /* if (bitPosition >= 32) */ {
-	                        roundConstantMsw ^= 1 << (bitPosition - 32);
-	                    }
-	                }
-
-	                // Compute next LFSR
-	                if (LFSR & 0x80) {
-	                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
-	                    LFSR = (LFSR << 1) ^ 0x71;
-	                } else {
-	                    LFSR <<= 1;
-	                }
-	            }
-
-	            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
-	        }
-	    }());
-
-	    // Reusable objects for temporary values
-	    var T = [];
-	    (function () {
-	        for (var i = 0; i < 25; i++) {
-	            T[i] = X64Word.create();
-	        }
-	    }());
-
-	    /**
-	     * SHA-3 hash algorithm.
-	     */
-	    var SHA3 = C_algo.SHA3 = Hasher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} outputLength
-	         *   The desired number of bits in the output hash.
-	         *   Only values permitted are: 224, 256, 384, 512.
-	         *   Default: 512
-	         */
-	        cfg: Hasher.cfg.extend({
-	            outputLength: 512
-	        }),
-
-	        _doReset: function () {
-	            var state = this._state = []
-	            for (var i = 0; i < 25; i++) {
-	                state[i] = new X64Word.init();
-	            }
-
-	            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcuts
-	            var state = this._state;
-	            var nBlockSizeLanes = this.blockSize / 2;
-
-	            // Absorb
-	            for (var i = 0; i < nBlockSizeLanes; i++) {
-	                // Shortcuts
-	                var M2i  = M[offset + 2 * i];
-	                var M2i1 = M[offset + 2 * i + 1];
-
-	                // Swap endian
-	                M2i = (
-	                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
-	                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
-	                );
-	                M2i1 = (
-	                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
-	                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
-	                );
-
-	                // Absorb message into state
-	                var lane = state[i];
-	                lane.high ^= M2i1;
-	                lane.low  ^= M2i;
-	            }
-
-	            // Rounds
-	            for (var round = 0; round < 24; round++) {
-	                // Theta
-	                for (var x = 0; x < 5; x++) {
-	                    // Mix column lanes
-	                    var tMsw = 0, tLsw = 0;
-	                    for (var y = 0; y < 5; y++) {
-	                        var lane = state[x + 5 * y];
-	                        tMsw ^= lane.high;
-	                        tLsw ^= lane.low;
-	                    }
-
-	                    // Temporary values
-	                    var Tx = T[x];
-	                    Tx.high = tMsw;
-	                    Tx.low  = tLsw;
-	                }
-	                for (var x = 0; x < 5; x++) {
-	                    // Shortcuts
-	                    var Tx4 = T[(x + 4) % 5];
-	                    var Tx1 = T[(x + 1) % 5];
-	                    var Tx1Msw = Tx1.high;
-	                    var Tx1Lsw = Tx1.low;
-
-	                    // Mix surrounding columns
-	                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
-	                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
-	                    for (var y = 0; y < 5; y++) {
-	                        var lane = state[x + 5 * y];
-	                        lane.high ^= tMsw;
-	                        lane.low  ^= tLsw;
-	                    }
-	                }
-
-	                // Rho Pi
-	                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
-	                    var tMsw;
-	                    var tLsw;
-
-	                    // Shortcuts
-	                    var lane = state[laneIndex];
-	                    var laneMsw = lane.high;
-	                    var laneLsw = lane.low;
-	                    var rhoOffset = RHO_OFFSETS[laneIndex];
-
-	                    // Rotate lanes
-	                    if (rhoOffset < 32) {
-	                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
-	                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
-	                    } else /* if (rhoOffset >= 32) */ {
-	                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
-	                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
-	                    }
-
-	                    // Transpose lanes
-	                    var TPiLane = T[PI_INDEXES[laneIndex]];
-	                    TPiLane.high = tMsw;
-	                    TPiLane.low  = tLsw;
-	                }
-
-	                // Rho pi at x = y = 0
-	                var T0 = T[0];
-	                var state0 = state[0];
-	                T0.high = state0.high;
-	                T0.low  = state0.low;
-
-	                // Chi
-	                for (var x = 0; x < 5; x++) {
-	                    for (var y = 0; y < 5; y++) {
-	                        // Shortcuts
-	                        var laneIndex = x + 5 * y;
-	                        var lane = state[laneIndex];
-	                        var TLane = T[laneIndex];
-	                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];
-	                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];
-
-	                        // Mix rows
-	                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
-	                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
-	                    }
-	                }
-
-	                // Iota
-	                var lane = state[0];
-	                var roundConstant = ROUND_CONSTANTS[round];
-	                lane.high ^= roundConstant.high;
-	                lane.low  ^= roundConstant.low;
-	            }
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-	            var blockSizeBits = this.blockSize * 32;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
-	            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var state = this._state;
-	            var outputLengthBytes = this.cfg.outputLength / 8;
-	            var outputLengthLanes = outputLengthBytes / 8;
-
-	            // Squeeze
-	            var hashWords = [];
-	            for (var i = 0; i < outputLengthLanes; i++) {
-	                // Shortcuts
-	                var lane = state[i];
-	                var laneMsw = lane.high;
-	                var laneLsw = lane.low;
-
-	                // Swap endian
-	                laneMsw = (
-	                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
-	                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
-	                );
-	                laneLsw = (
-	                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
-	                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
-	                );
-
-	                // Squeeze state to retrieve hash
-	                hashWords.push(laneLsw);
-	                hashWords.push(laneMsw);
-	            }
-
-	            // Return final computed hash
-	            return new WordArray.init(hashWords, outputLengthBytes);
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-
-	            var state = clone._state = this._state.slice(0);
-	            for (var i = 0; i < 25; i++) {
-	                state[i] = state[i].clone();
-	            }
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA3('message');
-	     *     var hash = CryptoJS.SHA3(wordArray);
-	     */
-	    C.SHA3 = Hasher._createHelper(SHA3);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA3(message, key);
-	     */
-	    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
-	}(Math));
-
-
-	return CryptoJS.SHA3;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha384.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha384.js
deleted file mode 100644
index a0b95bf..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha384.js
+++ /dev/null
@@ -1,83 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core", "./sha512"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var X64WordArray = C_x64.WordArray;
-	    var C_algo = C.algo;
-	    var SHA512 = C_algo.SHA512;
-
-	    /**
-	     * SHA-384 hash algorithm.
-	     */
-	    var SHA384 = C_algo.SHA384 = SHA512.extend({
-	        _doReset: function () {
-	            this._hash = new X64WordArray.init([
-	                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
-	                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
-	                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
-	                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
-	            ]);
-	        },
-
-	        _doFinalize: function () {
-	            var hash = SHA512._doFinalize.call(this);
-
-	            hash.sigBytes -= 16;
-
-	            return hash;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA384('message');
-	     *     var hash = CryptoJS.SHA384(wordArray);
-	     */
-	    C.SHA384 = SHA512._createHelper(SHA384);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA384(message, key);
-	     */
-	    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
-	}());
-
-
-	return CryptoJS.SHA384;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha512.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha512.js
deleted file mode 100644
index d274ab0..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/sha512.js
+++ /dev/null
@@ -1,326 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./x64-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./x64-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Hasher = C_lib.Hasher;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var X64WordArray = C_x64.WordArray;
-	    var C_algo = C.algo;
-
-	    function X64Word_create() {
-	        return X64Word.create.apply(X64Word, arguments);
-	    }
-
-	    // Constants
-	    var K = [
-	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
-	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
-	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
-	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
-	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
-	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
-	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
-	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
-	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
-	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
-	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
-	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
-	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
-	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
-	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
-	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
-	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
-	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
-	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
-	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
-	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
-	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
-	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
-	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
-	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
-	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
-	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
-	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
-	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
-	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
-	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
-	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
-	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
-	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
-	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
-	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
-	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
-	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
-	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
-	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
-	    ];
-
-	    // Reusable objects
-	    var W = [];
-	    (function () {
-	        for (var i = 0; i < 80; i++) {
-	            W[i] = X64Word_create();
-	        }
-	    }());
-
-	    /**
-	     * SHA-512 hash algorithm.
-	     */
-	    var SHA512 = C_algo.SHA512 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new X64WordArray.init([
-	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
-	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
-	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
-	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcuts
-	            var H = this._hash.words;
-
-	            var H0 = H[0];
-	            var H1 = H[1];
-	            var H2 = H[2];
-	            var H3 = H[3];
-	            var H4 = H[4];
-	            var H5 = H[5];
-	            var H6 = H[6];
-	            var H7 = H[7];
-
-	            var H0h = H0.high;
-	            var H0l = H0.low;
-	            var H1h = H1.high;
-	            var H1l = H1.low;
-	            var H2h = H2.high;
-	            var H2l = H2.low;
-	            var H3h = H3.high;
-	            var H3l = H3.low;
-	            var H4h = H4.high;
-	            var H4l = H4.low;
-	            var H5h = H5.high;
-	            var H5l = H5.low;
-	            var H6h = H6.high;
-	            var H6l = H6.low;
-	            var H7h = H7.high;
-	            var H7l = H7.low;
-
-	            // Working variables
-	            var ah = H0h;
-	            var al = H0l;
-	            var bh = H1h;
-	            var bl = H1l;
-	            var ch = H2h;
-	            var cl = H2l;
-	            var dh = H3h;
-	            var dl = H3l;
-	            var eh = H4h;
-	            var el = H4l;
-	            var fh = H5h;
-	            var fl = H5l;
-	            var gh = H6h;
-	            var gl = H6l;
-	            var hh = H7h;
-	            var hl = H7l;
-
-	            // Rounds
-	            for (var i = 0; i < 80; i++) {
-	                var Wil;
-	                var Wih;
-
-	                // Shortcut
-	                var Wi = W[i];
-
-	                // Extend message
-	                if (i < 16) {
-	                    Wih = Wi.high = M[offset + i * 2]     | 0;
-	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
-	                } else {
-	                    // Gamma0
-	                    var gamma0x  = W[i - 15];
-	                    var gamma0xh = gamma0x.high;
-	                    var gamma0xl = gamma0x.low;
-	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
-	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
-
-	                    // Gamma1
-	                    var gamma1x  = W[i - 2];
-	                    var gamma1xh = gamma1x.high;
-	                    var gamma1xl = gamma1x.low;
-	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
-	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
-
-	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
-	                    var Wi7  = W[i - 7];
-	                    var Wi7h = Wi7.high;
-	                    var Wi7l = Wi7.low;
-
-	                    var Wi16  = W[i - 16];
-	                    var Wi16h = Wi16.high;
-	                    var Wi16l = Wi16.low;
-
-	                    Wil = gamma0l + Wi7l;
-	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
-	                    Wil = Wil + gamma1l;
-	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
-	                    Wil = Wil + Wi16l;
-	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
-
-	                    Wi.high = Wih;
-	                    Wi.low  = Wil;
-	                }
-
-	                var chh  = (eh & fh) ^ (~eh & gh);
-	                var chl  = (el & fl) ^ (~el & gl);
-	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
-	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
-
-	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
-	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
-	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
-	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
-
-	                // t1 = h + sigma1 + ch + K[i] + W[i]
-	                var Ki  = K[i];
-	                var Kih = Ki.high;
-	                var Kil = Ki.low;
-
-	                var t1l = hl + sigma1l;
-	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
-	                var t1l = t1l + chl;
-	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
-	                var t1l = t1l + Kil;
-	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
-	                var t1l = t1l + Wil;
-	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
-
-	                // t2 = sigma0 + maj
-	                var t2l = sigma0l + majl;
-	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
-
-	                // Update working variables
-	                hh = gh;
-	                hl = gl;
-	                gh = fh;
-	                gl = fl;
-	                fh = eh;
-	                fl = el;
-	                el = (dl + t1l) | 0;
-	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
-	                dh = ch;
-	                dl = cl;
-	                ch = bh;
-	                cl = bl;
-	                bh = ah;
-	                bl = al;
-	                al = (t1l + t2l) | 0;
-	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
-	            }
-
-	            // Intermediate hash value
-	            H0l = H0.low  = (H0l + al);
-	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
-	            H1l = H1.low  = (H1l + bl);
-	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
-	            H2l = H2.low  = (H2l + cl);
-	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
-	            H3l = H3.low  = (H3l + dl);
-	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
-	            H4l = H4.low  = (H4l + el);
-	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
-	            H5l = H5.low  = (H5l + fl);
-	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
-	            H6l = H6.low  = (H6l + gl);
-	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
-	            H7l = H7.low  = (H7l + hl);
-	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Convert hash to 32-bit word array before returning
-	            var hash = this._hash.toX32();
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        },
-
-	        blockSize: 1024/32
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA512('message');
-	     *     var hash = CryptoJS.SHA512(wordArray);
-	     */
-	    C.SHA512 = Hasher._createHelper(SHA512);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA512(message, key);
-	     */
-	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
-	}());
-
-
-	return CryptoJS.SHA512;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/tripledes.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/tripledes.js
deleted file mode 100644
index 1a92477..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/tripledes.js
+++ /dev/null
@@ -1,779 +0,0 @@
-;(function (root, factory, undef) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    // Permuted Choice 1 constants
-	    var PC1 = [
-	        57, 49, 41, 33, 25, 17, 9,  1,
-	        58, 50, 42, 34, 26, 18, 10, 2,
-	        59, 51, 43, 35, 27, 19, 11, 3,
-	        60, 52, 44, 36, 63, 55, 47, 39,
-	        31, 23, 15, 7,  62, 54, 46, 38,
-	        30, 22, 14, 6,  61, 53, 45, 37,
-	        29, 21, 13, 5,  28, 20, 12, 4
-	    ];
-
-	    // Permuted Choice 2 constants
-	    var PC2 = [
-	        14, 17, 11, 24, 1,  5,
-	        3,  28, 15, 6,  21, 10,
-	        23, 19, 12, 4,  26, 8,
-	        16, 7,  27, 20, 13, 2,
-	        41, 52, 31, 37, 47, 55,
-	        30, 40, 51, 45, 33, 48,
-	        44, 49, 39, 56, 34, 53,
-	        46, 42, 50, 36, 29, 32
-	    ];
-
-	    // Cumulative bit shift constants
-	    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
-
-	    // SBOXes and round permutation constants
-	    var SBOX_P = [
-	        {
-	            0x0: 0x808200,
-	            0x10000000: 0x8000,
-	            0x20000000: 0x808002,
-	            0x30000000: 0x2,
-	            0x40000000: 0x200,
-	            0x50000000: 0x808202,
-	            0x60000000: 0x800202,
-	            0x70000000: 0x800000,
-	            0x80000000: 0x202,
-	            0x90000000: 0x800200,
-	            0xa0000000: 0x8200,
-	            0xb0000000: 0x808000,
-	            0xc0000000: 0x8002,
-	            0xd0000000: 0x800002,
-	            0xe0000000: 0x0,
-	            0xf0000000: 0x8202,
-	            0x8000000: 0x0,
-	            0x18000000: 0x808202,
-	            0x28000000: 0x8202,
-	            0x38000000: 0x8000,
-	            0x48000000: 0x808200,
-	            0x58000000: 0x200,
-	            0x68000000: 0x808002,
-	            0x78000000: 0x2,
-	            0x88000000: 0x800200,
-	            0x98000000: 0x8200,
-	            0xa8000000: 0x808000,
-	            0xb8000000: 0x800202,
-	            0xc8000000: 0x800002,
-	            0xd8000000: 0x8002,
-	            0xe8000000: 0x202,
-	            0xf8000000: 0x800000,
-	            0x1: 0x8000,
-	            0x10000001: 0x2,
-	            0x20000001: 0x808200,
-	            0x30000001: 0x800000,
-	            0x40000001: 0x808002,
-	            0x50000001: 0x8200,
-	            0x60000001: 0x200,
-	            0x70000001: 0x800202,
-	            0x80000001: 0x808202,
-	            0x90000001: 0x808000,
-	            0xa0000001: 0x800002,
-	            0xb0000001: 0x8202,
-	            0xc0000001: 0x202,
-	            0xd0000001: 0x800200,
-	            0xe0000001: 0x8002,
-	            0xf0000001: 0x0,
-	            0x8000001: 0x808202,
-	            0x18000001: 0x808000,
-	            0x28000001: 0x800000,
-	            0x38000001: 0x200,
-	            0x48000001: 0x8000,
-	            0x58000001: 0x800002,
-	            0x68000001: 0x2,
-	            0x78000001: 0x8202,
-	            0x88000001: 0x8002,
-	            0x98000001: 0x800202,
-	            0xa8000001: 0x202,
-	            0xb8000001: 0x808200,
-	            0xc8000001: 0x800200,
-	            0xd8000001: 0x0,
-	            0xe8000001: 0x8200,
-	            0xf8000001: 0x808002
-	        },
-	        {
-	            0x0: 0x40084010,
-	            0x1000000: 0x4000,
-	            0x2000000: 0x80000,
-	            0x3000000: 0x40080010,
-	            0x4000000: 0x40000010,
-	            0x5000000: 0x40084000,
-	            0x6000000: 0x40004000,
-	            0x7000000: 0x10,
-	            0x8000000: 0x84000,
-	            0x9000000: 0x40004010,
-	            0xa000000: 0x40000000,
-	            0xb000000: 0x84010,
-	            0xc000000: 0x80010,
-	            0xd000000: 0x0,
-	            0xe000000: 0x4010,
-	            0xf000000: 0x40080000,
-	            0x800000: 0x40004000,
-	            0x1800000: 0x84010,
-	            0x2800000: 0x10,
-	            0x3800000: 0x40004010,
-	            0x4800000: 0x40084010,
-	            0x5800000: 0x40000000,
-	            0x6800000: 0x80000,
-	            0x7800000: 0x40080010,
-	            0x8800000: 0x80010,
-	            0x9800000: 0x0,
-	            0xa800000: 0x4000,
-	            0xb800000: 0x40080000,
-	            0xc800000: 0x40000010,
-	            0xd800000: 0x84000,
-	            0xe800000: 0x40084000,
-	            0xf800000: 0x4010,
-	            0x10000000: 0x0,
-	            0x11000000: 0x40080010,
-	            0x12000000: 0x40004010,
-	            0x13000000: 0x40084000,
-	            0x14000000: 0x40080000,
-	            0x15000000: 0x10,
-	            0x16000000: 0x84010,
-	            0x17000000: 0x4000,
-	            0x18000000: 0x4010,
-	            0x19000000: 0x80000,
-	            0x1a000000: 0x80010,
-	            0x1b000000: 0x40000010,
-	            0x1c000000: 0x84000,
-	            0x1d000000: 0x40004000,
-	            0x1e000000: 0x40000000,
-	            0x1f000000: 0x40084010,
-	            0x10800000: 0x84010,
-	            0x11800000: 0x80000,
-	            0x12800000: 0x40080000,
-	            0x13800000: 0x4000,
-	            0x14800000: 0x40004000,
-	            0x15800000: 0x40084010,
-	            0x16800000: 0x10,
-	            0x17800000: 0x40000000,
-	            0x18800000: 0x40084000,
-	            0x19800000: 0x40000010,
-	            0x1a800000: 0x40004010,
-	            0x1b800000: 0x80010,
-	            0x1c800000: 0x0,
-	            0x1d800000: 0x4010,
-	            0x1e800000: 0x40080010,
-	            0x1f800000: 0x84000
-	        },
-	        {
-	            0x0: 0x104,
-	            0x100000: 0x0,
-	            0x200000: 0x4000100,
-	            0x300000: 0x10104,
-	            0x400000: 0x10004,
-	            0x500000: 0x4000004,
-	            0x600000: 0x4010104,
-	            0x700000: 0x4010000,
-	            0x800000: 0x4000000,
-	            0x900000: 0x4010100,
-	            0xa00000: 0x10100,
-	            0xb00000: 0x4010004,
-	            0xc00000: 0x4000104,
-	            0xd00000: 0x10000,
-	            0xe00000: 0x4,
-	            0xf00000: 0x100,
-	            0x80000: 0x4010100,
-	            0x180000: 0x4010004,
-	            0x280000: 0x0,
-	            0x380000: 0x4000100,
-	            0x480000: 0x4000004,
-	            0x580000: 0x10000,
-	            0x680000: 0x10004,
-	            0x780000: 0x104,
-	            0x880000: 0x4,
-	            0x980000: 0x100,
-	            0xa80000: 0x4010000,
-	            0xb80000: 0x10104,
-	            0xc80000: 0x10100,
-	            0xd80000: 0x4000104,
-	            0xe80000: 0x4010104,
-	            0xf80000: 0x4000000,
-	            0x1000000: 0x4010100,
-	            0x1100000: 0x10004,
-	            0x1200000: 0x10000,
-	            0x1300000: 0x4000100,
-	            0x1400000: 0x100,
-	            0x1500000: 0x4010104,
-	            0x1600000: 0x4000004,
-	            0x1700000: 0x0,
-	            0x1800000: 0x4000104,
-	            0x1900000: 0x4000000,
-	            0x1a00000: 0x4,
-	            0x1b00000: 0x10100,
-	            0x1c00000: 0x4010000,
-	            0x1d00000: 0x104,
-	            0x1e00000: 0x10104,
-	            0x1f00000: 0x4010004,
-	            0x1080000: 0x4000000,
-	            0x1180000: 0x104,
-	            0x1280000: 0x4010100,
-	            0x1380000: 0x0,
-	            0x1480000: 0x10004,
-	            0x1580000: 0x4000100,
-	            0x1680000: 0x100,
-	            0x1780000: 0x4010004,
-	            0x1880000: 0x10000,
-	            0x1980000: 0x4010104,
-	            0x1a80000: 0x10104,
-	            0x1b80000: 0x4000004,
-	            0x1c80000: 0x4000104,
-	            0x1d80000: 0x4010000,
-	            0x1e80000: 0x4,
-	            0x1f80000: 0x10100
-	        },
-	        {
-	            0x0: 0x80401000,
-	            0x10000: 0x80001040,
-	            0x20000: 0x401040,
-	            0x30000: 0x80400000,
-	            0x40000: 0x0,
-	            0x50000: 0x401000,
-	            0x60000: 0x80000040,
-	            0x70000: 0x400040,
-	            0x80000: 0x80000000,
-	            0x90000: 0x400000,
-	            0xa0000: 0x40,
-	            0xb0000: 0x80001000,
-	            0xc0000: 0x80400040,
-	            0xd0000: 0x1040,
-	            0xe0000: 0x1000,
-	            0xf0000: 0x80401040,
-	            0x8000: 0x80001040,
-	            0x18000: 0x40,
-	            0x28000: 0x80400040,
-	            0x38000: 0x80001000,
-	            0x48000: 0x401000,
-	            0x58000: 0x80401040,
-	            0x68000: 0x0,
-	            0x78000: 0x80400000,
-	            0x88000: 0x1000,
-	            0x98000: 0x80401000,
-	            0xa8000: 0x400000,
-	            0xb8000: 0x1040,
-	            0xc8000: 0x80000000,
-	            0xd8000: 0x400040,
-	            0xe8000: 0x401040,
-	            0xf8000: 0x80000040,
-	            0x100000: 0x400040,
-	            0x110000: 0x401000,
-	            0x120000: 0x80000040,
-	            0x130000: 0x0,
-	            0x140000: 0x1040,
-	            0x150000: 0x80400040,
-	            0x160000: 0x80401000,
-	            0x170000: 0x80001040,
-	            0x180000: 0x80401040,
-	            0x190000: 0x80000000,
-	            0x1a0000: 0x80400000,
-	            0x1b0000: 0x401040,
-	            0x1c0000: 0x80001000,
-	            0x1d0000: 0x400000,
-	            0x1e0000: 0x40,
-	            0x1f0000: 0x1000,
-	            0x108000: 0x80400000,
-	            0x118000: 0x80401040,
-	            0x128000: 0x0,
-	            0x138000: 0x401000,
-	            0x148000: 0x400040,
-	            0x158000: 0x80000000,
-	            0x168000: 0x80001040,
-	            0x178000: 0x40,
-	            0x188000: 0x80000040,
-	            0x198000: 0x1000,
-	            0x1a8000: 0x80001000,
-	            0x1b8000: 0x80400040,
-	            0x1c8000: 0x1040,
-	            0x1d8000: 0x80401000,
-	            0x1e8000: 0x400000,
-	            0x1f8000: 0x401040
-	        },
-	        {
-	            0x0: 0x80,
-	            0x1000: 0x1040000,
-	            0x2000: 0x40000,
-	            0x3000: 0x20000000,
-	            0x4000: 0x20040080,
-	            0x5000: 0x1000080,
-	            0x6000: 0x21000080,
-	            0x7000: 0x40080,
-	            0x8000: 0x1000000,
-	            0x9000: 0x20040000,
-	            0xa000: 0x20000080,
-	            0xb000: 0x21040080,
-	            0xc000: 0x21040000,
-	            0xd000: 0x0,
-	            0xe000: 0x1040080,
-	            0xf000: 0x21000000,
-	            0x800: 0x1040080,
-	            0x1800: 0x21000080,
-	            0x2800: 0x80,
-	            0x3800: 0x1040000,
-	            0x4800: 0x40000,
-	            0x5800: 0x20040080,
-	            0x6800: 0x21040000,
-	            0x7800: 0x20000000,
-	            0x8800: 0x20040000,
-	            0x9800: 0x0,
-	            0xa800: 0x21040080,
-	            0xb800: 0x1000080,
-	            0xc800: 0x20000080,
-	            0xd800: 0x21000000,
-	            0xe800: 0x1000000,
-	            0xf800: 0x40080,
-	            0x10000: 0x40000,
-	            0x11000: 0x80,
-	            0x12000: 0x20000000,
-	            0x13000: 0x21000080,
-	            0x14000: 0x1000080,
-	            0x15000: 0x21040000,
-	            0x16000: 0x20040080,
-	            0x17000: 0x1000000,
-	            0x18000: 0x21040080,
-	            0x19000: 0x21000000,
-	            0x1a000: 0x1040000,
-	            0x1b000: 0x20040000,
-	            0x1c000: 0x40080,
-	            0x1d000: 0x20000080,
-	            0x1e000: 0x0,
-	            0x1f000: 0x1040080,
-	            0x10800: 0x21000080,
-	            0x11800: 0x1000000,
-	            0x12800: 0x1040000,
-	            0x13800: 0x20040080,
-	            0x14800: 0x20000000,
-	            0x15800: 0x1040080,
-	            0x16800: 0x80,
-	            0x17800: 0x21040000,
-	            0x18800: 0x40080,
-	            0x19800: 0x21040080,
-	            0x1a800: 0x0,
-	            0x1b800: 0x21000000,
-	            0x1c800: 0x1000080,
-	            0x1d800: 0x40000,
-	            0x1e800: 0x20040000,
-	            0x1f800: 0x20000080
-	        },
-	        {
-	            0x0: 0x10000008,
-	            0x100: 0x2000,
-	            0x200: 0x10200000,
-	            0x300: 0x10202008,
-	            0x400: 0x10002000,
-	            0x500: 0x200000,
-	            0x600: 0x200008,
-	            0x700: 0x10000000,
-	            0x800: 0x0,
-	            0x900: 0x10002008,
-	            0xa00: 0x202000,
-	            0xb00: 0x8,
-	            0xc00: 0x10200008,
-	            0xd00: 0x202008,
-	            0xe00: 0x2008,
-	            0xf00: 0x10202000,
-	            0x80: 0x10200000,
-	            0x180: 0x10202008,
-	            0x280: 0x8,
-	            0x380: 0x200000,
-	            0x480: 0x202008,
-	            0x580: 0x10000008,
-	            0x680: 0x10002000,
-	            0x780: 0x2008,
-	            0x880: 0x200008,
-	            0x980: 0x2000,
-	            0xa80: 0x10002008,
-	            0xb80: 0x10200008,
-	            0xc80: 0x0,
-	            0xd80: 0x10202000,
-	            0xe80: 0x202000,
-	            0xf80: 0x10000000,
-	            0x1000: 0x10002000,
-	            0x1100: 0x10200008,
-	            0x1200: 0x10202008,
-	            0x1300: 0x2008,
-	            0x1400: 0x200000,
-	            0x1500: 0x10000000,
-	            0x1600: 0x10000008,
-	            0x1700: 0x202000,
-	            0x1800: 0x202008,
-	            0x1900: 0x0,
-	            0x1a00: 0x8,
-	            0x1b00: 0x10200000,
-	            0x1c00: 0x2000,
-	            0x1d00: 0x10002008,
-	            0x1e00: 0x10202000,
-	            0x1f00: 0x200008,
-	            0x1080: 0x8,
-	            0x1180: 0x202000,
-	            0x1280: 0x200000,
-	            0x1380: 0x10000008,
-	            0x1480: 0x10002000,
-	            0x1580: 0x2008,
-	            0x1680: 0x10202008,
-	            0x1780: 0x10200000,
-	            0x1880: 0x10202000,
-	            0x1980: 0x10200008,
-	            0x1a80: 0x2000,
-	            0x1b80: 0x202008,
-	            0x1c80: 0x200008,
-	            0x1d80: 0x0,
-	            0x1e80: 0x10000000,
-	            0x1f80: 0x10002008
-	        },
-	        {
-	            0x0: 0x100000,
-	            0x10: 0x2000401,
-	            0x20: 0x400,
-	            0x30: 0x100401,
-	            0x40: 0x2100401,
-	            0x50: 0x0,
-	            0x60: 0x1,
-	            0x70: 0x2100001,
-	            0x80: 0x2000400,
-	            0x90: 0x100001,
-	            0xa0: 0x2000001,
-	            0xb0: 0x2100400,
-	            0xc0: 0x2100000,
-	            0xd0: 0x401,
-	            0xe0: 0x100400,
-	            0xf0: 0x2000000,
-	            0x8: 0x2100001,
-	            0x18: 0x0,
-	            0x28: 0x2000401,
-	            0x38: 0x2100400,
-	            0x48: 0x100000,
-	            0x58: 0x2000001,
-	            0x68: 0x2000000,
-	            0x78: 0x401,
-	            0x88: 0x100401,
-	            0x98: 0x2000400,
-	            0xa8: 0x2100000,
-	            0xb8: 0x100001,
-	            0xc8: 0x400,
-	            0xd8: 0x2100401,
-	            0xe8: 0x1,
-	            0xf8: 0x100400,
-	            0x100: 0x2000000,
-	            0x110: 0x100000,
-	            0x120: 0x2000401,
-	            0x130: 0x2100001,
-	            0x140: 0x100001,
-	            0x150: 0x2000400,
-	            0x160: 0x2100400,
-	            0x170: 0x100401,
-	            0x180: 0x401,
-	            0x190: 0x2100401,
-	            0x1a0: 0x100400,
-	            0x1b0: 0x1,
-	            0x1c0: 0x0,
-	            0x1d0: 0x2100000,
-	            0x1e0: 0x2000001,
-	            0x1f0: 0x400,
-	            0x108: 0x100400,
-	            0x118: 0x2000401,
-	            0x128: 0x2100001,
-	            0x138: 0x1,
-	            0x148: 0x2000000,
-	            0x158: 0x100000,
-	            0x168: 0x401,
-	            0x178: 0x2100400,
-	            0x188: 0x2000001,
-	            0x198: 0x2100000,
-	            0x1a8: 0x0,
-	            0x1b8: 0x2100401,
-	            0x1c8: 0x100401,
-	            0x1d8: 0x400,
-	            0x1e8: 0x2000400,
-	            0x1f8: 0x100001
-	        },
-	        {
-	            0x0: 0x8000820,
-	            0x1: 0x20000,
-	            0x2: 0x8000000,
-	            0x3: 0x20,
-	            0x4: 0x20020,
-	            0x5: 0x8020820,
-	            0x6: 0x8020800,
-	            0x7: 0x800,
-	            0x8: 0x8020000,
-	            0x9: 0x8000800,
-	            0xa: 0x20800,
-	            0xb: 0x8020020,
-	            0xc: 0x820,
-	            0xd: 0x0,
-	            0xe: 0x8000020,
-	            0xf: 0x20820,
-	            0x80000000: 0x800,
-	            0x80000001: 0x8020820,
-	            0x80000002: 0x8000820,
-	            0x80000003: 0x8000000,
-	            0x80000004: 0x8020000,
-	            0x80000005: 0x20800,
-	            0x80000006: 0x20820,
-	            0x80000007: 0x20,
-	            0x80000008: 0x8000020,
-	            0x80000009: 0x820,
-	            0x8000000a: 0x20020,
-	            0x8000000b: 0x8020800,
-	            0x8000000c: 0x0,
-	            0x8000000d: 0x8020020,
-	            0x8000000e: 0x8000800,
-	            0x8000000f: 0x20000,
-	            0x10: 0x20820,
-	            0x11: 0x8020800,
-	            0x12: 0x20,
-	            0x13: 0x800,
-	            0x14: 0x8000800,
-	            0x15: 0x8000020,
-	            0x16: 0x8020020,
-	            0x17: 0x20000,
-	            0x18: 0x0,
-	            0x19: 0x20020,
-	            0x1a: 0x8020000,
-	            0x1b: 0x8000820,
-	            0x1c: 0x8020820,
-	            0x1d: 0x20800,
-	            0x1e: 0x820,
-	            0x1f: 0x8000000,
-	            0x80000010: 0x20000,
-	            0x80000011: 0x800,
-	            0x80000012: 0x8020020,
-	            0x80000013: 0x20820,
-	            0x80000014: 0x20,
-	            0x80000015: 0x8020000,
-	            0x80000016: 0x8000000,
-	            0x80000017: 0x8000820,
-	            0x80000018: 0x8020820,
-	            0x80000019: 0x8000020,
-	            0x8000001a: 0x8000800,
-	            0x8000001b: 0x0,
-	            0x8000001c: 0x20800,
-	            0x8000001d: 0x820,
-	            0x8000001e: 0x20020,
-	            0x8000001f: 0x8020800
-	        }
-	    ];
-
-	    // Masks that select the SBOX input
-	    var SBOX_MASK = [
-	        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
-	        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
-	    ];
-
-	    /**
-	     * DES block cipher algorithm.
-	     */
-	    var DES = C_algo.DES = BlockCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-
-	            // Select 56 bits according to PC1
-	            var keyBits = [];
-	            for (var i = 0; i < 56; i++) {
-	                var keyBitPos = PC1[i] - 1;
-	                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
-	            }
-
-	            // Assemble 16 subkeys
-	            var subKeys = this._subKeys = [];
-	            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
-	                // Create subkey
-	                var subKey = subKeys[nSubKey] = [];
-
-	                // Shortcut
-	                var bitShift = BIT_SHIFTS[nSubKey];
-
-	                // Select 48 bits according to PC2
-	                for (var i = 0; i < 24; i++) {
-	                    // Select from the left 28 key bits
-	                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
-
-	                    // Select from the right 28 key bits
-	                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
-	                }
-
-	                // Since each subkey is applied to an expanded 32-bit input,
-	                // the subkey can be broken into 8 values scaled to 32-bits,
-	                // which allows the key to be used without expansion
-	                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
-	                for (var i = 1; i < 7; i++) {
-	                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
-	                }
-	                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
-	            }
-
-	            // Compute inverse subkeys
-	            var invSubKeys = this._invSubKeys = [];
-	            for (var i = 0; i < 16; i++) {
-	                invSubKeys[i] = subKeys[15 - i];
-	            }
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._subKeys);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._invSubKeys);
-	        },
-
-	        _doCryptBlock: function (M, offset, subKeys) {
-	            // Get input
-	            this._lBlock = M[offset];
-	            this._rBlock = M[offset + 1];
-
-	            // Initial permutation
-	            exchangeLR.call(this, 4,  0x0f0f0f0f);
-	            exchangeLR.call(this, 16, 0x0000ffff);
-	            exchangeRL.call(this, 2,  0x33333333);
-	            exchangeRL.call(this, 8,  0x00ff00ff);
-	            exchangeLR.call(this, 1,  0x55555555);
-
-	            // Rounds
-	            for (var round = 0; round < 16; round++) {
-	                // Shortcuts
-	                var subKey = subKeys[round];
-	                var lBlock = this._lBlock;
-	                var rBlock = this._rBlock;
-
-	                // Feistel function
-	                var f = 0;
-	                for (var i = 0; i < 8; i++) {
-	                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
-	                }
-	                this._lBlock = rBlock;
-	                this._rBlock = lBlock ^ f;
-	            }
-
-	            // Undo swap from last round
-	            var t = this._lBlock;
-	            this._lBlock = this._rBlock;
-	            this._rBlock = t;
-
-	            // Final permutation
-	            exchangeLR.call(this, 1,  0x55555555);
-	            exchangeRL.call(this, 8,  0x00ff00ff);
-	            exchangeRL.call(this, 2,  0x33333333);
-	            exchangeLR.call(this, 16, 0x0000ffff);
-	            exchangeLR.call(this, 4,  0x0f0f0f0f);
-
-	            // Set output
-	            M[offset] = this._lBlock;
-	            M[offset + 1] = this._rBlock;
-	        },
-
-	        keySize: 64/32,
-
-	        ivSize: 64/32,
-
-	        blockSize: 64/32
-	    });
-
-	    // Swap bits across the left and right words
-	    function exchangeLR(offset, mask) {
-	        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
-	        this._rBlock ^= t;
-	        this._lBlock ^= t << offset;
-	    }
-
-	    function exchangeRL(offset, mask) {
-	        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
-	        this._lBlock ^= t;
-	        this._rBlock ^= t << offset;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.DES = BlockCipher._createHelper(DES);
-
-	    /**
-	     * Triple-DES block cipher algorithm.
-	     */
-	    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-	            // Make sure the key length is valid (64, 128 or >= 192 bit)
-	            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
-	                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
-	            }
-
-	            // Extend the key according to the keying options defined in 3DES standard
-	            var key1 = keyWords.slice(0, 2);
-	            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
-	            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
-
-	            // Create DES instances
-	            this._des1 = DES.createEncryptor(WordArray.create(key1));
-	            this._des2 = DES.createEncryptor(WordArray.create(key2));
-	            this._des3 = DES.createEncryptor(WordArray.create(key3));
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._des1.encryptBlock(M, offset);
-	            this._des2.decryptBlock(M, offset);
-	            this._des3.encryptBlock(M, offset);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            this._des3.decryptBlock(M, offset);
-	            this._des2.encryptBlock(M, offset);
-	            this._des1.decryptBlock(M, offset);
-	        },
-
-	        keySize: 192/32,
-
-	        ivSize: 64/32,
-
-	        blockSize: 64/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.TripleDES = BlockCipher._createHelper(TripleDES);
-	}());
-
-
-	return CryptoJS.TripleDES;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/x64-core.js b/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/x64-core.js
deleted file mode 100644
index 57dcc14..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/crypto-js/x64-core.js
+++ /dev/null
@@ -1,304 +0,0 @@
-;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory(require("./core"));
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define(["./core"], factory);
-	}
-	else {
-		// Global (browser)
-		factory(root.CryptoJS);
-	}
-}(this, function (CryptoJS) {
-
-	(function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var X32WordArray = C_lib.WordArray;
-
-	    /**
-	     * x64 namespace.
-	     */
-	    var C_x64 = C.x64 = {};
-
-	    /**
-	     * A 64-bit word.
-	     */
-	    var X64Word = C_x64.Word = Base.extend({
-	        /**
-	         * Initializes a newly created 64-bit word.
-	         *
-	         * @param {number} high The high 32 bits.
-	         * @param {number} low The low 32 bits.
-	         *
-	         * @example
-	         *
-	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
-	         */
-	        init: function (high, low) {
-	            this.high = high;
-	            this.low = low;
-	        }
-
-	        /**
-	         * Bitwise NOTs this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after negating.
-	         *
-	         * @example
-	         *
-	         *     var negated = x64Word.not();
-	         */
-	        // not: function () {
-	            // var high = ~this.high;
-	            // var low = ~this.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise ANDs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to AND with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after ANDing.
-	         *
-	         * @example
-	         *
-	         *     var anded = x64Word.and(anotherX64Word);
-	         */
-	        // and: function (word) {
-	            // var high = this.high & word.high;
-	            // var low = this.low & word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise ORs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to OR with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after ORing.
-	         *
-	         * @example
-	         *
-	         *     var ored = x64Word.or(anotherX64Word);
-	         */
-	        // or: function (word) {
-	            // var high = this.high | word.high;
-	            // var low = this.low | word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise XORs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to XOR with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after XORing.
-	         *
-	         * @example
-	         *
-	         *     var xored = x64Word.xor(anotherX64Word);
-	         */
-	        // xor: function (word) {
-	            // var high = this.high ^ word.high;
-	            // var low = this.low ^ word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Shifts this word n bits to the left.
-	         *
-	         * @param {number} n The number of bits to shift.
-	         *
-	         * @return {X64Word} A new x64-Word object after shifting.
-	         *
-	         * @example
-	         *
-	         *     var shifted = x64Word.shiftL(25);
-	         */
-	        // shiftL: function (n) {
-	            // if (n < 32) {
-	                // var high = (this.high << n) | (this.low >>> (32 - n));
-	                // var low = this.low << n;
-	            // } else {
-	                // var high = this.low << (n - 32);
-	                // var low = 0;
-	            // }
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Shifts this word n bits to the right.
-	         *
-	         * @param {number} n The number of bits to shift.
-	         *
-	         * @return {X64Word} A new x64-Word object after shifting.
-	         *
-	         * @example
-	         *
-	         *     var shifted = x64Word.shiftR(7);
-	         */
-	        // shiftR: function (n) {
-	            // if (n < 32) {
-	                // var low = (this.low >>> n) | (this.high << (32 - n));
-	                // var high = this.high >>> n;
-	            // } else {
-	                // var low = this.high >>> (n - 32);
-	                // var high = 0;
-	            // }
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Rotates this word n bits to the left.
-	         *
-	         * @param {number} n The number of bits to rotate.
-	         *
-	         * @return {X64Word} A new x64-Word object after rotating.
-	         *
-	         * @example
-	         *
-	         *     var rotated = x64Word.rotL(25);
-	         */
-	        // rotL: function (n) {
-	            // return this.shiftL(n).or(this.shiftR(64 - n));
-	        // },
-
-	        /**
-	         * Rotates this word n bits to the right.
-	         *
-	         * @param {number} n The number of bits to rotate.
-	         *
-	         * @return {X64Word} A new x64-Word object after rotating.
-	         *
-	         * @example
-	         *
-	         *     var rotated = x64Word.rotR(7);
-	         */
-	        // rotR: function (n) {
-	            // return this.shiftR(n).or(this.shiftL(64 - n));
-	        // },
-
-	        /**
-	         * Adds this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to add with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after adding.
-	         *
-	         * @example
-	         *
-	         *     var added = x64Word.add(anotherX64Word);
-	         */
-	        // add: function (word) {
-	            // var low = (this.low + word.low) | 0;
-	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
-	            // var high = (this.high + word.high + carry) | 0;
-
-	            // return X64Word.create(high, low);
-	        // }
-	    });
-
-	    /**
-	     * An array of 64-bit words.
-	     *
-	     * @property {Array} words The array of CryptoJS.x64.Word objects.
-	     * @property {number} sigBytes The number of significant bytes in this word array.
-	     */
-	    var X64WordArray = C_x64.WordArray = Base.extend({
-	        /**
-	         * Initializes a newly created word array.
-	         *
-	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
-	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create();
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create([
-	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
-	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
-	         *     ]);
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create([
-	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
-	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
-	         *     ], 10);
-	         */
-	        init: function (words, sigBytes) {
-	            words = this.words = words || [];
-
-	            if (sigBytes != undefined) {
-	                this.sigBytes = sigBytes;
-	            } else {
-	                this.sigBytes = words.length * 8;
-	            }
-	        },
-
-	        /**
-	         * Converts this 64-bit word array to a 32-bit word array.
-	         *
-	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
-	         *
-	         * @example
-	         *
-	         *     var x32WordArray = x64WordArray.toX32();
-	         */
-	        toX32: function () {
-	            // Shortcuts
-	            var x64Words = this.words;
-	            var x64WordsLength = x64Words.length;
-
-	            // Convert
-	            var x32Words = [];
-	            for (var i = 0; i < x64WordsLength; i++) {
-	                var x64Word = x64Words[i];
-	                x32Words.push(x64Word.high);
-	                x32Words.push(x64Word.low);
-	            }
-
-	            return X32WordArray.create(x32Words, this.sigBytes);
-	        },
-
-	        /**
-	         * Creates a copy of this word array.
-	         *
-	         * @return {X64WordArray} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = x64WordArray.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-
-	            // Clone "words" array
-	            var words = clone.words = this.words.slice(0);
-
-	            // Clone each X64Word object
-	            var wordsLength = words.length;
-	            for (var i = 0; i < wordsLength; i++) {
-	                words[i] = words[i].clone();
-	            }
-
-	            return clone;
-	        }
-	    });
-	}());
-
-
-	return CryptoJS;
-
-}));
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/uni-config-center b/uniCloud-aliyun/cloudfunctions/router/node_modules/uni-config-center
deleted file mode 120000
index 725efc5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/uni-config-center
+++ /dev/null
@@ -1 +0,0 @@
-../../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/uni-id b/uniCloud-aliyun/cloudfunctions/router/node_modules/uni-id
deleted file mode 120000
index 851064d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/uni-id
+++ /dev/null
@@ -1 +0,0 @@
-../../../../uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/node_modules/vk-unicloud b/uniCloud-aliyun/cloudfunctions/router/node_modules/vk-unicloud
deleted file mode 120000
index 4f33825..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/node_modules/vk-unicloud
+++ /dev/null
@@ -1 +0,0 @@
-../../../../uni_modules/vk-unicloud/uniCloud/cloudfunctions/common/vk-unicloud
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/package-lock.json b/uniCloud-aliyun/cloudfunctions/router/package-lock.json
deleted file mode 100644
index ac76494..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/package-lock.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "router",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-    },
-    "uni-config-center": {
-      "version": "file:../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-    },
-    "uni-id": {
-      "version": "file:../../../uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id",
-      "requires": {
-        "uni-config-center": "file:../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-      },
-      "dependencies": {
-        "uni-config-center": {
-          "version": "file:../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-        }
-      }
-    },
-    "vk-unicloud": {
-      "version": "file:../../../uni_modules/vk-unicloud/uniCloud/cloudfunctions/common/vk-unicloud"
-    }
-  }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/add.js
deleted file mode 100644
index c6a7413..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-album',
-            dataJson: data
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/delete.js
deleted file mode 100644
index 250aaf9..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-album',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/list.js
deleted file mode 100644
index 156d25e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/list 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-album',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/update.js
deleted file mode 100644
index 7b68902..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/album/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-album',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/add.js
deleted file mode 100644
index f6e6d3f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-article-category',
-            dataJson: data
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/delete.js
deleted file mode 100644
index dcf3a8a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-article-category',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/list.js
deleted file mode 100644
index c73819e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/list 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-article-category',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/update.js
deleted file mode 100644
index 7022832..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/category/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-article-category',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/add.js
deleted file mode 100644
index f70dbda..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/add.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-article',
-            dataJson: {
-                ...data, ...{
-                    viewNum: 0,
-                    downloadNum: 0,
-                }
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/delete.js
deleted file mode 100644
index 826cfd7..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-article',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/list.js
deleted file mode 100644
index 3d7b80c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/list.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/list 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-article',
-            foreignDB: [
-                {
-                    dbName: "jjx-article-category",
-                    localKey: "parentId",
-                    foreignKey: "_id",
-                    as: "category",
-                    limit: 1,
-                },
-
-            ]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/update.js
deleted file mode 100644
index 8e38765..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/article/list/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-article',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/add.js
deleted file mode 100644
index 82806ab..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/add.js
+++ /dev/null
@@ -1,34 +0,0 @@
-module.exports = {
-  /**
-   * 添加单条数据
-   * @url admin/kong/sys/add 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-    // 业务逻辑开始-----------------------------------------------------------
-		let {
-			params1,
-			params2,
-			params3
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		let dbName = "jjx-contract-template";
-		res.id = await vk.baseDao.add({
-			dbName,
-			dataJson:{
-				params1,
-				params2,
-				params3
-			}
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js
deleted file mode 100644
index 05d928f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js
+++ /dev/null
@@ -1,30 +0,0 @@
-module.exports = {
-  /**
-   * 数据删除
-   * @url admin/kong/sys/delete 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let { _id } = data;
-		if(vk.pubfn.isNull(_id)){
-			return { code : -1, msg : 'id不能为空' };
-		}
-		let dbName = "jjx-contract-template";
-		await vk.baseDao.deleteById({
-			dbName: dbName,
-			id:_id
-		});
-		
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/getList.js
deleted file mode 100644
index 21e7f9c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/getList.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-contract-template";
-		res = await vk.baseDao.getTableData({
-			dbName,
-			data
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/update.js
deleted file mode 100644
index f84fbc4..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/update.js
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
-  /**
-   * 修改数据
-   * @url admin/kong/sys/update 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			_id,
-			params1,
-			params2,
-			params3
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		if(vk.pubfn.isNullOne(_id)){
-			return { code : -1, msg : '参数错误' };
-		}
-		let dbName = "jjx-contract-template";
-		await vk.baseDao.updateById({
-			dbName,
-			id:_id,
-			dataJson:{
-				params1,
-				params2,
-				params3
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/add.js
deleted file mode 100644
index 272186f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/coopExplore/config/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-coop-config',
-            dataJson: data
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/delete.js
deleted file mode 100644
index 1223d3e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/coopExplore/config/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-coop-config',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/list.js
deleted file mode 100644
index cdccaee..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/coopExplore/config/sys/list 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-coop-config',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/update.js
deleted file mode 100644
index 3439557..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/coopExplore/config/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/coopExplore/config/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-coop-config',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/add.js
deleted file mode 100644
index ad7f7e8..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/add.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 新增询价模板
-	 * @url admin/enquiry/template/sys/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			label,
-			enable,
-			sort,
-			values
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		let dbName = "jjx-enquiry-attributes";
-		res.id = await vk.baseDao.add({
-			dbName,
-			dataJson:{
-				label,
-				enable,
-				sort,
-				values
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/delete.js
deleted file mode 100644
index f138631..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/delete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 数据删除
-   * @url admin/kong/sys/delete 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-    // 业务逻辑开始-----------------------------------------------------------
-		let { _id } = data;
-		if(vk.pubfn.isNull(_id)){
-			return { code : -1, msg : 'id不能为空' };
-		}
-		let dbName = "jjx-enquiry-attributes";
-		await vk.baseDao.deleteById({
-			dbName,
-			id:_id
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/getList.js
deleted file mode 100644
index 1378b84..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/getList.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-enquiry-attributes";
-		res = await vk.baseDao.getTableData({
-			dbName,
-			data
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/update.js
deleted file mode 100644
index 120079b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/attributes/sys/update.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 新增询价模板
-	 * @url admin/enquiry/template/sys/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			_id,
-			label,
-			enable,
-			sort,
-			values
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		let dbName = "jjx-enquiry-attributes";
-		res.id = await vk.baseDao.updateById({
-			dbName,
-			id: _id,
-			dataJson:{
-				label,
-				enable,
-				sort,
-				values
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/add.js
deleted file mode 100644
index 804d4ff..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/add.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 新增询价模板
-	 * @url admin/enquiry/template/sys/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			name,
-			enable,
-			sort,
-			attributes,
-            extraAttributes
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		let dbName = "jjx-enquiry-template";
-		res.id = await vk.baseDao.add({
-			dbName,
-			dataJson:{
-				name,
-				enable,
-				sort,
-				attributes,
-                extraAttributes
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/delete.js
deleted file mode 100644
index 6945628..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/delete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 数据删除
-   * @url admin/kong/sys/delete 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-    // 业务逻辑开始-----------------------------------------------------------
-		let { _id } = data;
-		if(vk.pubfn.isNull(_id)){
-			return { code : -1, msg : 'id不能为空' };
-		}
-		let dbName = "jjx-enquiry-template";
-		await vk.baseDao.deleteById({
-			dbName,
-			id:_id
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/getList.js
deleted file mode 100644
index 3249887..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/getList.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-enquiry-template";
-		res = await vk.baseDao.getTableData({
-			dbName,
-			data
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/update.js
deleted file mode 100644
index 0209b77..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/enquiry/template/sys/update.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 新增询价模板
-	 * @url admin/enquiry/template/sys/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			_id,
-			name,
-			enable,
-			sort,
-			attributes,
-            extraAttributes
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		let dbName = "jjx-enquiry-template";
-		res.id = await vk.baseDao.updateById({
-			dbName,
-			id: _id,
-			dataJson:{
-				name,
-				enable,
-				sort,
-				attributes,
-                extraAttributes
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/fadada/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/fadada/sys/getList.js
deleted file mode 100644
index 57df6fa..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/fadada/sys/getList.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/fadada/sys/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const dbName = "fadada-verify-record";
-        res = await vk.baseDao.selects({
-            dbName,
-            whereJson: {
-                type: data.type
-            },
-            sortArr: [{name: "authenticationSubmitTime", type: "desc"}],
-            foreignDB: [
-                {
-                    dbName: "uni-id-users",
-                    localKey: "_id",
-                    foreignKey: "_id",
-                    as: "user",
-                    limit: 1, // limit=1则以对象形式返回
-                }
-            ]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/add.js
deleted file mode 100644
index 628a67f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-goods-category',
-            dataJson: data
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/delete.js
deleted file mode 100644
index 8d8e37d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-goods-category',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/list.js
deleted file mode 100644
index 76bac98..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/list 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-goods-category',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/update.js
deleted file mode 100644
index 69df892..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/category/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-goods-category',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/add.js
deleted file mode 100644
index 2745800..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/add.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-goods',
-            dataJson: {
-                ...data, ...{
-                    viewNum: 0,
-                }
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/delete.js
deleted file mode 100644
index 5237bad..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-goods',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/list.js
deleted file mode 100644
index c995ff5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/list.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/list 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-goods',
-            foreignDB: [
-                {
-                    dbName: "jjx-goods-category",
-                    localKey: "parentId",
-                    foreignKey: "_id",
-                    as: "category",
-                    limit: 1,
-                },
-
-            ]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/update.js
deleted file mode 100644
index 28982b6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/goods/list/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-goods',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/add.js
deleted file mode 100644
index fd1024a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/add.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-notice',
-            dataJson: {
-                ...data, ...{
-                    viewNum: 0
-                }
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/delete.js
deleted file mode 100644
index 7d04f8e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-notice',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/list.js
deleted file mode 100644
index d24fad2..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/list.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/list 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-notice'
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/update.js
deleted file mode 100644
index 3f073af..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/notice/list/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-notice',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/add.js
deleted file mode 100644
index cff9fa5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-other-article-category',
-            dataJson: data
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/delete.js
deleted file mode 100644
index 9277839..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-other-article-category',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/list.js
deleted file mode 100644
index e5d281d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/list 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-other-article-category',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/update.js
deleted file mode 100644
index e23f2d6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/category/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-other-article-category',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/add.js
deleted file mode 100644
index 1badfc3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/add.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-other-article',
-            dataJson: {
-                ...data, ...{
-                    viewNum: 0,
-                    downloadNum: 0,
-                }
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/delete.js
deleted file mode 100644
index 6a1970a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-other-article',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/list.js
deleted file mode 100644
index 9f3b9e5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/list.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/list 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-other-article',
-            foreignDB: [
-                {
-                    dbName: "jjx-other-article-category",
-                    localKey: "parentId",
-                    foreignKey: "_id",
-                    as: "category",
-                    limit: 1,
-                },
-
-            ]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/update.js
deleted file mode 100644
index cdbff9e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/otherArticle/list/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-other-article',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/setting_config.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/setting_config.js
deleted file mode 100644
index fb5ed8c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/setting_config.js
+++ /dev/null
@@ -1,83 +0,0 @@
-'use strict';
-var vk; // 全局vk实例
-// 涉及的表名
-const dbName = {
-	configSite: "jjx-config-site", // 测试表
-};
-
-var db = uniCloud.database(); // 全局数据库引用
-var _ = db.command; // 数据库操作符
-var $ = _.aggregate; // 聚合查询操作符
-/**
- * 权限注意：访问以下链接查看
- * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#内置权限
- */
-var cloudObject = {
-	isCloudObject: true, // 标记为云对象模式
-	/**
-	 * 请求前处理，主要用于调用方法之前进行预处理，一般用于拦截器、统一的身份验证、参数校验、定义全局对象等。
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#before-预处理
-	 */
-	_before: async function() {
-		vk = this.vk; // 将vk定义为全局对象
-		// let { customUtil, uniID, config, pubFun } = this.getUtil(); // 获取工具包
-	},
-	/**
-	 * 请求后处理，主要用于处理本次调用方法的返回结果或者抛出的错误
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#after-后处理
-	 */
-	_after: async function(options) {
-		let { err, res } = options;
-		if (err) {
-			return; // 如果方法抛出错误，直接return;不处理
-		}
-		return res;
-	},
-	/**
-	 * 获取列表
-	 * @url admin/config.getList 前端调用的url参数地址
-	 */
-	getList: async function(data) {
-		let res = { code: 0, msg: '' };
-		let { uid } = this.getClientInfo(); // 获取客户端信息
-		// 业务逻辑开始-----------------------------------------------------------
-		
-	
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * 模板函数
-	 * @url admin/config.test 前端调用的url参数地址
-	 */
-	test: async function(data) {
-		let res = { code: 0, msg: '' };
-		let { uid } = this.getClientInfo(); // 获取客户端信息
-		// 业务逻辑开始-----------------------------------------------------------
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * @param {Object} data更新网站配置
-	 */
-	sys_updateSiteInfo: async function(data) {
-		let res = { code: 0, msg: '' };
-		let { uid } = this.getClientInfo(); // 获取客户端信息
-		// 业务逻辑开始-----------------------------------------------------------
-		const {_id,siteLogo, siteTitle, siteDesc, siteCopyright, siteIcpNumber, companyName, companyAddress, companyPhone, companyEmail, companyServicePhone, companyGzhImage, companyMobileSiteImage} = data
-		res.data = await vk.baseDao.setById({
-		  dbName: dbName.configSite,
-		  dataJson:{
-			_id: 'jinjiuxingangcheng',
-		    siteLogo, siteTitle, siteDesc, siteCopyright, siteIcpNumber, companyName, companyAddress, companyPhone, companyEmail, companyServicePhone, companyGzhImage, companyMobileSiteImage
-		  },
-		});
-		
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-};
-
-module.exports = cloudObject;
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/site_config/sys/detail.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/site_config/sys/detail.js
deleted file mode 100644
index d3c0336..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/site_config/sys/detail.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/site_config/sys/detail 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		res.data = await vk.baseDao.findById({
-			dbName: "jjx-site-config",
-			id: 'jinjiuxingangcheng'
-		})
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/site_config/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/site_config/sys/update.js
deleted file mode 100644
index 873942d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/site_config/sys/update.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/site_config/sys/update 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-
-		const {_id,siteLogo, siteTitle, siteDesc, siteCopyright, siteIcpNumber, companyName, companyAddress, companyPhone, companyEmail, companyServicePhone, companyGzhImage, companyMobileSiteImage} = data
-		res.data = await vk.baseDao.setById({
-		  dbName: "jjx-site-config",
-		  dataJson:{
-			  _id: 'jinjiuxingangcheng',
-		    siteLogo, siteTitle, siteDesc, siteCopyright, siteIcpNumber, companyName, companyAddress, companyPhone, companyEmail, companyServicePhone, companyGzhImage, companyMobileSiteImage
-		  },
-		});
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/add.js
deleted file mode 100644
index abf63c0..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/add.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const formRules = require("../util/formRules.js");
-module.exports = {
-  /**
-   * 添加单条数据
-   * @url admin/kong/sys/add 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		
-		let formRulesRes = await formRules.add(event);
-		if (formRulesRes.code !== 0) {
-			return formRulesRes;
-		}
-    // 业务逻辑开始-----------------------------------------------------------
-		let {
-			name,
-			icon,
-			sort,
-			remark,
-			parent_id,
-			level
-		} = data;
-		
-		let dbName = "jjx-spot-category";
-		
-		
-		if(parent_id) {
-			const parent = await vk.baseDao.findById({
-				dbName,
-				id: parent_id
-			})
-			
-			if(parent.level >= 3) {
-				return {
-					code: -1,
-					msg: '最多支持三级分类'
-				}
-			}
-			
-			level = parent.level + 1
-			
-		} else {
-			level = 1
-		}
-		res.id = await vk.baseDao.add({
-			dbName,
-			dataJson:{
-				name,
-				icon,
-				sort,
-				remark,
-				parent_id,
-				level
-			}
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/delete.js
deleted file mode 100644
index f88a0f8..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/delete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 数据删除
-   * @url admin/kong/sys/delete 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-    // 业务逻辑开始-----------------------------------------------------------
-		let { _id } = data;
-		if(vk.pubfn.isNull(_id)){
-			return { code : -1, msg : 'id不能为空' };
-		}
-		let dbName = "jjx-spot-category";
-		await vk.baseDao.deleteById({
-			dbName,
-			id:_id
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/getList.js
deleted file mode 100644
index b5daa7b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/getList.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-spot-category";
-		res = await vk.baseDao.getTableData({
-			dbName,
-			data
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/getTree.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/getTree.js
deleted file mode 100644
index 81d4266..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/getTree.js
+++ /dev/null
@@ -1,45 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-spot-category";
-		res = await vk.baseDao.selects({
-		  dbName,
-		  pageIndex: 1,
-		  pageSize: 500,
-		  whereJson:{
-		    parent_id: _.in([null, ""]),
-		    _id: _.exists(true)
-		  },
-		  sortArr: [{ name: "sort", type: "asc" }],
-		  // 树状结构参数
-		  treeProps: {
-		    id: "_id",          // 唯一标识字段，默认为 _id
-		    parent_id: "parent_id", // 父级标识字段，默认为 parent_id
-		    children: "children",   // 自定义返回的下级字段名，默认为 children
-		    level: 3,               // 查询返回的树的最大层级。超过设定层级的节点不会返回。默认10级，最大15，最小1
-		    limit: 500,             // 每一级最大返回的数据。
-		    whereJson: {
-		    }
-		  }
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/update.js
deleted file mode 100644
index 0c216ca..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/sys/update.js
+++ /dev/null
@@ -1,67 +0,0 @@
-module.exports = {
-  /**
-   * 修改数据
-   * @url admin/kong/sys/update 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			_id,
-			name,
-			icon,
-			sort,
-			remark,
-			parent_id,
-			level
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		if(vk.pubfn.isNullOne(_id)){
-			return { code : -1, msg : '参数错误' };
-		}
-		let dbName = "jjx-spot-category";
-		
-		
-		if(parent_id) {
-			const parent = await vk.baseDao.findById({
-				dbName,
-				id: parent_id
-			})
-			
-			if(parent.level >= 3) {
-				return {
-					code: -1,
-					msg: '最多支持三级分类'
-				}
-			}
-			
-			level = parent.level + 1
-			
-		} else {
-			level = 1
-		}
-		
-		await vk.baseDao.updateById({
-			dbName,
-			id:_id,
-			dataJson:{
-				name,
-				icon,
-				sort,
-				remark,
-				parent_id,
-				level
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/util/formRules.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/util/formRules.js
deleted file mode 100644
index beb72ee..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/category/util/formRules.js
+++ /dev/null
@@ -1,59 +0,0 @@
-'use strict';
-/**
- * 表单验证
- */
-class Util {
-	constructor() {
-
-	}
-	/**
-	 * 添加
-	 */
-	async add(event) {
-		let { data = {}, userInfo, util } = event;
-		let { vk } = util;
-		let res = { code: 0, msg: '' };
-		// 验证规则开始 -----------------------------------------------------------
-		let rules = {
-			name: [
-				// 必填
-				{ required: true, message: "名称不能为空", trigger: ['blur','change'] },
-			]
-			
-		};
-		// 验证规则结束 -----------------------------------------------------------
-
-		// 开始进行验证
-		res = vk.pubfn.formValidate({
-			data: data,
-			rules: rules
-		});
-		// 返回验证结果
-		return res;
-	}
-	/**
-	 * 修改
-	 */
-	async update(event) {
-		let { data = {}, userInfo, util } = event;
-		let { vk } = util;
-		let res = { code: 0, msg: '' };
-
-		// 验证规则开始 -----------------------------------------------------------
-		let rules = {
-			_id: [
-				{ required: true, message: 'id不能为空', trigger: 'blur' },
-			],
-		};
-		// 验证规则结束 -----------------------------------------------------------
-
-		// 开始进行验证
-		res = vk.pubfn.formValidate({
-			data: data,
-			rules: rules
-		});
-		// 返回验证结果
-		return res;
-	}
-}
-module.exports = new Util
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/add.js
deleted file mode 100644
index 4ccdd52..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/add.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const formRules = require("../util/formRules.js");
-module.exports = {
-  /**
-   * 添加单条数据
-   * @url admin/kong/sys/add 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		
-		let formRulesRes = await formRules.add(event);
-		if (formRulesRes.code !== 0) {
-			return formRulesRes;
-		}
-    // 业务逻辑开始-----------------------------------------------------------
-		let {
-			name,categoryIds,address,stock,files,sort
-		} = data;
-		
-		let dbName = "jjx-spot-goods";
-		
-		
-		res.id = await vk.baseDao.add({
-			dbName,
-			dataJson:{
-				name,categoryIds,address,stock,files,user_id: uid,sort
-			}
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/delete.js
deleted file mode 100644
index 40835f6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/delete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 数据删除
-   * @url admin/kong/sys/delete 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-    // 业务逻辑开始-----------------------------------------------------------
-		let { _id } = data;
-		if(vk.pubfn.isNull(_id)){
-			return { code : -1, msg : 'id不能为空' };
-		}
-		let dbName = "jjx-spot-goods";
-		await vk.baseDao.deleteById({
-			dbName,
-			id:_id
-		});
-    // 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/getList.js
deleted file mode 100644
index c8dc57d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/getList.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-spot-goods";
-		res = await vk.baseDao.getTableData({
-			dbName,
-			data
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/getTree.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/getTree.js
deleted file mode 100644
index c3f0bf8..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/getTree.js
+++ /dev/null
@@ -1,45 +0,0 @@
-module.exports = {
-  /**
-   * 查询多条记录 分页
-   * @url admin/kong/sys/getList 前端调用的url参数地址
-   * data 请求参数 说明
-   * @param {Number}         pageIndex 当前页码
-   * @param {Number}         pageSize  每页显示数量
-   * @param {Array<Object>}  sortRule  排序规则
-   * @param {object}         formData  查询条件数据源
-   * @param {Array<Object>}  columns   查询条件规则
-   * res 返回参数说明
-   * @param {Number}         code      错误码，0表示成功
-   * @param {String}         msg       详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-spot-goods";
-		res = await vk.baseDao.selects({
-		  dbName,
-		  pageIndex: 1,
-		  pageSize: 500,
-		  whereJson:{
-		    parent_id: _.in([null, ""]),
-		    _id: _.exists(true)
-		  },
-		  sortArr: [{ name: "sort", type: "asc" }],
-		  // 树状结构参数
-		  treeProps: {
-		    id: "_id",          // 唯一标识字段，默认为 _id
-		    parent_id: "parent_id", // 父级标识字段，默认为 parent_id
-		    children: "children",   // 自定义返回的下级字段名，默认为 children
-		    level: 3,               // 查询返回的树的最大层级。超过设定层级的节点不会返回。默认10级，最大15，最小1
-		    limit: 500,             // 每一级最大返回的数据。
-		    whereJson: {
-		    }
-		  }
-		});
-		return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/update.js
deleted file mode 100644
index 57c758e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/sys/update.js
+++ /dev/null
@@ -1,35 +0,0 @@
-module.exports = {
-  /**
-   * 修改数据
-   * @url admin/kong/sys/update 前端调用的url参数地址
-   * data 请求参数 说明
-   * res 返回参数说明
-   * @param {Number} code 错误码，0表示成功
-   * @param {String} msg 详细信息
-   */
-  main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			_id,name,categoryIds,address,stock,files,sort
-		} = data;
-		// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-		if(vk.pubfn.isNullOne(_id)){
-			return { code : -1, msg : '参数错误' };
-		}
-		let dbName = "jjx-spot-goods";
-		await vk.baseDao.updateById({
-			dbName,
-			id:_id,
-			dataJson:{
-				name,categoryIds,address,stock,files,sort
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-    return res;
-  }
-
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/util/formRules.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/util/formRules.js
deleted file mode 100644
index beb72ee..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/spot/goods/util/formRules.js
+++ /dev/null
@@ -1,59 +0,0 @@
-'use strict';
-/**
- * 表单验证
- */
-class Util {
-	constructor() {
-
-	}
-	/**
-	 * 添加
-	 */
-	async add(event) {
-		let { data = {}, userInfo, util } = event;
-		let { vk } = util;
-		let res = { code: 0, msg: '' };
-		// 验证规则开始 -----------------------------------------------------------
-		let rules = {
-			name: [
-				// 必填
-				{ required: true, message: "名称不能为空", trigger: ['blur','change'] },
-			]
-			
-		};
-		// 验证规则结束 -----------------------------------------------------------
-
-		// 开始进行验证
-		res = vk.pubfn.formValidate({
-			data: data,
-			rules: rules
-		});
-		// 返回验证结果
-		return res;
-	}
-	/**
-	 * 修改
-	 */
-	async update(event) {
-		let { data = {}, userInfo, util } = event;
-		let { vk } = util;
-		let res = { code: 0, msg: '' };
-
-		// 验证规则开始 -----------------------------------------------------------
-		let rules = {
-			_id: [
-				{ required: true, message: 'id不能为空', trigger: 'blur' },
-			],
-		};
-		// 验证规则结束 -----------------------------------------------------------
-
-		// 开始进行验证
-		res = vk.pubfn.formValidate({
-			data: data,
-			rules: rules
-		});
-		// 返回验证结果
-		return res;
-	}
-}
-module.exports = new Util
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeCoop.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeCoop.js
deleted file mode 100644
index f9d96b6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeCoop.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/system/user/sys/changeCoop 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        const company = await vk.baseDao.findById({
-            dbName: "uni-id-users",
-            id: data.id
-        });
-
-        const isCoop = (!company.isCoop || company.isCoop === 0) ? 1 : 0
-        await vk.baseDao.updateById({
-            dbName: "uni-id-users",
-            id: data.id,
-            dataJson: {
-                isCoop
-            }
-        });
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeStatus.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeStatus.js
deleted file mode 100644
index 0850e79..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/changeStatus.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 认证审核
-	 * @url admin/system/user/sys/changeStatus 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-        const {id, authStatus, refuseReason} = data
-        const fadadaConfirm = authStatus === 1
-        await vk.baseDao.updateById({
-            dbName: 'uni-id-users',
-            id,
-            dataJson: {
-                authStatus,
-                fadadaConfirm,
-                refuseReason,
-                authTime: Date.now()
-            }
-        })
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/add.js
deleted file mode 100644
index 971d94d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-user-level',
-            dataJson: data
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/delete.js
deleted file mode 100644
index 828b5b2..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-user-level',
-            id: data._id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/list.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/list.js
deleted file mode 100644
index 402adb8..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/list.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url admin/article/category/sys/list 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-user-level',
-            sortArr: [
-                { name: "level", type: "asc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/update.js
deleted file mode 100644
index 48da09d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/userLevel/sys/update.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url admin/article/category/sys/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-user-level',
-            dataJson: data,
-            id: data._id
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/category/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/category/pub/getList.js
deleted file mode 100644
index e78b952..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/category/pub/getList.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/article/category/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-article-category',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/changeCollect.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/changeCollect.js
deleted file mode 100644
index 6b7c9dc..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/changeCollect.js
+++ /dev/null
@@ -1,43 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/article/collect/kh/changeCollect 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const collect = await vk.baseDao.findByWhereJson({
-            dbName: 'jjx-article-collect',
-            whereJson: {
-                uid,
-                articleId: data.articleId
-            }
-        })
-
-        if (collect) {
-            await vk.baseDao.deleteById({
-                dbName: "jjx-article-collect",
-                id: collect._id
-            });
-        } else {
-            await vk.baseDao.add({
-                dbName: "jjx-article-collect",
-                dataJson: {
-                    uid,
-                    articleId: data.articleId
-                }
-            });
-        }
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/check.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/check.js
deleted file mode 100644
index c5b53d6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/check.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/article/collect/kh/check 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const collect = await vk.baseDao.findByWhereJson({
-            dbName: 'jjx-article-collect',
-            whereJson: {
-                uid,
-                articleId: data.articleId
-            }
-        })
-
-        res.data = !!collect
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/getList.js
deleted file mode 100644
index ea6f938..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/collect/kh/getList.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/article/collect/kh/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.select({
-            dbName: 'jjx-article-collect',
-            whereJson: {
-                uid
-            }
-        })
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/kh/add.js
deleted file mode 100644
index f22e98c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/kh/add.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/article/list/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-article',
-            dataJson: {
-                ...data, ...{
-                    viewNum: 0,
-                    downloadNum: 0,
-                }
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/kh/getUserList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/kh/getUserList.js
deleted file mode 100644
index a7b0c90..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/kh/getUserList.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/article/list/kh/getUserList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, pageIndex, pageSize} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.select({
-            dbName: 'jjx-article',
-            getCount: true,
-            pageIndex,
-            pageSize,
-            whereJson: {
-                uid
-            },
-            sortArr: [
-                {name: "_id", type: "desc"}
-            ],
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/pub/addDownload.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/pub/addDownload.js
deleted file mode 100644
index 0bc9981..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/pub/addDownload.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/article/list/pub/addDownload 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: "jwvdp-app-public",
-            id: data.id,
-            dataJson: {
-                downloadNum: _.inc(1)
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/pub/getList.js
deleted file mode 100644
index e8d7f3a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/article/list/pub/getList.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/article/list/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const {pageIndex, pageSize, parentId, keyword} = data
-        const whereJson = {parentId}
-        if (vk.pubfn.isNotNull(keyword)) {
-            whereJson.name = new RegExp(keyword)
-        }
-        res = await vk.baseDao.select({
-            dbName: 'jjx-article',
-            getCount: true,
-            pageIndex,
-            pageSize,
-            whereJson,
-            sortArr: [
-                {name: "_id", type: "desc"}
-            ],
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/add.js
deleted file mode 100644
index 4a28233..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/add.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/cart/kh/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const inCart = await vk.baseDao.findByWhereJson({
-            dbName: "jjx-cart",
-            whereJson: {
-                uid,
-                goodsId: data.goodsId
-            }
-        });
-
-        if (inCart) {
-            await vk.baseDao.updateById({
-                dbName: "jjx-cart",
-                id: inCart._id,
-                dataJson: {
-                    num: _.inc(1)
-                }
-            })
-        } else {
-            await vk.baseDao.add({
-                dbName: "jjx-cart",
-                dataJson: {
-                    num: 1,
-                    goodsId: data.goodsId,
-                    uid
-                }
-            })
-        }
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/changeNum.js b/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/changeNum.js
deleted file mode 100644
index 1008699..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/changeNum.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/cart/kh/changeNum 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const info = await vk.baseDao.findByWhereJson({
-            dbName: "jjx-cart",
-            whereJson: {
-                uid,
-                goodsId: data.goodsId
-            }
-        });
-
-        if (info.num > 1) {
-            await vk.baseDao.updateById({
-                dbName: "jjx-cart",
-                id: info._id,
-                dataJson: {
-                    num: _.dec(1)
-                }
-            })
-        } else {
-            await vk.baseDao.deleteById({
-                dbName: "jjx-cart",
-                id: info._id
-            })
-        }
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/delete.js
deleted file mode 100644
index 50572c6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/delete.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/cart/kh/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-        console.log(data.ids)
-        await vk.baseDao.del({
-            dbName: "jjx-cart",
-            whereJSON: {
-                uid,
-                _id: _.in(data.ids)
-            }
-        })
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/getList.js
deleted file mode 100644
index d79f9e1..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/getList.js
+++ /dev/null
@@ -1,38 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/cart/kh/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.selects({
-            dbName: "jjx-cart",
-            whereJson: {
-                uid
-            },
-            pageIndex: 1,
-            pageSize: 1000000000,
-            foreignDB: [
-                {
-                    dbName: "jjx-goods",
-                    localKey: "goodsId",
-                    foreignKey: "_id",
-                    as: "goods",
-                    limit: 1
-                }
-            ]
-        })
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/add.js
deleted file mode 100644
index 7ce20bb..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/add.js
+++ /dev/null
@@ -1,65 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 新增合同
-     * @url client/contract/kh/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        data.transactionId = vk.pubfn.createOrderNo("C", 20)
-        const contractId = await vk.baseDao.add({
-            dbName: 'jjx-contract',
-            dataJson: {
-                ...data, ...{
-                    status: 0,
-                    userId: uid,
-                    changeNum: 0
-                }
-            }
-        })
-
-        await vk.daoCenter.userContractDao.adds([
-            {
-                transactionId: vk.pubfn.createOrderNo("P", 20),
-                userId: uid,
-                role: 'buyer',
-                sign: false,
-                contractId,
-            },
-            {
-                transactionId: vk.pubfn.createOrderNo("P", 20),
-                userId: data.seller,
-                role: 'seller',
-                sign: false,
-                contractId,
-            }
-        ])
-
-        if (data.type === 'process') {
-            await vk.baseDao.updateById({
-                dbName: 'jjx-process-sheet',
-                id: data.sheetId,
-                dataJson: {
-                    status: 1
-                }
-            })
-            await vk.baseDao.updateById({
-                dbName: 'jjx-process-quote',
-                id: data.quoteId,
-                dataJson: {
-                    status: 1
-                }
-            })
-        }
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js
deleted file mode 100644
index c378dd5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js
+++ /dev/null
@@ -1,78 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 新增签约宝合同
-     * @url client/contract/kh/addSign 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const otherUser = await vk.baseDao.findByWhereJson({
-            dbName: 'uni-id-users',
-            whereJson: {
-                mobile: data.phone
-            }
-        })
-        if (JSON.stringify(otherUser) === '{}') return {
-            code: -1,
-            msg: '该用户不存在'
-        }
-
-        if (!otherUser.fadadaConfirm) return {
-            code: -1,
-            msg: '该用户未通过法大大认证,无法签约'
-        }
-
-        data.transactionId = vk.pubfn.createOrderNo("C", 20)
-        const uploaddocs = await pubFun.fadada('uploaddocs.api', {
-            contract_id: data.transactionId,
-            doc_title: data.title,
-            doc_url: data.contractFile,
-            // file: doc_url,
-            doc_type: '.pdf'
-        })
-        if (parseInt(uploaddocs.code) === 1000) {
-            const contractId = await vk.baseDao.add({
-                dbName: 'jjx-contract',
-                dataJson: {
-                    ...data, ...{
-                        status: 1,
-                        userId: uid,
-                        changeNum: 0,
-                        productTitle: data.title,
-                        docTitle: data.title,
-                        type: 'sign',
-                        contractBase: data.contractFile,
-                        partyCount: 2
-                    }
-                }
-            })
-
-            await vk.daoCenter.userContractDao.adds([
-                {
-                    transactionId: vk.pubfn.createOrderNo("S", 20),
-                    userId: uid,
-                    role: data.userType === 1 ? 'seller' : 'buyer',
-                    sign: false,
-                    contractId,
-                },
-                {
-                    transactionId: vk.pubfn.createOrderNo("S", 20),
-                    userId: otherUser._id,
-                    role: data.userType === 1 ? 'buyer' : 'seller',
-                    sign: false,
-                    contractId,
-                }
-            ])
-        }
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/extSign.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/extSign.js
deleted file mode 100644
index f9ac557..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/extSign.js
+++ /dev/null
@@ -1,77 +0,0 @@
-'use strict';
-const dbName = require("../../../../dao/config.js")
-module.exports = {
-	/**
-	 * 签署合同
-	 * @url client/enquiry/quote/kh/extSign 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, contractId } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		// 获取用户ID
-		const {fadadaCustomerId, fadadaSealId} = userInfo
-		
-		// if(!fadadaSealId) {
-		// 	return {
-		// 		code: -1,
-		// 		msg: '请在个人中心上传印章'
-		// 	}
-		// }
-
-        const contract = await vk.baseDao.findByWhereJson({
-            dbName: dbName.contract,
-            whereJson: {
-                _id: contractId,
-            }
-        })
-		
-		// 获取合同信息
-		const userContract = await vk.baseDao.selects({
-			dbName: dbName.userContract,
-			getMain: true,
-			getOne: true,
-			whereJson: {
-				contractId: contractId,
-				userId: uid
-			},
-			foreignDB:[
-			    {
-					dbName: dbName.contract,
-					localKey:"contractId", // 主表外键字段名
-					foreignKey: "_id", // 副表外键字段名
-					as: "contract",
-					limit: 1, // 当limit = 1时，以对象形式返回，否则以数组形式返回
-				}
-			], 
-		})
-		console.log('userContract: ',userContract);
-		
-		let sign_keyword = '';
-		if(userContract.role == 'buyer') {
-			sign_keyword = userContract.contract.buyerSignKeyword
-		}else if(userContract.role == 'seller') {
-			sign_keyword = userContract.contract.sellerSignKeyword
-		}
-
-		
-		const fadadaUrl = await pubFun.fadadaUrl('extsign.api', {
-			transaction_id: userContract.transactionId,
-			contract_id: contract.transactionId,
-			customer_id: fadadaCustomerId,
-			doc_title: userContract.contract.docTitle,
-			sign_keyword: sign_keyword,
-			notify_url: 'https://fc-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/fadada_contract_notify',
-			return_url: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/pages/contract/index'
-		})
-		
-		res.data = fadadaUrl
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/generate.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/generate.js
deleted file mode 100644
index ce30391..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/generate.js
+++ /dev/null
@@ -1,80 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-	/**
-	 * 发起/创建合同
-	 * @url client/contract/kh/launch 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, contractId,title,contractFile,otherFile,signEndDate,buyerSignKeyword, sellerSignKeyword } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		
-		const contract = await vk.baseDao.findByWhereJson({
-			dbName: dbName.contract,
-			whereJson: {
-				_id: contractId,
-				userId: uid
-			}
-		})
-		console.log('contract: ',dbName.contract,uid);
-		// 上传合同模板并填充
-		pubFun.fadada('generate_contract.api', {
-			template_id: '20231120',
-			contract_id: contract.fadadaContractId,
-			parameter_map: JSON.stringify({
-				jiaName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
-				jiaDate: '',
-				jiaPhone: '',
-				yiName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
-				yiDate: '',
-				yiPhone: '',
-				sellerSupplement: contract.sellerSupplement,
-			}),
-		})
-		
-		
-		const uploaddocs = await pubFun.fadada('uploaddocs.api', {
-			contract_id: contract.fadadaContractId,
-			doc_title: title,
-			doc_url: contractFile,
-			// file: doc_url,
-			doc_type: '.pdf'
-		})
-		
-		if(uploaddocs.code == 1000) {
-			await vk.baseDao.update({
-				dbName: dbName.contract,
-				whereJson: {
-					_id: contractId,
-					userId: uid
-				},
-				dataJson: {
-					status: 1,
-					docTitle: title,
-					signEndDate,
-					otherFile,
-					contractBase: contractFile,
-					buyerSignKeyword,
-					sellerSignKeyword
-				}
-			})
-			
-			res.data = uploaddocs.result
-		}else {
-			return {
-				code: -1,
-				msg: uploaddocs.msg
-			}
-		}
-		
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getDetail.js
deleted file mode 100644
index 36545b4..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getDetail.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-const dbName = require("../../../../dao/config");
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/contract/kh/getDetail 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, contractId } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.findByWhereJson({
-            dbName: dbName.contract,
-            whereJson: {
-                _id: contractId,
-                userId: uid
-            }
-        })
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getList.js
deleted file mode 100644
index 735c624..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/getList.js
+++ /dev/null
@@ -1,59 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-    /**
-     * 获取我的合同列表
-     * @url client/enquiry/contract/kh/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, pageIndex, pageSize, tradeMethod, status} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const lastWhereJson = {}
-        const whereJson = {
-            userId: uid
-        }
-        if (tradeMethod != null) {
-            lastWhereJson['contract.tradeMethod'] = tradeMethod
-        }
-
-        if (status != null) {
-            lastWhereJson['contract.status'] = status
-        }
-
-        res = await vk.daoCenter.userContractDao.selects({
-            data: {
-                pageIndex,
-                pageSize
-            },
-            whereJson: whereJson,
-            sortArr: [{"name": "_id", "type": "desc"}],
-            foreignDB: [
-                {
-                    dbName: dbName.contract,
-                    localKey: "contractId", // 主表外键字段名
-                    foreignKey: "_id", // 副表外键字段名
-                    as: "contract",
-                    limit: 1, // 当limit = 1时，以对象形式返回，否则以数组形式返回
-                    foreignDB: [
-                        {
-                            dbName: dbName.userContract,
-                            localKey: "_id", // 主表外键字段名
-                            foreignKey: "contractId", // 副表外键字段名
-                            as: "partyList",
-                            limit: 1000,
-                        }
-                    ]
-                }
-            ],
-            lastWhereJson: lastWhereJson
-        })
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/launch.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/launch.js
deleted file mode 100644
index ed24566..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/launch.js
+++ /dev/null
@@ -1,73 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-    /**
-     * 发起/创建合同
-     * @url client/contract/kh/launch 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, contractId, title, contractFile, otherFile, signEndDate, buyerSignKeyword, sellerSignKeyword} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const contract = await vk.baseDao.findByWhereJson({
-            dbName: dbName.contract,
-            whereJson: {
-                _id: contractId,
-                userId: uid
-            }
-        })
-        console.log('contract: ', contract);
-        const newTransactionId = vk.pubfn.createOrderNo("C", 20)
-
-        await vk.baseDao.update({
-            dbName: dbName.contract,
-            whereJson: {
-                _id: contractId
-            },
-            dataJson: {
-                transactionId: newTransactionId,
-            }
-        })
-        const uploaddocs = await pubFun.fadada('uploaddocs.api', {
-            contract_id: newTransactionId,
-            doc_title: title,
-            doc_url: contractFile,
-            // file: doc_url,
-            doc_type: '.pdf'
-        })
-        if (parseInt(uploaddocs.code) === 1000) {
-            await vk.baseDao.update({
-                dbName: dbName.contract,
-                whereJson: {
-                    _id: contractId,
-                    userId: uid
-                },
-                dataJson: {
-                    status: 1,
-                    docTitle: title,
-                    signEndDate,
-                    otherFile,
-                    contractBase: contractFile,
-                    buyerSignKeyword,
-                    sellerSignKeyword
-                }
-            })
-
-            res.data = uploaddocs.result
-        } else {
-            return {
-                code: -1,
-                msg: uploaddocs.msg
-            }
-        }
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/viewContract.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/viewContract.js
deleted file mode 100644
index f45eba5..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/viewContract.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-	/**
-	 * 查看合同
-	 * @url client/contract/kh/view 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, contractId } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		
-		const contract = await vk.daoCenter.contractDao.selects({
-			whereJson: {
-				_id: contractId
-			},
-			getOne: true,
-			getMain: true
-		})
-		
-		const viewRes = pubFun.fadadaUrl('viewContract.api', {
-			contract_id: contract.transactionId
-		})
-		
-		res.data = viewRes
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/coop/config/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/coop/config/pub/getList.js
deleted file mode 100644
index 663d22a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/coop/config/pub/getList.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/coop/config/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.select({
-            dbName: 'jjx-coop-config',
-            whereJson: {
-                type: data.type,
-            },
-            sortArr: [
-                {name: "sort", type: "asc"},
-                {name: "_id", type: "desc"},
-            ],
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/attributes/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/attributes/pub/getList.js
deleted file mode 100644
index 96390f1..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/attributes/pub/getList.js
+++ /dev/null
@@ -1,56 +0,0 @@
-'use strict';
-const dbName = 'jjx-enquiry-attributes'
-module.exports = {
-	/**
-	 * 查询现货列表
-	 * @url client/spot/goods/kh/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		const {pageIndex,pageSize,label } = data
-		
-		let whereJson = {
-			enable: true,
-			label
-		};
-		
-	
-		
-		res = await vk.baseDao.selects({
-		  dbName,
-		  getCount:false,
-		  pageIndex,
-		  pageSize,
-		  // 主表where条件
-		  whereJson: whereJson,
-		  // 主表字段显示规则
-		  fieldJson:{},
-		  // 主表排序规则
-		  sortArr:[{ name:"sort", type:"asc" }],
-		  
-		});
-		
-		res.rows.forEach(item => {
-			item.options = item.values.map(citem => {
-				return {
-					label: citem,
-					value: citem
-				}
-			})
-			delete item.values
-		})
-		
-		
-		
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/attributes/pub/getOne.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/attributes/pub/getOne.js
deleted file mode 100644
index b9d99ff..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/attributes/pub/getOne.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict';
-const dbName = 'jjx-enquiry-attributes'
-module.exports = {
-	/**
-	 * 查询现货列表
-	 * @url client/spot/goods/kh/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "",list: [] };
-		// 业务逻辑开始-----------------------------------------------------------
-		const {pageIndex,pageSize,label } = data
-		
-		let whereJson = {
-			enable: true,
-			label
-		};
-		
-	
-		
-		const info = await vk.baseDao.findByWhereJson({
-		  dbName,
-		  getCount:false,
-		  whereJson: whereJson,
-		});
-		
-		if(info != null) {
-			res.list = info.values.map(item => {
-				return {
-					label: item,
-					value: item
-				}
-			})
-		}
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/contract/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/contract/kh/getList.js
deleted file mode 100644
index e09b4f3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/contract/kh/getList.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-
-module.exports = {
-	/**
-	 * 获取我的合同列表
-	 * @url client/enquiry/contract/kh/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-		res = await vk.baseDao.getTableData({
-			dbName: 'jjx-contract',
-			data
-		})
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/addQuote.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/addQuote.js
deleted file mode 100644
index c1b504b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/addQuote.js
+++ /dev/null
@@ -1,63 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 新增报价
-     * @url client/enquiry/quote/kh/addQuote 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, sheet, totalPrice} = data;
-        let {company, manager, person, accountType} = userInfo
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        let subjectName = ''
-        let subjectMobile = ''
-        let managerName = ''
-        let managerMobile = ''
-
-        if (accountType === 1 && person.personName && person.mobile) {
-            subjectName = person.personName
-            subjectMobile = person.mobile
-        } else {
-            subjectName = company.companyName
-            subjectMobile = company.legalMobile
-            if (manager && manager.mobile && manager.personName) {
-                managerName = manager.personName
-                managerMobile = manager.mobile
-            }
-        }
-
-        // 添加报价单
-        res.data = await vk.baseDao.add({
-            dbName: "jjx-enquiry-quote",// 表名
-            dataJson: { // 需要新增的数据 json格式
-                ...data,
-                ...{
-                    userId: data.uid,
-                    status: 0,
-                    subjectName,
-                    subjectMobile,
-                    managerName,
-                    managerMobile,
-                }
-            }
-        });
-
-        vk.baseDao.update({
-            dbName: "jjx-enquiry-sheet",// 表名
-            whereJson: {
-                _id: data.sheetId,
-            },
-            dataJson: {
-                quoteNum: _.inc(1)
-            }
-        })
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/confirmQuote.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/confirmQuote.js
deleted file mode 100644
index f337cbc..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/confirmQuote.js
+++ /dev/null
@@ -1,160 +0,0 @@
-'use strict';
-
-const dbName = require('../../../../../dao/config.js')
-module.exports = {
-    /**
-     * 同意合作
-     * @url client/enquiry/quote/kh/confirmQuote 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {
-            data = {}, userInfo, util, filterResponse, originalParam
-        } = event;
-        let {
-            customUtil,
-            uniID,
-            config,
-            pubFun,
-            vk,
-            db,
-            _
-        } = util;
-        let {
-            uid,
-            quoteId
-        } = data;
-        let res = {
-            code: 0,
-            msg: ""
-        };
-        // 业务逻辑开始-----------------------------------------------------------
-
-        // 修改报价单状态
-        const quote = await vk.baseDao.updateAndReturn({
-            dbName: 'jjx-enquiry-quote',
-            whereJson: {
-                _id: quoteId,
-                status: 0
-            },
-            dataJson: {
-                status: 1
-            }
-        })
-
-        if (!quote) {
-            return {
-                code: -1,
-                msg: '请刷新页面'
-            }
-        }
-        // 获取乙方信息
-        const quoteUser = await vk.baseDao.select({
-            dbName: dbName.user,
-            getMain: true,
-            getOne: true,
-            whereJson: {
-                _id: quote.userId
-            }
-        })
-
-
-        // 获取询价单信息
-        const sheet = await vk.baseDao.selects({
-            dbName: dbName.enquirySheet,
-            whereJson: {_id: quote.sheetId},
-            getMain: true,
-            getOne: true
-        })
-
-        // 获取商品信息
-        const productTitle = sheet.productList.map(item => {
-            return item.goodsName
-        }).join("/")
-
-        const fadadaContractId = vk.pubfn.createOrderNo("E", 20)
-        // 上传合同模板并填充
-        // if(sheet.signMethod == 0 && sheet.contractType == 0) {
-        // 	pubFun.fadada('generate_contract.api', {
-        // 		template_id: '20231120',
-        // 		contract_id: fadadaContractId,
-        // 		parameter_map: JSON.stringify({
-        // 			jiaName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
-        // 			jiaDate: '',
-        // 			jiaPhone: '',
-        // 			yiName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
-        // 			yiDate: '',
-        // 			yiPhone: '',
-        // 			sellerSupplement: '',
-        // 		}),
-        // 	})
-        // }
-
-
-        // 新增合同记录
-        const contractId = await vk.baseDao.add({
-            dbName: 'jjx-contract',
-            dataJson: {
-                fadadaContractId: fadadaContractId,
-                contractBase: '', // 原始合同
-                contractHistory: [], // 历史合同
-                contractFinal: '', // 归档合同
-                status: 0,
-                userId: uid,
-                type: 'enquiry',
-                quoteId: quoteId,
-                sheetId: quote.sheetId,
-                productList: quote.productList,
-                productTitle,
-                tradeMethod: quote.tradeMethod,
-                partyCount: 2,
-                signCount: 0,
-                contractType: sheet.contractType,
-                signMethod: sheet.signMethod,
-                sellerSupplement: sheet.sellerSupplement,
-                transactionId: vk.pubfn.createOrderNo("C", 20),
-                amount: quote.totalPrice,
-            }
-        })
-
-        await vk.baseDao.updateById({
-            dbName: 'jjx-enquiry-sheet',
-            id: quote.sheetId,
-            dataJson: {
-                status: 1
-            }
-        })
-        await vk.baseDao.updateById({
-            dbName: 'jjx-enquiry-quote',
-            id: quoteId,
-            dataJson: {
-                status: 1
-            }
-        })
-
-        // 上传合同模板
-
-        //新增 用户与合同的关联记录
-        await vk.daoCenter.userContractDao.adds([
-            {
-                transactionId: vk.pubfn.createOrderNo("E", 20),
-                userId: uid,
-                role: 'buyer',
-                sign: false,
-                contractId
-            },
-            {
-                transactionId: vk.pubfn.createOrderNo("E", 20),
-                userId: quote.userId,
-                role: 'seller',
-                sign: false,
-                contractId
-            }
-        ])
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/uploadTemplate.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/uploadTemplate.js
deleted file mode 100644
index 10cb5c3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/uploadTemplate.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 上传合同
-	 * @url client/enquiry/quote/kh/uploadTemplate 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, base64 } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		const file = pubFun.base64ToFile(base64, 'adv.pdf')
-		
-		res.data = await pubFun.fadada('upload_template_docs.api', {
-			contract_template_id: vk.pubfn.createOrderNo("Contract", 25),
-			template_name: 'template_name',
-			file: file
-		})
-		
-		
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/add.js
deleted file mode 100644
index 3aaa0b2..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/add.js
+++ /dev/null
@@ -1,61 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/enquiry/sheet/kh/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        // 生成询价编号
-
-        // 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
-        let dbName = "jjx-enquiry-sheet";
-        res.id = await vk.baseDao.add({
-            dbName,
-            dataJson: {
-                ...data,
-                ...{
-                    answerNumber: 0,
-                    userId: uid,
-                    status: 0,
-                    quoteNum: 0
-                }
-            }
-
-        });
-
-        const messageUserList = await vk.baseDao.select({
-            dbName: "jjx-message-config",
-            whereJson: {
-                enquiry: true
-            }
-        })
-        const messageList = []
-        for (let i = 0; i < messageUserList.rows.length; i++) {
-            if (messageUserList.rows[i].uid !== uid) {
-                messageList.push({
-                    uid: messageUserList.rows[i].uid,
-                    title: `询价:${data.title}`,
-                    content: `新的询价信息发布，赶紧去看看吧`,
-                    type: 'old',
-                    hasRead: false,
-                    pk: res.id
-                })
-            }
-        }
-        await vk.baseDao.adds({
-            dbName: "jjx-message",
-            dataJson: messageList
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/changeToOnlineSign.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/changeToOnlineSign.js
deleted file mode 100644
index 6a66387..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/changeToOnlineSign.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/enquiry/sheet/kh/changeToOnlineSign 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: "jjx-enquiry-sheet",
-            id: data.id,
-            dataJson: {
-                signMethod: 0,
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/delete.js
deleted file mode 100644
index d001742..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/delete.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-const dbName = require('../../../../../dao/config.js')
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/enquiry/sheet/kh/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let { _id } = data;
-		if(vk.pubfn.isNull(_id)){
-			return { code : -1, msg : 'id不能为空' };
-		}
-		await vk.baseDao.deleteById({
-			dbName: dbName.enquirySheet,
-			id:_id
-		});
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getDetail.js
deleted file mode 100644
index 109564c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getDetail.js
+++ /dev/null
@@ -1,59 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 获取报价单详情
-	 * @url client/enquiry/sheet/pub/getDetail 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, _id } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-enquiry-sheet";
-		res.data = await vk.baseDao.selects({
-			dbName,
-			getOne: true,
-			getMain: true,
-			whereJson: {
-				_id: _id
-			},
-			foreignDB: [
-				{
-					dbName:"uni-id-users",
-					localKey:"userId",
-					foreignKey:"_id",
-					as:"user",
-					limit:1, // limit=1则以对象形式返回
-					fieldJson:{
-						_id: true,
-						company: {
-							companyName: true,
-							mobile: true,
-						}, 
-						person: {
-							personName: true,
-							mobile: true,
-						},
-						businessCard: true,
-						accountType: true,
-					},
-				},
-				{
-					dbName: "jjx-enquiry-quote",
-					localKey: "_id",
-					foreignKey: "sheetId",
-					as: "quoteList",
-					limit: 500, // limit=1则以对象形式返回
-				}
-			]
-		});
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js
deleted file mode 100644
index f6f0dca..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js
+++ /dev/null
@@ -1,130 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 获取用户发布的询价单
-     * @url client/enquiry/sheet/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, pageIndex, pageSize, keyword, categoryIds, provinceCodes, formData, status} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        let dbName = "jjx-enquiry-sheet";
-
-
-        let whereJson = {};
-
-        if (vk.pubfn.isNotNull(keyword)) {
-            whereJson.name = new RegExp(keyword)
-        }
-
-        if (data.userId && vk.pubfn.isNotNull(data.userId)) {
-            whereJson.userId = data.userId
-        } else {
-            whereJson.status = 0
-        }
-
-        if (vk.pubfn.isNotNull(status) && status !== 'all') {
-            if (status === 'noQuote') whereJson.quoteNum = 0
-            else if (status === 'notPick') whereJson.status = 0
-            else if (status === 'picked') whereJson.status = 1
-        }
-
-        if (formData && formData.hasOwnProperty('companyList') && vk.pubfn.isNotNull(formData.companyList)) {
-            whereJson.userId = _.in(formData.companyList)
-        }
-
-        if (formData && formData.hasOwnProperty('categoryIds') && vk.pubfn.isNotNull(formData.categoryIds)) {
-            whereJson.categoryIds = _.in(formData.categoryIds)
-        }
-
-        if (vk.pubfn.isNotNull(provinceCodes)) {
-            whereJson['address.province.code'] = _.in(provinceCodes)
-        }
-
-        res = await vk.baseDao.selects({
-            dbName,
-            pageIndex,
-            pageSize,
-            whereJson,
-            sortArr: [{name: "_add_time", type: "desc"}],
-            foreignDB: [
-                {
-                    dbName: "uni-id-users",
-                    localKey: "userId",
-                    foreignKey: "_id",
-                    as: "user",
-                    limit: 1, // limit=1则以对象形式返回
-                    fieldJson: {
-                        _id: true,
-                        company: {
-                            companyName: true
-                        },
-                        person: {
-                            personName: true
-                        },
-                        businessCard: true,
-                        accountType: true,
-                    },
-                },
-                {
-                    dbName: "jjx-enquiry-quote",
-                    localKey: "_id",
-                    foreignKey: "sheetId",
-                    as: "quoteList",
-                    limit: 500, // limit=1则以对象形式返回
-                }
-            ]
-        });
-
-        const rows = res.rows
-        rows.forEach((row, rowIndex) => {
-            row.productList.forEach(async (product, productIndex) => {
-                rows[rowIndex].productList[productIndex].template = await vk.baseDao.findById({
-                    dbName,
-                    data: {
-                        id: product.goodsId
-                    }
-                });
-            })
-        })
-
-        res.notPickNum = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-                status: 0
-            },
-        });
-
-        res.pickedNum = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-                status: 1
-            },
-        });
-
-        res.noQuoteNum = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-                quoteNum: 0
-            },
-        });
-
-        res.all = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-            },
-        });
-
-        res.rows = rows
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/template/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/template/pub/getList.js
deleted file mode 100644
index 5953269..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/template/pub/getList.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-const dbName = 'jjx-enquiry-template'
-module.exports = {
-	/**
-	 * 查询现货列表
-	 * @url client/spot/goods/kh/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		const {pageIndex,pageSize } = data
-		
-		let whereJson = {
-			enable: true
-		};
-		
-	
-		
-		res = await vk.baseDao.selects({
-		  dbName,
-		  getCount:false,
-		  pageIndex,
-		  pageSize,
-		  // 主表where条件
-		  whereJson: whereJson,
-		  // 主表字段显示规则
-		  fieldJson:{},
-		  // 主表排序规则
-		  sortArr:[{ name:"sort", type:"desc" }],
-		  
-		});
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/fadada.js b/uniCloud-aliyun/cloudfunctions/router/service/client/fadada.js
deleted file mode 100644
index 779b26a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/fadada.js
+++ /dev/null
@@ -1,390 +0,0 @@
-'use strict';
-const {
-	verify
-} = require("crypto");
-var CryptoJS = require("crypto-js");
-var vk; // 全局vk实例
-// 涉及的表名
-const dbName = require("../../dao/config.js")
-
-var db = uniCloud.database(); // 全局数据库引用
-var _ = db.command; // 数据库操作符
-var $ = _.aggregate; // 聚合查询操作符
-/**
- * 权限注意：访问以下链接查看
- * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#内置权限
- */
-var cloudObject = {
-	isCloudObject: true, // 标记为云对象模式
-	/**
-	 * 请求前处理，主要用于调用方法之前进行预处理，一般用于拦截器、统一的身份验证、参数校验、定义全局对象等。
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#before-预处理
-	 */
-	_before: async function() {
-		vk = this.vk; // 将vk定义为全局对象
-		// let { customUtil, uniID, config, pubFun } = this.getUtil(); // 获取工具包
-	},
-	/**
-	 * 请求后处理，主要用于处理本次调用方法的返回结果或者抛出的错误
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#after-后处理
-	 */
-	_after: async function(options) {
-		let {
-			err,
-			res
-		} = options;
-		if (err) {
-			return; // 如果方法抛出错误，直接return;不处理
-		}
-		return res;
-	},
-	/**
-	 * 获取列表
-	 * @url client/fadada.getList 前端调用的url参数地址
-	 */
-	getList: async function(data) {
-		let res = {
-			code: 0,
-			msg: ''
-		};
-		let {
-			uid
-		} = this.getClientInfo(); // 获取客户端信息
-		// 业务逻辑开始-----------------------------------------------------------
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * 模板函数
-	 * @url client/fadada.test 前端调用的url参数地址
-	 */
-	test: async function(data) {
-
-	},
-	/**
-	 * 实名认证异步通知回调
-	 * @param {Object} data
-	 */
-	async pub_verifyNotify(data) {
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun
-		} = this.getUtil(); // 获取工具包
-        console.log('fadada res:', data)
-		const {
-			customerId
-		} = data;
-		// 查询认证结果
-		let user = await vk.baseDao.findByWhereJson({
-			dbName: "uni-id-users",
-			whereJson: {
-				fadadaCustomerId: customerId,
-			}
-		});
-		let res
-
-		if (user.accountType === 1) {
-			res = await pubFun.fadada('find_personCertInfo.api', {
-				verified_serialno: user.fadadaVerify.transactionNo
-			})
-			console.log('fadada check res:', res)
-			// 认证结果
-			const {person} = res.data
-			if(res.code !== 1 || person.status !== 2) {
-				return
-			}
-		} else {
-			res = await pubFun.fadada('find_companyCertInfo.api', {
-				verified_serialno: user.fadadaVerify.transactionNo
-			})
-			console.log('fadada check res:', res)
-			// 认证结果
-			const {company, manager} = res.data
-			if(res.code !== 1 || company.status !== 4 ||  manager.status !== 2) {
-				return
-			}
-			
-		}
-
-
-		//  认证成功
-		await vk.baseDao.setById({
-			dbName: "fadada-verify-record",
-			dataJson: {
-				_id: user._id,
-				...res.data
-			}
-		})
-
-
-
-		await vk.baseDao.updateById({
-			dbName: "uni-id-users",
-			id: user._id,
-			dataJson: {
-				person: res.data.person,
-				company: res.data.company,
-				manager: res.data.manager,
-				bankCard: res.data.bankCard,
-				fadadaConfirm: true,
-				status: 1
-			}
-		});
-
-
-
-		return res
-	},
-	/**
-	 * 合同签署回调处理
-	 * @param {Object} data
-	 */
-	async pub_contractNotify(data) {
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun
-		} = this.getUtil(); // 获取工具包
-		// 开启事务
-		const transaction = await vk.baseDao.startTransaction();
-
-		const {
-			transaction_id,
-			contract_id,
-			timestamp,
-			result_code,
-			download_url,
-			viewpdf_url
-		} = data
-		try {
-			if (result_code == '3000') {
-				// 获取用户信息
-				const userContract = await vk.daoCenter.userContractDao.updateAndReturn({
-					db: transaction,
-					whereJson: {
-						transactionId: transaction_id,
-						sign: false
-					},
-					dataJson: {
-						sign: true
-					}
-				})
-
-				let contract = await vk.daoCenter.contractDao.updateAndReturn({
-					db: transaction,
-					whereJson: {
-						_id: userContract.contractId,
-						status: 1,
-					},
-					dataJson: {
-						signCount: _.inc(1),
-						contractHistory: _.push(download_url)
-					}
-				})
-
-                // 用户交易额
-                await vk.baseDao.update({
-                    dbName: "uni-id-users",
-                    whereJson: {
-                        _id: userContract.userId
-                    },
-                    dataJson: {
-                        transactionAmount: _.inc(contract.amount)
-                    }
-                })
-
-				if (contract.signCount == contract.partyCount) {
-					contract = await vk.daoCenter.contractDao.updateAndReturn({
-						db: transaction,
-						whereJson: {
-							_id: userContract.contractId,
-							status: 1
-						},
-						dataJson: {
-							status: 2
-						}
-					})
-				}
-			}
-			await transaction.commit();
-		} catch (e) {
-			await transaction.rollback();
-			return false
-		}
-		return data;
-	},
-	/**
-	 * 获取用户认证结果
-	 */
-	async getVerifyResult() {
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun
-		} = this.getUtil(); // 获取工具包
-		let res = {
-			code: 0,
-			msg: ''
-		};
-		let {
-			uid
-		} = this.getClientInfo(); // 获取客户端信息
-		let {
-			accountType,
-			fadadaCustomerId
-		} = await this.getUserInfo();
-
-		res.data = await vk.baseDao.findById({
-			dbName: "fadada-verify-record",
-			id: uid
-		});
-
-		return res
-	},
-	/**
-	 * 获取实名认证地址
-	 */
-	async getVerifyUrl() {
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun
-		} = this.getUtil(); // 获取工具包
-		let res = {
-			code: 0,
-			msg: ''
-		};
-		let {
-			uid
-		} = this.getClientInfo(); // 获取客户端信息
-		let {
-			accountType,
-			fadadaCustomerId,
-			fadadaVerify
-		} = await this.getUserInfo();
-		// 业务逻辑开始-----------------------------------------------------------
-
-		if (fadadaVerify) {
-			res.data = fadadaVerify
-			return res;
-		}
-
-
-		let verify_url_res;
-
-		if (accountType === 1) {
-			verify_url_res = await pubFun.fadada('get_person_verify_url.api', {
-				customer_id: fadadaCustomerId,
-				verified_way: 2,
-				page_modify: 1,
-				cert_flag: 1,
-				notify_url: 'https://fc-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/fadada_verify_notify',
-				return_url: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/pages/user/user?menu=fadada'
-
-			})
-		} else {
-			verify_url_res = await pubFun.fadada('get_company_verify_url.api', {
-				customer_id: fadadaCustomerId,
-				page_modify: 1,
-				cert_flag: 1,
-				notify_url: 'https://fc-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/fadada_verify_notify',
-				return_url: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/pages/user/user?menu=fadada'
-			})
-			console.log(': ', );
-		}
-
-		console.log('verify_url_res: ', verify_url_res);
-		let {
-			transactionNo,
-			url
-		} = verify_url_res.data
-		var parsedWordArray = CryptoJS.enc.Base64.parse(url);
-		url = parsedWordArray.toString(CryptoJS.enc.Utf8);
-
-		await vk.baseDao.update({
-			dbName: "uni-id-users",
-			whereJson: {
-				_id: uid
-			},
-			dataJson: {
-				fadadaVerify: {
-					transactionNo,
-					url
-				}
-			}
-		});
-
-
-
-		res.data = {
-			transactionNo,
-			url
-		}
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-
-	},
-	/**
-	 * 调用此接口将customer_id与实名交易号进行绑定，
-	 * 绑定成功后该customer_id无法再次绑定其它不同主体认证交易号。
-	 * 必须绑定成功后续才可发起签署
-	 */
-	async applyCert({
-		customerId,
-		transactionNo
-	}) {
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun
-		} = this.getUtil(); // 获取工具包
-	},
-	async generateContract() {
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun
-		} = this.getUtil(); // 获取工具包
-		let res = {
-			code: 0,
-			msg: ''
-		};
-		let {
-			uid
-		} = this.getClientInfo(); // 获取客户端信息
-		const contract_id = vk.pubfn.createOrderNo("Contract", 25);
-		const parameter_map = {
-			saler: '网宿科技'
-		};
-		const dynamic_tables = [{
-			headers: ["采购商品", "采购数量", "商品单位"], //表头，
-			datas: [
-				["螺纹钢", "200", "米"]
-			],
-			pageBegin: -1
-		}]
-		const params = {
-			template_id: 'sale',
-			doc_title: '测试买卖合同',
-			contract_id: contract_id,
-			fill_type: 0, // 填充类型 0 pdf 模板、1 在线填充模板
-			parameter_map: JSON.stringify(parameter_map), //填充内容
-			dynamic_tables: JSON.stringify(dynamic_tables), //填充表格
-		}
-		console.log(params);
-		res.data = await pubFun.fadada('generate_contract.api', params)
-		return res;
-	}
-}
-
-module.exports = cloudObject;
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/category/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/category/pub/getList.js
deleted file mode 100644
index a89b9d6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/category/pub/getList.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/goods/category/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-goods-category',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/kh/add.js
deleted file mode 100644
index f22e98c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/kh/add.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/article/list/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: 'jjx-article',
-            dataJson: {
-                ...data, ...{
-                    viewNum: 0,
-                    downloadNum: 0,
-                }
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getDetail.js
deleted file mode 100644
index 6a76e08..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getDetail.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/goods/list/pub/getDetail 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.findById({
-            dbName: "jjx-goods",
-            id: data.id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getList.js
deleted file mode 100644
index a5c5fef..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/goods/list/pub/getList.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/goods/list/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const {pageIndex, pageSize, parentId, keyword, city, } = data
-        const whereJson = {}
-        if (vk.pubfn.isNotNull(keyword)) {
-            whereJson.name = new RegExp(keyword)
-        }
-        if (vk.pubfn.isNotNull(city)) {
-            whereJson['address.city.code'] = city
-        }
-        if (vk.pubfn.isNotNull(parentId)) {
-            whereJson.parentId = parentId
-        }
-
-        res = await vk.baseDao.select({
-            dbName: 'jjx-goods',
-            getCount: true,
-            pageIndex,
-            pageSize,
-            whereJson,
-            sortArr: [
-                {name: "_id", type: "desc"}
-            ],
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/getConfig.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/getConfig.js
deleted file mode 100644
index 2c39691..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/getConfig.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/message/config/kh/getConfig 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const messageConfig = await vk.baseDao.findByWhereJson({
-            dbName: "jjx-message-config",
-            whereJson: {
-                uid
-            }
-        });
-
-        if (!messageConfig) {
-            const id = await vk.baseDao.add({
-                dbName: "jjx-message-config",
-                dataJson: {
-                    uid,
-                    article: true,
-                    process: true,
-                    old: true,
-                    enquiry: true,
-                    productList: [],
-                    addressRegion: {}
-                }
-            })
-
-            res = await vk.baseDao.findById({
-                dbName: "jjx-message-config",
-                id: id
-            });
-        } else res = messageConfig
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/setConfig.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/setConfig.js
deleted file mode 100644
index e3ae658..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/setConfig.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/message/config/kh/setConfig 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/update.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/update.js
deleted file mode 100644
index 86492e6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/config/kh/update.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/message/config/kh/update 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, article, process, old, enquiry, productList, addressRegion} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.update({
-            dbName: "jjx-message-config",
-            whereJson: {uid},
-            dataJson: {
-                article,
-                process,
-                old,
-                enquiry,
-                productList,
-                addressRegion
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/add.js
deleted file mode 100644
index ba7cb8b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/add.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/message/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        console.log('here is message', data)
-        await vk.baseDao.add({
-            dbName: "jjx-message",
-            dataJson: {
-                uid,
-                title: data.title,
-                content: data.content,
-                type: data.type,
-                hasRead: false
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/delete.js
deleted file mode 100644
index fc9439b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/delete.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/message/kh/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.deleteById({
-            dbName: "jjx-message",
-            id: data.id
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/getList.js
deleted file mode 100644
index 8982110..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/getList.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/message/kh/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, pageIndex, pageSize} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.select({
-            dbName: "jjx-message",
-            whereJson: {
-                uid,
-            },
-            sortArr: [{"name": "_id", "type": "desc"}],
-            pageIndex,
-            pageSize
-        })
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/setAllRead.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/setAllRead.js
deleted file mode 100644
index 1a116b4..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/setAllRead.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/message/kh/setRead 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.update({
-            dbName: "jjx-message",
-            whereJson: {
-                uid: uid,
-                hasRead: false
-            },
-            dataJson: {
-                hasRead: true
-            }
-        });
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/setRead.js b/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/setRead.js
deleted file mode 100644
index e03ef66..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/message/kh/setRead.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/message/kh/setRead 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: "jjx-message",
-            id: data.id,
-            dataJson: {
-                hasRead: true
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/notice/list/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/notice/list/pub/getDetail.js
deleted file mode 100644
index 5f82111..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/notice/list/pub/getDetail.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/notice/list/pub/getDetail 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.findById({
-            dbName: "jjx-notice",
-            id: data.id,
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/notice/list/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/notice/list/pub/getList.js
deleted file mode 100644
index 9d00344..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/notice/list/pub/getList.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/notice/list/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const {pageIndex, pageSize, parentId, keyword} = data
-        const whereJson = {parentId}
-        if (vk.pubfn.isNotNull(keyword)) {
-            whereJson.name = new RegExp(keyword)
-        }
-        res = await vk.baseDao.select({
-            dbName: 'jjx-notice',
-            getCount: true,
-            pageIndex,
-            pageSize: 12,
-            whereJson,
-            sortArr: [
-                {name: "_id", type: "desc"}
-            ],
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/add.js
deleted file mode 100644
index 559178e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/add.js
+++ /dev/null
@@ -1,48 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/old/kh/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const pk = await vk.baseDao.add({
-            dbName: "jjx-old",
-            dataJson: data
-        })
-
-        const messageUserList = await vk.baseDao.select({
-            dbName: "jjx-message-config",
-            whereJson: {
-                old: true
-            }
-        })
-        const messageList = []
-        for (let i = 0; i < messageUserList.rows.length; i++) {
-            if (messageUserList.rows[i].uid !== uid) {
-                messageList.push({
-                    uid: messageUserList.rows[i].uid,
-                    title: `旧货:${data.title}`,
-                    content: `新的旧货信息发布，赶紧去看看吧`,
-                    type: 'old',
-                    hasRead: false,
-                    pk
-                })
-            }
-        }
-        await vk.baseDao.adds({
-            dbName: "jjx-message",
-            dataJson: messageList
-        });
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/delete.js
deleted file mode 100644
index f7f148e..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/delete.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/enquiry/sheet/kh/delete 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        let {id} = data;
-        if (vk.pubfn.isNull(id)) {
-            return {code: -1, msg: 'id不能为空'};
-        }
-        await vk.baseDao.deleteById({
-            dbName: 'jjx-old',
-            id
-        });
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/getList.js
deleted file mode 100644
index 2a053bd..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/old/kh/getList.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/old/kh/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.select({
-            dbName: "jjx-old",
-            whereJson: {
-                uid
-            }
-        })
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getDetail.js
deleted file mode 100644
index 9e0640f..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getDetail.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/old/pub/getDetail 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.findById({
-            dbName: "jjx-old",
-            id: data.id,
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getList.js
deleted file mode 100644
index 82ed537..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/old/pub/getList.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/old/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, pageIndex, pageSize, type} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const whereJson = {}
-        if (vk.pubfn.isNotNull(data.keyword)) {
-            whereJson.name = new RegExp(data.keyword)
-        }
-        if (vk.pubfn.isNotNull(data.categoryIds)) {
-            whereJson.category = _.in(data.categoryIds)
-        }
-        if (vk.pubfn.isNotNull(data.provinceCodes)) {
-            whereJson['address[0].code'] = _.in(data.provinceCodes)
-        }
-
-
-        res = await vk.baseDao.select({
-            dbName: "jjx-old",
-            pageIndex,
-            pageSize,
-            sortArr: [{"name": "_id", "type": "desc"}],
-            whereJson: {
-                type: type
-            },
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js
deleted file mode 100644
index d690469..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js
+++ /dev/null
@@ -1,56 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/order/kh/add 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        let goods
-        if (data.type === 0) {
-            goods = await vk.baseDao.findById({
-                dbName: "jjx-goods",
-                id: data.goodsId
-            })
-        } else {
-            goods = data.goods
-        }
-
-        // type 0: 商品
-        // type 1: 自营
-        // type 2: 保证金
-        // type 3: 会员升级
-        const orderId = await vk.baseDao.add({
-            dbName: "jjx-order",
-            dataJson: {
-                orderNo: vk.pubfn.createOrderNo("O", 20),
-                uid,
-                orderStatus: 0,
-                type: data.type,
-                amount: goods.amount * data.num,
-            }
-        })
-
-        await vk.baseDao.add({
-            dbName: "jjx-order-goods",
-            dataJson: {
-                orderId,
-                goodsId: data.goodsId,
-                num: data.num,
-                goodsName: goods.name,
-                goodsPrice: goods.amount,
-                goodsCover: goods.cover,
-            }
-        })
-
-        res.data = orderId
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js
deleted file mode 100644
index f825980..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js
+++ /dev/null
@@ -1,63 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/order/kh/addFromList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        let amount = 0
-        for (const item of data.list) {
-            const goods = await vk.baseDao.findById({
-                dbName: "jjx-goods",
-                id: item.goodsId
-            })
-            amount += item.num * goods.amount
-        }
-
-        const orderId = await vk.baseDao.adds({
-            dbName: "jjx-order",
-            dataJson: {
-                orderNo: vk.pubfn.createOrderNo("O", 20),
-                orderStatus: 0,
-                type: data.type,
-                uid,
-                amount
-            }
-        })
-
-        const list = []
-        for (const item of data.list) {
-            const goods = await vk.baseDao.findById({
-                dbName: "jjx-goods",
-                id: item.goodsId
-            })
-
-            list.push({
-                orderId: orderId,
-                goodsId: item.goodsId,
-                num: item.num,
-                goodsName: goods.name,
-                goodsPrice: goods.amount,
-                goodsCover: goods.cover
-            })
-        }
-
-        await vk.baseDao.adds({
-            dbName: "jjx-order-goods",
-            dataJson: list
-        })
-
-        res.data = orderId
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js
deleted file mode 100644
index 601a9bf..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/order/kh/getInfo 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.selects({
-            dbName: "jjx-order",
-            getOne: true,
-            getMain: true,
-            whereJson: {
-                _id: data.id
-            },
-            foreignDB: [
-                {
-                    dbName: "jjx-order-goods",
-                    localKey: "_id",
-                    foreignKey: "orderId",
-                    as: "goods",
-                }
-            ]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getList.js
deleted file mode 100644
index 6ba1bb7..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getList.js
+++ /dev/null
@@ -1,43 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/order/kh/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, type, pageIndex, pageSize} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const whereJson = {uid}
-        if(!vk.pubfn.isNull(type))  whereJson.type = type
-        res = await vk.baseDao.selects({
-            dbName: "jjx-order",
-            whereJson,
-            pageIndex,
-            pageSize,
-            sortArr:[{ "name":"_id", "type":"desc" }],
-            foreignDB: [
-                {
-                    dbName: "jjx-order-goods",
-                    localKey: "_id",
-                    foreignKey: "orderId",
-                    as: "goods",
-                    limit: 500
-                }
-            ],
-        })
-
-        // res.rows.forEach(item => {
-        //     if (item.type === 0) {
-        //         item.goods =
-        //     }
-        // })
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/resetOrderNo.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/resetOrderNo.js
deleted file mode 100644
index d66b530..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/resetOrderNo.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/order/kh/resetOrderNo 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: "jjx-order",
-            id: data.id,
-            dataJson: {
-                orderNo: vk.pubfn.createOrderNo("O", 20),
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js
deleted file mode 100644
index 93685e3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/order/kh/updateAddress 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: "jjx-order",
-            id: data.id,
-            dataJson: {
-                address: data.address,
-                addressDetail: data.addressDetail,
-                phone: data.phone,
-                name: data.name
-            }
-        });
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/pub/test.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/pub/test.js
deleted file mode 100644
index 5472395..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/pub/test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 此函数名称
-	 * @url client/order/pub/test 前端调用的url参数地址
-	 * data 请求参数
-	 * @params {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, originalParam } = event;
-		let { customUtil, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		// 可写与数据库的交互逻辑等等
-
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/category/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/category/pub/getList.js
deleted file mode 100644
index c9bde53..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/category/pub/getList.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/otherArticle/category/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-other-article-category',
-            sortArr: [
-                { name: "sort", type: "asc" },
-                { name: "_id", type: "desc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/list/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/list/pub/getDetail.js
deleted file mode 100644
index ca35a92..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/list/pub/getDetail.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/otherArticle/list/pub/getDetail 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.findById({
-            dbName: "jjx-other-article",
-            id: data.id,
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/list/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/list/pub/getList.js
deleted file mode 100644
index 387f28c..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/otherArticle/list/pub/getList.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/otherArticle/list/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const {pageIndex, pageSize, parentId} = data
-        const whereJson = {parentId}
-        res = await vk.baseDao.select({
-            dbName: 'jjx-other-article',
-            getCount: true,
-            pageIndex,
-            pageSize,
-            whereJson,
-            sortArr: [
-                {name: "_id", type: "desc"}
-            ],
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/payment.js b/uniCloud-aliyun/cloudfunctions/router/service/client/payment.js
deleted file mode 100644
index cdd30e8..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/payment.js
+++ /dev/null
@@ -1,146 +0,0 @@
-'use strict';
-var vk; // 全局vk实例
-// 涉及的表名
-const dbName = {
-    //test: "vk-test", // 测试表
-};
-
-var db = uniCloud.database(); // 全局数据库引用
-var _ = db.command; // 数据库操作符
-var $ = _.aggregate; // 聚合查询操作符
-/**
- * 权限注意：访问以下链接查看
- * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#内置权限
- */
-var cloudObject = {
-    isCloudObject: true, // 标记为云对象模式
-    /**
-     * 请求前处理，主要用于调用方法之前进行预处理，一般用于拦截器、统一的身份验证、参数校验、定义全局对象等。
-     * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#before-预处理
-     */
-    _before: async function () {
-        vk = this.vk; // 将vk定义为全局对象
-        // let { customUtil, uniID, config, pubFun } = this.getUtil(); // 获取工具包
-    },
-    /**
-     * 请求后处理，主要用于处理本次调用方法的返回结果或者抛出的错误
-     * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#after-后处理
-     */
-    _after: async function (options) {
-        let {err, res} = options;
-        if (err) {
-            return; // 如果方法抛出错误，直接return;不处理
-        }
-        return res;
-    },
-    /**
-     * 获取列表
-     * @url client/payment.getList 前端调用的url参数地址
-     */
-    pub_payNotify: async function (data) {
-        let res = {code: 0, msg: ''};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const order = await vk.baseDao.findByWhereJson({
-            dbName: "jjx-order",
-            whereJson: {
-                orderNo: data.billNo,
-            }
-        });
-
-        // type 0: 商品
-        // type 1: 自营
-        // type 2: 保证金
-        // type 3: 会员升级
-
-        if (order && order.orderStatus === 0 && data.billStatus === 'PAID') {
-            const billPayment = JSON.parse(data.billPayment)
-            await vk.baseDao.updateById({
-                dbName: "jjx-order",
-                id: order._id,
-                dataJson: {
-                    orderStatus: 1,
-                    payTime: billPayment.payTime,
-                    payAmount: parseFloat(billPayment.receiptAmount) / 100,
-                    payNo: billPayment.paySeqId,
-                }
-            });
-
-            if (order.type === 2) {
-                await vk.baseDao.updateById({
-                    dbName: "uni-id-users",
-                    id: order.uid,
-                    dataJson: {
-                        paidEnsure: _.inc(parseFloat(billPayment.receiptAmount) / 100),
-                    }
-                });
-            } else if (order.type === 3) {
-                const goods = await vk.baseDao.findByWhereJson({
-                    dbName: "jjx-goods",
-                    whereJson: {
-                        orderId: order._id,
-                    }
-                });
-                await vk.baseDao.updateById({
-                    dbName: "uni-id-users",
-                    id: order.uid,
-                    dataJson: {
-                        userLevel: goods.goodsId,
-                        userGrade: 0
-                    }
-                });
-                const user = await vk.baseDao.findById({
-                    dbName: "uni-id-users",
-                    id: order.uid
-                });
-                if (user.inviter_uid && user.inviter_uid.length > 0) {
-                    await vk.baseDao.updateById({
-                        dbName: "uni-id-users",
-                        id: user.inviter_uid[0],
-                        dataJson: {
-                            inviteNum: _.inc(1)
-                        }
-                    });
-                }
-                const messageConfig = await vk.baseDao.find({
-                    dbName: "jjx-message-config",
-                    dataJson: {
-                        uid: order.uid
-                    }
-                });
-
-                if (!messageConfig) {
-                    await vk.baseDao.add({
-                        dbName: "jjx-message-config",
-                        dataJson: {
-                            uid: order.uid,
-                            article: true,
-                            process: true,
-                            old: true,
-                            enquiry: true,
-                            productList: [],
-                            addressRegion: {}
-                        }
-                    })
-                }
-            }
-        }
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    },
-    /**
-     * 模板函数
-     * @url client/payment.test 前端调用的url参数地址
-     */
-    test: async function (data) {
-        let res = {code: 0, msg: ''};
-        let {uid} = this.getClientInfo(); // 获取客户端信息
-        // 业务逻辑开始-----------------------------------------------------------
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    },
-};
-
-module.exports = cloudObject;
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/add.js
deleted file mode 100644
index 4d30158..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/add.js
+++ /dev/null
@@ -1,77 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 新增加工单
-	 * @url client/process/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let {
-			data = {}, userInfo, util, filterResponse, originalParam
-		} = event;
-		let {
-			customUtil,
-			uniID,
-			config,
-			pubFun,
-			vk,
-			db,
-			_
-		} = util;
-		let {
-			uid,
-			title,
-			address,
-			files,
-			remark,
-			invoice,
-			writeInvoiceTime,
-			nvoiceType,
-			transportDocuments,
-			transportLimit,
-			tradeMethod,
-			payMethod,
-			advancePayRate,
-			otherPayMethod,
-			reputationPayDay,
-			answerTime,
-			earnestMoney,
-			status
-		} = data;
-		let res = {
-			code: 0,
-			msg: "添加成功"
-		};
-		// 业务逻辑开始-----------------------------------------------------------
-		res.id = await vk.baseDao.add({
-			dbName: '',
-			dataJson:{
-				title,
-				address,
-				files,
-				remark,
-				invoice,
-				writeInvoiceTime,
-				nvoiceType,
-				transportDocuments,
-				otherTransportDocuments,
-				transportLimit,
-				tradeMethod,
-				payMethod,
-				advancePayRate,
-				otherPayMethod,
-				reputationPayDay,
-				answerTime,
-				earnestMoney,
-				status,
-				answerNumber: 0,
-				userId: uid
-			}
-		});
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/addQuote.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/addQuote.js
deleted file mode 100644
index 0939457..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/kh/addQuote.js
+++ /dev/null
@@ -1,65 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 新增报价
-	 * @url client/process/quote/kh/addQuote 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        const dbName = 'jjx-process-quote'
-        await vk.baseDao.add({
-            dbName,// 表名
-            dataJson: { // 需要新增的数据 json格式
-                ...data,
-                ...{
-                    userId: data.uid,
-                    status: 0
-                }
-            }
-        });
-
-        vk.baseDao.update({
-            dbName: "jjx-process-sheet",// 表名
-            whereJson: {
-                _id: data.sheetId,
-            },
-            dataJson: {
-                quoteNum: _.inc(1)
-            }
-        })
-
-        const messageUserList = await vk.baseDao.select({
-            dbName: "jjx-message-config",
-            whereJson: {
-                process: true
-            }
-        })
-        const messageList = []
-        for (let i = 0; i < messageUserList.rows.length; i++) {
-            if (messageUserList.rows[i].uid !== uid) {
-                messageList.push({
-                    uid: messageUserList.rows[i].uid,
-                    title: `加工:${data.title}`,
-                    content: `新的加工信息发布，赶紧去看看吧`,
-                    type: 'old',
-                    hasRead: false,
-                    pk: res.id
-                })
-            }
-        }
-        await vk.baseDao.adds({
-            dbName: "jjx-message",
-            dataJson: messageList
-        });
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/pub/getList.js
deleted file mode 100644
index 46912b6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/quote/pub/getList.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 获取加工单
-	 * @url client/process/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/add.js
deleted file mode 100644
index bc49624..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/add.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-const dbName = require('../../../../../dao/config.js')
-module.exports = {
-    /**
-     * 新增加工单
-     * @url client/process/kh/add 前端调用的url参数地址
-     * data 请求参数
-     * @param event
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        let dbName = "jjx-process-sheet";
-        res.id = await vk.baseDao.add({
-            dbName,
-            dataJson: {
-                ...data,
-                ...{
-                    userId: data.uid,
-                    quoteNum: 0,
-                    status: 0,
-                }
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/changeToOnlineSign.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/changeToOnlineSign.js
deleted file mode 100644
index ddd3616..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/changeToOnlineSign.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/enquiry/sheet/kh/changeToOnlineSign 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: "jjx-process-sheet",
-            id: data.id,
-            dataJson: {
-                signMethod: 0,
-            }
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getInfo.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getInfo.js
deleted file mode 100644
index 199a715..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getInfo.js
+++ /dev/null
@@ -1,62 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 加工详情
-     * @url client/process/sheet/pub/getInfo 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const dbName = "jjx-process-sheet";
-        const quoteDbName = "jjx-process-quote";
-        const userDbName = "uni-id-users";
-
-        res = await vk.baseDao.findById({
-            dbName, id: data.id
-        })
-
-        res.quoteList = await vk.baseDao.selects({
-            dbName: quoteDbName,
-            whereJson: {
-                sheetId: data.id,
-            },
-            foreignDB: [
-                {
-                    dbName: "uni-id-users",
-                    localKey: "userId",
-                    foreignKey: "_id",
-                    as: "user",
-                    limit: 1, // limit=1则以对象形式返回
-                    fieldJson: {
-                        _id: true,
-                        company: {
-                            companyName: true,
-                            mobile: true,
-                        },
-                        person: {
-                            personName: true,
-                            mobile: true,
-                        },
-                        businessCard: true,
-                        accountType: true,
-                    },
-                }
-            ]
-        })
-
-        res.user = await vk.baseDao.findById({
-            dbName: userDbName,
-            id: res.userId
-        })
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.js
deleted file mode 100644
index 06bce98..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.js
+++ /dev/null
@@ -1,140 +0,0 @@
-'use strict';
-const dbName = require('../../../../../dao/config.js')
-module.exports = {
-    /**
-     * 获取加工单
-     * @url client/process/pub/getList 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes, formData, status} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        const dbName = "jjx-process-sheet";
-        const whereJson = {};
-
-        if (vk.pubfn.isNotNull(keyword)) {
-            whereJson.name = new RegExp(keyword)
-        }
-        if (vk.pubfn.isNotNull(userId)) {
-            whereJson.userId = userId
-        }else {
-            whereJson.status = 0
-        }
-
-        if (formData && formData.hasOwnProperty('companyList') && vk.pubfn.isNotNull(formData.companyList)) {
-            whereJson.userId = _.in(formData.companyList)
-        }
-
-        if (formData && formData.hasOwnProperty('categoryIds') && vk.pubfn.isNotNull(formData.categoryIds)) {
-            whereJson.productList = _.in(formData.categoryIds)
-        }
-
-        if (vk.pubfn.isNotNull(provinceCodes)) {
-            whereJson['address.province.code'] = _.in(provinceCodes)
-        }
-
-        if (vk.pubfn.isNotNull(status) && status !== 'all') {
-            if (status === 'noQuote') whereJson.quoteNum = 0
-            else if (status === 'notPick') whereJson.status = 0
-            else if (status === 'picked') whereJson.status = 1
-        }
-
-        res = await vk.baseDao.selects({
-            dbName,
-            pageIndex,
-            pageSize,
-            whereJson,
-            sortArr:[{ name:"_add_time", type:"desc" }],
-            foreignDB: [
-                {
-                    dbName: "uni-id-users",
-                    localKey: "userId",
-                    foreignKey: "_id",
-                    as: "user",
-                    limit: 1, // limit=1则以对象形式返回
-                    fieldJson: {
-                        _id: true,
-                        company: {
-                            companyName: true
-                        },
-                        person: {
-                            personName: true
-                        },
-                        businessCard: true,
-                        accountType: true,
-                    },
-                }
-            ]
-        });
-
-        for (const item of res.rows) {
-            item.quoteList = await vk.baseDao.selects({
-                dbName: 'jjx-process-quote',
-                whereJson: {
-                    sheetId: item._id,
-                },
-                foreignDB: [
-                    {
-                        dbName: "uni-id-users",
-                        localKey: "userId",
-                        foreignKey: "_id",
-                        as: "user",
-                        limit: 1, // limit=1则以对象形式返回
-                        fieldJson: {
-                            _id: true,
-                            company: {
-                                companyName: true,
-                                mobile: true,
-                            },
-                            person: {
-                                personName: true,
-                                mobile: true,
-                            },
-                            businessCard: true,
-                            accountType: true,
-                        },
-                    }
-                ]
-            })
-        }
-
-        res.notPickNum = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-                status: 0
-            },
-        });
-
-        res.pickedNum = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-                status: 1
-            },
-        });
-
-
-        res.noQuoteNum = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-                quoteNum: 0
-            },
-        });
-
-        res.all = await vk.baseDao.count({
-            dbName,
-            whereJson: {
-                userId: uid,
-            },
-        });
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/pub.test.js b/uniCloud-aliyun/cloudfunctions/router/service/client/pub.test.js
deleted file mode 100644
index 1f1de17..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/pub.test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * 此为云对象模式，可以在这一个对象中写多个函数，具体文档请查看
- * https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html
- */
-'use strict';
-var vk; // 全局vk实例
-// 涉及的表名
-const dbName = {
-	//test: "vk-test", // 测试表
-};
-
-var db = uniCloud.database(); // 全局数据库引用
-var _ = db.command; // 数据库操作符
-var $ = _.aggregate; // 聚合查询操作符
-/**
- * 权限注意：访问以下链接查看
- * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#内置权限
- */
-var cloudObject = {
-	isCloudObject: true, // 标记为云对象模式
-	/**
-	 * 请求前处理，主要用于调用方法之前进行预处理，一般用于拦截器、统一的身份验证、参数校验、定义全局对象等。
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#before-预处理
-	 */
-	_before: async function() {
-		vk = this.vk; // 将vk定义为全局对象
-		// let { customUtil, uniID, config, pubFun } = this.getUtil(); // 获取工具包
-	},
-	/**
-	 * 请求后处理，主要用于处理本次调用方法的返回结果或者抛出的错误
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#after-后处理
-	 */
-	_after: async function(options) {
-		let { err, res } = options;
-		if (err) {
-			return; // 如果方法抛出错误，直接return;不处理
-		}
-		return res;
-	},
-	/**
-	 * 模板函数
-	 * @url client/pub.test.getInfo 前端调用的url参数地址
-	 */
-	getInfo: async function(data) {
-		let { uid } = this.getClientInfo(); // 获取客户端信息
-		let userInfo = await this.getUserInfo(); // 获取当前登录的用户信息
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		console.log("getInfo请求参数", data);
-		res.userInfo = userInfo; // 返回前端当前登录的用户信息
-		
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * 模板函数
-	 * @url client/pub.test.getList 前端调用的url参数地址
-	 */
-	getList: async function(data) {
-		let { uid, filterResponse, originalParam } = this.getClientInfo(); // 获取客户端信息
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		console.log("getList请求参数", data);
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * 云对象调用自身函数
-	 * @url client/pub.test.test1 前端调用的url参数地址
-	 */
-	test1: async function(data) {
-		let { uid, filterResponse, originalParam } = this.getClientInfo(); // 获取客户端信息
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		console.log("test1请求参数", data);
-		let res1 = await this.getInfo(data);
-		console.log("res1", res1);
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * 云对象调用任意云对象或云函数
-	 * @url client/pub.test.test2 前端调用的url参数地址
-	 */
-	test2: async function(data) {
-		let { uid, filterResponse, originalParam } = this.getClientInfo(); // 获取客户端信息
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		console.log("test2请求参数", data);
-		let callRes = await vk.callFunction({
-			url: 'client/pub.test.getInfo',
-			clientInfo: this.getClientInfo(),
-			data: {
-				a:1
-			},
-		});
-		console.log("callRes", callRes);
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-};
-
-module.exports = cloudObject;
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/add.js
deleted file mode 100644
index 0066e6d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/add.js
+++ /dev/null
@@ -1,73 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-	/**
-	 * 添加印章
-	 * @url client/seal/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, imageBase64, imageUrl, remark, type, enable, } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		const {fadadaCustomerId}  = userInfo
-		
-		// 上传印章
-		
-		
-		
-		
-		
-		const fadadaRes = await pubFun.fadada('add_signature.api', {
-			customer_id: fadadaCustomerId,
-			signature_img_base64: imageBase64
-		})
-		
-		if(fadadaRes.code != 1 ) {
-			
-			return {
-				code: -1,
-				msg: fadadaRes.msg
-			}
-		}
-		
-		await vk.baseDao.update({
-			dbName: dbName.seal,
-			whereJson: {
-				_id : _.exists(true),
-			},
-			dataJson: {
-				isDefault: false
-			}
-		})
-		
-		const sealId = await vk.baseDao.add({
-			dbName: dbName.seal,
-			dataJson: {
-				imageUrl: imageUrl,
-				remark,
-				type,
-				enable,
-				isDefault: true,
-				fadadaSealId: fadadaRes.data.signature_id,
-				userId: uid
-			}
-		})
-		
-		vk.baseDao.update({
-			dbName: dbName.user,
-			whereJson: {
-				_id: uid
-			},
-			dataJson: {
-				fadadaSealId: fadadaRes.data.signature_id
-			}
-		})
-		res.data = fadadaRes
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/delete.js
deleted file mode 100644
index 1b471b2..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/delete.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-	/**
-	 * 删除印章
-	 * @url client/seal/kh/delete 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, _id } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		await vk.baseDao.delete({
-			dbName: dbName.seal,
-			whereJson: {
-				_id
-			}
-		})
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/getList.js
deleted file mode 100644
index e049fb3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/getList.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-	/**
-	 * 获取印章列表
-	 * @url client/seal/kh/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, pageIndex, pageSize } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		res = await vk.baseDao.selects({
-			dbName: dbName.seal,
-			pageIndex,
-			pageSize,
-			whereJson: {
-				userId: uid
-			}
-		})
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/update.js b/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/update.js
deleted file mode 100644
index 5fe7ea0..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/seal/kh/update.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-const dbName = require('../../../../dao/config.js')
-module.exports = {
-	/**
-	 * 更新印章
-	 * @url client/seal/kh/update 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, _id, imageUrl, remark, type, enable, isDefault } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		if(isDefault) {
-			await vk.baseDao.update({
-				dbName: dbName.seal,
-				dataJson: {
-					isDefault: false
-				}
-			})
-		}
-		await vk.baseDao.update({
-			dbName: dbName.seal,
-			whereJson: {
-				_id
-			},
-			dataJson: {
-				image,
-				remark,
-				type,
-				isDefault
-			}
-		})
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/selfSupport/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/selfSupport/kh/add.js
deleted file mode 100644
index d8ccbb4..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/selfSupport/kh/add.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/selfSupport/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.add({
-            dbName: "jjx-self-support",
-            dataJson: data
-        })
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/selfSupport/kh/addOrder.js b/uniCloud-aliyun/cloudfunctions/router/service/client/selfSupport/kh/addOrder.js
deleted file mode 100644
index c64eea8..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/selfSupport/kh/addOrder.js
+++ /dev/null
@@ -1,80 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/selfSupport/kh/addOrder 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, contentList, amountList, type} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const configList = await vk.baseDao.select({
-            dbName: "jjx-coop-config",
-            whereJson: {
-                type
-            }
-        })
-
-        const goodsList = []
-        let amount = 0
-        configList.rows.forEach(config => {
-            config.contents.forEach(content => {
-                if (content.amountList) {
-                    content.amountList.forEach(amountItem => {
-                        if (amountList.includes(amountItem._index)) {
-                            amount += amountItem.amount
-                            goodsList.push({
-                                goodsName: `${config.name}-${content.title}-${amountItem.title}`,
-                                num: 1,
-                                goodsPrice: amountItem.amount,
-                                goodsCover: null,
-                                goodsId: null,
-                            })
-                        }
-                    })
-                }
-            })
-        })
-
-        const orderId = await vk.baseDao.add({
-            dbName: "jjx-order",
-            dataJson: {
-                orderNo: vk.pubfn.createOrderNo("SP", 20),
-                uid,
-                orderStatus: 0,
-                type: 1,
-                amount: amount * contentList.length,
-            }
-        })
-
-        goodsList.forEach((item, index) => {
-            goodsList[index].orderId = orderId
-        })
-
-        await vk.baseDao.adds({
-            dbName: "jjx-order-goods",
-            dataJson: goodsList
-        })
-
-        contentList.forEach((item, index) => {
-            contentList[index].orderId = orderId
-        })
-
-        console.log('contentList', contentList)
-
-        await vk.baseDao.adds({
-            dbName: "jjx-order-self-product",
-            dataJson: contentList
-        })
-
-        res.data = orderId
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/category/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/category/pub/getList.js
deleted file mode 100644
index 391d481..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/category/pub/getList.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 查询商品分类列表
-	 * @url client/product/category/pub/getAll 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, whereJson } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-spot-category";
-		res.data = await vk.baseDao.selects({
-			dbName,
-			getMain: true,
-			whereJson
-		});
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/category/pub/getTree.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/category/pub/getTree.js
deleted file mode 100644
index c138b06..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/category/pub/getTree.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 查询商品分类列表
-	 * @url client/product/category/pub/getAll 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let dbName = "jjx-spot-category";
-		res = await vk.baseDao.selects({
-		  dbName,
-		  pageIndex: 1,
-		  pageSize: 500,
-		  whereJson:{
-		    parent_id: _.in([null, ""]),
-		    _id: _.exists(true)
-		  },
-		  sortArr: [{ name: "sort", type: "asc" }],
-		  // 树状结构参数
-		  treeProps: {
-		    id: "_id",          // 唯一标识字段，默认为 _id
-		    parent_id: "parent_id", // 父级标识字段，默认为 parent_id
-		    children: "children",   // 自定义返回的下级字段名，默认为 children
-		    level: 3,               // 查询返回的树的最大层级。超过设定层级的节点不会返回。默认10级，最大15，最小1
-		    limit: 500,             // 每一级最大返回的数据。
-		    whereJson: {
-		    }
-		  }
-		});
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addCooperate.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addCooperate.js
deleted file mode 100644
index be49fdc..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addCooperate.js
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 申请合作
-	 * @url client/spot/goods/kh/addCooperate 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid,company,manager,person,accountType, goodsUserId, goodsId,remark } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let info = await vk.baseDao.findByWhereJson({
-		  dbName:"jjx-goods-cooperate",
-		  whereJson:{
-		    userId: uid,
-			goodsId: goodsId
-		  }
-		});
-		
-		if(info != null) {
-			return {
-				code: -1,
-				msg: '您已经申请过了'
-			}
-		}
-		
-		let subjectName = ''
-		let subjectMobile = ''
-		let managerName = ''
-		let managerMobile = ''
-		
-		if(accountType == 1) {
-			subjectName = person.personName
-			subjectMobile = person.mobile
-		}else {
-			subjectName = company.companyName
-			subjectMobile = company.legalMobile
-			if(manager.mobile && manager.personName){
-				managerName = manager.personName
-				managerMobile = manager.mobile
-			}
-		}
-		
-		res.data = await vk.baseDao.add({
-		  dbName:"jjx-goods-cooperate",// 表名
-		  dataJson:{ // 需要新增的数据 json格式
-			userId: uid,
-			goodsUserId: goodsUserId,
-			goodsId: goodsId,
-			company,
-			manager,
-			person,
-			accountType,
-			status: 0,
-			subjectName,
-			subjectMobile,
-			managerName,
-			managerMobile,
-			remark
-		  }
-		});
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addUpdate.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addUpdate.js
deleted file mode 100644
index 67ab1ca..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/addUpdate.js
+++ /dev/null
@@ -1,57 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 新增或更新现货
-     * @url client/product/goods/kh/addUpdate 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        const dbName = 'jjx-spot-goods'
-        let {_id, name, categoryIds, address, stock, files} = data
-        // 业务逻辑开始-----------------------------------------------------------
-        let info = await vk.baseDao.findByWhereJson({
-            dbName,
-            whereJson: {
-                userId: uid,
-            }
-        });
-
-        if (info == null) {
-            await vk.baseDao.add({
-                dbName,
-                dataJson: {
-                    name,
-                    categoryIds,
-                    address,
-                    stock,
-                    files,
-                    userId: uid,
-                    sort: 0,
-                    status: 0
-                }
-            });
-        } else {
-            await vk.baseDao.updateById({
-                dbName,
-                id: info._id,
-                dataJson: {
-                    name,
-                    categoryIds,
-                    address,
-                    stock,
-                    files,
-                    status: 0
-                }
-            });
-        }
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/getSelfOne.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/getSelfOne.js
deleted file mode 100644
index 0441d0d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/kh/getSelfOne.js
+++ /dev/null
@@ -1,55 +0,0 @@
-'use strict';
-const dbName = 'jjx-spot-goods'
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/spot/goods/kh/getSelfOne 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-        res = await vk.baseDao.selects({
-            dbName,
-            whereJson: {
-                userId: uid,
-            },
-            limit: 1,
-            foreignDB: [
-                {
-                    dbName: "jjx-goods-cooperate",
-                    localKey: "_id",
-                    foreignKey: "goodsId",
-                    as: "cooperateList",
-                    limit: 500, // limit=1则以对象形式返回
-                    foreignDB: [{
-                        dbName: "uni-id-users",
-                        localKey: "userId",
-                        foreignKey: "_id",
-                        as: "user",
-                        limit: 1, // limit=1则以对象形式返回
-                        fieldJson: {
-                            _id: true,
-                            company: {
-                                companyName: true
-                            },
-                            person: {
-                                personName: true
-                            },
-                            businessCard: true,
-                            accountType: true,
-                        },
-                    },
-                    ]
-                }]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getDetail.js
deleted file mode 100644
index 4c45da6..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getDetail.js
+++ /dev/null
@@ -1,93 +0,0 @@
-'use strict';
-const dbName = 'jjx-spot-goods'
-module.exports = {
-    /**
-     * XXXnameXXX
-     * @url client/spot/goods/kh/getDetail 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {
-            data = {}, userInfo, util, filterResponse, originalParam
-        } = event;
-        let {
-            customUtil,
-            uniID,
-            config,
-            pubFun,
-            vk,
-            db,
-            _
-        } = util;
-        let {
-            uid
-        } = data;
-        let res = {
-            code: 0,
-            msg: ""
-        };
-        // 业务逻辑开始-----------------------------------------------------------
-        const {
-            _id
-        } = data
-        res.data = await vk.baseDao.selects({
-            dbName,
-            getOne: true,
-            getMain: true,
-            // 主表where条件
-            whereJson: {
-                _id: _id
-            },
-            foreignDB: [{
-                dbName: "uni-id-users",
-                localKey: "userId",
-                foreignKey: "_id",
-                as: "user",
-                limit: 1, // limit=1则以对象形式返回
-                fieldJson: {
-                    _id: true,
-                    company: {
-                        companyName: true
-                    },
-                    person: {
-                        personName: true
-                    },
-                    businessCard: true,
-                    accountType: true,
-                },
-            },
-                {
-                    dbName: "jjx-goods-cooperate",
-                    localKey: "_id",
-                    foreignKey: "goodsId",
-                    as: "cooperateList",
-                    limit: 500, // limit=1则以对象形式返回
-                    foreignDB: [{
-                        dbName: "uni-id-users",
-                        localKey: "userId",
-                        foreignKey: "_id",
-                        as: "user",
-                        limit: 1, // limit=1则以对象形式返回
-                        fieldJson: {
-                            _id: true,
-                            company: {
-                                companyName: true
-                            },
-                            person: {
-                                personName: true
-                            },
-                            businessCard: true,
-                            accountType: true,
-                        },
-                    },
-                    ]
-                }
-            ]
-        });
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getList.js
deleted file mode 100644
index 8d74b5d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/spot/goods/pub/getList.js
+++ /dev/null
@@ -1,72 +0,0 @@
-'use strict';
-const dbName = 'jjx-spot-goods'
-module.exports = {
-	/**
-	 * 查询现货列表
-	 * @url client/spot/goods/kh/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		const {keyword, categoryIds,provinceCodes,pageIndex,pageSize } = data
-		
-		let whereJson = {};
-		
-		if(vk.pubfn.isNotNull(keyword)) {
-			whereJson.name = new RegExp(keyword)
-		}
-		if(vk.pubfn.isNotNull(categoryIds)) {
-			whereJson.categoryIds = _.in(categoryIds)
-		}
-		
-		if(vk.pubfn.isNotNull(categoryIds)) {
-			whereJson.categoryIds = _.in(categoryIds)
-		}
-		
-		if(vk.pubfn.isNotNull(provinceCodes)) {
-			whereJson['address.province.code'] = _.in(provinceCodes)
-		}
-		
-		res = await vk.baseDao.selects({
-		  dbName,
-		  getCount:false,
-		  pageIndex,
-		  pageSize,
-		  // 主表where条件
-		  whereJson: whereJson,
-		  // 主表字段显示规则
-		  fieldJson:{},
-		  // 主表排序规则
-		  sortArr:[{ name:"sort", type:"desc" }],
-		  foreignDB: [
-			  {
-				dbName:"uni-id-users",
-				localKey:"userId",
-				foreignKey:"_id",
-				as:"user",
-				limit:1, // limit=1则以对象形式返回
-				fieldJson:{
-				    _id: true,
-				    company: {
-						companyName: true
-					}, 
-				    person: {
-						personName: true
-					},
-					businessCard: true,
-					accountType: true,
-				},
-			  }
-		  ]
-		});
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/addAuth.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/addAuth.js
deleted file mode 100644
index 4e7fdb1..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/addAuth.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 手动认证
-	 * @url client/user/kh/addAuth 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        await vk.baseDao.updateById({
-            dbName: 'uni-id-users',
-            id: uid,
-            dataJson: data
-        })
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/exchangeUpgrade.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/exchangeUpgrade.js
deleted file mode 100644
index 9cd9d4a..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/exchangeUpgrade.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/user/kh/exchangeUpgrade 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        const userLevelConfig = await vk.baseDao.findById({
-			dbName: "jjx-user-level",
-            id: data.id
-		});
-
-        if(parseInt(userInfo.userLevel) < userLevelConfig.level) {
-            await vk.baseDao.updateById({
-                dbName: "uni-id-users",
-                id: uid,
-                dataJson: {
-                    userLevel: userLevelConfig.level
-                }
-            });
-        }
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/getFadadaRes.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/getFadadaRes.js
deleted file mode 100644
index 52e94af..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/getFadadaRes.js
+++ /dev/null
@@ -1,76 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/user/kh/getFadadaRes 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        let user = await vk.baseDao.findByWhereJson({
-            dbName: "uni-id-users",
-            whereJson: {
-                _id: uid,
-            }
-        });
-        let checkRes
-
-        if (user.accountType === 1) {
-            checkRes = await pubFun.fadada('find_personCertInfo.api', {
-                verified_serialno: user.fadadaVerify.transactionNo
-            })
-            console.log('fadada check checkRes:', checkRes)
-            // 认证结果
-            const {person} = checkRes.data
-            if(parseInt(checkRes.code) !== 1 || parseInt(person.status) !== 2) {
-                return
-            }
-        } else {
-            checkRes = await pubFun.fadada('find_companyCertInfo.api', {
-                verified_serialno: user.fadadaVerify.transactionNo
-            })
-            console.log('fadada check checkRes:', checkRes)
-            // 认证结果
-            const {company, manager} = checkRes.data
-            if(parseInt(checkRes.code) !== 1 || parseInt(company.status) !== 4 ||  parseInt(manager.status) !== 2) {
-                return
-            }
-
-        }
-
-
-        //  认证成功
-        await vk.baseDao.setById({
-            dbName: "fadada-verify-record",
-            dataJson: {
-                _id: user._id,
-                ...checkRes.data
-            }
-        })
-
-
-
-        await vk.baseDao.updateById({
-            dbName: "uni-id-users",
-            id: user._id,
-            dataJson: {
-                person: checkRes.data.person,
-                company: checkRes.data.company,
-                manager: checkRes.data.manager,
-                bankCard: checkRes.data.bankCard,
-                fadadaConfirm: true,
-                authStatus: 1
-            }
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/setBusinessCard.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/setBusinessCard.js
deleted file mode 100644
index 2959308..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/setBusinessCard.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 设置名片数据
-	 * @url client/user/kh/setBusinessCard 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-	
-		
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
deleted file mode 100644
index bc37c65..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-const dbName = require("../../../../dao/config");
-module.exports = {
-    /**
-     * 企业用户列表
-     * @url client/user/pub/getCompany 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {code: 0, msg: ""};
-        const whereJson = {
-            accountType: 2
-        }
-        if (!vk.pubfn.isNull(data.keyword)) whereJson['company.companyName'] = new RegExp(data.keyword);
-        if (!vk.pubfn.isNull(data.isCoop)) whereJson.isCoop = data.isCoop;
-        if (!vk.pubfn.isNull(data.province) && data.province && data.province.length > 0) {
-            whereJson['businessCard.address.province.code'] = _.in(data.province);
-        }
-        if (!vk.pubfn.isNull(data.city) && data.city && data.city.length > 0) {
-            whereJson['businessCard.address.city.code'] = _.in(data.city);
-        }
-        if (!vk.pubfn.isNull(data.mainSpotCategoryIds) && data.mainSpotCategoryIds && data.mainSpotCategoryIds.length > 0) {
-            whereJson['businessCard.mainSpotCategoryIds'] = _.in(data.mainSpotCategoryIds);
-        }
-        // 业务逻辑开始-----------------------------------------------------------
-        res = await vk.baseDao.select({
-            dbName: dbName.user,
-            whereJson,
-            pageSize: -1,
-            pageIndex: 1,
-            sortArr: [{"name": "_id", "type": "desc"}],
-        });
-        console.log('whereJson', whereJson)
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getDetail.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getDetail.js
deleted file mode 100644
index 48d26f1..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getDetail.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-module.exports = {
-    /**
-     * 获取企业详情
-     * @url client/user/pub/getDetail 前端调用的url参数地址
-     * data 请求参数
-     * @param {String} params1  参数1
-     */
-    main: async (event) => {
-        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
-        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
-        let {uid, _id} = data;
-        let res = {code: 0, msg: ""};
-        // 业务逻辑开始-----------------------------------------------------------
-
-        const dbName = "uni-id-users"
-        res.data = await vk.baseDao.selects({
-            dbName,
-            getOne: true,
-            getMain: true,
-            whereJson: {
-                _id
-            },
-            foreignDB: [
-                {
-                    dbName: 'jjx-spot-goods',
-                    localKey: "_id",
-                    foreignKey: "userId",
-                    as: "spotList",
-                },
-                {
-                    dbName: 'jjx-enquiry-sheet',
-                    localKey: "_id",
-                    foreignKey: "userId",
-                    as: "enquiryList",
-                },
-                {
-                    dbName: 'jjx-process-sheet',
-                    localKey: "_id",
-                    foreignKey: "userId",
-                    as: "processList",
-                }
-            ]
-        })
-
-
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getList.js
deleted file mode 100644
index 179f7d4..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getList.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 获取商家列表
-	 * @url client/user/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let { dcloud_appid, appids } = data.formData || {};
-		let whereJson = {
-			accountType: _.in([1, 2]),
-			fadadaConfirm: true
-		};
-		if (dcloud_appid) {
-			if (dcloud_appid === "___empty-array___") {
-				whereJson["dcloud_appid"] = [];
-			} else if (dcloud_appid === "___error___") {
-				whereJson["dcloud_appid"] = _.and(_.exists(true), _.nin(appids));
-			} else if (dcloud_appid === "___non-existent___") {
-				whereJson["dcloud_appid"] = _.exists(false);
-			} else {
-				whereJson["dcloud_appid"] = _.or(_.eq(dcloud_appid), _.exists(false));
-			}
-		}
-		let dbName = "uni-id-users";
-		res = await vk.baseDao.getTableData({
-			dbName,
-			data,
-			whereJson,
-			sortArr: [{ "name": "register_date", "type": "desc" }],
-			// 副表列表
-			foreignDB: [{
-				dbName: "opendb-app-list",
-				localKey: "dcloud_appid",
-				foreignKey: "appid",
-				localKeyType: "array",
-				as: "appList",
-				limit: 500
-			}],
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/test.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/test.js
deleted file mode 100644
index e17fbc0..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 此函数名称
-	 * @url client/user/pub/test 前端调用的url参数地址
-	 * data 请求参数
-	 * @params {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, originalParam } = event;
-		let { customUtil, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		// 可写与数据库的交互逻辑等等
-
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/userLevel/pub/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/userLevel/pub/getList.js
deleted file mode 100644
index b2eae5b..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/userLevel/pub/getList.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url client/userLevel/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-
-        res = await vk.baseDao.getTableData({
-            dbName: 'jjx-user-level',
-            sortArr: [
-                { name: "level", type: "asc" },
-            ],
-        });
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/muban_object.js b/uniCloud-aliyun/cloudfunctions/router/service/muban_object.js
deleted file mode 100644
index c9bdfd3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/muban_object.js
+++ /dev/null
@@ -1,67 +0,0 @@
-'use strict';
-var vk; // 全局vk实例
-// 涉及的表名
-const dbName = {
-	//test: "vk-test", // 测试表
-};
-
-var db = uniCloud.database(); // 全局数据库引用
-var _ = db.command; // 数据库操作符
-var $ = _.aggregate; // 聚合查询操作符
-/**
- * 权限注意：访问以下链接查看
- * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#内置权限
- */
-var cloudObject = {
-	isCloudObject: true, // 标记为云对象模式
-	/**
-	 * 请求前处理，主要用于调用方法之前进行预处理，一般用于拦截器、统一的身份验证、参数校验、定义全局对象等。
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#before-预处理
-	 */
-	_before: async function() {
-		vk = this.vk; // 将vk定义为全局对象
-		// let { customUtil, uniID, config, pubFun } = this.getUtil(); // 获取工具包
-	},
-	/**
-	 * 请求后处理，主要用于处理本次调用方法的返回结果或者抛出的错误
-	 * 文档地址：https://vkdoc.fsq.pub/client/uniCloud/cloudfunctions/cloudObject.html#after-后处理
-	 */
-	_after: async function(options) {
-		let { err, res } = options;
-		if (err) {
-			return; // 如果方法抛出错误，直接return;不处理
-		}
-		return res;
-	},
-	/**
-	 * 模板函数
-	 * @url client/muban.getInfo 前端调用的url参数地址
-	 */
-	getInfo: async function(data) {
-		let { uid } = this.getClientInfo(); // 获取客户端信息
-		let userInfo = await this.getUserInfo(); // 获取当前登录的用户信息
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		console.log("请求参数", data);
-		res.userInfo = userInfo; // 返回前端当前登录的用户信息
-		
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	},
-	/**
-	 * 模板函数
-	 * @url client/muban.getList 前端调用的url参数地址
-	 */
-	getList: async function(data) {
-		let { uid, filterResponse, originalParam } = this.getClientInfo(); // 获取客户端信息
-		let res = { code: 0, msg: '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		console.log("请求参数", data);
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-};
-
-module.exports = cloudObject;
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_inviter_uid.js b/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_inviter_uid.js
deleted file mode 100644
index c89d725..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_inviter_uid.js
+++ /dev/null
@@ -1,45 +0,0 @@
-module.exports = {
-	/**
-	 * 多表查询
-	 * @url template/db_api/pub/selects_inviter_uid 前端调用的url参数地址
-	 * data 请求参数 说明
-	 * res 返回参数说明
-	 * @params {Number} code 错误码，0表示成功
-	 * @params {String} msg 详细信息
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, originalParam } = event;
-		let { uniID, pubFun, vk, db, _, $ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		/**
-		 * 此为演示 使用数组下标对应的值进行连表，如用户表根据inviter_uid的第一个值进行连表查出第一个上级的用户信息
-		 */
-		res = await vk.baseDao.selects({
-			dbName: "uni-id-users",
-			getCount: false,
-			pageIndex: 1,
-			pageSize: 5,
-			fieldJson: {
-				token: false,
-				password: false
-			},
-			// 副表列表
-			foreignDB: [{
-				dbName: "uni-id-users",
-				localKey: $.arrayElemAt(['$inviter_uid', 0]),
-				foreignKey: "_id",
-				as: "inviterUserInfo",
-				limit: 1,
-				fieldJson: {
-					token: false,
-					password: false
-				},
-			}]
-		});
-		console.log(11, res.rows);
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/tree.js b/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/tree.js
deleted file mode 100644
index 7877dfa..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/tree.js
+++ /dev/null
@@ -1,36 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * XXXnameXXX
-	 * @url template/db_api/pub/tree 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		res = await vk.baseDao.getTableData({
-			dbName: "opendb-admin-menus",
-			whereJson:{
-				enable: true,
-				parent_id: null
-			},
-			// 树状结构参数
-			treeProps: {
-				id: "menu_id",          // 唯一标识字段，默认为 _id
-				parent_id: "parent_id", // 父级标识字段，默认为 parent_id
-				children: "children",   // 自定义返回的下级字段名，默认为 children
-				level: 3,               // 查询返回的树的最大层级。超过设定层级的节点不会返回。默认10级，最大15，最小1
-				limit: 500,             // 每一级最大返回的数据。
-				whereJson: {
-					enable: true
-				}
-			}
-		});
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/alipay/pub/code2Session.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/alipay/pub/code2Session.js
deleted file mode 100644
index da6c233..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/alipay/pub/code2Session.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * code2Session
-	 * @url template/openapi/alipay/pub/code2Session 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			code,
-		} = data;
-		let code2SessionRes = await vk.openapi.alipay.auth.code2Session({
-			code,
-			needKey: true
-		});
-		if (code2SessionRes.code !== 0) {
-			return code2SessionRes;
-		}
-		console.log('code2SessionRes: ', code2SessionRes);
-		res.openid = code2SessionRes.openid;
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/alipay/pub/getMiniCode.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/alipay/pub/getMiniCode.js
deleted file mode 100644
index ab85fd7..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/alipay/pub/getMiniCode.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 获取支付宝小程序码
-	 * @url template/openapi/alipay/pub/getMiniCode 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} path  小程序页面路径
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			page,
-			scene
-		} = data;
-		res = await vk.openapi.alipay.acode.getMiniCode(data);
-		res.base64 = res.qr_code_url_circle_white; // 兼容其他小程序的返回字段
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/code2Session.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/code2Session.js
deleted file mode 100644
index 45453f1..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/code2Session.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * code2Session
-	 * @url template/openapi/douyin/pub/code2Session 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			code,
-			anonymousCode
-		} = data;
-		let code2SessionRes = await vk.openapi.douyin.auth.code2Session({
-			code,
-			anonymousCode,
-			needKey: true
-		});
-		if (code2SessionRes.code !== 0) {
-			return code2SessionRes;
-		}
-		console.log('code2SessionRes: ', code2SessionRes);
-		res.openid = code2SessionRes.openid;
-		res.anonymousOpenid = code2SessionRes.anonymousOpenid;
-		res.unionid = code2SessionRes.unionid;
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/getMiniCode.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/getMiniCode.js
deleted file mode 100644
index 1c453a0..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/getMiniCode.js
+++ /dev/null
@@ -1,46 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 获取抖音小程序码
-	 * @url template/openapi/douyin/pub/getMiniCode 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} path  小程序页面路径
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			path
-		} = data;
-
-		res = await vk.openapi.douyin.acode.getMiniCode({
-			path
-		});
-		if (typeof res === "object" && res.code) {
-			return res;
-		}
-		try {
-			// 二进制转base64
-			let base64 = Buffer.from(res, 'binary').toString('base64');
-			return {
-				code: 0,
-				base64: `data:image/png;base64,${base64}`
-			};
-		} catch (err) {
-			// 转base64失败
-			return {
-				code: -1,
-				msg: "生成小程序码失败",
-				err: {
-					message: err.message,
-					stack: err.stack
-				}
-			};
-		}
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/imgSecCheck.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/imgSecCheck.js
deleted file mode 100644
index cf41883..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/imgSecCheck.js
+++ /dev/null
@@ -1,38 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 图片违规检测示例
-	 * @url template/openapi/douyin/pub/imgSecCheck 前端调用的url参数地址
-	 * data 请求参数 说明
-	 * res 返回参数说明
-	 * @params {Number} code 错误码，0表示成功
-	 * @params {String} msg 详细信息
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util } = event;
-		let { config, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let { base64 } = data;
-		/**
-		 * 实际开发中，图片可能是多张图，比如多达9张图
-		 * 如果在一个请求中循环检测，可能会超时。
-		 * 方案1：前端选择完图片就自动一张一张检测和上传（即9张图会有9个请求）
-		 * 方案2：使用Promise.all
-		 */
-		let imgSecCheckRes = await vk.openapi.douyin.security.imgSecCheck({
-			base64
-		});
-		if (imgSecCheckRes.code !== 0) {
-			// 未通过检测
-			return imgSecCheckRes;
-		}
-		// 若通过检测，则继续执行自己的业务
-		// ...
-		// ...
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/msgSecCheck.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/msgSecCheck.js
deleted file mode 100644
index 3b1aa99..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/douyin/pub/msgSecCheck.js
+++ /dev/null
@@ -1,36 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 文本违规检测示例
-	 * @url template/openapi/douyin/pub/msgSecCheck 前端调用的url参数地址
-	 * data 请求参数 说明
-	 * res 返回参数说明
-	 * @params {Number} code 错误码，0表示成功
-	 * @params {String} msg 详细信息
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util } = event;
-		let { config, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			content,
-		} = data;
-		// 实际业务中，content可能是评论的内容等
-		let msgSecCheckRes = await vk.openapi.douyin.security.msgSecCheck({
-			content,
-		});
-		if (msgSecCheckRes.code !== 0) {
-			// 未通过检测
-			return msgSecCheckRes;
-		}
-		res.result = msgSecCheckRes;
-		// 若通过检测，则继续执行自己的业务
-		// ...
-		// ...
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/code2Session.js b/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/code2Session.js
deleted file mode 100644
index 88c9616..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/code2Session.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * code2Session
-	 * @url template/openapi/qq/pub/code2Session 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
-		let {
-			code,
-			anonymousCode
-		} = data;
-		let code2SessionRes = await vk.openapi.qq.auth.code2Session({
-			code,
-			needKey: true
-		});
-		if (code2SessionRes.code !== 0) {
-			return code2SessionRes;
-		}
-		console.log('code2SessionRes: ', code2SessionRes);
-		res.openid = code2SessionRes.openid;
-		res.unionid = code2SessionRes.unionid;
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/setCertification.js b/uniCloud-aliyun/cloudfunctions/router/service/user/kh/setCertification.js
deleted file mode 100644
index fd8e98d..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/setCertification.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var CryptoJS = require("crypto-js");
-module.exports = {
-	/**
-	 * 绑定邮箱
-	 * @url user/kh/bindEmail 前端调用的url参数地址
-	 * @description 将当前登录用户绑定邮箱
-	 * data 请求参数 说明
-	 * @param {String} email 用户邮箱
-	 * res 返回参数说明
-	 * @param {Number} code 错误码，0表示成功
-	 * @param {String} msg 详细信息
-	 */
-	main: async (event) => {
-		let {
-			data = {}, util, userInfo
-		} = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let res = {
-			code: 0
-		};
-		
-		// const userInfo = await this.getUserInfo();
-		// 业务逻辑开始-----------------------------------------------------------
-		const {
-			realname,
-			address,
-			address_detail,
-			mail_address,
-			id_card_front,
-			id_card_back,
-			contact_mobile,
-			contact_qq,
-			contact_email,
-			contact_wechat_image,
-			contact_wechat,
-			bank_name,
-			bank_account_name,
-			bank_card,
-			screen_shot
-		} = data
-		// 验证实名信息
-		// const get_person_verify_url_res = await pubFun.fadada('get_person_verify_url.api', {
-		// 	customer_id: userInfo.fadada_customer_id,
-		// 	verified_way: 2,
-		// 	page_modify: 1
-		// })
-		
-		// let {transactionNo, url} = get_person_verify_url_res.data
-		let transactionNo = 'fe00569db2ac43709697df16be737d96'
-		let url = 'aHR0cHM6Ly9yZWFsbmFtZXZlcmlmeS10ZXN0LmZhZGFkYS5jb20vZmRkQXV0aGVudGljYXRpb25TZXJ2aWNlL3YxL2FwaS9zeW5zQXV0aGVudGljYXRpb24uYWN0aW9uP3RyYW5zYWN0aW9uX25vPTE3RTM0NDM3MzZDMDczODE5NDgyODQyRjcwMkYzQkI4NjNFMzQ3OTkwQjg4N0MxOUVFRkI1MjBEMkM2NjVFMDVFMDM3MEZFRjVBQTlBOEI3JnNpZ249UkRGQ1JERTJRVEpCUkRCRU9UUkRNRE16TURjMFJURTRPRVl4UWpZeFFqQXhOVGM0TXpNek5nPT0mYXBwX2lkPTQwNTk0MiZ0aW1lc3RhbXA9MTY5ODY2MTExMTg2Mg=='
-		var parsedWordArray = CryptoJS.enc.Base64.parse(url);
-		var parsedStr = parsedWordArray.toString(CryptoJS.enc.Utf8);
-		console.log("parsed:",parsedStr);
-
-		// 
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js
deleted file mode 100644
index c528ce0..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js
+++ /dev/null
@@ -1,119 +0,0 @@
-module.exports = {
-    /**
-     * 手机号登陆(手机号+手机验证码)
-     * @url user/pub/loginBySms 前端调用的url参数地址
-     * @description 手机号登陆(手机号+手机验证码)
-     * data 请求参数 说明
-     * @param {String} mobile 手机号
-     * @param {String} code 验证码
-     * @param {String} type 指定操作类型，不传：存在则登录不存在则注册 login：只能登录 register：只能注册
-     * @param {String} password 密码，当前用户为新注册时生效
-     * @param {String} inviteCode 邀请人的邀请码，当前用户为新注册时生效
-     * @param {String} myInviteCode 设置当前注册用户自己的邀请码，当前用户为新注册时生效（不传会自动生成）
-     * @param {Boolean} needPermission 设置为true时会在checkToken时返回用户权限（permission），如果是在admin端，需传true
-     * res 返回参数说明
-     * @param {Number} code 错误码，0表示成功
-     * @param {String} msg 详细信息
-     * @param {String} token 登录成功之后返回的token信息
-     * @param {String} tokenExpired token过期时间
-     */
-    main: async (event) => {
-        let {data = {}, util, originalParam} = event;
-        let {uniID, config, pubFun, vk, db, _} = util;
-        let {uid} = data;
-        let res = {};
-        // 业务逻辑开始-----------------------------------------------------------
-        let {
-            mobile,
-            code,
-            type,
-            password,
-            inviteCode,
-            myInviteCode,
-            needPermission,
-            accountType,
-            company,
-            person
-        } = data;
-        res = await uniID.loginBySms({
-            mobile,
-            code,
-            type,
-            password,
-            inviteCode,
-            myInviteCode,
-            needPermission
-        });
-        // 修改用户昵称为:手机尾号xxxx用户
-        if (res.token) {
-            if (!res.msg) {
-                res.msg = res.type === "register" ? "注册成功" : "登录成功";
-            }
-            // 注册法大大
-            if (res.type === "register") {
-                const fadadaRes = await pubFun.fadada('account_register.api', {
-                    open_id: res.uid + 'fdd',
-                    account_type: accountType + '',
-                })
-                console.log('fadadaRes: ', {
-                    open_id: res.uid + 'fdd',
-                    account_type: accountType + '',
-                });
-                console.log('fadadaRes: ', fadadaRes);
-                if (fadadaRes.code == 1) {
-                    await vk.baseDao.update({
-                        dbName: "uni-id-users",
-                        whereJson: {
-                            _id: res.uid
-                        },
-                        dataJson: {
-                            fadadaCustomerId: fadadaRes.data,
-                            quoteTimes: 0,
-                            person,
-                            company,
-                            accountType: accountType,
-                            nickname: accountType == 1 ? person.personName : company.companyName,
-                            authStatus: -1,
-                            userLevel: -1,
-                            userGrade: 0,
-                            paidEnsure: 0,
-                            // 累计交易
-                            transactionAmount: 0,
-                            inviteNum: 0,
-                        }
-                    });
-
-                } else {
-                    vk.baseDao.del({
-                        dbName: "uni-id-users",
-                        whereJson: {
-                            _id: res.uid
-                        },
-                    })
-                }
-
-                await vk.baseDao.add({
-                    dbName: "jjx-message",
-                    dataJson: {
-                        uid: res.uid,
-                        title: '恭喜！您已注册成功！',
-                        content: '尊敬的用户，恭喜您已经注册金久信钢铁交易平台，感谢您的支持！',
-                        type: 'reg',
-                        hasRead: false
-                    }
-                });
-
-            }
-            // 日志服务
-            const loginLogService = vk.require("service/user/util/login_log");
-            await loginLogService.add({
-                type: "login",
-                login_type: "sms",
-                user_id: res.uid,
-                context: originalParam.context
-            }, util);
-        }
-        // 业务逻辑结束-----------------------------------------------------------
-        return res;
-    }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/util/pubFunction.js b/uniCloud-aliyun/cloudfunctions/router/util/pubFunction.js
deleted file mode 100644
index 1e561a3..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/util/pubFunction.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * 自定义公共函数包
- * 这里可以写你自己的公共函数
- */
-var CryptoJS = require("crypto-js");
-const crypto = require('crypto');
-var pubFun = {};
-/**
- * 公共函数写法示例
- * 调用示例：
- * pubFun.test();
- * 或
- * vk.myfn.test();
- */
-pubFun.test = function(path) {
-	// 此处可以直接使用 vk 实例
-	let timeStr = vk.pubfn.timeFormat(new Date(), "yyyy-MM-dd hh:mm:ss");
-	// 逻辑
-	// ...
-	// 逻辑	
-	return {
-		timeStr,
-		msg: "这是公共函数test的返回"
-	}
-}
-
-const url = 'http://test.api.fabigbig.com:8888/api'
-const app_id = 405942
-const app_secret = 'ODDW0vm9FvDj2RYQRmoryVnH'
-
-const getFadadaSign = function(api, params, timestamp) {
-	const copyParams = {
-		...params
-	}
-	//1. A.将参与摘要计算的业务参数按字典升序排列
-	let computeKeys = Object.keys(params)
-
-	var sortedParams = computeKeys.sort().reduce((acc, curr, index) => {
-		acc += params[curr];
-		return acc;
-	}, '');
-
-	// 1.B.将 app_secret 附加到字符串串前
-	let str1 = app_secret + sortedParams
-	console.log('sortedParams: ',sortedParams);
-	if (api == 'generate_contract.api') {
-		str1 = app_secret + params.template_id + params.contract_id
-	} else if (api == 'uploaddocs.api') {
-		str1 = app_secret + params.contract_id
-	} else if (api == 'extsign.api') {
-		str1 = app_secret + params.customer_id
-	}
-
-
-	// 步骤 2.对得到的字符串进⾏SHA1 加密
-	const sha1_1 = CryptoJS.SHA1(str1).toString().toUpperCase()
-	console.log('sha1_1: ', sha1_1);
-	// 步骤 3.计算 timestamp的MD5值，并和app_id，步骤 2 中得到的字符串拼接得到新的字符串
-	let timestampMd5 = ''
-	if (api == 'extsign.api') {
-		timestampMd5 = CryptoJS.MD5(params.transaction_id + timestamp).toString().toUpperCase()
-	} else {
-		timestampMd5 = CryptoJS.MD5(timestamp).toString().toUpperCase()
-	}
-
-	let str2 = app_id + timestampMd5 + sha1_1
-	if (api == 'generate_contract.api') {
-		str2 += params.parameter_map
-	} else if (api == 'extsign.api') {
-
-	}
-
-	// 步骤 4.对步骤3中得到的字符串进行SHA1 加密
-	const str3 = CryptoJS.SHA1(str2).toString().toUpperCase()
-	// 步骤 5.对步骤 4 中得到的字符串进⾏base64 加密
-	var wordArray = CryptoJS.enc.Utf8.parse(str3);
-	const msg_digest = CryptoJS.enc.Base64.stringify(wordArray);
-
-	return msg_digest;
-
-}
-pubFun.getFadadaSign = getFadadaSign
-
-/**
- * 给法大大发请求
-
- * @param {Object} api
- * @param {Object} params
- */
-pubFun.fadada = async function(api, params) {
-
-
-
-	const timestamp = vk.pubfn.timeFormat(new Date(), "yyyyMMddhhmmss");
-	const msg_digest = getFadadaSign(api, params, timestamp)
-
-	const res = await vk.request({
-		url: url + '/' + api,
-		method: "POST",
-		header: {
-			"content-type": "application/x-www-form-urlencoded;charset=UTF-8",
-		},
-		data: {
-			app_id: app_id,
-			timestamp,
-			v: '2.0',
-			msg_digest,
-			...params
-		}
-	});
-	console.log('res: ', res);
-	return res;
-}
-
-function buildQueryString(params) {
-	let queryString = '';
-	for (const key in params) {
-		if (params.hasOwnProperty(key)) {
-			if (queryString.length > 0) {
-				queryString += '&';
-			}
-			queryString += `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`;
-		}
-	}
-	return queryString;
-}
-
-/**
- * 给法大大发请求
-
- * @param {Object} api
- * @param {Object} params
- */
-pubFun.fadadaUrl = function(api, params) {
-
-
-
-	const timestamp = vk.pubfn.timeFormat(new Date(), "yyyyMMddhhmmss");
-	const msg_digest = getFadadaSign(api, params, timestamp)
-
-	const queryParams = buildQueryString({
-		app_id: app_id,
-		timestamp,
-		v: '2.0',
-		msg_digest,
-		...params
-	});
-	const fullUrl = `${url}/${api}?${queryParams}`;
-
-
-	return fullUrl;
-}
-
-pubFun.base64ToFile = function(base64, fileName) {
-	
-}
-
-module.exports = pubFun;
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/config.js b/uniCloud-tcb/cloudfunctions/router/config.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/config.js
rename to uniCloud-tcb/cloudfunctions/router/config.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/index.js b/uniCloud-tcb/cloudfunctions/router/dao/index.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/dao/index.js
rename to uniCloud-tcb/cloudfunctions/router/dao/index.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/modules/userDao.js b/uniCloud-tcb/cloudfunctions/router/dao/modules/userDao.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/dao/modules/userDao.js
rename to uniCloud-tcb/cloudfunctions/router/dao/modules/userDao.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/index.js b/uniCloud-tcb/cloudfunctions/router/index.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/index.js
rename to uniCloud-tcb/cloudfunctions/router/index.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/middleware/index.js b/uniCloud-tcb/cloudfunctions/router/middleware/index.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/middleware/index.js
rename to uniCloud-tcb/cloudfunctions/router/middleware/index.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/middleware/modules/addAdminLog.js b/uniCloud-tcb/cloudfunctions/router/middleware/modules/addAdminLog.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/middleware/modules/addAdminLog.js
rename to uniCloud-tcb/cloudfunctions/router/middleware/modules/addAdminLog.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/middleware/modules/customFilter1.js b/uniCloud-tcb/cloudfunctions/router/middleware/modules/customFilter1.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/middleware/modules/customFilter1.js
rename to uniCloud-tcb/cloudfunctions/router/middleware/modules/customFilter1.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/middleware/modules/customFilter2.js b/uniCloud-tcb/cloudfunctions/router/middleware/modules/customFilter2.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/middleware/modules/customFilter2.js
rename to uniCloud-tcb/cloudfunctions/router/middleware/modules/customFilter2.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/middleware/modules/registerInitFilter.js b/uniCloud-tcb/cloudfunctions/router/middleware/modules/registerInitFilter.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/middleware/modules/registerInitFilter.js
rename to uniCloud-tcb/cloudfunctions/router/middleware/modules/registerInitFilter.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/middleware/modules/returnUserInfoFilter.js b/uniCloud-tcb/cloudfunctions/router/middleware/modules/returnUserInfoFilter.js
similarity index 97%
rename from uniCloud-aliyun/cloudfunctions/router/middleware/modules/returnUserInfoFilter.js
rename to uniCloud-tcb/cloudfunctions/router/middleware/modules/returnUserInfoFilter.js
index c39e975..1df61b9 100644
--- a/uniCloud-aliyun/cloudfunctions/router/middleware/modules/returnUserInfoFilter.js
+++ b/uniCloud-tcb/cloudfunctions/router/middleware/modules/returnUserInfoFilter.js
@@ -6,7 +6,6 @@
 
 module.exports = [{
 	id: "returnUserInfo",
-	// 符合下方正则条件的云函数才会进入该中间件
 	regExp: [
 		"^user/pub/login(.*)",
 		"^user/pub/register(.*)",
diff --git a/uniCloud-aliyun/cloudfunctions/router/package.json b/uniCloud-tcb/cloudfunctions/router/package.json
similarity index 80%
rename from uniCloud-aliyun/cloudfunctions/router/package.json
rename to uniCloud-tcb/cloudfunctions/router/package.json
index ac14b02..f7b7059 100644
--- a/uniCloud-aliyun/cloudfunctions/router/package.json
+++ b/uniCloud-tcb/cloudfunctions/router/package.json
@@ -1,7 +1,7 @@
 {
   "name": "router",
   "version": "1.0.0",
-  "description": "【开箱即用】vk-uniCloud-router - 云函数路由模式 - uniCloud开发框架 - 已集成uni-id",
+  "description": "在router目录下执行 npm i",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "crypto-js": "^4.2.0",
     "uni-config-center": "file:../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
     "uni-id": "file:../../../uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id",
     "vk-unicloud": "file:../../../uni_modules/vk-unicloud/uniCloud/cloudfunctions/common/vk-unicloud"
@@ -19,11 +18,11 @@
   "cloudfunction-config": {
     "concurrency": 1,
     "memorySize": 512,
-    "path": "/http/router",
+    "path": "",
     "timeout": 60,
     "triggers": [],
     "runtime": "Nodejs12",
     "keepRunningAfterReturn": false
   },
   "extensions": {}
-}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/router.param.json b/uniCloud-tcb/cloudfunctions/router/router.param.json
similarity index 84%
rename from uniCloud-aliyun/cloudfunctions/router/router.param.json
rename to uniCloud-tcb/cloudfunctions/router/router.param.json
index 580d5c7..1e0a277 100644
--- a/uniCloud-aliyun/cloudfunctions/router/router.param.json
+++ b/uniCloud-tcb/cloudfunctions/router/router.param.json
@@ -6,9 +6,8 @@
 
 {
 	"uni_id_token":"",
-	"$url":"template/db_api/pub/tree",
+	"$url":"template/openapi/weixin/pub/getTemplateList",
 	"data":{
-		"username":"admin",
-		"password":"123456"
+		
 	}
 }
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/kong/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/kong/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/select/kh/user.js b/uniCloud-tcb/cloudfunctions/router/service/admin/select/kh/user.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/select/kh/user.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/select/kh/user.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/addUpdate.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/addUpdate.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/addUpdate.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/addUpdate.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app-upgrade-center/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app-upgrade-center/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/createPublishHtml.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/createPublishHtml.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/createPublishHtml.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/createPublishHtml.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/getInfo.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/getInfo.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/getInfo.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/getInfo.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/index.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/index.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/index.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/index.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/lib/art-template.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/lib/art-template.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/lib/art-template.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/lib/art-template.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/template.html b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/template.html
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/template.html
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/createPublishHtml/template.html
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/app/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/app/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/adds.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/adds.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/adds.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/adds.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/bindPermission.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/bindPermission.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/bindPermission.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/bindPermission.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/getAll.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/getAll.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/getAll.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/getAll.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/getCascader.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/getCascader.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/getCascader.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/getCascader.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/updateBase.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/updateBase.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/sys/updateBase.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/sys/updateBase.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/menu/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/menu/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/getAll.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/getAll.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/getAll.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/getAll.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateBase.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/updateBase.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateBase.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/updateBase.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/permission/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/bindMenu.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/bindMenu.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/bindMenu.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/bindMenu.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/bindPermission.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/bindPermission.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/bindPermission.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/bindPermission.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/getList.js
similarity index 84%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/getList.js
index b8ef282..f99c35e 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/getList.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/getList.js
@@ -31,13 +31,7 @@ module.exports = {
 					foreignKey: "permission_id",
 					as: "permissionList",
 					limit: 500,
-					fieldJson: {
-						permission_id: true,
-						permission_name: true,
-						comment: true,
-						enable: true,
-						url: true
-					}
+					fieldJson: { permission_id:true, permission_name:true,comment:true, enable:true, url:true },
 				},
 				{
 					dbName: "opendb-admin-menus",
@@ -46,18 +40,12 @@ module.exports = {
 					foreignKey: "menu_id",
 					as: "menuList",
 					limit: 500,
-					fieldJson: {
-						menu_id: true,
-						name: true,
-						comment: true,
-						enable: true,
-						url: true
-					}
-				}
+					fieldJson: { menu_id:true, name:true,comment:true, enable:true, url:true },
+				},
 			]
 		});
 		// 业务逻辑结束-----------------------------------------------------------
 		return res;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/updateBase.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/updateBase.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/sys/updateBase.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/sys/updateBase.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/role/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/role/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/role/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/batchUpdateAppLogin.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/batchUpdateAppLogin.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/batchUpdateAppLogin.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/batchUpdateAppLogin.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/batchUpdateInviterUid.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/batchUpdateInviterUid.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/batchUpdateInviterUid.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/batchUpdateInviterUid.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/batchUpdateStatus.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/batchUpdateStatus.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/batchUpdateStatus.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/batchUpdateStatus.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/bindRole.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/bindRole.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/bindRole.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/bindRole.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/resetPassword.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/resetPassword.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/resetPassword.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/resetPassword.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system/user/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system/user/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system/user/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/admin-log/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/admin-log/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/admin-log/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/admin-log/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/components-dynamic/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/util/formRules.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/util/formRules.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/global-data/util/formRules.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/global-data/util/formRules.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/afreshNotice.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/afreshNotice.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/afreshNotice.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/afreshNotice.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/pay-orders/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/kh/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/kh/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/kh/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/kh/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/categories/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/delete.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/update.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-files/files/kh/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-log/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-log/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/system_uni/uni-id-log/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/admin/system_uni/uni-id-log/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/后台PC管理端.md b/uniCloud-tcb/cloudfunctions/router/service/admin/后台PC管理端.md
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/admin/后台PC管理端.md
rename to uniCloud-tcb/cloudfunctions/router/service/admin/后台PC管理端.md
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/小程序、h5、APP客户端.md b/uniCloud-tcb/cloudfunctions/router/service/client/小程序、h5、APP客户端.md
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/client/小程序、h5、APP客户端.md
rename to uniCloud-tcb/cloudfunctions/router/service/client/小程序、h5、APP客户端.md
diff --git a/uniCloud-tcb/cloudfunctions/router/service/common/公共逻辑（公共接口）.md b/uniCloud-tcb/cloudfunctions/router/service/common/公共逻辑（公共接口）.md
new file mode 100644
index 0000000..e69de29
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/muban.js b/uniCloud-tcb/cloudfunctions/router/service/muban.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/muban.js
rename to uniCloud-tcb/cloudfunctions/router/service/muban.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/muban_easy.js b/uniCloud-tcb/cloudfunctions/router/service/muban_easy.js
similarity index 78%
rename from uniCloud-aliyun/cloudfunctions/router/service/muban_easy.js
rename to uniCloud-tcb/cloudfunctions/router/service/muban_easy.js
index 8601279..0b95150 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/muban_easy.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/muban_easy.js
@@ -7,8 +7,8 @@ module.exports = {
 	 * @param {String} params1  参数1
 	 */
 	main: async (event) => {
-		let { data = {}, userInfo, util, originalParam } = event;
-		let { customUtil, config, pubFun, vk, db, _ } = util;
+		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
 		let { uid } = data;
 		let res = { code: 0, msg: "" };
 		// 业务逻辑开始-----------------------------------------------------------
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/baidu/client/pub/getAccessToken.js b/uniCloud-tcb/cloudfunctions/router/service/plugs/baidu/client/pub/getAccessToken.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/baidu/client/pub/getAccessToken.js
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/baidu/client/pub/getAccessToken.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/business_license.js b/uniCloud-tcb/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/business_license.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/business_license.js
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/business_license.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/idcard.js b/uniCloud-tcb/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/idcard.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/idcard.js
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/baidu/client/pub/ocr/idcard.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/getComponentsDynamicData.js b/uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/getComponentsDynamicData.js
similarity index 97%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/getComponentsDynamicData.js
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/getComponentsDynamicData.js
index 5aa19d7..dc8dfe7 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/getComponentsDynamicData.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/getComponentsDynamicData.js
@@ -20,11 +20,11 @@ module.exports = {
 		let res_select = await vk.baseDao.select({
 			dbName:"vk-components-dynamic",
 			getCount:false,
-			pageSize:500,
+			pageSize:100,
 			whereJson:{
 				data_id : _.in(ids)
 			},
-		});
+		}, event.util);
 		// 将数组形式 转换成 组件需要的格式
 		res.componentsDynamic = {};
 		for(let i in res_select.rows){
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/init.js b/uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/init.js
similarity index 71%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/init.js
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/init.js
index 43822d3..c32f528 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/init.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/init.js
@@ -32,14 +32,14 @@ module.exports = {
 			pageIndex:1,
 			pageSize:100,
 			whereJson:whereJson
-		});
+		}, event.util);
 		if(res.rows.length == data_ids.length){
 			return res;
 		}
 		await vk.baseDao.del({
 			dbName:dbName,
 			whereJson:whereJson
-		});
+		},event.util);
 		let dataArr = [
 			{
 			  "data_id": "vk-test-notice-bar-01",
@@ -78,16 +78,16 @@ module.exports = {
 			  "data": {
 			    "list": [
 			      {
-			      	"title": "标题11111111",
-			      	"image": "https://img0.baidu.com/it/u=1595128334,82706458&fm=26&fmt=auto&gp=0.jpg"
+			        "title": "标题11111111",
+			        "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1594798331539&di=fe544344d765e4f23f90457f02a2d361&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2F1%2F58f03bf05fddb.jpg%3Fdown"
 			      },
 			      {
-			      	"title": "标题2222222",
-			      	"image": "https://img2.baidu.com/it/u=3290011888,2972843018&fm=26&fmt=auto&gp=0.jpg"
+			        "title": "标题2222222",
+			        "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1594798658581&di=bcd5486940ad88cf88a904f411c53e94&imgtype=0&src=http%3A%2F%2Fn.sinaimg.cn%2Fsinacn15%2F600%2Fw1920h1080%2F20180505%2Fad66-hacuuvt5802647.jpg"
 			      },
 			      {
-			      	"title": "标题3333333",
-			      	"image": "https://img2.baidu.com/it/u=528808604,872300859&fm=26&fmt=auto&gp=0.jpg"
+			        "title": "标题3333333",
+			        "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1594798022306&di=ed613c19ef36df7856b383601acb2f05&imgtype=0&src=http%3A%2F%2Fimg.pconline.com.cn%2Fimages%2Fupload%2Fupc%2Ftx%2Fwallpaper%2F1306%2F17%2Fc1%2F22199754_1371460645988.jpg"
 			      }
 			    ],
 			    "height": 300
@@ -104,7 +104,7 @@ module.exports = {
 					"border":false,
 					"list":[
 						{
-							"icon":"red-packet",
+							"icon":"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1594798331539&di=fe544344d765e4f23f90457f02a2d361&imgtype=0&src=http%3A%2F%2Fpic1.win4000.com%2Fwallpaper%2F1%2F58f03bf05fddb.jpg%3Fdown",
 							"text":"按钮1",
 							"page":"../vk-u-notice-bar/vk-u-notice-bar"
 						},
@@ -130,7 +130,7 @@ module.exports = {
 		await vk.baseDao.adds({
 			dbName:dbName,
 			dataJson:dataArr
-		});
+		},event.util);
 
     // 业务逻辑结束-----------------------------------------------------------
     return res;
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/update.js b/uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/components_dynamic/client/pub/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/components_dynamic/client/pub/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/plugs/插件.md b/uniCloud-tcb/cloudfunctions/router/service/plugs/插件.md
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/plugs/插件.md
rename to uniCloud-tcb/cloudfunctions/router/service/plugs/插件.md
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/Promise.all.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/Promise.all.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/Promise.all.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/Promise.all.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/add.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/add.js
similarity index 60%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/add.js
index 659c4d8..5079bd7 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/add.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/add.js
@@ -1,20 +1,19 @@
 module.exports = {
-	/**
-	 * 添加单条数据
-	 * @url template/db_api/pub/add 前端调用的url参数地址
-	 * data 请求参数 说明
-	 * res 返回参数说明
-	 * @params {Number} code 错误码，0表示成功
-	 * @params {String} msg 详细信息
-	 */
-	main: async (event) => {
+  /**
+   * 添加单条数据
+   * @url template/db_api/pub/add 前端调用的url参数地址
+   * data 请求参数 说明
+   * res 返回参数说明
+   * @params {Number} code 错误码，0表示成功
+   * @params {String} msg 详细信息
+   */
+  main: async (event) => {
 		let { data = {}, userInfo, util, originalParam } = event;
 		let { uniID, pubFun, vk , db, _ } = util;
 		let { uid } = data;
 		let res = { code : 0, msg : 'ok' };
-		// 业务逻辑开始-----------------------------------------------------------
-		let startTime = Date.now();
-		
+    // 业务逻辑开始-----------------------------------------------------------
+		// 随机定位开始-----------------------------------------------------------
 		// 为了方便测试,这里固定在杭州市西湖区附近
 		let longitude = 120.12792 + Math.floor(Math.random() * 500) / 10000;
 		let latitude = 30.228932  + Math.floor(Math.random() * 500) / 10000;
@@ -31,10 +30,7 @@ module.exports = {
 				},
 			}
 		});
-		
-		let endTime = Date.now();
-		res.runTime = (endTime - startTime);
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
+    // 业务逻辑结束-----------------------------------------------------------
+    return res;
+  }
 }
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/adds.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/adds.js
similarity index 83%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/adds.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/adds.js
index c331c1c..d75bbda 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/adds.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/adds.js
@@ -14,9 +14,9 @@ module.exports = {
 		let res = { code : 0, msg : 'ok' };	
     // 业务逻辑开始----------------------------------------------------------- 
 		let dbName = "vk-test";
-		let startTime = Date.now();
+		let runTime1 = new Date().getTime();
 		let addNum = 10;
-		console.log("开始运行，添加"+addNum+"条数据");
+		console.log(new Date(runTime1),"开始运行,添加"+addNum+"条数据");
 		// 承载所有读操作的 promise 的数组
 		let dataArr = [];
 		
@@ -41,9 +41,10 @@ module.exports = {
 			dataJson:dataArr
 		});
 		
-		let endTime = Date.now();
-		res.runTime = endTime - startTime;
-		console.log("运行结束，耗时:"+res.runTime/1000 + "秒");
+		let runTime2 = new Date().getTime();
+		let runTime = ((runTime2 - runTime1) / 1000 + "秒");
+		console.log(new Date(runTime2),"运行结束,耗时:"+runTime);
+		res.runTime = runTime;
     // 业务逻辑结束-----------------------------------------------------------
     return res;
   }
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/avg.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/avg.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/avg.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/avg.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/count.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/count.js
similarity index 88%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/count.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/count.js
index 2ddcb75..0d86f1f 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/count.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/count.js
@@ -13,17 +13,12 @@ module.exports = {
 		let { uid } = data;
 		let res = { code : 0, msg : 'ok' };
     // 业务逻辑开始-----------------------------------------------------------
-		let startTime = Date.now();
-		
 		res.num = await vk.baseDao.count({
 			dbName:"vk-test",
 			whereJson:{
 
 			}
 		});
-		
-		let endTime = Date.now();
-		res.runTime = (endTime - startTime);
 		// 对应的sql:
 		// count * from vk-test
     // 业务逻辑结束-----------------------------------------------------------
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/del.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/del.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/del.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/del.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/deleteById.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/deleteById.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/deleteById.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/deleteById.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/findById.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/findById.js
similarity index 92%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/findById.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/findById.js
index 30c8f43..e8a0ab4 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/findById.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/findById.js
@@ -13,7 +13,7 @@ module.exports = {
 		let { uid } = data;
 		let res = { code : 0, msg : 'ok' };
     // 业务逻辑开始-----------------------------------------------------------
-		let startTime = Date.now();
+		let startTime = new Date().getTime();
 		res.item = await vk.baseDao.findById({
 			dbName:"vk-test",
 			id:data._id,
@@ -21,7 +21,7 @@ module.exports = {
 
 			}
 		});
-		let endTime = Date.now();
+		let endTime = new Date().getTime();
 		res.runTime = (endTime - startTime);
 		// 上面的 fieldJson 可以设置 显示什么字段或设置不显示什么字段 如 money:false 代表不显示money字段
 		// 对应的sql:
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/findByWhereJson.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/findByWhereJson.js
similarity index 90%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/findByWhereJson.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/findByWhereJson.js
index 6f01891..16db31c 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/findByWhereJson.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/findByWhereJson.js
@@ -13,8 +13,6 @@ module.exports = {
 		let { uid } = data;
 		let res = { code : 0, msg : 'ok' };
     // 业务逻辑开始----------------------------------------------------------- 
-		let startTime = Date.now();
-		
 		res.item = await vk.baseDao.findByWhereJson({
 			dbName:"vk-test",
 			fieldJson:{
@@ -24,10 +22,6 @@ module.exports = {
 				_id:data._id,
 			}
 		});
-		
-		let endTime = Date.now();
-		res.runTime = (endTime - startTime);
-		
 		// 上面的 fieldJson 可以设置 显示什么字段或设置不显示什么字段 如 money:false 代表不显示money字段
 		// 对应的sql:
 		// select * from vk-test where _id = "5f3a125b3d11c6000106d338"
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/geo.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/geo.js
similarity index 78%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/geo.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/geo.js
index 1350f3f..f1640de 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/geo.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/geo.js
@@ -21,9 +21,7 @@ module.exports = {
 				location: _.geoNear({
 				  geometry: new db.Geo.Point(120.12792, 30.228932),	// 点的地理位置,为了方便测试,这里固定在杭州市西湖区
 				  maxDistance: 4000,	// 选填，最大距离，米为单位
-				  minDistance: 0			,// 选填，最小距离，米为单位
-					distanceMultiplier:1,     // 返回时在距离上乘以该数字 1代表米 100 代表厘米 0.001 代表千米
-					distanceField:"distance", // 输出的每个记录中 distance 即是与给定点的距离
+				  minDistance: 0			// 选填，最小距离，米为单位
 				})
 			},
 		});
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/getList.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/groupCount.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/groupCount.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/groupCount.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/groupCount.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/max.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/max.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/max.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/max.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/min.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/min.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/min.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/min.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/sample.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/sample.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/sample.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/sample.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/select.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/select.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/select.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/select.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/select2.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/select2.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/select2.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/select2.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_geo.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_geo.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_geo.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_geo.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_getOne.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_getOne.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_getOne.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_getOne.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_mode_2.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_mode_2.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_mode_2.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_mode_2.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_mode_3.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_mode_3.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/selects_mode_3.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/selects_mode_3.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/sum.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/sum.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/sum.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/sum.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/update.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/updateAndReturn.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/updateAndReturn.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/updateAndReturn.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/updateAndReturn.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/updateById.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/updateById.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/pub/updateById.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/pub/updateById.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/add.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/add.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/add.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/add.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/delete.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/delete.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/delete.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/delete.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/getList.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/getList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/getList.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/getList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/update.js b/uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/update.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/db_api/sys/update.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/db_api/sys/update.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/imgSecCheck.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/qq/pub/imgSecCheck.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/imgSecCheck.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/qq/pub/imgSecCheck.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/msgSecCheck.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/qq/pub/msgSecCheck.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/qq/pub/msgSecCheck.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/qq/pub/msgSecCheck.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/getTemplateList.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/getTemplateList.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/getTemplateList.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/getTemplateList.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/imgSecCheck.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/imgSecCheck.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/imgSecCheck.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/imgSecCheck.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/msgSecCheck.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/msgSecCheck.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/msgSecCheck.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/msgSecCheck.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/sendMessage.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/sendMessage.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/sendMessage.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/sendMessage.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/sendTemplateMessage.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/sendTemplateMessage.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/sendTemplateMessage.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/sendTemplateMessage.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/sendUniformMessage.js b/uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/sendUniformMessage.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/openapi/weixin/pub/sendUniformMessage.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/openapi/weixin/pub/sendUniformMessage.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/test/pub/addition.js b/uniCloud-tcb/cloudfunctions/router/service/template/test/pub/addition.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/test/pub/addition.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/test/pub/addition.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/test/pub/findGoodsInfo.js b/uniCloud-tcb/cloudfunctions/router/service/template/test/pub/findGoodsInfo.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/test/pub/findGoodsInfo.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/test/pub/findGoodsInfo.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/test/pub/temporaryCache.js b/uniCloud-tcb/cloudfunctions/router/service/template/test/pub/temporaryCache.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/test/pub/temporaryCache.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/test/pub/temporaryCache.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/test.js b/uniCloud-tcb/cloudfunctions/router/service/template/test/sys/test.js
similarity index 57%
rename from uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/test.js
rename to uniCloud-tcb/cloudfunctions/router/service/template/test/sys/test.js
index 353041e..0fec407 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/kh/test.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/template/test/sys/test.js
@@ -1,22 +1,19 @@
-'use strict';
 module.exports = {
 	/**
 	 * 此函数名称
-	 * @url client/user/kh/test 前端调用的url参数地址
-	 * data 请求参数
-	 * @params {String} params1  参数1
+	 * @url template/test/sys/test 前端调用的url参数地址
+	 * data 请求参数 说明
+	 * res 返回参数说明
+	 * @params {Number} code 错误码，0表示成功
+	 * @params {String} msg 详细信息
 	 */
 	main: async (event) => {
 		let { data = {}, userInfo, util, originalParam } = event;
-		let { customUtil, config, pubFun, vk, db, _ } = util;
+		let { uniID, config, pubFun, vk , db, _ } = util;
 		let { uid } = data;
 		let res = { code : 0, msg : '' };
 		// 业务逻辑开始-----------------------------------------------------------
-		// 可写与数据库的交互逻辑等等
-
-
-
-
+    res.msg = "ok";
 		// 业务逻辑结束-----------------------------------------------------------
 		return res;
 	}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/template/云函数示例模板.md b/uniCloud-tcb/cloudfunctions/router/service/template/云函数示例模板.md
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/template/云函数示例模板.md
rename to uniCloud-tcb/cloudfunctions/router/service/template/云函数示例模板.md
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/acceptInvite.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/acceptInvite.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/acceptInvite.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/acceptInvite.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/addUploadRecord.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/addUploadRecord.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/addUploadRecord.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/addUploadRecord.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindAlipay.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindAlipay.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindAlipay.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindAlipay.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindEmail.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindEmail.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindEmail.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindEmail.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindMobile.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindMobile.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindMobile.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindMobile.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindNewEmail.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindNewEmail.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindNewEmail.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindNewEmail.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindNewMobile.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindNewMobile.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindNewMobile.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindNewMobile.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindQQ.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindQQ.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindQQ.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindQQ.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindWeixin.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/bindWeixin.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/bindWeixin.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/bindWeixin.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getAlipayMiniCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getAlipayMiniCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getAlipayMiniCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getAlipayMiniCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getInvitedUser.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getInvitedUser.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getInvitedUser.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getInvitedUser.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getMenu.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getMenu.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getMenu.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getMenu.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getMyUserInfo.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getMyUserInfo.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getMyUserInfo.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getMyUserInfo.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getQQMiniCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getQQMiniCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getQQMiniCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getQQMiniCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getWeixinMPqrcode.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getWeixinMPqrcode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getWeixinMPqrcode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getWeixinMPqrcode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getWeixinMPscheme.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getWeixinMPscheme.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getWeixinMPscheme.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getWeixinMPscheme.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/getWeixinMPurl.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/getWeixinMPurl.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/getWeixinMPurl.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/getWeixinMPurl.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/resetPwd.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/resetPwd.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/resetPwd.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/resetPwd.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/setAvatar.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/setAvatar.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/setAvatar.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/setAvatar.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/setUserInviteCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/setUserInviteCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/setUserInviteCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/setUserInviteCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindAlipay.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindAlipay.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindAlipay.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindAlipay.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindEmail.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindEmail.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindEmail.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindEmail.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindMobile.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindMobile.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindMobile.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindMobile.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindQQ.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindQQ.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindQQ.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindQQ.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindWeixin.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindWeixin.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/unbindWeixin.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/unbindWeixin.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/updatePwd.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/updatePwd.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/updatePwd.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/updatePwd.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/updateUser.js b/uniCloud-tcb/cloudfunctions/router/service/user/kh/updateUser.js
similarity index 79%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/kh/updateUser.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/kh/updateUser.js
index 7c52d81..e422d80 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/user/kh/updateUser.js
+++ b/uniCloud-tcb/cloudfunctions/router/service/user/kh/updateUser.js
@@ -18,12 +18,12 @@ module.exports = {
     let res = {};
     // 业务逻辑开始-----------------------------------------------------------
     // 允许修改的字段列表
-    // let updateKeys = ["nickname", "avatar", "gender", "social_info", 'businessCard'];
+    let updateKeys = ["nickname", "avatar", "gender", "social_info"];
     let dataJson = {};
-    // for (let i in updateKeys) {
-    //   let key = updateKeys[i];
-    //   if (vk.pubfn.isNotNull(data[key])) dataJson[key] = data[key];
-    // }
+    for (let i in updateKeys) {
+      let key = updateKeys[i];
+      if (vk.pubfn.isNotNull(data[key])) dataJson[key] = data[key];
+    }
     dataJson.uid = uid;
     res = await uniID.updateUser(dataJson);
     // 业务逻辑结束-----------------------------------------------------------
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/checkToken.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/checkToken.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/checkToken.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/checkToken.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/checkVersion.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/checkVersion.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/checkVersion.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/checkVersion.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/code2SessionAlipay.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/code2SessionAlipay.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/code2SessionAlipay.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/code2SessionAlipay.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/code2SessionWeixin.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/code2SessionWeixin.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/code2SessionWeixin.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/code2SessionWeixin.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/getPhoneNumber.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/getPhoneNumber.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/getPhoneNumber.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/getPhoneNumber.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/getUserInfoByInviteCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/getUserInfoByInviteCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/getUserInfoByInviteCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/getUserInfoByInviteCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/login.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/login.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/login.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/login.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByAlipay.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByAlipay.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByAlipay.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByAlipay.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByEmail.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByEmail.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByEmail.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByEmail.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByQQ.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByQQ.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByQQ.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByQQ.js
diff --git a/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginBySms.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginBySms.js
new file mode 100644
index 0000000..ff07353
--- /dev/null
+++ b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginBySms.js
@@ -0,0 +1,72 @@
+module.exports = {
+	/**
+	 * 手机号登陆(手机号+手机验证码)
+	 * @url user/pub/loginBySms 前端调用的url参数地址
+	 * @description 手机号登陆(手机号+手机验证码)
+	 * data 请求参数 说明
+	 * @param {String} mobile 手机号
+	 * @param {String} code 验证码
+	 * @param {String} type 指定操作类型，不传：存在则登录不存在则注册 login：只能登录 register：只能注册 
+	 * @param {String} password 密码，当前用户为新注册时生效
+	 * @param {String} inviteCode 邀请人的邀请码，当前用户为新注册时生效
+	 * @param {String} myInviteCode 设置当前注册用户自己的邀请码，当前用户为新注册时生效（不传会自动生成）
+	 * @param {Boolean} needPermission 设置为true时会在checkToken时返回用户权限（permission），如果是在admin端，需传true
+	 * res 返回参数说明
+	 * @param {Number} code 错误码，0表示成功
+	 * @param {String} msg 详细信息
+	 * @param {String} token 登录成功之后返回的token信息
+	 * @param {String} tokenExpired token过期时间
+	 */
+	main: async (event) => {
+		let { data = {}, util, originalParam } = event;
+		let { uniID, config, pubFun, vk, db, _ } = util;
+		let { uid } = data;
+		let res = {};
+		// 业务逻辑开始-----------------------------------------------------------
+		let {
+			mobile,
+			code,
+			type,
+			password,
+			inviteCode,
+			myInviteCode,
+			needPermission
+		} = data;
+		res = await uniID.loginBySms({
+			mobile,
+			code,
+			type,
+			password,
+			inviteCode,
+			myInviteCode,
+			needPermission
+		});
+		// 修改用户昵称为:手机尾号xxxx用户
+		if (res.token) {
+			if (!res.msg) {
+				res.msg = res.type === "register" ? "注册成功" : "登录成功";
+			}
+			let mobileStr = mobile.substring(7);
+			await vk.baseDao.update({
+				dbName: "uni-id-users",
+				whereJson: {
+					_id: res.uid,
+					nickname: null
+				},
+				dataJson: {
+					nickname: `手机尾号${mobileStr}用户`
+				}
+			});
+			// 日志服务
+			const loginLogService = vk.require("service/user/util/login_log");
+			await loginLogService.add({
+				type: "login",
+				login_type: "sms",
+				user_id: res.uid,
+				context: originalParam.context
+			}, util);
+		}
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByUniverify.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByUniverify.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByUniverify.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByUniverify.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByWeixin.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByWeixin.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByWeixin.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByWeixin.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByWeixinPhoneNumber.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByWeixinPhoneNumber.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByWeixinPhoneNumber.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/loginByWeixinPhoneNumber.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/logout.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/logout.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/logout.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/logout.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/register.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/register.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/register.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/register.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/resetPasswordByEmail.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/resetPasswordByEmail.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/resetPasswordByEmail.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/resetPasswordByEmail.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/resetPasswordByMobile.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/resetPasswordByMobile.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/resetPasswordByMobile.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/resetPasswordByMobile.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendEmailCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/sendEmailCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendEmailCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/sendEmailCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendSmsCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/pub/sendSmsCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendSmsCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/pub/sendSmsCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/sys/encryptPwd.js b/uniCloud-tcb/cloudfunctions/router/service/user/sys/encryptPwd.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/sys/encryptPwd.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/sys/encryptPwd.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/sys/setVerifyCode.js b/uniCloud-tcb/cloudfunctions/router/service/user/sys/setVerifyCode.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/sys/setVerifyCode.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/sys/setVerifyCode.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/util/login_log.js b/uniCloud-tcb/cloudfunctions/router/service/user/util/login_log.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/util/login_log.js
rename to uniCloud-tcb/cloudfunctions/router/service/user/util/login_log.js
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/统一用户中心.md b/uniCloud-tcb/cloudfunctions/router/service/user/统一用户中心.md
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/service/user/统一用户中心.md
rename to uniCloud-tcb/cloudfunctions/router/service/user/统一用户中心.md
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/逻辑层目录说明.md b/uniCloud-tcb/cloudfunctions/router/service/逻辑层目录说明.md
similarity index 92%
rename from uniCloud-aliyun/cloudfunctions/router/service/逻辑层目录说明.md
rename to uniCloud-tcb/cloudfunctions/router/service/逻辑层目录说明.md
index 3290fa1..2dd318c 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/逻辑层目录说明.md
+++ b/uniCloud-tcb/cloudfunctions/router/service/逻辑层目录说明.md
@@ -5,7 +5,7 @@
 ```
 .
 ├── service──────────────────────# 逻辑层（用于写业务逻辑）
-│ └── admin────────────────# PC后台管理端逻辑（admin框架开发中。。。）
+│ └── admin────────────────# PC后台管理端逻辑
 │ ── └── xxxxxxxxxxxxxxx──────# 
 │ ── └── xxxxxxxxxxxxxxx──────# 
 │ ── └── xxxxxxxxxxxxxxx──────# 
@@ -14,12 +14,10 @@
 │ ── └── user─────────────────# 用户服务（自己系统的逻辑）
 │ ──── └── kh───────────────────# kh函数为必须登录后才能访问的函数
 │ ──── └── pub──────────────────# pub函数为所有人都可以访问,不限制
-│ ──── └── sys──────────────────# sys函数为需要角色授权才能访问的函数
 │ ──── └── util─────────────────# 用户服务专用的工具包
 │ ── └── order────────────────# 订单服务（自己系统的逻辑）
 │ ──── └── kh───────────────────# kh函数为必须登录后才能访问的函数
 │ ──── └── pub──────────────────# pub函数为所有人都可以访问,不限制
-│ ──── └── sys──────────────────# sys函数为需要角色授权才能访问的函数
 │ ──── └── util─────────────────# 订单服务专用的工具包
 │ ── └── xxxxxxxxxxxxxxx──────# 
 │ ── └── xxxxxxxxxxxxxxx──────# 
diff --git a/uniCloud-tcb/cloudfunctions/router/util/pubFunction.js b/uniCloud-tcb/cloudfunctions/router/util/pubFunction.js
new file mode 100644
index 0000000..b737a29
--- /dev/null
+++ b/uniCloud-tcb/cloudfunctions/router/util/pubFunction.js
@@ -0,0 +1,26 @@
+/**
+ * 自定义公共函数包
+ * 这里可以写你自己的公共函数
+ */
+var pubFun = {};
+/**
+ * 公共函数写法示例
+ * 调用示例：
+ * pubFun.test();
+ * 或
+ * vk.myfn.test();
+ */
+pubFun.test = function(path) {
+	// 此处可以直接使用 vk 实例
+	let timeStr = vk.pubfn.timeFormat(new Date(), "yyyy-MM-dd hh:mm:ss");
+	// 逻辑
+	// ...
+	// 逻辑	
+	return {
+		timeStr,
+		msg: "这是公共函数test的返回"
+	}
+}
+
+
+module.exports = pubFun;
diff --git a/uniCloud-aliyun/cloudfunctions/router/util/urlrewrite.js b/uniCloud-tcb/cloudfunctions/router/util/urlrewrite.js
similarity index 100%
rename from uniCloud-aliyun/cloudfunctions/router/util/urlrewrite.js
rename to uniCloud-tcb/cloudfunctions/router/util/urlrewrite.js
diff --git a/uniCloud-aliyun/database/JQL查询.jql b/uniCloud-tcb/database/JQL查询.jql
similarity index 100%
rename from uniCloud-aliyun/database/JQL查询.jql
rename to uniCloud-tcb/database/JQL查询.jql
diff --git a/uniCloud-aliyun/database/db_init.json b/uniCloud-tcb/database/db_init.json
similarity index 100%
rename from uniCloud-aliyun/database/db_init.json
rename to uniCloud-tcb/database/db_init.json
diff --git a/uniCloud-aliyun/database/fadada-verify-record.schema.json b/uniCloud-tcb/database/fadada-verify-record.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/fadada-verify-record.schema.json
rename to uniCloud-tcb/database/fadada-verify-record.schema.json
diff --git a/uniCloud-aliyun/database/jjx-contract.schema.json b/uniCloud-tcb/database/jjx-contract.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/jjx-contract.schema.json
rename to uniCloud-tcb/database/jjx-contract.schema.json
diff --git a/uniCloud-aliyun/database/jjx-enquiry-quote.schema.json b/uniCloud-tcb/database/jjx-enquiry-quote.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/jjx-enquiry-quote.schema.json
rename to uniCloud-tcb/database/jjx-enquiry-quote.schema.json
diff --git a/uniCloud-aliyun/database/opendb-admin-log.schema.json b/uniCloud-tcb/database/opendb-admin-log.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-admin-log.schema.json
rename to uniCloud-tcb/database/opendb-admin-log.schema.json
diff --git a/uniCloud-aliyun/database/opendb-admin-menus.schema.json b/uniCloud-tcb/database/opendb-admin-menus.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-admin-menus.schema.json
rename to uniCloud-tcb/database/opendb-admin-menus.schema.json
diff --git a/uniCloud-aliyun/database/opendb-app-list.schema.json b/uniCloud-tcb/database/opendb-app-list.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-app-list.schema.json
rename to uniCloud-tcb/database/opendb-app-list.schema.json
diff --git a/uniCloud-aliyun/database/opendb-app-versions.schema.json b/uniCloud-tcb/database/opendb-app-versions.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-app-versions.schema.json
rename to uniCloud-tcb/database/opendb-app-versions.schema.json
diff --git a/uniCloud-aliyun/database/opendb-open-data.schema.json b/uniCloud-tcb/database/opendb-open-data.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-open-data.schema.json
rename to uniCloud-tcb/database/opendb-open-data.schema.json
diff --git a/uniCloud-aliyun/database/opendb-tempdata.schema.json b/uniCloud-tcb/database/opendb-tempdata.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-tempdata.schema.json
rename to uniCloud-tcb/database/opendb-tempdata.schema.json
diff --git a/uniCloud-aliyun/database/opendb-verify-codes.schema.json b/uniCloud-tcb/database/opendb-verify-codes.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/opendb-verify-codes.schema.json
rename to uniCloud-tcb/database/opendb-verify-codes.schema.json
diff --git a/uniCloud-aliyun/database/uni-id-log.schema.json b/uniCloud-tcb/database/uni-id-log.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/uni-id-log.schema.json
rename to uniCloud-tcb/database/uni-id-log.schema.json
diff --git a/uniCloud-aliyun/database/uni-id-permissions.schema.json b/uniCloud-tcb/database/uni-id-permissions.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/uni-id-permissions.schema.json
rename to uniCloud-tcb/database/uni-id-permissions.schema.json
diff --git a/uniCloud-aliyun/database/uni-id-roles.schema.json b/uniCloud-tcb/database/uni-id-roles.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/uni-id-roles.schema.json
rename to uniCloud-tcb/database/uni-id-roles.schema.json
diff --git a/uniCloud-aliyun/database/uni-id-users.schema.json b/uniCloud-tcb/database/uni-id-users.schema.json
similarity index 100%
rename from uniCloud-aliyun/database/uni-id-users.schema.json
rename to uniCloud-tcb/database/uni-id-users.schema.json
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
index 25ce12a..80e0661 100644
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
@@ -1,70 +1,169 @@
-{
-	"passwordSecret": "passwordSecret-demo",
-	"tokenSecret": "tokenSecret-demo",
-	"tokenExpiresIn": 604800,
-	"tokenExpiresThreshold": 259200,
-	"tokenMaxLimit": 10,
-	"passwordErrorLimit": 6,
-	"bindTokenToDevice": false,
-	"passwordErrorRetryTime": 3600,
-	"autoSetInviteCode": true,
-	"forceInviteCode": false,
-	"preferedAppPlatform": "app-plus",
-	"preferedWebPlatform": "h5",
-	"removeDcloudAppid": false,
-	"app-plus": {
-		"tokenExpiresIn": 604800,
-		"oauth": {
-			"weixin": {
-				"appid": "",
-				"appsecret": ""
-			}
-		}
-	},
-	"mp-weixin": {
-		"oauth": {
-			"weixin": {
-				"appid": "",
-				"appsecret": ""
-			}
-		}
-	},
-	"h5-weixin": {
-		"oauth": {
-			"weixin": {
-				"appid": "",
-				"appsecret": ""
-			}
-		}
-	},
-	"mp-alipay": {
-		"oauth": {
-			"alipay": {
-				"appid": "",
-				"privateKey": ""
-			}
-		}
-	},
-	"mp-qq": {
-		"oauth": {
-			"qq": {
-				"appid": "",
-				"appsecret": ""
-			}
-		}
-	},
-	"service": {
-		"sms": {
-			"name": "重要",
-			"codeExpiresIn": 180,
-			"smsKey": "",
-			"smsSecret": "",
-			"templateId": ""
-		},
-		"univerify": {
-			"appid": "",
-			"apiKey": "",
-			"apiSecret": ""
-		}
-	}
-}
+[
+    {
+        "dcloudAppid": "__UNI__8BFD66E",
+        "isDefaultConfig": true,
+        "passwordSecret": "passwordSecret-demo",
+        "tokenSecret": "tokenSecret-demo",
+        "tokenExpiresIn": 604800,
+        "tokenExpiresThreshold": 259200,
+        "tokenMaxLimit": 10,
+        "passwordErrorLimit": 6,
+        "bindTokenToDevice": false,
+        "passwordErrorRetryTime": 3600,
+        "autoSetInviteCode": true,
+        "forceInviteCode": false,
+        "preferedAppPlatform": "app-plus",
+        "preferedWebPlatform": "h5",
+        "removeDcloudAppid": false,
+        "app-plus": {
+            "tokenExpiresIn": 604800,
+            "oauth": {
+                "weixin": {
+                    "appid": "",
+                    "appsecret": ""
+                }
+            }
+        },
+        "mp-weixin": {
+            "oauth": {
+                "weixin": {
+                    "appid": "",
+                    "appsecret": ""
+                }
+            }
+        },
+        "h5-weixin": {
+            "oauth": {
+                "weixin": {
+                    "appid": "wxf44c1b32124fe1d5",
+                    "appsecret": "d98e9f42513cca4cc63e7c462886e839"
+                }
+            }
+        },
+        "h5": {
+            "oauth": {
+                "weixin": {
+                    "appid": "wxf44c1b32124fe1d5",
+                    "appsecret": "d98e9f42513cca4cc63e7c462886e839"
+                },
+                "qq": {
+                    "appid": "101795826",
+                    "appsecret": "1a41633966fb97cefea512f6c8601638"
+                }
+            }
+        },
+        "mp-alipay": {
+            "oauth": {
+                "alipay": {
+                    "appid": "",
+                    "privateKey": ""
+                }
+            }
+        },
+        "mp-qq": {
+            "oauth": {
+                "qq": {
+                    "appid": "",
+                    "appsecret": ""
+                }
+            }
+        },
+        "service": {
+            "sms": {
+                "name": "重要",
+                "codeExpiresIn": 180,
+                "smsKey": "",
+                "smsSecret": "",
+                "templateId": ""
+            },
+            "univerify": {
+                "appid": "",
+                "apiKey": "",
+                "apiSecret": ""
+            }
+        }
+    },
+    {
+        "dcloudAppid": "__UNI__EB80D26",
+        "passwordSecret": "passwordSecret-demo",
+        "tokenSecret": "tokenSecret-demo",
+        "tokenExpiresIn": 604800,
+        "tokenExpiresThreshold": 259200,
+        "tokenMaxLimit": 10,
+        "passwordErrorLimit": 6,
+        "bindTokenToDevice": false,
+        "passwordErrorRetryTime": 3600,
+        "autoSetInviteCode": true,
+        "forceInviteCode": false,
+        "preferedAppPlatform": "app-plus",
+        "preferedWebPlatform": "h5",
+        "removeDcloudAppid": false,
+        "app-plus": {
+            "tokenExpiresIn": 604800,
+            "oauth": {
+                "weixin": {
+                    "appid": "",
+                    "appsecret": ""
+                }
+            }
+        },
+        "mp-weixin": {
+            "oauth": {
+                "weixin": {
+                    "appid": "",
+                    "appsecret": ""
+                }
+            }
+        },
+        "h5-weixin": {
+            "oauth": {
+                "weixin": {
+                    "appid": "wx950c88b951cadd52",
+                    "appsecret": "266aa413275c08d86ab0ffefd79962b7"
+                }
+            }
+        },
+        "h5": {
+            "oauth": {
+                "weixin": {
+                    "appid": "wx950c88b951cadd52",
+                    "appsecret": "266aa413275c08d86ab0ffefd79962b7"
+                },
+                "qq": {
+                    "appid": "101795826",
+                    "appsecret": "1a41633966fb97cefea512f6c8601638"
+                }
+            }
+        },
+        "mp-alipay": {
+            "oauth": {
+                "alipay": {
+                    "appid": "",
+                    "privateKey": ""
+                }
+            }
+        },
+        "mp-qq": {
+            "oauth": {
+                "qq": {
+                    "appid": "",
+                    "appsecret": ""
+                }
+            }
+        },
+        "service": {
+            "sms": {
+                "name": "重要",
+                "codeExpiresIn": 180,
+                "smsKey": "",
+                "smsSecret": "",
+                "templateId": ""
+            },
+            "univerify": {
+                "appid": "",
+                "apiKey": "",
+                "apiSecret": ""
+            }
+        }
+    }
+]
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/vk-unicloud/index.js b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/vk-unicloud/index.js
index f56be77..614be55 100644
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/vk-unicloud/index.js
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/vk-unicloud/index.js
@@ -76,7 +76,8 @@ module.exports = {
 					"enable": true,                // 是否使用阿里云短信代替unicloud短信发送短信验证码
 					"accessKeyId": "LTAI4FyY6A493kVYn5ezyAw6",              // 短信密钥key
 					"accessKeySecret": "776MyYZfRb8cQHTe5ji0jBVu1rHfa9",          // 短信密钥secret
-					"signName": "亿利通",                 // 默认签名
+					// "signName": "亿利通",                 // 默认签名
+					"signName": "金久信钢铁交易平台",                 // 默认签名
 					"templateCode": {
 						"verifyCode": "SMS_210078693"              // 验证码短信模板 - 配合uni-id需要
 					}
diff --git a/util/MapInit.js b/util/MapInit.js
new file mode 100644
index 0000000..3083cde
--- /dev/null
+++ b/util/MapInit.js
@@ -0,0 +1,13 @@
+// 初始化地图
+export default {
+    init() {
+        return new Promise((resolve, reject) => {
+            // 如果已加载直接返回
+            if (window.T) {
+                console.log('地图脚本初始化成功...')
+                resolve(window.T)
+                reject('error')
+            }
+        })
+    }
+}
diff --git a/util/index.js b/util/index.js
index 27378e3..b260a07 100644
--- a/util/index.js
+++ b/util/index.js
@@ -2,4 +2,53 @@ export const WRITE_INVOICE_TIME = ['付款当月（限20号之前付款，20号
 
 export const INVOICE_TYPE = ['增值税专用发票13%', '增值税普通发票', '普通发票']
 
-export const PROCESS_PAY_METHOD = ['预付', '货到验收后付款', '提货付全款', '信誉采购，货到签单后账期：']
+export const PROCESS_PAY_METHOD = ['预付', '货到验收后付款', '提货付全款', '信誉采购，货到签单后账期：', '其他付款方式']
+
+export const USER_LEVEL = [
+    {
+        value: -1,
+        label: '普通用户',
+    },
+    {
+        value: 0,
+        label: '认证用户',
+    },
+    {
+        value: 1,
+        label: '黄金VIP',
+    },
+    {
+        value: 2,
+        label: '铂金VIP',
+    },
+    {
+        value: 3,
+        label: '钻石VIP',
+    },
+    {
+        value: 4,
+        label: '实力厂家',
+    },
+    {
+        value: 5,
+        label: '实力加工厂',
+    },
+    {
+        value: 6,
+        label: '实力供货商',
+    },
+    {
+        value: 7,
+        label: '实力采购商',
+    },
+];
+
+export const getUserLevelLabel = (level) => {
+    let label = '';
+    USER_LEVEL.forEach(item => {
+        if (item.value === level) {
+            label = item.label;
+        }
+    });
+    return label;
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 0a7724b..e36c488 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,13 @@
   "resolved" "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.5.tgz"
   "version" "7.23.5"
 
+"@babel/runtime@^7.12.0":
+  "integrity" "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g=="
+  "resolved" "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz"
+  "version" "7.24.5"
+  dependencies:
+    "regenerator-runtime" "^0.14.0"
+
 "@icon-park/vue@^1.4.2":
   "integrity" "sha512-YXXC53R0hjM76B2M4ANRI0m2bQB1cifUW+YXxQfGofITP6gr+pSMafBz/vzECYSkW3zZklm2mVuqQj4RAZGR2Q=="
   "resolved" "https://registry.npmmirror.com/@icon-park/vue/-/vue-1.4.2.tgz"
@@ -15,6 +22,11 @@
     "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
     "csstype" "^3.0.3"
 
+"@transloadit/prettier-bytes@0.0.7":
+  "integrity" "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA=="
+  "resolved" "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz"
+  "version" "0.0.7"
+
 "@types/caseless@*":
   "integrity" "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg=="
   "resolved" "https://registry.npmmirror.com/@types/caseless/-/caseless-0.12.5.tgz"
@@ -25,6 +37,11 @@
   "resolved" "https://registry.npmmirror.com/@types/crypto-js/-/crypto-js-4.2.1.tgz"
   "version" "4.2.1"
 
+"@types/event-emitter@^0.3.3":
+  "integrity" "sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ=="
+  "resolved" "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.5.tgz"
+  "version" "0.3.5"
+
 "@types/node@*":
   "integrity" "sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg=="
   "resolved" "https://registry.npmmirror.com/@types/node/-/node-20.10.1.tgz"
@@ -47,6 +64,49 @@
   "resolved" "https://registry.npmmirror.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz"
   "version" "4.0.5"
 
+"@uppy/companion-client@^2.2.2":
+  "integrity" "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og=="
+  "resolved" "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz"
+  "version" "2.2.2"
+  dependencies:
+    "@uppy/utils" "^4.1.2"
+    "namespace-emitter" "^2.0.1"
+
+"@uppy/core@^2.0.3", "@uppy/core@^2.1.1", "@uppy/core@^2.1.4", "@uppy/core@^2.3.3":
+  "integrity" "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ=="
+  "resolved" "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz"
+  "version" "2.3.4"
+  dependencies:
+    "@transloadit/prettier-bytes" "0.0.7"
+    "@uppy/store-default" "^2.1.1"
+    "@uppy/utils" "^4.1.3"
+    "lodash.throttle" "^4.1.1"
+    "mime-match" "^1.0.2"
+    "namespace-emitter" "^2.0.1"
+    "nanoid" "^3.1.25"
+    "preact" "^10.5.13"
+
+"@uppy/store-default@^2.1.1":
+  "integrity" "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ=="
+  "resolved" "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz"
+  "version" "2.1.1"
+
+"@uppy/utils@^4.1.2", "@uppy/utils@^4.1.3":
+  "integrity" "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw=="
+  "resolved" "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz"
+  "version" "4.1.3"
+  dependencies:
+    "lodash.throttle" "^4.1.1"
+
+"@uppy/xhr-upload@^2.0.3", "@uppy/xhr-upload@^2.0.7":
+  "integrity" "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ=="
+  "resolved" "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz"
+  "version" "2.1.3"
+  dependencies:
+    "@uppy/companion-client" "^2.2.2"
+    "@uppy/utils" "^4.1.2"
+    "nanoid" "^3.1.25"
+
 "@vant/area-data@^1.5.1":
   "integrity" "sha512-gR5TPEzTbxN1cTK1aDhCoyikSCLX7DAacxyXoKyI4SAsYYTZrDl/nLgQFIm9vLsvWzlPIda8xV8/U3x7M9k6ww=="
   "resolved" "https://registry.npmmirror.com/@vant/area-data/-/area-data-1.5.1.tgz"
@@ -66,6 +126,84 @@
     "postcss" "^8.4.14"
     "source-map" "^0.6.1"
 
+"@wangeditor/basic-modules@^1.1.7", "@wangeditor/basic-modules@1.x":
+  "integrity" "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz"
+  "version" "1.1.7"
+  dependencies:
+    "is-url" "^1.2.4"
+
+"@wangeditor/code-highlight@^1.0.3":
+  "integrity" "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz"
+  "version" "1.0.3"
+  dependencies:
+    "prismjs" "^1.23.0"
+
+"@wangeditor/core@^1.1.19", "@wangeditor/core@1.x":
+  "integrity" "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz"
+  "version" "1.1.19"
+  dependencies:
+    "@types/event-emitter" "^0.3.3"
+    "event-emitter" "^0.3.5"
+    "html-void-elements" "^2.0.0"
+    "i18next" "^20.4.0"
+    "scroll-into-view-if-needed" "^2.2.28"
+    "slate-history" "^0.66.0"
+
+"@wangeditor/editor-for-vue@^1.0.2":
+  "integrity" "sha512-BOENvAXJVtVXlE2X50AAvjV82YlCUeu5cbeR0cvEQHQjYtiVnJtq7HSoj85r2kTgGouI5OrpJG9BBEjSjUSPyA=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-1.0.2.tgz"
+  "version" "1.0.2"
+
+"@wangeditor/editor@^5.1.23", "@wangeditor/editor@>=5.1.0":
+  "integrity" "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz"
+  "version" "5.1.23"
+  dependencies:
+    "@uppy/core" "^2.1.1"
+    "@uppy/xhr-upload" "^2.0.3"
+    "@wangeditor/basic-modules" "^1.1.7"
+    "@wangeditor/code-highlight" "^1.0.3"
+    "@wangeditor/core" "^1.1.19"
+    "@wangeditor/list-module" "^1.0.5"
+    "@wangeditor/table-module" "^1.1.4"
+    "@wangeditor/upload-image-module" "^1.0.2"
+    "@wangeditor/video-module" "^1.1.4"
+    "dom7" "^3.0.0"
+    "is-hotkey" "^0.2.0"
+    "lodash.camelcase" "^4.3.0"
+    "lodash.clonedeep" "^4.5.0"
+    "lodash.debounce" "^4.0.8"
+    "lodash.foreach" "^4.5.0"
+    "lodash.isequal" "^4.5.0"
+    "lodash.throttle" "^4.1.1"
+    "lodash.toarray" "^4.4.0"
+    "nanoid" "^3.2.0"
+    "slate" "^0.72.0"
+    "snabbdom" "^3.1.0"
+
+"@wangeditor/list-module@^1.0.5":
+  "integrity" "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz"
+  "version" "1.0.5"
+
+"@wangeditor/table-module@^1.1.4":
+  "integrity" "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz"
+  "version" "1.1.4"
+
+"@wangeditor/upload-image-module@^1.0.2":
+  "integrity" "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz"
+  "version" "1.0.2"
+
+"@wangeditor/video-module@^1.1.4":
+  "integrity" "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg=="
+  "resolved" "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz"
+  "version" "1.1.4"
+
 "ajv@^6.12.3":
   "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
   "resolved" "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz"
@@ -100,6 +238,11 @@
   dependencies:
     "babel-runtime" "6.x"
 
+"async-validator@1.11.5":
+  "integrity" "sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w=="
+  "resolved" "https://registry.npmmirror.com/async-validator/-/async-validator-1.11.5.tgz"
+  "version" "1.11.5"
+
 "asynckit@^0.4.0":
   "integrity" "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
   "resolved" "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz"
@@ -140,6 +283,20 @@
   "resolved" "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
   "version" "0.12.0"
 
+"charenc@0.0.2":
+  "integrity" "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
+  "resolved" "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz"
+  "version" "0.0.2"
+
+"clipboard@^2.0.0":
+  "integrity" "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw=="
+  "resolved" "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz"
+  "version" "2.0.11"
+  dependencies:
+    "good-listener" "^1.2.2"
+    "select" "^1.1.2"
+    "tiny-emitter" "^2.0.0"
+
 "combined-stream@^1.0.6", "combined-stream@~1.0.6":
   "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
   "resolved" "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz"
@@ -147,16 +304,31 @@
   dependencies:
     "delayed-stream" "~1.0.0"
 
+"compute-scroll-into-view@^1.0.20":
+  "integrity" "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+  "resolved" "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz"
+  "version" "1.0.20"
+
 "core-js@^2.4.0":
   "integrity" "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
   "resolved" "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz"
   "version" "2.6.12"
 
+"core-js@^3.6.5":
+  "integrity" "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug=="
+  "resolved" "https://registry.npmmirror.com/core-js/-/core-js-3.37.0.tgz"
+  "version" "3.37.0"
+
 "core-util-is@1.0.2":
   "integrity" "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
   "resolved" "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz"
   "version" "1.0.2"
 
+"crypt@0.0.2":
+  "integrity" "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
+  "resolved" "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz"
+  "version" "0.0.2"
+
 "crypto-js@^4.2.0":
   "integrity" "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
   "resolved" "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz"
@@ -167,6 +339,14 @@
   "resolved" "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz"
   "version" "3.1.2"
 
+"d@^1.0.1", "d@^1.0.2", "d@1":
+  "integrity" "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw=="
+  "resolved" "https://registry.npmmirror.com/d/-/d-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "es5-ext" "^0.10.64"
+    "type" "^2.7.2"
+
 "dashdash@^1.12.0":
   "integrity" "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="
   "resolved" "https://registry.npmmirror.com/dashdash/-/dashdash-1.14.1.tgz"
@@ -189,6 +369,18 @@
   "resolved" "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz"
   "version" "1.0.0"
 
+"delegate@^3.1.2":
+  "integrity" "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+  "resolved" "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz"
+  "version" "3.2.0"
+
+"dom7@^3.0.0":
+  "integrity" "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g=="
+  "resolved" "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "ssr-window" "^3.0.0-alpha.1"
+
 "ecc-jsbn@~0.1.1":
   "integrity" "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="
   "resolved" "https://registry.npmmirror.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
@@ -197,7 +389,7 @@
     "jsbn" "~0.1.0"
     "safer-buffer" "^2.1.0"
 
-"element-ui@2.15.13":
+"element-ui@^2.15.1", "element-ui@2.15.13":
   "integrity" "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg=="
   "resolved" "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz"
   "version" "2.15.13"
@@ -209,6 +401,58 @@
     "resize-observer-polyfill" "^1.5.0"
     "throttle-debounce" "^1.0.1"
 
+"es5-ext@^0.10.35", "es5-ext@^0.10.62", "es5-ext@^0.10.64", "es5-ext@~0.10.14":
+  "integrity" "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg=="
+  "resolved" "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz"
+  "version" "0.10.64"
+  dependencies:
+    "es6-iterator" "^2.0.3"
+    "es6-symbol" "^3.1.3"
+    "esniff" "^2.0.1"
+    "next-tick" "^1.1.0"
+
+"es6-iterator@^2.0.3":
+  "integrity" "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g=="
+  "resolved" "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz"
+  "version" "2.0.3"
+  dependencies:
+    "d" "1"
+    "es5-ext" "^0.10.35"
+    "es6-symbol" "^3.1.1"
+
+"es6-symbol@^3.1.1", "es6-symbol@^3.1.3":
+  "integrity" "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg=="
+  "resolved" "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz"
+  "version" "3.1.4"
+  dependencies:
+    "d" "^1.0.2"
+    "ext" "^1.7.0"
+
+"esniff@^2.0.1":
+  "integrity" "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="
+  "resolved" "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz"
+  "version" "2.0.1"
+  dependencies:
+    "d" "^1.0.1"
+    "es5-ext" "^0.10.62"
+    "event-emitter" "^0.3.5"
+    "type" "^2.7.2"
+
+"event-emitter@^0.3.5":
+  "integrity" "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="
+  "resolved" "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz"
+  "version" "0.3.5"
+  dependencies:
+    "d" "1"
+    "es5-ext" "~0.10.14"
+
+"ext@^1.7.0":
+  "integrity" "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw=="
+  "resolved" "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz"
+  "version" "1.7.0"
+  dependencies:
+    "type" "^2.7.2"
+
 "extend@~3.0.2":
   "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
   "resolved" "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz"
@@ -259,6 +503,13 @@
   dependencies:
     "assert-plus" "^1.0.0"
 
+"good-listener@^1.2.2":
+  "integrity" "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw=="
+  "resolved" "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz"
+  "version" "1.2.2"
+  dependencies:
+    "delegate" "^3.1.2"
+
 "har-schema@^2.0.0":
   "integrity" "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
   "resolved" "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz"
@@ -272,6 +523,11 @@
     "ajv" "^6.12.3"
     "har-schema" "^2.0.0"
 
+"html-void-elements@^2.0.0":
+  "integrity" "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A=="
+  "resolved" "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz"
+  "version" "2.0.1"
+
 "http-signature@~1.2.0":
   "integrity" "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="
   "resolved" "https://registry.npmmirror.com/http-signature/-/http-signature-1.2.0.tgz"
@@ -281,11 +537,43 @@
     "jsprim" "^1.2.2"
     "sshpk" "^1.7.0"
 
+"i18next@^20.4.0":
+  "integrity" "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A=="
+  "resolved" "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz"
+  "version" "20.6.1"
+  dependencies:
+    "@babel/runtime" "^7.12.0"
+
+"immer@^9.0.6":
+  "integrity" "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="
+  "resolved" "https://registry.npmmirror.com/immer/-/immer-9.0.21.tgz"
+  "version" "9.0.21"
+
+"is-buffer@~1.1.6":
+  "integrity" "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+  "resolved" "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz"
+  "version" "1.1.6"
+
+"is-hotkey@^0.2.0":
+  "integrity" "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw=="
+  "resolved" "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz"
+  "version" "0.2.0"
+
+"is-plain-object@^5.0.0":
+  "integrity" "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+  "resolved" "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz"
+  "version" "5.0.0"
+
 "is-typedarray@~1.0.0":
   "integrity" "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
   "resolved" "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz"
   "version" "1.0.0"
 
+"is-url@^1.2.4":
+  "integrity" "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+  "resolved" "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz"
+  "version" "1.2.4"
+
 "isstream@~0.1.2":
   "integrity" "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
   "resolved" "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz"
@@ -321,16 +609,67 @@
     "json-schema" "0.4.0"
     "verror" "1.10.0"
 
+"lodash.camelcase@^4.3.0":
+  "integrity" "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+  "resolved" "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"
+  "version" "4.3.0"
+
+"lodash.clonedeep@^4.5.0":
+  "integrity" "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+  "resolved" "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"
+  "version" "4.5.0"
+
+"lodash.debounce@^4.0.8":
+  "integrity" "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+  "resolved" "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  "version" "4.0.8"
+
+"lodash.foreach@^4.5.0":
+  "integrity" "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ=="
+  "resolved" "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz"
+  "version" "4.5.0"
+
+"lodash.isequal@^4.5.0":
+  "integrity" "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+  "resolved" "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"
+  "version" "4.5.0"
+
+"lodash.throttle@^4.1.1":
+  "integrity" "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+  "resolved" "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
+  "version" "4.1.1"
+
+"lodash.toarray@^4.4.0":
+  "integrity" "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw=="
+  "resolved" "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz"
+  "version" "4.4.0"
+
 "lodash@^4.17.21":
   "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
   "resolved" "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
   "version" "4.17.21"
 
+"md5@^2.3.0":
+  "integrity" "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="
+  "resolved" "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz"
+  "version" "2.3.0"
+  dependencies:
+    "charenc" "0.0.2"
+    "crypt" "0.0.2"
+    "is-buffer" "~1.1.6"
+
 "mime-db@1.52.0":
   "integrity" "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
   "resolved" "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz"
   "version" "1.52.0"
 
+"mime-match@^1.0.2":
+  "integrity" "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg=="
+  "resolved" "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "wildcard" "^1.1.0"
+
 "mime-types@^2.1.12", "mime-types@~2.1.19":
   "integrity" "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="
   "resolved" "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz"
@@ -338,11 +677,21 @@
   dependencies:
     "mime-db" "1.52.0"
 
-"nanoid@^3.3.6":
+"namespace-emitter@^2.0.1":
+  "integrity" "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g=="
+  "resolved" "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz"
+  "version" "2.0.1"
+
+"nanoid@^3.1.25", "nanoid@^3.2.0", "nanoid@^3.3.6":
   "integrity" "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
   "resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz"
   "version" "3.3.7"
 
+"next-tick@^1.1.0":
+  "integrity" "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+  "resolved" "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz"
+  "version" "1.1.0"
+
 "normalize-wheel@^1.0.1":
   "integrity" "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
   "resolved" "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz"
@@ -372,6 +721,16 @@
     "picocolors" "^1.0.0"
     "source-map-js" "^1.0.2"
 
+"preact@^10.5.13":
+  "integrity" "sha512-aQAIxtzWEwH8ou+OovWVSVNlFImL7xUCwJX3YMqA3U8iKCNC34999fFOnWjYNsylgfPgMexpbk7WYOLtKr/mxg=="
+  "resolved" "https://registry.npmmirror.com/preact/-/preact-10.21.0.tgz"
+  "version" "10.21.0"
+
+"prismjs@^1.23.0":
+  "integrity" "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
+  "resolved" "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz"
+  "version" "1.29.0"
+
 "psl@^1.1.28":
   "integrity" "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
   "resolved" "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz"
@@ -392,6 +751,11 @@
   "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
   "version" "0.11.1"
 
+"regenerator-runtime@^0.14.0":
+  "integrity" "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+  "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz"
+  "version" "0.14.1"
+
 "request@^2.88.2":
   "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="
   "resolved" "https://registry.npmmirror.com/request/-/request-2.88.2.tgz"
@@ -433,6 +797,39 @@
   "resolved" "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
   "version" "2.1.2"
 
+"scroll-into-view-if-needed@^2.2.28":
+  "integrity" "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA=="
+  "resolved" "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz"
+  "version" "2.2.31"
+  dependencies:
+    "compute-scroll-into-view" "^1.0.20"
+
+"select@^1.1.2":
+  "integrity" "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+  "resolved" "https://registry.npmmirror.com/select/-/select-1.1.2.tgz"
+  "version" "1.1.2"
+
+"slate-history@^0.66.0":
+  "integrity" "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng=="
+  "resolved" "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz"
+  "version" "0.66.0"
+  dependencies:
+    "is-plain-object" "^5.0.0"
+
+"slate@^0.72.0", "slate@>=0.65.3":
+  "integrity" "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw=="
+  "resolved" "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz"
+  "version" "0.72.8"
+  dependencies:
+    "immer" "^9.0.6"
+    "is-plain-object" "^5.0.0"
+    "tiny-warning" "^1.0.3"
+
+"snabbdom@^3.1.0":
+  "integrity" "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q=="
+  "resolved" "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.6.2.tgz"
+  "version" "3.6.2"
+
 "sortablejs@^1.15.0":
   "integrity" "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
   "resolved" "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz"
@@ -468,11 +865,26 @@
     "safer-buffer" "^2.0.2"
     "tweetnacl" "~0.14.0"
 
+"ssr-window@^3.0.0-alpha.1":
+  "integrity" "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
+  "resolved" "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz"
+  "version" "3.0.0"
+
 "throttle-debounce@^1.0.1", "throttle-debounce@^1.1.0":
   "integrity" "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
   "resolved" "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz"
   "version" "1.1.0"
 
+"tiny-emitter@^2.0.0":
+  "integrity" "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+  "resolved" "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
+  "version" "2.1.0"
+
+"tiny-warning@^1.0.3":
+  "integrity" "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+  "resolved" "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz"
+  "version" "1.0.3"
+
 "tough-cookie@~2.5.0":
   "integrity" "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="
   "resolved" "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz"
@@ -493,6 +905,11 @@
   "resolved" "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz"
   "version" "0.14.5"
 
+"type@^2.7.2":
+  "integrity" "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+  "resolved" "https://registry.npmmirror.com/type/-/type-2.7.2.tgz"
+  "version" "2.7.2"
+
 "umy-table@^1.1.8", "umy-table@1.1.8":
   "integrity" "sha512-yqPMFwZ6MUNqI73KamsNKBTbHRA7VuVZDEWobaySghtf4n/s7INuTNQoADB/ROVK57WOXr99Xpnol0aMqGlASA=="
   "resolved" "https://registry.npmmirror.com/umy-table/-/umy-table-1.1.8.tgz"
@@ -556,12 +973,36 @@
   "resolved" "https://registry.npmmirror.com/vk-unicloud-admin-ui/-/vk-unicloud-admin-ui-1.17.53.tgz"
   "version" "1.17.53"
 
+"vue-clipboard2@^0.3.3":
+  "integrity" "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw=="
+  "resolved" "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz"
+  "version" "0.3.3"
+  dependencies:
+    "clipboard" "^2.0.0"
+
 "vue-cropper@^0.6.4":
   "integrity" "sha512-U3bm17Li/Xwfw2t3pr8/hFE/tYhvwIWqepHK9IFC1TnX1KFd64VyfCD9nMBhPY91RyvMC6jSQgT/DyDNKuTpIQ=="
   "resolved" "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.6.4.tgz"
   "version" "0.6.4"
 
-"vue@^2.5.17", "vue@^2.7.15", "vue@>= 2.6.0 < 3", "vue@2.x":
+"vue-drag-verify2@^1.2.0":
+  "integrity" "sha512-Ie6cxw2K1fpDZDYwFaSxfNhJ9NDKWJyXQppDCPakN/HK92DHukdIFfZqaCS9hTgtSF3ZCuaVYYZ8UOYQHiOS7Q=="
+  "resolved" "https://registry.npmmirror.com/vue-drag-verify2/-/vue-drag-verify2-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "vue" "^2.5.11"
+
+"vue-tianditu@^1.2.11":
+  "integrity" "sha512-yE80uENFI3be2Fh9gIjQ7R+H5y0fl7sNw8+MhkUpB7VDEnwiT4som93n+1kroMs9fNwMiSVXAMeBsJ+YrmGjIg=="
+  "resolved" "https://registry.npmmirror.com/vue-tianditu/-/vue-tianditu-1.2.11.tgz"
+  "version" "1.2.11"
+  dependencies:
+    "async-validator" "1.11.5"
+    "core-js" "^3.6.5"
+    "element-ui" "^2.15.1"
+    "vue" "^2.6.12"
+
+"vue@^2.5.11", "vue@^2.5.17", "vue@^2.6.12", "vue@^2.6.14", "vue@^2.7.15", "vue@>= 2.6.0 < 3", "vue@2.x":
   "integrity" "sha512-a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ=="
   "resolved" "https://registry.npmmirror.com/vue/-/vue-2.7.15.tgz"
   "version" "2.7.15"
@@ -576,6 +1017,11 @@
   dependencies:
     "sortablejs" "1.10.2"
 
+"wildcard@^1.1.0":
+  "integrity" "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng=="
+  "resolved" "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz"
+  "version" "1.1.2"
+
 "xe-utils@^3.0.0-beta.12", "xe-utils@^3.5.14":
   "integrity" "sha512-Xq6mS8dWwHBQsQUEBXcZYSaBV0KnNLoVWd0vRRDI3nKpbNxfs/LSCK0W21g1edLFnXYfKqg7hh5dakr3RtYY0A=="
   "resolved" "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.14.tgz"