修改样式BUG

5f53e721 · 罗超 · 46398b80 · 5f53e721 · 5f53e721 · 5f53e721
Commit 5f53e721 authored Sep 22, 2023 by 罗超
22 changed files
--- a/components/coupon/index.vue
+++ b/components/coupon/index.vue
@@ -10,18 +10,18 @@
 					<view class="ticket">
 						<view class="miane">
 							<view class="money">
-								<text class="small" v-if="x.coupon_data.type==1">￥</text>
+								<text class="small" style="font-family: microsoft yahei ui light;" v-if="x.couponsType==1">￥</text>
-								<text style="font-size: 44px;">{{x.sub_price.toString().split('.')[0]}}</text>
+								<text style="font-size: 44px;font-family: nav-font;">{{x.denomination}}</text>
-								<text class="small" v-if="x.coupon_data.type==2">折</text>
+								<text class="small"  style="font-family: microsoft yahei ui light;" v-if="x.couponsType!=1">折</text>
 							</view>
-							<view class="tiaojian">满{{x.coupon_min_price}}元可用</view>
+							<view class="tiaojian">满{{x.useCondition}}元可用</view>
 						</view>
 					</view>
 					<view class="detail">
 						<view class="coupond">
-							<view class="name">{{x.coupon_data.name}}</view>
+							<view class="name">{{x.couponName}}</view>
-							<view class="date">{{x.start_time+"-"+x.end_time}}</view>
+							<view class="date">{{ x.expirationDate }} 失效</view>
-							<view class="rule">{{x.coupon_data.rule}}</view>
+							<!-- <view class="rule" v-if="x.lineTeamName!='' || x.lineName!=''">{{x.lineName}} {{x.lineTeamName}} 可用</view> -->
 						</view>
 						<view class="chosen">
 							<u-radio-group v-model="value" @change="radioChange" >
@@ -65,8 +65,8 @@
 			this.value = this.current;
 			this.ts = this.list
 			this.ts.forEach(x => {
-				x.start_time = x.start_time.split(' ')[0].replace(/-/g, '.')
+				x.start_time = x.effectDate.split(' ')[0].replace(/-/g, '.')
-				x.end_time = x.end_time.split(' ')[0].replace(/-/g, '.')
+				x.end_time = x.expirationDate.split(' ')[0].replace(/-/g, '.')
 			})
 		},
 		methods: {
@@ -78,6 +78,7 @@
 				}
 			},
 			radioChange(e){
+				console.log(e)
 				if(this.currentChosen != e){
 					this.currentChosen = e
 				}else{

--- a/manifest.json
+++ b/manifest.json
 {
-    "name": "mallapp",
+    "name" : "mallapp",
-    "appid": "",
+    "appid" : "__UNI__4422593",
-    "description": "",
+    "description" : "",
-    "versionName": "1.0.0",
+    "versionName" : "1.0.0",
-    "versionCode": "100",
+    "versionCode" : "100",
-    "transformPx": false,
+    "transformPx" : false,
    /* 5+App特有相关 */
-    "app-plus": {
+    "app-plus" : {
-        "usingComponents": true,
+        "usingComponents" : true,
-        "nvueCompiler": "uni-app",
+        "nvueCompiler" : "uni-app",
-        "compilerVersion": 3,
+        "compilerVersion" : 3,
-        "splashscreen": {
+        "splashscreen" : {
-            "alwaysShowBeforeRender": true,
+            "alwaysShowBeforeRender" : true,
-            "waiting": true,
+            "waiting" : true,
-            "autoclose": true,
+            "autoclose" : true,
-            "delay": 0
+            "delay" : 0
        },
        /* 模块配置 */
-        "modules": {
+        "modules" : {
-            "Share": {}
+            "Share" : {}
        },
        /* 应用发布信息 */
-        "distribute": {
+        "distribute" : {
            /* android打包配置 */
-            "android": {
+            "android" : {
-                "permissions": [
+                "permissions" : [
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -50,73 +50,72 @@
                ]
            },
            /* ios打包配置 */
-            "ios": {},
+            "ios" : {},
            /* SDK配置 */
-            "sdkConfigs": {
+            "sdkConfigs" : {
-                "share": {
+                "share" : {
-                    "weixin": {
+                    "weixin" : {
-                        "appid": "wxbb033190e0ffa5db",
+                        "appid" : "wxbb033190e0ffa5db",
-                        "UniversalLinks": ""
+                        "UniversalLinks" : ""
                    }
                },
-                "oauth": {
+                "oauth" : {
-                    "univerify": {}
+                    "univerify" : {}
                }
            }
        }
    },
    /* 快应用特有相关 */
-    "quickapp": {},
+    "quickapp" : {},
    /* 小程序特有相关 */
-    "mp-weixin": {
+    "mp-weixin" : {
-        "appid": "wxcf0727a7c78b501e",
+        "appid" : "wxcf0727a7c78b501e",
-        "setting": {
+        "setting" : {
-            "urlCheck": false,
+            "urlCheck" : false,
-            "minified": false
+            "minified" : false
        },
-        "usingComponents": true,
+        "usingComponents" : true,
-        "permission": {
+        "permission" : {
-            "scope.userLocation": {
+            "scope.userLocation" : {
-                "desc": "你的位置信息将用于小程序位置接口的效果展示"
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
            }
        },
-        "optimization": {
+        "optimization" : {
-            "subPackages": true
+            "subPackages" : true
        }
    },
-    "mp-alipay": {
+    "mp-alipay" : {
-        "component2": true,
+        "component2" : true,
-        "usingComponents": true,
+        "usingComponents" : true,
-        "appid": "2021002181604459",
+        "appid" : "2021002181604459",
-        "plugins": {
+        "plugins" : {
            // 使用到的插件
-            "subscribeMsg": {
+            "subscribeMsg" : {
                // 订阅消息插件
-                "version": "*", // 目前只支持设置 * 拉取当前上架最新版本
+                "version" : "*", // 目前只支持设置 * 拉取当前上架最新版本
-                "provider": "2021001155639035" // 消息订阅插件 appid
+                "provider" : "2021001155639035" // 消息订阅插件 appid
            }
        }
    },
+    "mp-baidu" : {
-    "mp-baidu": {
+        "usingComponents" : true
-        "usingComponents": true
    },
-    "mp-toutiao": {
+    "mp-toutiao" : {
-        "usingComponents": true
+        "usingComponents" : true
    },
-    "uniStatistics": {
+    "uniStatistics" : {
-        "enable": false
+        "enable" : false
    },
-    "h5": {
+    "h5" : {
-        "router": {
+        "router" : {
-            "mode": "history",
+            "mode" : "history",
-            "base": "/h5/"
+            "base" : "/h5/"
        },
-        "template": "h5.html",
+        "template" : "h5.html",
-        "sdkConfigs": {
+        "sdkConfigs" : {
-            "maps": {
+            "maps" : {
-                "qqmap": {
+                "qqmap" : {
-                    "key": "ZAPBZ-SVBWR-OAMWM-WC45H-AKFU3-FIBP3"
+                    "key" : "ZAPBZ-SVBWR-OAMWM-WC45H-AKFU3-FIBP3"
                }
            }
        }

--- a/node_modules.rar
+++ b/node_modules.rar
--- a/node_modules/js-md5/CHANGELOG.md
+++ b/node_modules/js-md5/CHANGELOG.md
+# Change Log
+## v0.7.3 / 2017-12-18
+### Fixed
+- incorrect result when first bit is 1 of bytes. #18
+## v0.7.2 / 2017-10-31
+### Improved
+- performance of hBytes increment.
+## v0.7.1 / 2017-10-29
+### Fixed
+- incorrect result when file size >= 4G.
+## v0.7.0 / 2017-10-29
+### Fixed
+- incorrect result when file size >= 512M.
+## v0.6.1 / 2017-10-07
+### Fixed
+- ArrayBuffer.isView issue in IE10.
+### Improved
+- performance of input check.
+## v0.6.0 / 2017-07-28
+### Added
+- support base64 string output.
+## v0.5.0 / 2017-07-14
+### Added
+- support for web worker. #11
+### Changed
+- throw error if input type is incorrect.
+- prevent webpack to require dependencies.
+## v0.4.2 / 2017-01-18
+### Fixed
+- `root` is undefined in some special environment. #7
+## v0.4.1 / 2016-03-31
+### Removed
+- length detection in node.js.
+### Deprecated
+- `buffer` and replace by `arrayBuffer`.
+## v0.4.0 / 2015-12-28
+### Added
+- support for update hash.
+- support for bytes array output.
+- support for ArrayBuffer output.
+- support for AMD.
+## v0.3.0 / 2015-03-07
+### Added
+- support byte Array, Uint8Array and ArrayBuffer input.
+## v0.2.2 / 2015-02-01
+### Fixed
+- bug when special length.
+### Improve
+- performance for node.js.
+## v0.2.1 / 2015-01-13
+### Improve
+- performance.
+## v0.2.0 / 2015-01-12
+### Removed
+- ascii parameter.
+### Improve
+- performance.
+## v0.1.4 / 2015-01-11
+### Improve
+- performance.
+### Added
+- test cases.
+## v0.1.3 / 2015-01-05
+### Added
+- bower package.
+- travis.
+- coveralls.
+### Improved
+- performance.
+### Fixed
+- JSHint warnings.
+## v0.1.2 / 2014-07-27
+### Fixed
+- accents bug
+## v0.1.1 / 2014-01-05
+### Changed
+- license
+## v0.1.0 / 2014-01-04
+### Added
+- initial release
--- a/node_modules/js-md5/LICENSE.txt
+++ b/node_modules/js-md5/LICENSE.txt
+Copyright 2014-2017 Chen, Yi-Cyuan
+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.
--- a/node_modules/js-md5/README.md
+++ b/node_modules/js-md5/README.md
+# js-md5
+[![Build Status](https://travis-ci.org/emn178/js-md5.svg?branch=master)](https://travis-ci.org/emn178/js-md5)
+[![Coverage Status](https://coveralls.io/repos/emn178/js-md5/badge.svg?branch=master)](https://coveralls.io/r/emn178/js-md5?branch=master)  
+[![NPM](https://nodei.co/npm/js-md5.png?stars&downloads)](https://nodei.co/npm/js-md5/)
+A simple MD5 hash function for JavaScript supports UTF-8 encoding.
+## Demo
+[MD5 Online](http://emn178.github.io/online-tools/md5.html)  
+[MD5 File Checksum Online](http://emn178.github.io/online-tools/md5_checksum.html)
+## Download
+[Compress](https://raw.github.com/emn178/js-md5/master/build/md5.min.js)  
+[Uncompress](https://raw.github.com/emn178/js-md5/master/src/md5.js)
+## Installation
+You can also install js-md5 by using Bower.
+    bower install md5
+For node.js, you can use this command to install:
+    npm install js-md5
+## Notice
+`buffer` method is deprecated. This maybe confuse with Buffer in node.js. Please use `arrayBuffer` instead.
+## Usage
+You could use like this:
+```JavaScript
+md5('Message to hash');
+var hash = md5.create();
+hash.update('Message to hash');
+hash.hex();
+```
+If you use node.js, you should require the module first:
+```JavaScript
+md5 = require('js-md5');
+```
+It supports AMD:
+```JavaScript
+require(['your/path/md5.js'], function(md5) {
+// ...
+});
+```
+[See document](https://emn178.github.com/js-md5/doc/)
+## Example
+```JavaScript
+md5(''); // d41d8cd98f00b204e9800998ecf8427e
+md5('The quick brown fox jumps over the lazy dog'); // 9e107d9d372bb6826bd81d3542a419d6
+md5('The quick brown fox jumps over the lazy dog.'); // e4d909c290d0fb1ca068ffaddf22cbd0
+// It also supports UTF-8 encoding
+md5('中文'); // a7bac2239fcdcb3a067903d8077c4a07
+// It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+md5([]); // d41d8cd98f00b204e9800998ecf8427e
+md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e
+// Different output
+md5(''); // d41d8cd98f00b204e9800998ecf8427e
+md5.hex(''); // d41d8cd98f00b204e9800998ecf8427e
+md5.array(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
+md5.digest(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
+md5.arrayBuffer(''); // ArrayBuffer
+md5.buffer(''); // ArrayBuffer, deprecated, This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+md5.base64(''); // 1B2M2Y8AsgTpgAmY7PhCfg==
+```
+## License
+The project is released under the [MIT license](http://www.opensource.org/licenses/MIT).
+## Contact
+The project's website is located at https://github.com/emn178/js-md5  
+Author: Chen, Yi-Cyuan (emn178@gmail.com)
--- a/node_modules/js-md5/build/md5.min.js
+++ b/node_modules/js-md5/build/md5.min.js
+/**
+ * [js-md5]{@link https://github.com/emn178/js-md5}
+ *
+ * @namespace md5
+ * @version 0.7.3
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+!function(){"use strict";function t(t){if(t)d[0]=d[16]=d[1]=d[2]=d[3]=d[4]=d[5]=d[6]=d[7]=d[8]=d[9]=d[10]=d[11]=d[12]=d[13]=d[14]=d[15]=0,this.blocks=d,this.buffer8=l;else if(a){var r=new ArrayBuffer(68);this.buffer8=new Uint8Array(r),this.blocks=new Uint32Array(r)}else this.blocks=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];this.h0=this.h1=this.h2=this.h3=this.start=this.bytes=this.hBytes=0,this.finalized=this.hashed=!1,this.first=!0}var r="input is invalid type",e="object"==typeof window,i=e?window:{};i.JS_MD5_NO_WINDOW&&(e=!1);var s=!e&&"object"==typeof self,h=!i.JS_MD5_NO_NODE_JS&&"object"==typeof process&&process.versions&&process.versions.node;h?i=global:s&&(i=self);var f=!i.JS_MD5_NO_COMMON_JS&&"object"==typeof module&&module.exports,o="function"==typeof define&&define.amd,a=!i.JS_MD5_NO_ARRAY_BUFFER&&"undefined"!=typeof ArrayBuffer,n="0123456789abcdef".split(""),u=[128,32768,8388608,-2147483648],y=[0,8,16,24],c=["hex","array","digest","buffer","arrayBuffer","base64"],p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),d=[],l;if(a){var A=new ArrayBuffer(68);l=new Uint8Array(A),d=new Uint32Array(A)}!i.JS_MD5_NO_NODE_JS&&Array.isArray||(Array.isArray=function(t){return"[object Array]"===Object.prototype.toString.call(t)}),!a||!i.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW&&ArrayBuffer.isView||(ArrayBuffer.isView=function(t){return"object"==typeof t&&t.buffer&&t.buffer.constructor===ArrayBuffer});var b=function(r){return function(e){return new t(!0).update(e)[r]()}},v=function(){var r=b("hex");h&&(r=w(r)),r.create=function(){return new t},r.update=function(t){return r.create().update(t)};for(var e=0;e<c.length;++e){var i=c[e];r[i]=b(i)}return r},w=function(t){var e=eval("require('crypto')"),i=eval("require('buffer').Buffer"),s=function(s){if("string"==typeof s)return e.createHash("md5").update(s,"utf8").digest("hex");if(null===s||void 0===s)throw r;return s.constructor===ArrayBuffer&&(s=new Uint8Array(s)),Array.isArray(s)||ArrayBuffer.isView(s)||s.constructor===i?e.createHash("md5").update(new i(s)).digest("hex"):t(s)};return s};t.prototype.update=function(t){if(!this.finalized){var e,i=typeof t;if("string"!==i){if("object"!==i)throw r;if(null===t)throw r;if(a&&t.constructor===ArrayBuffer)t=new Uint8Array(t);else if(!(Array.isArray(t)||a&&ArrayBuffer.isView(t)))throw r;e=!0}for(var s,h,f=0,o=t.length,n=this.blocks,u=this.buffer8;f<o;){if(this.hashed&&(this.hashed=!1,n[0]=n[16],n[16]=n[1]=n[2]=n[3]=n[4]=n[5]=n[6]=n[7]=n[8]=n[9]=n[10]=n[11]=n[12]=n[13]=n[14]=n[15]=0),e)if(a)for(h=this.start;f<o&&h<64;++f)u[h++]=t[f];else for(h=this.start;f<o&&h<64;++f)n[h>>2]|=t[f]<<y[3&h++];else if(a)for(h=this.start;f<o&&h<64;++f)(s=t.charCodeAt(f))<128?u[h++]=s:s<2048?(u[h++]=192|s>>6,u[h++]=128|63&s):s<55296||s>=57344?(u[h++]=224|s>>12,u[h++]=128|s>>6&63,u[h++]=128|63&s):(s=65536+((1023&s)<<10|1023&t.charCodeAt(++f)),u[h++]=240|s>>18,u[h++]=128|s>>12&63,u[h++]=128|s>>6&63,u[h++]=128|63&s);else for(h=this.start;f<o&&h<64;++f)(s=t.charCodeAt(f))<128?n[h>>2]|=s<<y[3&h++]:s<2048?(n[h>>2]|=(192|s>>6)<<y[3&h++],n[h>>2]|=(128|63&s)<<y[3&h++]):s<55296||s>=57344?(n[h>>2]|=(224|s>>12)<<y[3&h++],n[h>>2]|=(128|s>>6&63)<<y[3&h++],n[h>>2]|=(128|63&s)<<y[3&h++]):(s=65536+((1023&s)<<10|1023&t.charCodeAt(++f)),n[h>>2]|=(240|s>>18)<<y[3&h++],n[h>>2]|=(128|s>>12&63)<<y[3&h++],n[h>>2]|=(128|s>>6&63)<<y[3&h++],n[h>>2]|=(128|63&s)<<y[3&h++]);this.lastByteIndex=h,this.bytes+=h-this.start,h>=64?(this.start=h-64,this.hash(),this.hashed=!0):this.start=h}return this.bytes>4294967295&&(this.hBytes+=this.bytes/4294967296<<0,this.bytes=this.bytes%4294967296),this}},t.prototype.finalize=function(){if(!this.finalized){this.finalized=!0;var t=this.blocks,r=this.lastByteIndex;t[r>>2]|=u[3&r],r>=56&&(this.hashed||this.hash(),t[0]=t[16],t[16]=t[1]=t[2]=t[3]=t[4]=t[5]=t[6]=t[7]=t[8]=t[9]=t[10]=t[11]=t[12]=t[13]=t[14]=t[15]=0),t[14]=this.bytes<<3,t[15]=this.hBytes<<3|this.bytes>>>29,this.hash()}},t.prototype.hash=function(){var t,r,e,i,s,h,f=this.blocks;this.first?r=((r=((t=((t=f[0]-680876937)<<7|t>>>25)-271733879<<0)^(e=((e=(-271733879^(i=((i=(-1732584194^2004318071&t)+f[1]-117830708)<<12|i>>>20)+t<<0)&(-271733879^t))+f[2]-1126478375)<<17|e>>>15)+i<<0)&(i^t))+f[3]-1316259209)<<22|r>>>10)+e<<0:(t=this.h0,r=this.h1,e=this.h2,r=((r+=((t=((t+=((i=this.h3)^r&(e^i))+f[0]-680876936)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[1]-389564586)<<12|i>>>20)+t<<0)&(t^r))+f[2]+606105819)<<17|e>>>15)+i<<0)&(i^t))+f[3]-1044525330)<<22|r>>>10)+e<<0),r=((r+=((t=((t+=(i^r&(e^i))+f[4]-176418897)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[5]+1200080426)<<12|i>>>20)+t<<0)&(t^r))+f[6]-1473231341)<<17|e>>>15)+i<<0)&(i^t))+f[7]-45705983)<<22|r>>>10)+e<<0,r=((r+=((t=((t+=(i^r&(e^i))+f[8]+1770035416)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[9]-1958414417)<<12|i>>>20)+t<<0)&(t^r))+f[10]-42063)<<17|e>>>15)+i<<0)&(i^t))+f[11]-1990404162)<<22|r>>>10)+e<<0,r=((r+=((t=((t+=(i^r&(e^i))+f[12]+1804603682)<<7|t>>>25)+r<<0)^(e=((e+=(r^(i=((i+=(e^t&(r^e))+f[13]-40341101)<<12|i>>>20)+t<<0)&(t^r))+f[14]-1502002290)<<17|e>>>15)+i<<0)&(i^t))+f[15]+1236535329)<<22|r>>>10)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[1]-165796510)<<5|t>>>27)+r<<0)^r))+f[6]-1069501632)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[11]+643717713)<<14|e>>>18)+i<<0)^i))+f[0]-373897302)<<20|r>>>12)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[5]-701558691)<<5|t>>>27)+r<<0)^r))+f[10]+38016083)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[15]-660478335)<<14|e>>>18)+i<<0)^i))+f[4]-405537848)<<20|r>>>12)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[9]+568446438)<<5|t>>>27)+r<<0)^r))+f[14]-1019803690)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[3]-187363961)<<14|e>>>18)+i<<0)^i))+f[8]+1163531501)<<20|r>>>12)+e<<0,r=((r+=((i=((i+=(r^e&((t=((t+=(e^i&(r^e))+f[13]-1444681467)<<5|t>>>27)+r<<0)^r))+f[2]-51403784)<<9|i>>>23)+t<<0)^t&((e=((e+=(t^r&(i^t))+f[7]+1735328473)<<14|e>>>18)+i<<0)^i))+f[12]-1926607734)<<20|r>>>12)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[5]-378558)<<4|t>>>28)+r<<0))+f[8]-2022574463)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[11]+1839030562)<<16|e>>>16)+i<<0))+f[14]-35309556)<<23|r>>>9)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[1]-1530992060)<<4|t>>>28)+r<<0))+f[4]+1272893353)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[7]-155497632)<<16|e>>>16)+i<<0))+f[10]-1094730640)<<23|r>>>9)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[13]+681279174)<<4|t>>>28)+r<<0))+f[0]-358537222)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[3]-722521979)<<16|e>>>16)+i<<0))+f[6]+76029189)<<23|r>>>9)+e<<0,r=((r+=((h=(i=((i+=((s=r^e)^(t=((t+=(s^i)+f[9]-640364487)<<4|t>>>28)+r<<0))+f[12]-421815835)<<11|i>>>21)+t<<0)^t)^(e=((e+=(h^r)+f[15]+530742520)<<16|e>>>16)+i<<0))+f[2]-995338651)<<23|r>>>9)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[0]-198630844)<<6|t>>>26)+r<<0)|~e))+f[7]+1126891415)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[14]-1416354905)<<15|e>>>17)+i<<0)|~t))+f[5]-57434055)<<21|r>>>11)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[12]+1700485571)<<6|t>>>26)+r<<0)|~e))+f[3]-1894986606)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[10]-1051523)<<15|e>>>17)+i<<0)|~t))+f[1]-2054922799)<<21|r>>>11)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[8]+1873313359)<<6|t>>>26)+r<<0)|~e))+f[15]-30611744)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[6]-1560198380)<<15|e>>>17)+i<<0)|~t))+f[13]+1309151649)<<21|r>>>11)+e<<0,r=((r+=((i=((i+=(r^((t=((t+=(e^(r|~i))+f[4]-145523070)<<6|t>>>26)+r<<0)|~e))+f[11]-1120210379)<<10|i>>>22)+t<<0)^((e=((e+=(t^(i|~r))+f[2]+718787259)<<15|e>>>17)+i<<0)|~t))+f[9]-343485551)<<21|r>>>11)+e<<0,this.first?(this.h0=t+1732584193<<0,this.h1=r-271733879<<0,this.h2=e-1732584194<<0,this.h3=i+271733878<<0,this.first=!1):(this.h0=this.h0+t<<0,this.h1=this.h1+r<<0,this.h2=this.h2+e<<0,this.h3=this.h3+i<<0)},t.prototype.hex=function(){this.finalize();var t=this.h0,r=this.h1,e=this.h2,i=this.h3;return n[t>>4&15]+n[15&t]+n[t>>12&15]+n[t>>8&15]+n[t>>20&15]+n[t>>16&15]+n[t>>28&15]+n[t>>24&15]+n[r>>4&15]+n[15&r]+n[r>>12&15]+n[r>>8&15]+n[r>>20&15]+n[r>>16&15]+n[r>>28&15]+n[r>>24&15]+n[e>>4&15]+n[15&e]+n[e>>12&15]+n[e>>8&15]+n[e>>20&15]+n[e>>16&15]+n[e>>28&15]+n[e>>24&15]+n[i>>4&15]+n[15&i]+n[i>>12&15]+n[i>>8&15]+n[i>>20&15]+n[i>>16&15]+n[i>>28&15]+n[i>>24&15]},t.prototype.toString=t.prototype.hex,t.prototype.digest=function(){this.finalize();var t=this.h0,r=this.h1,e=this.h2,i=this.h3;return[255&t,t>>8&255,t>>16&255,t>>24&255,255&r,r>>8&255,r>>16&255,r>>24&255,255&e,e>>8&255,e>>16&255,e>>24&255,255&i,i>>8&255,i>>16&255,i>>24&255]},t.prototype.array=t.prototype.digest,t.prototype.arrayBuffer=function(){this.finalize();var t=new ArrayBuffer(16),r=new Uint32Array(t);return r[0]=this.h0,r[1]=this.h1,r[2]=this.h2,r[3]=this.h3,t},t.prototype.buffer=t.prototype.arrayBuffer,t.prototype.base64=function(){for(var t,r,e,i="",s=this.array(),h=0;h<15;)t=s[h++],r=s[h++],e=s[h++],i+=p[t>>>2]+p[63&(t<<4|r>>>4)]+p[63&(r<<2|e>>>6)]+p[63&e];return t=s[h],i+=p[t>>>2]+p[t<<4&63]+"=="};var _=v();f?module.exports=_:(i.md5=_,o&&define(function(){return _}))}();
\ No newline at end of file
--- a/node_modules/js-md5/package.json
+++ b/node_modules/js-md5/package.json
+{
+  "name": "js-md5",
+  "version": "0.7.3",
+  "description": "A simple MD5 hash function for JavaScript supports UTF-8 encoding.",
+  "main": "src/md5.js",
+  "devDependencies": {
+    "expect.js": "~0.3.1",
+    "jsdoc": "^3.4.0",
+    "mocha": "~2.3.4",
+    "nyc": "^11.3.0",
+    "requirejs": "^2.1.22",
+    "uglify-js": "^3.1.9",
+    "webworker-threads": "^0.7.11"
+  },
+  "scripts": {
+    "test": "nyc mocha tests/node-test.js",
+    "report": "nyc --reporter=html --reporter=text mocha tests/node-test.js",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "doc": "rm -rf doc;jsdoc src README.md -d doc",
+    "compress": "uglifyjs src/md5.js -c -m eval --comments --output build/md5.min.js",
+    "build": "npm run-script compress;npm run-script doc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/emn178/js-md5.git"
+  },
+  "keywords": [
+    "md5",
+    "hash",
+    "encryption",
+    "cryptography",
+    "HMAC"
+  ],
+  "license": "MIT",
+  "author": "Chen, Yi-Cyuan <emn178@gmail.com>",
+  "homepage": "https://github.com/emn178/js-md5",
+  "bugs": {
+    "url": "https://github.com/emn178/js-md5/issues"
+  },
+  "nyc": {
+    "exclude": [
+      "tests"
+    ]
+  }
+}
--- a/node_modules/js-md5/src/md5.js
+++ b/node_modules/js-md5/src/md5.js
+/**
+ * [js-md5]{@link https://github.com/emn178/js-md5}
+ *
+ * @namespace md5
+ * @version 0.7.3
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+(function () {
+  'use strict';
+  var ERROR = 'input is invalid type';
+  var WINDOW = typeof window === 'object';
+  var root = WINDOW ? window : {};
+  if (root.JS_MD5_NO_WINDOW) {
+    WINDOW = false;
+  }
+  var WEB_WORKER = !WINDOW && typeof self === 'object';
+  var NODE_JS = !root.JS_MD5_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
+  if (NODE_JS) {
+    root = global;
+  } else if (WEB_WORKER) {
+    root = self;
+  }
+  var COMMON_JS = !root.JS_MD5_NO_COMMON_JS && typeof module === 'object' && module.exports;
+  var AMD = typeof define === 'function' && define.amd;
+  var ARRAY_BUFFER = !root.JS_MD5_NO_ARRAY_BUFFER && typeof ArrayBuffer !== 'undefined';
+  var HEX_CHARS = '0123456789abcdef'.split('');
+  var EXTRA = [128, 32768, 8388608, -2147483648];
+  var SHIFT = [0, 8, 16, 24];
+  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer', 'base64'];
+  var BASE64_ENCODE_CHAR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
+  var blocks = [], buffer8;
+  if (ARRAY_BUFFER) {
+    var buffer = new ArrayBuffer(68);
+    buffer8 = new Uint8Array(buffer);
+    blocks = new Uint32Array(buffer);
+  }
+  if (root.JS_MD5_NO_NODE_JS || !Array.isArray) {
+    Array.isArray = function (obj) {
+      return Object.prototype.toString.call(obj) === '[object Array]';
+    };
+  }
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+  /**
+   * @method hex
+   * @memberof md5
+   * @description Output hash as hex string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} Hex string
+   * @example
+   * md5.hex('The quick brown fox jumps over the lazy dog');
+   * // equal to
+   * md5('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method digest
+   * @memberof md5
+   * @description Output hash as bytes array
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Array} Bytes array
+   * @example
+   * md5.digest('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method array
+   * @memberof md5
+   * @description Output hash as bytes array
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Array} Bytes array
+   * @example
+   * md5.array('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method arrayBuffer
+   * @memberof md5
+   * @description Output hash as ArrayBuffer
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @example
+   * md5.arrayBuffer('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method buffer
+   * @deprecated This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+   * @memberof md5
+   * @description Output hash as ArrayBuffer
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @example
+   * md5.buffer('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method base64
+   * @memberof md5
+   * @description Output hash as base64 string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} base64 string
+   * @example
+   * md5.base64('The quick brown fox jumps over the lazy dog');
+   */
+  var createOutputMethod = function (outputType) {
+    return function (message) {
+      return new Md5(true).update(message)[outputType]();
+    };
+  };
+  /**
+   * @method create
+   * @memberof md5
+   * @description Create Md5 object
+   * @returns {Md5} Md5 object.
+   * @example
+   * var hash = md5.create();
+   */
+  /**
+   * @method update
+   * @memberof md5
+   * @description Create and update Md5 object
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Md5} Md5 object.
+   * @example
+   * var hash = md5.update('The quick brown fox jumps over the lazy dog');
+   * // equal to
+   * var hash = md5.create();
+   * hash.update('The quick brown fox jumps over the lazy dog');
+   */
+  var createMethod = function () {
+    var method = createOutputMethod('hex');
+    if (NODE_JS) {
+      method = nodeWrap(method);
+    }
+    method.create = function () {
+      return new Md5();
+    };
+    method.update = function (message) {
+      return method.create().update(message);
+    };
+    for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
+      var type = OUTPUT_TYPES[i];
+      method[type] = createOutputMethod(type);
+    }
+    return method;
+  };
+  var nodeWrap = function (method) {
+    var crypto = eval("require('crypto')");
+    var Buffer = eval("require('buffer').Buffer");
+    var nodeMethod = function (message) {
+      if (typeof message === 'string') {
+        return crypto.createHash('md5').update(message, 'utf8').digest('hex');
+      } else {
+        if (message === null || message === undefined) {
+          throw ERROR;
+        } else if (message.constructor === ArrayBuffer) {
+          message = new Uint8Array(message);
+        }
+      }
+      if (Array.isArray(message) || ArrayBuffer.isView(message) ||
+        message.constructor === Buffer) {
+        return crypto.createHash('md5').update(new Buffer(message)).digest('hex');
+      } else {
+        return method(message);
+      }
+    };
+    return nodeMethod;
+  };
+  /**
+   * Md5 class
+   * @class Md5
+   * @description This is internal class.
+   * @see {@link md5.create}
+   */
+  function Md5(sharedMemory) {
+    if (sharedMemory) {
+      blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+      blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+      blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+      blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      this.blocks = blocks;
+      this.buffer8 = buffer8;
+    } else {
+      if (ARRAY_BUFFER) {
+        var buffer = new ArrayBuffer(68);
+        this.buffer8 = new Uint8Array(buffer);
+        this.blocks = new Uint32Array(buffer);
+      } else {
+        this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+      }
+    }
+    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = this.hBytes = 0;
+    this.finalized = this.hashed = false;
+    this.first = true;
+  }
+  /**
+   * @method update
+   * @memberof Md5
+   * @instance
+   * @description Update hash
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Md5} Md5 object.
+   * @see {@link md5.update}
+   */
+  Md5.prototype.update = function (message) {
+    if (this.finalized) {
+      return;
+    }
+    var notString, type = typeof message;
+    if (type !== 'string') {
+      if (type === 'object') {
+        if (message === null) {
+          throw ERROR;
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
+          message = new Uint8Array(message);
+        } else if (!Array.isArray(message)) {
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
+            throw ERROR;
+          }
+        }
+      } else {
+        throw ERROR;
+      }
+      notString = true;
+    }
+    var code, index = 0, i, length = message.length, blocks = this.blocks;
+    var buffer8 = this.buffer8;
+    while (index < length) {
+      if (this.hashed) {
+        this.hashed = false;
+        blocks[0] = blocks[16];
+        blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+        blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+        blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+        blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      }
+      if (notString) {
+        if (ARRAY_BUFFER) {
+          for (i = this.start; index < length && i < 64; ++index) {
+            buffer8[i++] = message[index];
+          }
+        } else {
+          for (i = this.start; index < length && i < 64; ++index) {
+            blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+          }
+        }
+      } else {
+        if (ARRAY_BUFFER) {
+          for (i = this.start; index < length && i < 64; ++index) {
+            code = message.charCodeAt(index);
+            if (code < 0x80) {
+              buffer8[i++] = code;
+            } else if (code < 0x800) {
+              buffer8[i++] = 0xc0 | (code >> 6);
+              buffer8[i++] = 0x80 | (code & 0x3f);
+            } else if (code < 0xd800 || code >= 0xe000) {
+              buffer8[i++] = 0xe0 | (code >> 12);
+              buffer8[i++] = 0x80 | ((code >> 6) & 0x3f);
+              buffer8[i++] = 0x80 | (code & 0x3f);
+            } else {
+              code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+              buffer8[i++] = 0xf0 | (code >> 18);
+              buffer8[i++] = 0x80 | ((code >> 12) & 0x3f);
+              buffer8[i++] = 0x80 | ((code >> 6) & 0x3f);
+              buffer8[i++] = 0x80 | (code & 0x3f);
+            }
+          }
+        } else {
+          for (i = this.start; index < length && i < 64; ++index) {
+            code = message.charCodeAt(index);
+            if (code < 0x80) {
+              blocks[i >> 2] |= code << SHIFT[i++ & 3];
+            } else if (code < 0x800) {
+              blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            } else if (code < 0xd800 || code >= 0xe000) {
+              blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            } else {
+              code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+              blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            }
+          }
+        }
+      }
+      this.lastByteIndex = i;
+      this.bytes += i - this.start;
+      if (i >= 64) {
+        this.start = i - 64;
+        this.hash();
+        this.hashed = true;
+      } else {
+        this.start = i;
+      }
+    }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
+    return this;
+  };
+  Md5.prototype.finalize = function () {
+    if (this.finalized) {
+      return;
+    }
+    this.finalized = true;
+    var blocks = this.blocks, i = this.lastByteIndex;
+    blocks[i >> 2] |= EXTRA[i & 3];
+    if (i >= 56) {
+      if (!this.hashed) {
+        this.hash();
+      }
+      blocks[0] = blocks[16];
+      blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+      blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+      blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+      blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+    }
+    blocks[14] = this.bytes << 3;
+    blocks[15] = this.hBytes << 3 | this.bytes >>> 29;
+    this.hash();
+  };
+  Md5.prototype.hash = function () {
+    var a, b, c, d, bc, da, blocks = this.blocks;
+    if (this.first) {
+      a = blocks[0] - 680876937;
+      a = (a << 7 | a >>> 25) - 271733879 << 0;
+      d = (-1732584194 ^ a & 2004318071) + blocks[1] - 117830708;
+      d = (d << 12 | d >>> 20) + a << 0;
+      c = (-271733879 ^ (d & (a ^ -271733879))) + blocks[2] - 1126478375;
+      c = (c << 17 | c >>> 15) + d << 0;
+      b = (a ^ (c & (d ^ a))) + blocks[3] - 1316259209;
+      b = (b << 22 | b >>> 10) + c << 0;
+    } else {
+      a = this.h0;
+      b = this.h1;
+      c = this.h2;
+      d = this.h3;
+      a += (d ^ (b & (c ^ d))) + blocks[0] - 680876936;
+      a = (a << 7 | a >>> 25) + b << 0;
+      d += (c ^ (a & (b ^ c))) + blocks[1] - 389564586;
+      d = (d << 12 | d >>> 20) + a << 0;
+      c += (b ^ (d & (a ^ b))) + blocks[2] + 606105819;
+      c = (c << 17 | c >>> 15) + d << 0;
+      b += (a ^ (c & (d ^ a))) + blocks[3] - 1044525330;
+      b = (b << 22 | b >>> 10) + c << 0;
+    }
+    a += (d ^ (b & (c ^ d))) + blocks[4] - 176418897;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ (a & (b ^ c))) + blocks[5] + 1200080426;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ (d & (a ^ b))) + blocks[6] - 1473231341;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ (c & (d ^ a))) + blocks[7] - 45705983;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (d ^ (b & (c ^ d))) + blocks[8] + 1770035416;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ (a & (b ^ c))) + blocks[9] - 1958414417;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ (d & (a ^ b))) + blocks[10] - 42063;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ (c & (d ^ a))) + blocks[11] - 1990404162;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (d ^ (b & (c ^ d))) + blocks[12] + 1804603682;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ (a & (b ^ c))) + blocks[13] - 40341101;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ (d & (a ^ b))) + blocks[14] - 1502002290;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ (c & (d ^ a))) + blocks[15] + 1236535329;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[1] - 165796510;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[6] - 1069501632;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[11] + 643717713;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[0] - 373897302;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[5] - 701558691;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[10] + 38016083;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[15] - 660478335;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[4] - 405537848;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[9] + 568446438;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[14] - 1019803690;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[3] - 187363961;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[8] + 1163531501;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[13] - 1444681467;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[2] - 51403784;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[7] + 1735328473;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[12] - 1926607734;
+    b = (b << 20 | b >>> 12) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[5] - 378558;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[8] - 2022574463;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[11] + 1839030562;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[14] - 35309556;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[1] - 1530992060;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[4] + 1272893353;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[7] - 155497632;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[10] - 1094730640;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[13] + 681279174;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[0] - 358537222;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[3] - 722521979;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[6] + 76029189;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[9] - 640364487;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[12] - 421815835;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[15] + 530742520;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[2] - 995338651;
+    b = (b << 23 | b >>> 9) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[0] - 198630844;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[7] + 1126891415;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[14] - 1416354905;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[5] - 57434055;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[12] + 1700485571;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[3] - 1894986606;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[10] - 1051523;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[1] - 2054922799;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[8] + 1873313359;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[15] - 30611744;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[6] - 1560198380;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[13] + 1309151649;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[4] - 145523070;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[11] - 1120210379;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[2] + 718787259;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[9] - 343485551;
+    b = (b << 21 | b >>> 11) + c << 0;
+    if (this.first) {
+      this.h0 = a + 1732584193 << 0;
+      this.h1 = b - 271733879 << 0;
+      this.h2 = c - 1732584194 << 0;
+      this.h3 = d + 271733878 << 0;
+      this.first = false;
+    } else {
+      this.h0 = this.h0 + a << 0;
+      this.h1 = this.h1 + b << 0;
+      this.h2 = this.h2 + c << 0;
+      this.h3 = this.h3 + d << 0;
+    }
+  };
+  /**
+   * @method hex
+   * @memberof Md5
+   * @instance
+   * @description Output hash as hex string
+   * @returns {String} Hex string
+   * @see {@link md5.hex}
+   * @example
+   * hash.hex();
+   */
+  Md5.prototype.hex = function () {
+    this.finalize();
+    var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3;
+    return HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
+      HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
+      HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
+      HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
+      HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
+      HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
+      HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
+      HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
+      HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
+      HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
+      HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
+      HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
+      HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
+      HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
+      HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
+      HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F];
+  };
+  /**
+   * @method toString
+   * @memberof Md5
+   * @instance
+   * @description Output hash as hex string
+   * @returns {String} Hex string
+   * @see {@link md5.hex}
+   * @example
+   * hash.toString();
+   */
+  Md5.prototype.toString = Md5.prototype.hex;
+  /**
+   * @method digest
+   * @memberof Md5
+   * @instance
+   * @description Output hash as bytes array
+   * @returns {Array} Bytes array
+   * @see {@link md5.digest}
+   * @example
+   * hash.digest();
+   */
+  Md5.prototype.digest = function () {
+    this.finalize();
+    var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3;
+    return [
+      h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >> 24) & 0xFF,
+      h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >> 24) & 0xFF,
+      h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >> 24) & 0xFF,
+      h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >> 24) & 0xFF
+    ];
+  };
+  /**
+   * @method array
+   * @memberof Md5
+   * @instance
+   * @description Output hash as bytes array
+   * @returns {Array} Bytes array
+   * @see {@link md5.array}
+   * @example
+   * hash.array();
+   */
+  Md5.prototype.array = Md5.prototype.digest;
+  /**
+   * @method arrayBuffer
+   * @memberof Md5
+   * @instance
+   * @description Output hash as ArrayBuffer
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @see {@link md5.arrayBuffer}
+   * @example
+   * hash.arrayBuffer();
+   */
+  Md5.prototype.arrayBuffer = function () {
+    this.finalize();
+    var buffer = new ArrayBuffer(16);
+    var blocks = new Uint32Array(buffer);
+    blocks[0] = this.h0;
+    blocks[1] = this.h1;
+    blocks[2] = this.h2;
+    blocks[3] = this.h3;
+    return buffer;
+  };
+  /**
+   * @method buffer
+   * @deprecated This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+   * @memberof Md5
+   * @instance
+   * @description Output hash as ArrayBuffer
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @see {@link md5.buffer}
+   * @example
+   * hash.buffer();
+   */
+  Md5.prototype.buffer = Md5.prototype.arrayBuffer;
+  /**
+   * @method base64
+   * @memberof Md5
+   * @instance
+   * @description Output hash as base64 string
+   * @returns {String} base64 string
+   * @see {@link md5.base64}
+   * @example
+   * hash.base64();
+   */
+  Md5.prototype.base64 = function () {
+    var v1, v2, v3, base64Str = '', bytes = this.array();
+    for (var i = 0; i < 15;) {
+      v1 = bytes[i++];
+      v2 = bytes[i++];
+      v3 = bytes[i++];
+      base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+        BASE64_ENCODE_CHAR[(v1 << 4 | v2 >>> 4) & 63] +
+        BASE64_ENCODE_CHAR[(v2 << 2 | v3 >>> 6) & 63] +
+        BASE64_ENCODE_CHAR[v3 & 63];
+    }
+    v1 = bytes[i];
+    base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+      BASE64_ENCODE_CHAR[(v1 << 4) & 63] +
+      '==';
+    return base64Str;
+  };
+  var exports = createMethod();
+  if (COMMON_JS) {
+    module.exports = exports;
+  } else {
+    /**
+     * @method md5
+     * @description Md5 hash function, export to global in browsers.
+     * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+     * @returns {String} md5 hashes
+     * @example
+     * md5(''); // d41d8cd98f00b204e9800998ecf8427e
+     * md5('The quick brown fox jumps over the lazy dog'); // 9e107d9d372bb6826bd81d3542a419d6
+     * md5('The quick brown fox jumps over the lazy dog.'); // e4d909c290d0fb1ca068ffaddf22cbd0
+     *
+     * // It also supports UTF-8 encoding
+     * md5('中文'); // a7bac2239fcdcb3a067903d8077c4a07
+     *
+     * // It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+     * md5([]); // d41d8cd98f00b204e9800998ecf8427e
+     * md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e
+     */
+    root.md5 = exports;
+    if (AMD) {
+      define(function () {
+        return exports;
+      });
+    }
+  }
+})();
--- a/package.json
+++ b/package.json
+{
+  "devDependencies": {
+    "js-md5": "^0.7.3"
+  }
+}
--- a/pages/coupon/index/index.vue
+++ b/pages/coupon/index/index.vue
@@ -3,13 +3,13 @@
    <u-tabs
      :list="list"
      :is-scroll="false"
-      :current="msg.UseState"
+      :current="currentIndex"
      @change="change"
      :active-color="mainColor"
      :show-bar="showBar"
      height="100"
    ></u-tabs>
-    <u-empty v-if="g.length == 0" text="暂无相关优惠券" mode="coupon"></u-empty>
+    <u-empty v-if="g.length == 0 && !loading" text="暂无相关优惠券" mode="coupon"></u-empty>
    <view
      v-if="g.length > 0"
@@ -29,19 +29,19 @@
      >
        <view class="couponList">
          <view class="item" v-for="(x, i) in g" :key="i" @click="godetails(x)">
-            <view :class="msg.UseState == 0 ? 'ticket' : 'ticket2'">
+            <view :class="{'ticket':msg.useState == 1,'ticket2':msg.useState != 1}">
              <view class="miane">
                <view class="money">
                  <!-- <text style="font-size: 44px;">{{x.sub_price.toString().split('.')[0]}}</text>
 		          <text  v-if="x.coupon.type==1">折</text> -->
-                  <text class="small" v-if="x.CouponType == 1">￥</text>
+                  <text class="small" style="font-family: microsoft yahei ui light;" v-if="x.couponsType == 1">￥</text>
-                  <Text style="font-size: 44px"
+                  <Text style="font-size: 44px;font-family: nav-font;"
-                    >{{ Number(x.DiscountsPrice) }}
+                    >{{ Number(x.denomination) }}
                  </Text>
-                  <Text class="small">{{ x.CouponType == 2 ? "折" : "" }}</Text>
+                  <Text class="small" style="font-family: microsoft yahei ui light;" >{{ x.couponsType != 1? "折" : "" }}</Text>
                </view>
                <view class="tiaojian"
-                  >满{{ Number(x.MinConsumePrice) }}元可用</view
+                  >满{{ Number(x.useCondition) }}元可用</view
                >
              </view>
              <view
@@ -69,13 +69,13 @@
            </view>
            <view class="detail">
              <view class="coupond">
-                <view class="name">{{ x.Name }}</view>
+                <view class="name" style="font-family:'microsoft yahei ui light';">{{ x.couponsName }}</view>
-                <view class="date">{{ x.StartDate + "-" + x.EndDate }}</view>
+                <view class="date">{{ x.expirationDate }} 失效</view>
-                <Text class="rule" v-if="x.UseTypeStr == 1">限商品类别</Text>
+                <Text class="rule" v-if="x.lineTeamName!='' || x.lineName!=''">{{x.lineName}} {{x.lineTeamName}} 可用</Text>
-                <Text class="rule" v-if="x.UseTypeStr == 2">限商品</Text>
+                <!-- <Text class="rule" v-if="x.UseTypeStr == 2">限商品</Text>
                <Text class="rule" v-if="x.UseTypeStr == 3">全场通用</Text>
-                <Text class="rule" v-if="x.UseTypeStr == 4">当面付</Text>
+                <Text class="rule" v-if="x.UseTypeStr == 4">当面付</Text> -->
              </view>
            </view>
          </view>
@@ -91,7 +91,7 @@
        />
      </scroll-view>
    </view>
-    <view
+    <!-- <view
      style="
        width: 100%;
        height: 50px;
@@ -106,7 +106,7 @@
      @click="goUrl"
    >
      <Text>去领券</Text>
-    </view>
+    </view> -->
    <!-- 加载中 -->
    <view class="loading" v-if="loading">
      <u-loading mode="flower" size="48">></u-loading>
@@ -133,14 +133,21 @@ export default {
      pageTitle: "我的优惠券",
      showAuth: false,
      U: {},
-      list: [{ name: "未使用" }, { name: "已使用" }, { name: "已过期" }],
+      list: [{ name: "未使用" }, { name: "已过期" }],
      mainColor: "",
      contentHeight: 0,
+	  currentIndex:0,
      msg: {
-        pageIndex: 1,
+        "pageIndex":1,
-        pageSize: 10,
+        "pageSize":8,
-        UseState: 0,
+        "useState":1,
+        "lineId":0,
+        "lineteamId":0,
+        "couponsName":"",
+        "couponsType":0,
+        "couponStatus":1,
+        "couponEffectStatus":1, //1 有效；3 无效
+        "couponsUseScope":0,
      },
      page_count: 1,
      g: [],
@@ -177,33 +184,32 @@ export default {
    });
  },
  onLoad: function (option) {
-    this.u = uni.getStorageSync("mall_UserInfo");
+    // this.u = uni.getStorageSync("mall_UserInfo");
-    if (!this.u) {
+    // if (!this.u) {
-      this.u = {
+    //   this.u = {
-        nickName: "未登录",
+    //     nickName: "未登录",
-        avatarUrl: "",
+    //     avatarUrl: "",
-      };
+    //   };
-      this.showAuth = true;
+    //   this.showAuth = true;
-    } else {
+    // } else {
-      this.init();
+    //   this.init();
-    }
+    // }
+	this.loading=true
+	this.init()
  },
  methods: {
    change(index) {
-      this.msg.UseState = index;
+		this.currentIndex=index
+      this.msg.useState = index==0?1:3;
      this.msg.pageIndex = 1;
      this.g = [];
      this.loading = true;
      this.init();
    },
    init() {
-      this.request2(
+		uni.showLoading()
-        {
+		this.javaApipost('b2b/user/getUserCouponAllotList',this.msg,(res)=>{
-          url: "/api/AppletUser/GetMemberCouponPageList",
-          data: this.msg,
-        },
-        (res) => {
-          if (res.resultCode == 1) {
 			this.loading = false;
 			this.g = this.g.concat(res.data.pageData);
@@ -211,9 +217,28 @@ export default {
 			if (this.page_count == 1) {
 			  this.status = "nomore";
 			}
-          }
+			uni.hideLoading()
-        }
+		},(err)=>{
-      );
+			console.log(err)
+			uni.hideLoading()
+		})
+      // this.request2(
+      //   {
+      //     url: "/api/AppletUser/GetMemberCouponPageList",
+      //     data: this.msg,
+      //   },
+      //   (res) => {
+      //     if (res.resultCode == 1) {
+      //       this.loading = false;
+      //       this.g = this.g.concat(res.data.pageData);
+      //       this.page_count = res.data.pageCount;
+      //       if (this.page_count == 1) {
+      //         this.status = "nomore";
+      //       }
+      //     }
+      //   }
+      // );
    },
    lower(e) {
      if (this.msg.pageIndex < this.page_count) {

--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,12 +23,12 @@
      <view
        class="content"
        :style="{
-          'padding-bottom':'78px',
+          'padding-bottom':(pageId==0?'78px':'0px'),
        }"
      >
 	  <!-- paddingTop: pagePaddingBottom, -->
        <view
-		v-if="false"
+			v-if="pageId!=0"
          class="index-title"
          :class="{ MainTopLeft: pageTitleStr.length > 10 }"
          :style="[

--- a/pages/jiuzhai/jz_Line.vue
+++ b/pages/jiuzhai/jz_Line.vue
@@ -309,10 +309,10 @@
 	<div class="jz_Line">
 		<view class="jz_Content">
 			<view class="search-box">
-				<!-- <view class="date" @click="showBranch=true">
+				<view class="date" @click="showBranch=true">
 					<u-icon name="location" color="#111" size="24"></u-icon>
 					<text style="margin-left: 20rpx;">{{currentBrachName}}</text>
-				</view> -->
+				</view>
 				<view style="width: 1px; flex: 1;">
 					<u-search placeholder="关键字搜索" v-model="msg.searchKey" @search="getList(1)" input-align="left" :value="msg.searchKey" text-color="#111"
 					 bg-color="rgba(0,0,0,0)" :show-action="false"></u-search>
@@ -448,7 +448,7 @@
 									</view>
 									<view class="price" style="text-align: unset;">
 										<text>￥</text>
-										<text class="money">{{parseFloat(item.b2CPrice).toFixed(2)}}</text>
+										<text class="money">{{parseFloat($utils.getretailer()?item.b2BPrice:item.b2CPrice).toFixed(2)}}</text>
 									</view>
 								</view>
 							</view>
@@ -461,8 +461,8 @@
 		<u-popup v-model="showTimePopup" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
 			<canlendar @finish="chosenDateResult"></canlendar>
 		</u-popup>
-		<!-- <u-picker mode="selector" v-model="showBranch" :default-selector="[0]" :range="branchList" @confirm='changeBranch'
+		<u-picker mode="selector" v-model="showBranch" :default-selector="[0]" :range="branchList" @confirm='changeBranch'
-		 range-key="BName"></u-picker> -->
+		 range-key="BName"></u-picker>
 	</div>
 </template>
 <script>
@@ -627,7 +627,7 @@
 							this.branchList = res.data.SiteList;
 							this.startCitys = res.data.CityList;
 							this.lineList = res.data.LineList;
-							this.msg.companyId = -1;//this.branchList[0].BId;
+							this.msg.companyId = this.branchList[0].BId;
 							this.currentBrachName = this.branchList[0].BName;
 							this.CityId = this.branchList[0].CityId;
 							this.currentLineId = this.lineList[0]

--- a/pages/jiuzhai/jz_LineDetail.vue
+++ b/pages/jiuzhai/jz_LineDetail.vue
@@ -136,7 +136,7 @@
      <view class="jz_TopPrice">
        <view class="jz_LineTitle">
          <text class="jz_renmin">¥</text
-          ><text class="jz_B2bPrice">{{ currentPrice.b2CPrice }}</text>
+          ><text class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
          <text style="color: #999999; font-size: 28rpx; font-weight: 400">
            /人起</text
          >
@@ -235,7 +235,7 @@
              <view
                v-if="item.remainNum > 0"
                style="color: #ff3166; font-size: 26rpx"
-                >￥{{ item.b2CPrice }}</view
+                >￥{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice}}</view
              >
              <view v-if="item.remainNum <= 0" style="padding: 20rpx 0">
                <text style="font-size: 32rpx; font-weight: 600">已售罄</text>
@@ -262,7 +262,7 @@
            <view
              style="color: #ff3166; font-size: 26rpx"
              v-if="customerDate.b2BPrice"
-              >￥{{ customerDate.b2BPrice }}</view
+              >￥{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</view
            >
            <view
              v-if="!customerDate.startDate"
@@ -469,6 +469,7 @@
            v-for="x in dataList.feature.tripImageList"
            :src="x"
            mode="widthFix"
+			@click='previewTravelPicHandler(x,dataList.feature.tripImageList)'
            style="width: 100%"
          ></image>
        </view>
@@ -746,7 +747,7 @@
 	  </view>
 	  <view style="padding-bottom: 22px;background-color: #FFF;" v-if="dataList.feature.detailsImageList && d.length>3">
-	  	<image :src="x" mode="widthFix" style="width: 100%;height: auto;margin-bottom: 10px;" v-for="x in dataList.feature.detailsImageList"></image>
+	  	<image :src="x" @click='previewTravelPicHandler(x,dataList.feature.detailsImageList)' mode="widthFix" style="width: 100%;height: auto;margin-bottom: 10px;" v-for="x in dataList.feature.detailsImageList"></image>
 	  </view>
      <view
        class="jz_TripDays"
@@ -1111,22 +1112,18 @@
        <view style="color: #ff3166; font-weight: bold">
          <text style="font-size: 22rpx">¥</text>
          <!-- 原b2b -->
-          <text style="font-size: 40rpx;font-family: nav-font;">{{
+          <text style="font-size: 40rpx;font-family: nav-font;">{{$utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice}}</text>
-            $utils.getretailer() == true
-              ? currentPrice.b2CPrice
-              : currentPrice.b2CPrice
-          }}</text>
          <text style="font-size: 22rpx">/起</text>
        </view>
        <view style="display: flex; align-items: center">
          <!-- #ifdef MP-WEIXIN -->
-          <button open-type="contact" class="jz_ConButton">
+          <button @click="downloadTripPlanHandler" class="jz_ConButton">
            <img
              style="width: 36rpx; height: 38rpx"
-              src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png"
+              src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1695376860000_131.png"
              alt=""
            />
-            <view style="color: #111111; font-size: 22rpx">客服</view>
+            <view style="color: #111111; font-size: 22rpx">下载行程</view>
          </button>
          <!-- #endif -->
          <!-- #ifdef MP-ALIPAY -->
@@ -1210,7 +1207,8 @@ export default {
      userId: uni.getStorageSync("mall_UserInfo").UserId,
 	  hideshare: false,
 	  topheight:0,
-	  shareData:null
+	  shareData:null,
+	  isDownloading:false
    };
  },
  created() {},
@@ -1319,6 +1317,52 @@ export default {
    //     },
    //   });
    // },
+	downloadTripPlanHandler(){
+		if(this.isDownloading) return;
+		uni.showLoading({
+			title:'这可能需要30秒，请耐心等待'
+		})
+		this.isDownloading=true
+		let url = `http://uploadfile.oytour.com/Home/PcToPdf2023New?configId=${this.delMsg.configId}&cityId=0&TCID=${this.delMsg.tcid}&orderId=0&isShowBase=1&isShowFlight=1&isShowFeature=1&isShowFee=1&isShowShop=1&isShowTip=1&isShowB2B=1&isShowTrip=1&isShowTitle=0&isShowGuest=0&isShowMan=1&isShowTCNUM=1&isShowVisa=1&isShowTripImage=1&templateId=3&isShowVideoImg=1&unionfid=0`
+		url = `http://ocr.oytour.com/Home/DownloadFileForPdf?url=${encodeURIComponent(url)}`
+		uni.downloadFile({
+		    url: url,
+		    success: (res) => {
+		      console.log("suc", res);
+		      if (res.statusCode === 200) {
+		        console.log("下载成功");
+		        const tempFilePath = res.tempFilePath; //返回的文件临时地址，用于后面打开本地预览所用
+		        wx.openDocument({
+		          filePath: tempFilePath,
+		          showMenu: true,
+		          fileType: "pdf",
+		          success: function (res) {},
+		        });
+		      }else{
+				  uni.showToast({
+				  	title:'下载失败，请重试。如果仍然失败，请联系销售索要PDF行程'
+				  })
+			  }
+			  uni.hideLoading()
+			  this.isDownloading=false
+		    },
+		    fail(err) {
+		      uni.showToast({
+		      	title:'下载失败，请重试。如果仍然失败，请联系销售索要PDF行程'
+		      })
+			  uni.hideLoading()
+			  this.isDownloading=false
+		    },
+		  });
+	},
+	previewTravelPicHandler(url,urls){
+		uni.previewImage({
+			urls:urls,
+			current:url
+		})
+	},
    reloadUserinfo() {
      this.u = uni.getStorageSync("mall_UserInfo");
 	  this.getLXYProductSharf()
@@ -1665,7 +1709,9 @@ export default {
          "&seat=" +
          encodeURIComponent(JSON.stringify(ren)) +
          "&tcid=" +
-          this.delMsg.tcid,
+          this.delMsg.tcid +
+		  "&lineId=" + 
+		  this.dataList.lineId,
      });
    },
    // #ifdef MP-WEIXIN

--- a/pages/jiuzhai/jz_MyOrder.vue
+++ b/pages/jiuzhai/jz_MyOrder.vue
@@ -49,6 +49,7 @@
  margin-top: 20px;
  border-radius: 20rpx;
  overflow: hidden;
+  background:rgba(0,0,0,.05)
 }
 .jz_MyOrder_img img {
@@ -101,7 +102,7 @@
    <template v-else>
      <view
        class="jz_MyOrderMain"
-        style="height: calc(100vh - 44px); overflow: hidden"
+        style="height: calc(100vh - 140px); overflow: hidden"
      >
        <scroll-view
          :scroll-y="true"
@@ -138,7 +139,7 @@
              </view>
              <view class="jz-Oright">
                {{
-                  item.orderStateName == "占位" ? "待付款" : item.orderStateName
+                  list.find(x=>x.Id==item.orderState||(x.Id==1&&item.orderState==2)).name
                }}
              </view>
            </view>
@@ -146,7 +147,8 @@
              <view class="jz_MyOrder_img">
                <img
                  mode="aspectFill"
-                  :src="getFirstImg(item.imgCover)"
+				  v-if="item.imgCover && item.imgCover.length>0"
+                  :src="item.imgCover[0].url"
                  alt=""
                />
              </view>
@@ -225,23 +227,30 @@ export default {
      msg: {
        pageIndex: 1,
        pageSize: 15,
-        MiniAppUserId: 0,
+        //MiniAppUserId: 0,
-        orderState: -1,
+		orderType:-1,
+        orderState: 0,
 		GroupType:1,//线路订单
+		queryDays:0,
+		pageCount:0
      },
      mainColor: "",
      list: [
        {
          name: "全部",
-          Id: -1,
+          Id: 0,
        },
        {
          name: "待付款",
-          Id: 2,
+          Id: 1,
+        },
+        {
+          name: "待发团",
+          Id: 3,
        },
 		{
 		  name: "已完成",
-          Id: 1,
+		  Id: 5,
 		},
        {
          name: "已取消",
@@ -259,10 +268,16 @@ export default {
      status: "加载中",
      price: 0,
      showBar: true,
+	  b2b_user_info:{}
    };
  },
  created() {
-    console.log(260, uni.getStorageSync("mall_UserInfo").OpenId);
+	this.b2b_user_info= uni.getStorageSync('b2b_user')
+	if(!this.b2b_user_info || !this.b2b_user_info.token){
+		uni.redirectTo({
+			url:'/pages/jiuzhai/login'
+		})
+	}
    // #ifdef MP-ALIPAY
    this.showBar = false;
    // #endif
@@ -289,7 +304,7 @@ export default {
  methods: {
    goOrderDetail(item) {
      console.log(item);
-      uni.redirectTo({
+      uni.navigateTo({
        url: "/pages/jiuzhai/jz_SureOrder?orderId=" + item.orderId,
      });
    },
@@ -337,14 +352,14 @@ export default {
        this.dataList = [];
      }
      this.userInfo = uni.getStorageSync("mall_UserInfo");
-      this.msg.MiniAppUserId = this.userInfo.UserId;
+      //this.msg.MiniAppUserId = this.userInfo.UserId;
+	  this.msg.CustomerId = this.b2b_user_info.customerId
      this.apipost(
-        "sellorder_post_GetMiniAppTravelOrderList",
+        "sellorder_post_GetTravelOrderB2BList",//"sellorder_post_GetMiniAppTravelOrderList",
        this.msg,
        (res) => {
          uni.hideLoading();
          if (res.resultCode == 1) {
-            console.log(res, "数据");
            if (type == 1) {
              this.dataList = res.data.pageData;
            } else {

--- a/pages/jiuzhai/jz_Reserve.vue
+++ b/pages/jiuzhai/jz_Reserve.vue
@@ -303,7 +303,8 @@
        />即时确认：本产品付款后可快速确认，放心期待您的旅行
      </view>
    </view>
-    <view
+    <!-- <view
      class="jz_form jz_GuestList"
      v-for="(subItem, subIndex) in GuestList"
      :key="subIndex"
@@ -339,16 +340,16 @@
            placeholder="请输入身份证号"
          />
        </view>
-      </view>
+      </view> -->
-      <view class="form-items" style="margin-top: -5px">
+      <!-- <view class="form-items" style="margin-top: -5px">
        <view class="label">学生</view>
        <view class="val">
-          <!-- <checkbox-group @change="changecheckbox($event, subIndex, subItem)">
+          <checkbox-group @change="changecheckbox($event, subIndex, subItem)">
            <checkbox
              :value="subItem.IsHightSchool"
              :checked="subItem.IsHightSchool"
            />
-          </checkbox-group> -->
+          </checkbox-group>
          <u-switch
            v-model="subItem.IsHightSchool"
            size="30"
@@ -356,8 +357,8 @@
            inactive-value="2"
          ></u-switch>
        </view>
-      </view>
+      </view> -->
-    </view>
+   <!-- </view> -->
    <view>
      <textarea
        class="jz_TextArea"
@@ -365,6 +366,25 @@
        v-model="Remarks"
      />
    </view>
+    <view class="empty-block"></view>
+	<view style="padding: 50rpx 40rpx">
+	  <view class="big-title">
+	    <text>优惠券</text>
+	  </view>
+	  <view style="margin-top: 30px;display: flex; align-items: center;">
+	  	<view style="font-size: 12px;width:1px;flex:1">请选择优惠券</view>
+		<view style="display: flex;align-items: center;">
+			<text style="color:#F20707;font-size: 12px;" @click="showCouponHandler">
+				<text style="flex: 1;" v-if="useCouponId == 0 &&couponList.length>0">{{couponList.length}}张可用优惠券</text>
+				<text class="content" style="color:grey" v-else-if="couponList.length==0">暂无优惠券</text>
+				<text class="content" v-else :style="{ color: mainColor }">已优惠 {{currentCoupon.discountMoney}} 元</text>
+				<!-- <u-icon name="ellipsis" size="36" v-if="couponList.length > 0"></u-icon> -->
+			</text>
+			<u-icon name="arrow" :size="32" color="#111" v-if="couponList.length>0"></u-icon>
+		</view>
+	  </view>
+	</view>
 	<view class="empty-block"></view>
    <!-- <view class="jz_ReseOrder">
 			<view class="jz_ReDix">
@@ -404,7 +424,7 @@
            <text style="margin-right: 30rpx">成人</text>
          </view>
          <view style="text-align: right"
-            >{{ orderMsg.ManNum }}人 × ¥{{ currentPriceInfo.b2CPrice }}</view
+            >{{ orderMsg.ManNum }}人 × ¥{{ currentPriceInfo.b2BPrice }}</view
          >
        </view>
        <view
@@ -420,7 +440,7 @@
            >{{ orderMsg.ChirdNeedBedNum }}人 × ¥{{
              ($utils.getretailer()
                ? currentPriceInfo.b2BPrice
-                : currentPriceInfo.b2CPrice) +
+                : currentPriceInfo.b2BPrice) +
              (currentPriceInfo.childNeedPrice
                ? currentPriceInfo.childNeedPrice
                : 0)
@@ -440,7 +460,7 @@
            >{{ orderMsg.ChirdNoBedNum }}人 × ¥{{
              ($utils.getretailer()
                ? currentPriceInfo.b2BPrice
-                : currentPriceInfo.b2CPrice) -
+                : currentPriceInfo.b2BPrice) -
              (currentPriceInfo.childNoNeedPrice
                ? currentPriceInfo.childNoNeedPrice
                : 0)
@@ -482,8 +502,55 @@
          >
        </view>
      </view>
+	  <view
+	    class="flex f12 grey"
+	    style="margin-bottom: 40rpx"
+	    v-if="currentPriceInfo.visaPrice > 0"
+	  >
+	    <view style="flex: 1">
+	      <text style="margin-right: 30rpx">签证费</text>
+	    </view>
+	    <view style="text-align: right"
+	      >{{ orderMsg.ManNum + orderMsg.ChirdNum, }}人 × ¥{{currentPriceInfo.visaPrice}}</view
+	    >
+	  </view>
+	  <view
+	    class="flex f12 grey"
+	    style="margin-bottom: 40rpx"
+	    v-if="currentPriceInfo.safeMoney > 0"
+	  >
+	    <view style="flex: 1">
+	      <text style="margin-right: 30rpx">保险</text>
+	    </view>
+	    <view style="text-align: right"
+	      >{{ orderMsg.ManNum + orderMsg.ChirdNum }}人 × ¥{{currentPriceInfo.safeMoney}}</view
+	    >
+	  </view>
+	  <view
+	    class="flex f12 grey"
+	    style="margin-bottom: 40rpx"
+		:style="{'color':mainColor+' !important'}"
+	    v-if="useCouponId>0"
+	  >
+	    <view style="flex: 1">
+	      <text style="margin-right: 30rpx">优惠券</text>
+	    </view>
+	    <view style="text-align: right">
+	      -¥{{currentCoupon.discountMoney}}</view>
+	  </view>
+	  <view
+	    class="flex f12 grey"
+	    style="margin-bottom: 40rpx"
+	  >
+	    <view style="flex: 1">
+	      <text style="margin-right: 30rpx">小计</text>
+	    </view>
+	    <view style="text-align: right">
+	      ¥{{parseFloat((price-currentCoupon.discountMoney)).toFixed(2)}}</view>
+	  </view>
    </view>
    <view class="empty-block"></view>
+	<coupon v-if="couponList.length > 0 && showCoupon" :list="couponList" :current="useCouponId" @close="closeCouponHandler"></coupon>
    <view style="padding: 50rpx 40rpx" v-if="tips != ''">
      <view class="big-title">
        <text>重要提醒</text>
@@ -498,10 +565,10 @@
      <view class="jz_OrderDiv">
        <view style="color: #ff3166; font-weight: bold">
          <text style="font-size: 22rpx">¥</text>
-          <text style="font-size: 40rpx; margin: 0 20rpx 0 5rpx">{{
+          <text style="font-size: 40rpx; margin: 0 20rpx 0 5rpx;font-family: nav-font;">{{
-            price
+            (price-currentCoupon.discountMoney).toFixed(2)
          }}</text>
-          <text style="color: #6e6e6e; font-size: 24rpx"
+          <text style="color: #6e6e6e; font-size: 24rpx;font-family: microsoft yahei ui light;"
            >共计{{ total }}人</text
          >
        </view>
@@ -524,12 +591,14 @@
 </template>
 <script>
+import coupon from '@/components/coupon/index';
 export default {
-  components: {},
+  components: {coupon},
  data() {
    return {
      submit: false,
      pageTitle: "订单填写",
+	  lineId:0,
      orderMsg: {
        ManNum: 0, //成人
        ChirdNoBedNum: 0, //儿童不占床
@@ -553,12 +622,21 @@ export default {
      orderData: "",
      Remarks: "", //备注
      GuestList: [],
+	  couponList:[],
+	  showCoupon: false,
+	  useCouponId:0,
+	  currentCoupon:{
+		  discountMoney:0
+	  },
+	  mainColor:''
    };
  },
  created() {
    uni.setNavigationBarTitle({
      title: "订单支付预览",
    });
+	this.mainColor = this.$uiConfig.mainColor;
+	this.activeStyle = `background:${this.mainColor};`;
  },
  onLoad(option) {
    if (option.seat) {
@@ -575,8 +653,38 @@ export default {
    if (option.tcid) {
      this.getDetails(option.tcid);
    }
+	if(option.lineId){
+		this.lineId=option.lineId
+		this.getUserCouponList()
+	}
  },
  methods: {
+	showCouponHandler() {
+	  	this.showCoupon = this.couponList.length>0;
+	},
+	closeCouponHandler(e) {
+		if (e != -1) {
+			this.useCouponId = e;
+			//this.getData();
+			this.currentCoupon = this.couponList.find(x=>x.id==this.useCouponId)
+			if(this.currentCoupon.couponsType==1){
+				this.currentCoupon.discountMoney = this.currentCoupon.denomination
+			}else{
+				this.currentCoupon.discountMoney=(parseFloat(this.price)*(1-parseFloat(this.currentCoupon.denomination/10))).toFixed(2)
+			}
+		}
+		this.showCoupon = false;
+	},
+	getUserCouponList(){
+		let params={"lineId":this.lineId,"lineteamId":0,"CouponsUseScope":2}
+		this.javaApipost('b2b/user/getUserCanUseCouponList',params,(res)=>{
+			if(res.resultCode==1){
+				this.couponList = res.data
+			}
+		},(err)=>{
+			console.log(err)
+		})
+	},
    changecheckbox(e, index, item) {
      if (item.IsHightSchool) {
        let newObj = JSON.parse(JSON.stringify(item));
@@ -601,6 +709,9 @@ export default {
          if (res.resultCode == 1) {
            this.tips = res.data.feature.importantTipText;
            this.ltName = res.data.ltName;
+			this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice
+			this.currentPriceInfo.safeMoney = res.data.currentPriceInfo.safeMoney
+			this.calcMoney()
          }
        },
        null
@@ -650,7 +761,7 @@ export default {
      // } else {
      //   price = this.currentPriceInfo.b2CPrice;
      // }
-      price = this.currentPriceInfo.b2CPrice;
+      price = this.currentPriceInfo.b2BPrice;
      this.orderMsg.ChirdNum =
        parseInt(this.orderMsg.ChirdNoBedNum) +
@@ -680,6 +791,11 @@ export default {
            ? this.currentPriceInfo.childNoNeedPrice
            : 0) * this.orderMsg.ChirdNoBedNum;
      }
+	  if(this.currentPriceInfo.visaPrice || this.currentPriceInfo.safeMoney){
+		  money+=(this.orderMsg.ManNum + this.orderMsg.ChirdNum)*this.currentPriceInfo.safeMoney
+		  money+=(this.orderMsg.ManNum + this.orderMsg.ChirdNum)*this.currentPriceInfo.visaPrice
+	  }
      this.price = money;
      //根据总人数 生成旅客信息
@@ -698,29 +814,29 @@ export default {
    //去支付
    goPay() {
 		let b2b_user_info = uni.getStorageSync("b2b_user")
-      for (var i = 0; i < this.GuestList.length; i++) {
+      // for (var i = 0; i < this.GuestList.length; i++) {
-        if (this.GuestList[i].SurName == "") {
+      //   if (this.GuestList[i].SurName == "") {
-          uni.showToast({
+      //     uni.showToast({
-            title: `请输入游客${i + 1}的姓名`,
+      //       title: `请输入游客${i + 1}的姓名`,
-            icon: "none",
+      //       icon: "none",
-          });
+      //     });
-          return;
+      //     return;
-        }
+      //   }
-        if (this.GuestList[i].IdCard == "") {
+      //   if (this.GuestList[i].IdCard == "") {
-          uni.showToast({
+      //     uni.showToast({
-            title: `请输入游客${i + 1}的身份证`,
+      //       title: `请输入游客${i + 1}的身份证`,
-            icon: "none",
+      //       icon: "none",
-          });
+      //     });
-          return;
+      //     return;
-        }
+      //   }
-        if (this.GuestList[i].MobilePhone == "") {
+      //   if (this.GuestList[i].MobilePhone == "") {
-          uni.showToast({
+      //     uni.showToast({
-            title: `请输入游客${i + 1}的联系电话`,
+      //       title: `请输入游客${i + 1}的联系电话`,
-            icon: "none",
+      //       icon: "none",
-          });
+      //     });
-          return;
+      //     return;
-        }
+      //   }
-      }
+      // }
      this.submit = true;
      this.userInfo = uni.getStorageSync("mall_UserInfo");
      this.basedataObj = uni.getStorageSync("basedata").mall;
@@ -736,7 +852,7 @@ export default {
      var ContactName = b2b_user_info.name //this.contactName;
      var ContactMobile = b2b_user_info.contactNumber //this.contactMobile;
      var CustomerType = b2b_user_info.isMember//4;
-      var price = this.currentPriceInfo.b2CPrice;
+      var price = this.currentPriceInfo.b2BPrice;
      let msg = {
        OrderId: 0,
        TCID: this.currentPriceInfo.tcid,
@@ -749,13 +865,15 @@ export default {
        IsIntermodal: 2,
        Unit_Price: price,
        TC_Price: price,
+		CouponAllotIds:this.useCouponId>0?this.currentCoupon.id.toString():'',
        ManNum: this.orderMsg.ManNum,
        ChirdNum: this.orderMsg.ChirdNum,
        ChirdNeedBedNum: this.orderMsg.ChirdNeedBedNum,
        BabyNum: this.orderMsg.BabyNum,
        OldPeopleNum: 0,
        SingleRoomNum: 0,
-        PreferPrice: this.price,
+        PreferPrice: this.price,//(this.price-this.currentCoupon.discountMoney),
+		//DiscountMoney: this.currentCoupon.discountMoney,
        YSeatNum: this.total,
        ESeatNum: 0,
        FSeatNum: 0,
@@ -795,7 +913,7 @@ export default {
        // #endif
        //MiniAppUserId: this.userInfo.UserId,
        Remarks: this.Remarks, //备注
-        GuestList: newobj,
+        //GuestList: newobj,
      };
      this.apipost(
        "sellorder_post_SetOrderInfoForB2B",

--- a/pages/jiuzhai/jz_SureOrder.vue
+++ b/pages/jiuzhai/jz_SureOrder.vue
@@ -604,24 +604,24 @@
      </view>
    </view>
    <view class="jz_orderbox flex">
-      <view style="display: flex">
+      <view style="display: flex" v-if="showPayBtn">
        <view
          class="jz_OrderReNow"
          @click="goCancel"
          style="background: #fff; color: #111; border: 1px solid #111"
-          v-if="showPayBtn"
        >
          <text v-if="!submitCancel">取消</text>
          <u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
        </view>
        <!-- 返回上一页 -->
-        <view
+        <!-- <view
          class="jz_OrderReNow"
          @click="goback"
          style="background: #fff; color: #111; border: 1px solid #111"
          v-if="!showPayBtn"
          >关闭
-        </view>
+        </view> -->
      </view>
      <view style="display: flex; margin-left: 30rpx">
        <!-- #ifdef MP-WEIXIN -->

--- a/pages/jiuzhai/login.vue
+++ b/pages/jiuzhai/login.vue
@@ -71,6 +71,9 @@
 				    if (res.resultCode == 1) {
 						uni.setStorageSync('b2b_user',res.data)
 						this.getLogin()
+					}else{
+						this.loginLoading=false
+						uni.hideLoading()
 					}
 				},(error)=>{

--- a/pages/user-center/user-center.vue
+++ b/pages/user-center/user-center.vue
@@ -570,7 +570,7 @@
            </view>
          </view>
        </template>
-		<view class="login-btn" style="margin:30px 0">退出登录</view>
+		<view class="login-btn" style="margin:30px 0" @click='signOutHandler'>退出登录</view>
      </view>
      <auth
        v-if="showAuth"
@@ -745,6 +745,13 @@ export default {
 			})
 		}
 	},
+	signOutHandler(){
+		uni.removeStorageSync('b2b_user')
+		uni.removeStorageSync('mall_UserInfo')
+		uni.redirectTo({
+			url:'/pages/jiuzhai/login'
+		})
+	},
    goHome() {
      uni.redirectTo({
        url: "/pages/index/main",

--- a/plugin/api.js
+++ b/plugin/api.js
+import Md5 from "js-md5"
 export default {
 	install(Vue, options) {
 		Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
@@ -136,6 +136,57 @@ export default {
 					typeof failed == "function" && failed(res.data);
 				}
 			})
+		},
+		Vue.prototype.javaApipost = function (cmd, msg, success, failed) {
+			let b2bUser = uni.getStorageSync('b2b_user')
+			let token = "";
+			let key = "";
+			let groupId = 0
+			let timestamp = (new Date()).valueOf();
+			var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+			if (b2bUser && b2bUser.token) {
+				token =  b2bUser.token //"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2OTUyODYxNDguMCwiZXhwIjoxNjk1NTQ1MzQ4LjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJncm91cElkIjowLCJyZXF1ZXN0RnJvbSI6M319.Z5mQBKMd_HL6_NqQcVkseN7Umh_7sI66-0PUYWVS8qw"//b2bUser.token
+				key = b2bUser.secretKey
+				groupId = b2bUser.groupId
+			}
+			var md5Str = Md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+			var postData = {
+				"groupId": groupId,
+				"msg": msg,
+				"timestamp": timestamp,
+				"token": token,
+				"sign": md5Str,
+			}
+			uni.request({
+				url: 'https://efficient.oytour.com/api/'+cmd,
+				method: "Post",
+				header: {
+					'Content-Type': 'application/json'
+				},
+				data: postData,
+				success: res => {
+					if (res.data.resultCode != 1) {
+						if (res.data.message != '') {
+							uni.showToast({
+								title: res.data.message,
+								icon: "none",
+							});
+						}
+						typeof failed == "function" && failed(res.data);
+					} else {
+						typeof success == "function" && success(res.data);
+					}
+				},
+				fail: (e) => {
+					console.log("网络请求fail:" + JSON.stringify(e));
+					uni.showModal({
+						content: "" + res.errMsg
+					});
+					typeof failed == "function" && failed(res.data);
+				}
+			})
 		},
 			Vue.prototype.apipostDownload = function (cmd, msg, success, failed) {
 				var postData = this.GetPostData(cmd, msg, "");

--- a/plugin/utils.js
+++ b/plugin/utils.js
@@ -31,8 +31,8 @@ function getRect(selector) {//获取元素的信息
 }
 function getretailer() {//判断是否是分销商
 	let isdistributor = false
-	let mall_UserInfo = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo") : {};
+	let mall_UserInfo = uni.getStorageSync("b2b_user");
-	if (mall_UserInfo.IsDistrbutorUser && mall_UserInfo.IsDistrbutorUser == 1) {
+	if (mall_UserInfo && mall_UserInfo.token) {
 		isdistributor = true
 	}
 	return isdistributor

--- a/yarn.lock
+++ b/yarn.lock
@@ -2,3 +2,7 @@
 # yarn lockfile v1
+js-md5@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz"
+  integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==