From 0225154ffdbcef878b27d63972fa9f306c4bc327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Sun, 20 Dec 2020 16:23:02 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E7=AB=AF=E8=B0=83=E8=AF=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue               |  9 ++++++++-
 package.json          |  1 +
 utils/vconsole.min.js | 10 ++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 utils/vconsole.min.js

diff --git a/App.vue b/App.vue
index 6591b55..c5f3d4a 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,8 @@
 <script>
 import Vue from 'vue'
+// #ifdef H5
+var VConsole = require('@/utils/vconsole.min.js');
+//  #endif
 export default {
   onLaunch: function() {
     const updateManager = uni.getUpdateManager()
@@ -37,7 +40,11 @@ export default {
     console.log("App Hide");
   },
   mounted() {
-	  this.setAppInfo()
+    // #ifdef H5
+    var vConsole = new VConsole();
+	console.log('开启调试');
+    //  #endif
+	this.setAppInfo()
   },
   methods: {
     // 获取系统栏高度
diff --git a/package.json b/package.json
index 8b20679..7db4ceb 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "jweixin-module": "^1.6.0",
     "miniapp-color-thief": "^1.0.5",
     "vue-ydui": "^1.2.6",
+	"vconsole": "^3.3.4",
     "wechat-jssdk": "^5.0.4"
   },
   "devDependencies": {
diff --git a/utils/vconsole.min.js b/utils/vconsole.min.js
new file mode 100644
index 0000000..ea401e1
--- /dev/null
+++ b/utils/vconsole.min.js
@@ -0,0 +1,10 @@
+/*!
+ * vConsole v3.3.4 (https://github.com/Tencent/vConsole)
+ * 
+ * Tencent is pleased to support the open source community by making vConsole available.
+ * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("VConsole",[],t):"object"==typeof exports?exports.VConsole=t():e.VConsole=t()}(window,function(){return function(e){var t={};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}return o.m=e,o.c=t,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)o.d(n,r,function(t){return e[t]}.bind(null,r));return n},o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,"a",t),t},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=6)}([function(e,t,o){var n,r,i;r=[t],void 0===(i="function"==typeof(n=function(e){"use strict";function t(e){return(t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function o(e){return"[object Number]"==Object.prototype.toString.call(e)}function n(e){return"[object String]"==Object.prototype.toString.call(e)}function r(e){return"[object Array]"==Object.prototype.toString.call(e)}function i(e){return"[object Boolean]"==Object.prototype.toString.call(e)}function a(e){return void 0===e}function l(e){return null===e}function c(e){return"[object Symbol]"==Object.prototype.toString.call(e)}function s(e){return!("[object Object]"!=Object.prototype.toString.call(e)&&(o(e)||n(e)||i(e)||r(e)||l(e)||d(e)||a(e)||c(e)))}function d(e){return"[object Function]"==Object.prototype.toString.call(e)}function u(e){var t=Object.prototype.toString.call(e);return"[object global]"==t||"[object Window]"==t||"[object DOMWindow]"==t}function v(e){if(!s(e)&&!r(e))return[];if(r(e)){var t=[];return e.forEach(function(e,o){t.push(o)}),t}return Object.getOwnPropertyNames(e).sort()}Object.defineProperty(e,"__esModule",{value:!0}),e.getDate=function(e){var t=e>0?new Date(e):new Date,o=t.getDate()<10?"0"+t.getDate():t.getDate(),n=t.getMonth()<9?"0"+(t.getMonth()+1):t.getMonth()+1,r=t.getFullYear(),i=t.getHours()<10?"0"+t.getHours():t.getHours(),a=t.getMinutes()<10?"0"+t.getMinutes():t.getMinutes(),l=t.getSeconds()<10?"0"+t.getSeconds():t.getSeconds(),c=t.getMilliseconds()<10?"0"+t.getMilliseconds():t.getMilliseconds();return c<100&&(c="0"+c),{time:+t,year:r,month:n,day:o,hour:i,minute:a,second:l,millisecond:c}},e.isNumber=o,e.isString=n,e.isArray=r,e.isBoolean=i,e.isUndefined=a,e.isNull=l,e.isSymbol=c,e.isObject=s,e.isFunction=d,e.isElement=function(e){return"object"===("undefined"==typeof HTMLElement?"undefined":t(HTMLElement))?e instanceof HTMLElement:e&&"object"===t(e)&&null!==e&&1===e.nodeType&&"string"==typeof e.nodeName},e.isWindow=u,e.isPlainObject=function(e){var o,n=Object.prototype.hasOwnProperty;if(!e||"object"!==t(e)||e.nodeType||u(e))return!1;try{if(e.constructor&&!n.call(e,"constructor")&&!n.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(e){return!1}for(o in e);return void 0===o||n.call(e,o)},e.htmlEncode=function(e){return document.createElement("a").appendChild(document.createTextNode(e)).parentNode.innerHTML},e.JSONStringify=function(e){if(!s(e)&&!r(e))return JSON.stringify(e);var t="{",o="}";r(e)&&(t="[",o="]");for(var n=t,i=v(e),a=0;a<i.length;a++){var l=i[a],u=e[l];try{r(e)||(s(l)||r(l)||c(l)?n+=Object.prototype.toString.call(l):n+=l,n+=": "),r(u)?n+="Array["+u.length+"]":s(u)||c(u)||d(u)?n+=Object.prototype.toString.call(u):n+=JSON.stringify(u),a<i.length-1&&(n+=", ")}catch(e){continue}}return n+=o},e.getObjAllKeys=v,e.getObjName=function(e){return Object.prototype.toString.call(e).replace("[object ","").replace("]","")},e.setStorage=function(e,t){window.localStorage&&(e="vConsole_"+e,localStorage.setItem(e,t))},e.getStorage=function(e){if(window.localStorage)return e="vConsole_"+e,localStorage.getItem(e)}})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n,r,i;r=[t,o(0),o(10)],void 0===(i="function"==typeof(n=function(o,n,r){"use strict";var i;Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,r=(i=r)&&i.__esModule?i:{default:i};var a={one:function(e,t){try{return(t||document).querySelector(e)||void 0}catch(e){return}},all:function(e,t){try{var o=(t||document).querySelectorAll(e);return Array.from(o)}catch(e){return[]}},addClass:function(e,t){if(e){(0,n.isArray)(e)||(e=[e]);for(var o=0;o<e.length;o++){var r=(e[o].className||"").split(" ");r.indexOf(t)>-1||(r.push(t),e[o].className=r.join(" "))}}},removeClass:function(e,t){if(e){(0,n.isArray)(e)||(e=[e]);for(var o=0;o<e.length;o++){for(var r=e[o].className.split(" "),i=0;i<r.length;i++)r[i]==t&&(r[i]="");e[o].className=r.join(" ").trim()}}},hasClass:function(e,t){return!(!e||!e.classList)&&e.classList.contains(t)},bind:function(e,t,o,r){e&&((0,n.isArray)(e)||(e=[e]),e.forEach(function(e){e.addEventListener(t,o,!!r)}))},delegate:function(e,t,o,n){e&&e.addEventListener(t,function(t){var r=a.all(o,e);if(r)e:for(var i=0;i<r.length;i++)for(var l=t.target;l;){if(l==r[i]){n.call(l,t);break e}if((l=l.parentNode)==e)break}},!1)}};a.render=r.default;var l=a;o.default=l,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n,r,i;r=[t],void 0===(i="function"==typeof(n=function(o){"use strict";function n(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0;var r=function(){function e(t){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"newPlugin";!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.id=t,this.name=o,this.isReady=!1,this.eventList={}}var t,o,r;return t=e,(o=[{key:"on",value:function(e,t){return this.eventList[e]=t,this}},{key:"trigger",value:function(e,t){if("function"==typeof this.eventList[e])this.eventList[e].call(this,t);else{var o="on"+e.charAt(0).toUpperCase()+e.slice(1);"function"==typeof this[o]&&this[o].call(this,t)}return this}},{key:"id",get:function(){return this._id},set:function(e){if(!e)throw"Plugin ID cannot be empty";this._id=e.toLowerCase()}},{key:"name",get:function(){return this._name},set:function(e){if(!e)throw"Plugin name cannot be empty";this._name=e}},{key:"vConsole",get:function(){return this._vConsole||void 0},set:function(e){if(!e)throw"vConsole cannot be empty";this._vConsole=e}}])&&n(t.prototype,o),r&&n(t,r),e}();o.default=r,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n,r,i;r=[t,o(0),o(1),o(2),o(18),o(19),o(20)],void 0===(i="function"==typeof(n=function(o,n,r,i,a,l,c){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}function d(e){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function u(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function v(e,t){return!t||"object"!==d(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function f(e){return(f=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,n=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}(n),r=s(r),i=s(i),a=s(a),l=s(l),c=s(c);var b=1e3,g=[],h={},m=function(e){function t(){var e,o;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);for(var n=arguments.length,r=new Array(n),i=0;i<n;i++)r[i]=arguments[i];return o=v(this,(e=f(t)).call.apply(e,[this].concat(r))),g.push(o.id),o.tplTabbox="",o.allowUnformattedLog=!0,o.isReady=!1,o.isShow=!1,o.$tabbox=null,o.console={},o.logList=[],o.isInBottom=!0,o.maxLogNumber=b,o.logNumber=0,o.mockConsole(),o}var o,s,m;return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}(t,i.default),o=t,(s=[{key:"onInit",value:function(){this.$tabbox=r.default.render(this.tplTabbox,{}),this.updateMaxLogNumber()}},{key:"onRenderTab",value:function(e){e(this.$tabbox)}},{key:"onAddTopBar",value:function(e){for(var t=this,o=["All","Log","Info","Warn","Error"],n=[],i=0;i<o.length;i++)n.push({name:o[i],data:{type:o[i].toLowerCase()},className:"",onClick:function(){if(r.default.hasClass(this,"vc-actived"))return!1;t.showLogType(this.dataset.type||"all")}});n[0].className="vc-actived",e(n)}},{key:"onAddTool",value:function(e){var t=this;e([{name:"Clear",global:!1,onClick:function(){t.clearLog(),t.vConsole.triggerEvent("clearLog")}}])}},{key:"onReady",value:function(){var e=this;e.isReady=!0;var t=r.default.all(".vc-subtab",e.$tabbox);r.default.bind(t,"click",function(o){if(o.preventDefault(),r.default.hasClass(this,"vc-actived"))return!1;r.default.removeClass(t,"vc-actived"),r.default.addClass(this,"vc-actived");var n=this.dataset.type,i=r.default.one(".vc-log",e.$tabbox);r.default.removeClass(i,"vc-log-partly-log"),r.default.removeClass(i,"vc-log-partly-info"),r.default.removeClass(i,"vc-log-partly-warn"),r.default.removeClass(i,"vc-log-partly-error"),"all"==n?r.default.removeClass(i,"vc-log-partly"):(r.default.addClass(i,"vc-log-partly"),r.default.addClass(i,"vc-log-partly-"+n))});var o=r.default.one(".vc-content");r.default.bind(o,"scroll",function(t){e.isShow&&(o.scrollTop+o.offsetHeight>=o.scrollHeight?e.isInBottom=!0:e.isInBottom=!1)});for(var n=0;n<e.logList.length;n++)e.printLog(e.logList[n]);e.logList=[]}},{key:"onRemove",value:function(){window.console.log=this.console.log,window.console.info=this.console.info,window.console.warn=this.console.warn,window.console.debug=this.console.debug,window.console.error=this.console.error,window.console.time=this.console.time,window.console.timeEnd=this.console.timeEnd,window.console.clear=this.console.clear,this.console={};var e=g.indexOf(this.id);e>-1&&g.splice(e,1)}},{key:"onShow",value:function(){this.isShow=!0,1==this.isInBottom&&this.autoScrollToBottom()}},{key:"onHide",value:function(){this.isShow=!1}},{key:"onShowConsole",value:function(){1==this.isInBottom&&this.autoScrollToBottom()}},{key:"onUpdateOption",value:function(){this.vConsole.option.maxLogNumber!=this.maxLogNumber&&(this.updateMaxLogNumber(),this.limitMaxLogs())}},{key:"updateMaxLogNumber",value:function(){this.maxLogNumber=this.vConsole.option.maxLogNumber||b,this.maxLogNumber=Math.max(1,this.maxLogNumber)}},{key:"limitMaxLogs",value:function(){if(this.isReady)for(;this.logNumber>this.maxLogNumber;){var e=r.default.one(".vc-item",this.$tabbox);if(!e)break;e.parentNode.removeChild(e),this.logNumber--}}},{key:"showLogType",value:function(e){var t=r.default.one(".vc-log",this.$tabbox);r.default.removeClass(t,"vc-log-partly-log"),r.default.removeClass(t,"vc-log-partly-info"),r.default.removeClass(t,"vc-log-partly-warn"),r.default.removeClass(t,"vc-log-partly-error"),"all"==e?r.default.removeClass(t,"vc-log-partly"):(r.default.addClass(t,"vc-log-partly"),r.default.addClass(t,"vc-log-partly-"+e))}},{key:"autoScrollToBottom",value:function(){this.vConsole.option.disableLogScrolling||this.scrollToBottom()}},{key:"scrollToBottom",value:function(){var e=r.default.one(".vc-content");e&&(e.scrollTop=e.scrollHeight-e.offsetHeight)}},{key:"mockConsole",value:function(){var e=this,t=this,o=["log","info","warn","debug","error"];window.console?(o.map(function(e){t.console[e]=window.console[e]}),t.console.time=window.console.time,t.console.timeEnd=window.console.timeEnd,t.console.clear=window.console.clear):window.console={},o.map(function(t){window.console[t]=function(){for(var o=arguments.length,n=new Array(o),r=0;r<o;r++)n[r]=arguments[r];e.printLog({logType:t,logs:n})}});var n={};window.console.time=function(e){n[e]=Date.now()},window.console.timeEnd=function(e){var t=n[e];t?(console.log(e+":",Date.now()-t+"ms"),delete n[e]):console.log(e+": 0ms")},window.console.clear=function(){t.clearLog();for(var e=arguments.length,o=new Array(e),n=0;n<e;n++)o[n]=arguments[n];t.console.clear.apply(window.console,o)}}},{key:"clearLog",value:function(){r.default.one(".vc-log",this.$tabbox).innerHTML="",this.logNumber=0,h={}}},{key:"printOriginLog",value:function(e){"function"==typeof this.console[e.logType]&&this.console[e.logType].apply(window.console,e.logs)}},{key:"printLog",value:function(e){var t=e.logs||[];if(t.length||e.content){t=[].slice.call(t||[]);var o=/^\[(\w+)\]$/i,r="",i=!1;if(n.isString(t[0])){var a=t[0].match(o);null!==a&&a.length>0&&(r=a[1].toLowerCase(),i=g.indexOf(r)>-1)}if(r===this.id||!0!==i&&"default"===this.id)if(e._id||(e._id="__vc_"+Math.random().toString(36).substring(2,8)),e.date||(e.date=+new Date),this.isReady){n.isString(t[0])&&i&&(t[0]=t[0].replace(o,""),""===t[0]&&t.shift());for(var l={_id:e._id,logType:e.logType,logText:[],hasContent:!!e.content,count:1},c=0;c<t.length;c++)n.isFunction(t[c])?l.logText.push(t[c].toString()):n.isObject(t[c])||n.isArray(t[c])?l.logText.push(n.JSONStringify(t[c])):l.logText.push(t[c]);l.logText=l.logText.join(" "),l.hasContent||h.logType!==l.logType||h.logText!==l.logText?(this.printNewLog(e,t),h=l):this.printRepeatLog(),this.isInBottom&&this.isShow&&this.autoScrollToBottom(),e.noOrigin||this.printOriginLog(e)}else this.logList.push(e);else e.noOrigin||this.printOriginLog(e)}}},{key:"printRepeatLog",value:function(){var e=r.default.one("#"+h._id),t=r.default.one(".vc-item-repeat",e);t||((t=document.createElement("i")).className="vc-item-repeat",e.insertBefore(t,e.lastChild)),h.count,h.count++,t.innerHTML=h.count}},{key:"printNewLog",value:function(e,t){var o=r.default.render(a.default,{_id:e._id,logType:e.logType,style:e.style||""}),i=/(\%c )|( \%c)/g,l=[];if(n.isString(t[0])&&i.test(t[0])){for(var c=t[0].split(i).filter(function(e){return void 0!==e&&""!==e&&!/ ?\%c ?/.test(e)}),s=t[0].match(i),u=0;u<s.length;u++)n.isString(t[u+1])&&l.push(t[u+1]);for(var v=s.length+1;v<t.length;v++)c.push(t[v]);t=c}for(var f=r.default.one(".vc-item-content",o),p=0;p<t.length;p++){var b=void 0;try{if(""===t[p])continue;b=n.isFunction(t[p])?"<span> "+t[p].toString()+"</span>":n.isObject(t[p])||n.isArray(t[p])?this.getFoldedLine(t[p]):(l[p]?'<span style="'.concat(l[p],'"> '):"<span> ")+n.htmlEncode(t[p]).replace(/\n/g,"<br/>")+"</span>"}catch(e){b="<span> ["+d(t[p])+"]</span>"}b&&("string"==typeof b?f.insertAdjacentHTML("beforeend",b):f.insertAdjacentElement("beforeend",b))}n.isObject(e.content)&&f.insertAdjacentElement("beforeend",e.content),r.default.one(".vc-log",this.$tabbox).insertAdjacentElement("beforeend",o),this.logNumber++,this.limitMaxLogs()}},{key:"getFoldedLine",value:function(e,t){var o=this;if(!t){var i=n.JSONStringify(e),a=i.substr(0,36);t=n.getObjName(e),i.length>36&&(a+="..."),t+=" "+a}var s=r.default.render(l.default,{outer:t,lineType:"obj"});return r.default.bind(r.default.one(".vc-fold-outer",s),"click",function(t){t.preventDefault(),t.stopPropagation(),r.default.hasClass(s,"vc-toggle")?(r.default.removeClass(s,"vc-toggle"),r.default.removeClass(r.default.one(".vc-fold-inner",s),"vc-toggle"),r.default.removeClass(r.default.one(".vc-fold-outer",s),"vc-toggle")):(r.default.addClass(s,"vc-toggle"),r.default.addClass(r.default.one(".vc-fold-inner",s),"vc-toggle"),r.default.addClass(r.default.one(".vc-fold-outer",s),"vc-toggle"));var i=r.default.one(".vc-fold-inner",s);return setTimeout(function(){if(0==i.children.length&&e){for(var t=n.getObjAllKeys(e),a=0;a<t.length;a++){var s=void 0,d="undefined",u="";try{s=e[t[a]]}catch(e){continue}n.isString(s)?(d="string",s='"'+s+'"'):n.isNumber(s)?d="number":n.isBoolean(s)?d="boolean":n.isNull(s)?(d="null",s="null"):n.isUndefined(s)?(d="undefined",s="undefined"):n.isFunction(s)?(d="function",s="function()"):n.isSymbol(s)&&(d="symbol");var v=void 0;if(n.isArray(s)){var f=n.getObjName(s)+"["+s.length+"]";v=o.getFoldedLine(s,r.default.render(c.default,{key:t[a],keyType:u,value:f,valueType:"array"},!0))}else if(n.isObject(s)){var p=n.getObjName(s);v=o.getFoldedLine(s,r.default.render(c.default,{key:n.htmlEncode(t[a]),keyType:u,value:p,valueType:"object"},!0))}else{e.hasOwnProperty&&!e.hasOwnProperty(t[a])&&(u="private");var b={lineType:"kv",key:n.htmlEncode(t[a]),keyType:u,value:n.htmlEncode(s),valueType:d};v=r.default.render(l.default,b)}i.insertAdjacentElement("beforeend",v)}if(n.isObject(e)){var g,h=e.__proto__;g=n.isObject(h)?o.getFoldedLine(h,r.default.render(c.default,{key:"__proto__",keyType:"private",value:n.getObjName(h),valueType:"object"},!0)):r.default.render(c.default,{key:"__proto__",keyType:"private",value:"null",valueType:"null"}),i.insertAdjacentElement("beforeend",g)}}}),!1}),s}}])&&u(o.prototype,s),m&&u(o,m),t}();m.AddedLogID=[];var y=m;o.default=y,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){"use strict";e.exports=function(e){var t=[];return t.toString=function(){return this.map(function(t){var o=function(e,t){var o=e[1]||"",n=e[3];if(!n)return o;if(t&&"function"==typeof btoa){var r=(a=n,l=btoa(unescape(encodeURIComponent(JSON.stringify(a)))),c="sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(l),"/*# ".concat(c," */")),i=n.sources.map(function(e){return"/*# sourceURL=".concat(n.sourceRoot).concat(e," */")});return[o].concat(i).concat([r]).join("\n")}var a,l,c;return[o].join("\n")}(t,e);return t[2]?"@media ".concat(t[2],"{").concat(o,"}"):o}).join("")},t.i=function(e,o){"string"==typeof e&&(e=[[null,e,""]]);for(var n={},r=0;r<this.length;r++){var i=this[r][0];null!=i&&(n[i]=!0)}for(var a=0;a<e.length;a++){var l=e[a];null!=l[0]&&n[l[0]]||(o&&!l[2]?l[2]=o:o&&(l[2]="(".concat(l[2],") and (").concat(o,")")),t.push(l))}},t}},function(e,t,o){"use strict";var n,r={},i=function(){return void 0===n&&(n=Boolean(window&&document&&document.all&&!window.atob)),n},a=function(){var e={};return function(t){if(void 0===e[t]){var o=document.querySelector(t);if(window.HTMLIFrameElement&&o instanceof window.HTMLIFrameElement)try{o=o.contentDocument.head}catch(e){o=null}e[t]=o}return e[t]}}();function l(e,t){for(var o=[],n={},r=0;r<e.length;r++){var i=e[r],a=t.base?i[0]+t.base:i[0],l={css:i[1],media:i[2],sourceMap:i[3]};n[a]?n[a].parts.push(l):o.push(n[a]={id:a,parts:[l]})}return o}function c(e,t){for(var o=0;o<e.length;o++){var n=e[o],i=r[n.id],a=0;if(i){for(i.refs++;a<i.parts.length;a++)i.parts[a](n.parts[a]);for(;a<n.parts.length;a++)i.parts.push(b(n.parts[a],t))}else{for(var l=[];a<n.parts.length;a++)l.push(b(n.parts[a],t));r[n.id]={id:n.id,refs:1,parts:l}}}}function s(e){var t=document.createElement("style");if(void 0===e.attributes.nonce){var n=o.nc;n&&(e.attributes.nonce=n)}if(Object.keys(e.attributes).forEach(function(o){t.setAttribute(o,e.attributes[o])}),"function"==typeof e.insert)e.insert(t);else{var r=a(e.insert||"head");if(!r)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");r.appendChild(t)}return t}var d,u=(d=[],function(e,t){return d[e]=t,d.filter(Boolean).join("\n")});function v(e,t,o,n){var r=o?"":n.css;if(e.styleSheet)e.styleSheet.cssText=u(t,r);else{var i=document.createTextNode(r),a=e.childNodes;a[t]&&e.removeChild(a[t]),a.length?e.insertBefore(i,a[t]):e.appendChild(i)}}var f=null,p=0;function b(e,t){var o,n,r;if(t.singleton){var i=p++;o=f||(f=s(t)),n=v.bind(null,o,i,!1),r=v.bind(null,o,i,!0)}else o=s(t),n=function(e,t,o){var n=o.css,r=o.media,i=o.sourceMap;if(r&&e.setAttribute("media",r),i&&btoa&&(n+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i))))," */")),e.styleSheet)e.styleSheet.cssText=n;else{for(;e.firstChild;)e.removeChild(e.firstChild);e.appendChild(document.createTextNode(n))}}.bind(null,o,t),r=function(){!function(e){if(null===e.parentNode)return!1;e.parentNode.removeChild(e)}(o)};return n(e),function(t){if(t){if(t.css===e.css&&t.media===e.media&&t.sourceMap===e.sourceMap)return;n(e=t)}else r()}}e.exports=function(e,t){(t=t||{}).attributes="object"==typeof t.attributes?t.attributes:{},t.singleton||"boolean"==typeof t.singleton||(t.singleton=i());var o=l(e,t);return c(o,t),function(e){for(var n=[],i=0;i<o.length;i++){var a=o[i],s=r[a.id];s&&(s.refs--,n.push(s))}e&&c(l(e,t),t);for(var d=0;d<n.length;d++){var u=n[d];if(0===u.refs){for(var v=0;v<u.parts.length;v++)u.parts[v]();delete r[u.id]}}}}},function(e,t,o){var n,r,i;r=[t,o(7),o(8)],void 0===(i="function"==typeof(n=function(o,n,r){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0;var i,a=(i=r,r=i&&i.__esModule?i:{default:i}).default;o.default=a,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n,r,i;r=[],void 0===(i="function"==typeof(n=function(){"use strict";if("undefined"==typeof Symbol){window.Symbol=function(){};var e="__symbol_iterator_key";window.Symbol.iterator=e,Array.prototype[e]=function(){var e=this,t=0;return{next:function(){return{done:e.length===t,value:e.length===t?void 0:e[t++]}}}}}})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n,r,i;r=[t,o(9),o(0),o(1),o(11),o(13),o(14),o(15),o(16),o(17),o(2),o(3),o(21),o(24),o(26),o(30),o(37)],void 0===(i="function"==typeof(n=function(o,n,r,i,a,l,c,s,d,u,v,f,p,b,g,h,m){"use strict";function y(e){return e&&e.__esModule?e:{default:e}}function _(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,n=y(n),r=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}(r),i=y(i),l=y(l),c=y(c),s=y(s),d=y(d),u=y(u),v=y(v),f=y(f),p=y(p),b=y(b),g=y(g),h=y(h),m=y(m);var w="#__vconsole",x=function(){function e(t){if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),i.default.one(w))console.debug("vConsole is already exists.");else{var o=this;if(this.version=n.default.version,this.$dom=null,this.isInited=!1,this.option={defaultPlugins:["system","network","element","storage"]},this.activedTab="",this.tabList=[],this.pluginList={},this.switchPos={x:10,y:10,startX:0,startY:0,endX:0,endY:0},this.tool=r,this.$=i.default,r.isObject(t))for(var a in t)this.option[a]=t[a];this._addBuiltInPlugins();var l,c=function(){o.isInited||(o._render(),o._mockTap(),o._bindEvent(),o._autoRun())};if(void 0!==document)"loading"===document.readyState?i.default.bind(window,"DOMContentLoaded",c):c();else l=setTimeout(function e(){document&&"complete"==document.readyState?(l&&clearTimeout(l),c()):l=setTimeout(e,1)},1)}}var t,o,a;return t=e,(o=[{key:"_addBuiltInPlugins",value:function(){this.addPlugin(new p.default("default","Log"));var e=this.option.defaultPlugins,t={system:{proto:b.default,name:"System"},network:{proto:g.default,name:"Network"},element:{proto:h.default,name:"Element"},storage:{proto:m.default,name:"Storage"}};if(e&&r.isArray(e))for(var o=0;o<e.length;o++){var n=t[e[o]];n?this.addPlugin(new n.proto(e[o],n.name)):console.debug("Unrecognized default plugin ID:",e[o])}}},{key:"_render",value:function(){if(!i.default.one(w)){var e=document.createElement("div");e.innerHTML=l.default,document.documentElement.insertAdjacentElement("beforeend",e.children[0])}this.$dom=i.default.one(w);var t=i.default.one(".vc-switch",this.$dom),o=1*r.getStorage("switch_x"),n=1*r.getStorage("switch_y");(o||n)&&(o+t.offsetWidth>document.documentElement.offsetWidth&&(o=document.documentElement.offsetWidth-t.offsetWidth),n+t.offsetHeight>document.documentElement.offsetHeight&&(n=document.documentElement.offsetHeight-t.offsetHeight),o<0&&(o=0),n<0&&(n=0),this.switchPos.x=o,this.switchPos.y=n,i.default.one(".vc-switch").style.right=o+"px",i.default.one(".vc-switch").style.bottom=n+"px");var a=window.devicePixelRatio||1,c=document.querySelector('[name="viewport"]');if(c&&c.content){var s=c.content.match(/initial\-scale\=\d+(\.\d+)?/);(s?parseFloat(s[0].split("=")[1]):1)<1&&(this.$dom.style.fontSize=13*a+"px")}i.default.one(".vc-mask",this.$dom).style.display="none"}},{key:"_mockTap",value:function(){var e,t,o,n=!1,r=null;this.$dom.addEventListener("touchstart",function(n){if(void 0===e){var i=n.targetTouches[0];t=i.pageX,o=i.pageY,e=n.timeStamp,r=n.target.nodeType===Node.TEXT_NODE?n.target.parentNode:n.target}},!1),this.$dom.addEventListener("touchmove",function(e){var r=e.changedTouches[0];(Math.abs(r.pageX-t)>10||Math.abs(r.pageY-o)>10)&&(n=!0)}),this.$dom.addEventListener("touchend",function(t){if(!1===n&&t.timeStamp-e<700&&null!=r){var o=!1;switch(r.tagName.toLowerCase()){case"textarea":o=!0;break;case"input":switch(r.type){case"button":case"checkbox":case"file":case"image":case"radio":case"submit":o=!1;break;default:o=!r.disabled&&!r.readOnly}}o?r.focus():t.preventDefault();var i=t.changedTouches[0],a=document.createEvent("MouseEvents");a.initMouseEvent("click",!0,!0,window,1,i.screenX,i.screenY,i.clientX,i.clientY,!1,!1,!1,!1,0,null),a.forwardedTouchEvent=!0,a.initEvent("click",!0,!0),r.dispatchEvent(a)}e=void 0,n=!1,r=null},!1)}},{key:"_bindEvent",value:function(){var e=this,t=i.default.one(".vc-switch",e.$dom);i.default.bind(t,"touchstart",function(t){e.switchPos.startX=t.touches[0].pageX,e.switchPos.startY=t.touches[0].pageY}),i.default.bind(t,"touchend",function(t){e.switchPos.x=e.switchPos.endX,e.switchPos.y=e.switchPos.endY,e.switchPos.startX=0,e.switchPos.startY=0,r.setStorage("switch_x",e.switchPos.x),r.setStorage("switch_y",e.switchPos.y)}),i.default.bind(t,"touchmove",function(o){if(o.touches.length>0){var n=o.touches[0].pageX-e.switchPos.startX,r=o.touches[0].pageY-e.switchPos.startY,i=e.switchPos.x-n,a=e.switchPos.y-r;i+t.offsetWidth>document.documentElement.offsetWidth&&(i=document.documentElement.offsetWidth-t.offsetWidth),a+t.offsetHeight>document.documentElement.offsetHeight&&(a=document.documentElement.offsetHeight-t.offsetHeight),i<0&&(i=0),a<0&&(a=0),t.style.right=i+"px",t.style.bottom=a+"px",e.switchPos.endX=i,e.switchPos.endY=a,o.preventDefault()}}),i.default.bind(i.default.one(".vc-switch",e.$dom),"click",function(){e.show()}),i.default.bind(i.default.one(".vc-hide",e.$dom),"click",function(){e.hide()}),i.default.bind(i.default.one(".vc-mask",e.$dom),"click",function(t){if(t.target!=i.default.one(".vc-mask"))return!1;e.hide()}),i.default.delegate(i.default.one(".vc-tabbar",e.$dom),"click",".vc-tab",function(t){var o=this.dataset.tab;o!=e.activedTab&&e.showTab(o)}),i.default.bind(i.default.one(".vc-panel",e.$dom),"transitionend webkitTransitionEnd oTransitionEnd otransitionend",function(t){if(t.target!=i.default.one(".vc-panel"))return!1;i.default.hasClass(e.$dom,"vc-toggle")||(t.target.style.display="none")});var o=i.default.one(".vc-content",e.$dom),n=!1;i.default.bind(o,"touchstart",function(e){var t=o.scrollTop,r=o.scrollHeight,a=t+o.offsetHeight;0===t?(o.scrollTop=1,0===o.scrollTop&&(i.default.hasClass(e.target,"vc-cmd-input")||(n=!0))):a===r&&(o.scrollTop=t-1,o.scrollTop===t&&(i.default.hasClass(e.target,"vc-cmd-input")||(n=!0)))}),i.default.bind(o,"touchmove",function(e){n&&e.preventDefault()}),i.default.bind(o,"touchend",function(e){n=!1})}},{key:"_autoRun",value:function(){for(var e in this.isInited=!0,this.pluginList)this._initPlugin(this.pluginList[e]);this.tabList.length>0&&this.showTab(this.tabList[0]),this.triggerEvent("ready")}},{key:"triggerEvent",value:function(e,t){e="on"+e.charAt(0).toUpperCase()+e.slice(1),r.isFunction(this.option[e])&&this.option[e].apply(this,t)}},{key:"_initPlugin",value:function(e){var t=this;e.vConsole=this,e.trigger("init"),e.trigger("renderTab",function(o){t.tabList.push(e.id);var n=i.default.render(c.default,{id:e.id,name:e.name});i.default.one(".vc-tabbar",t.$dom).insertAdjacentElement("beforeend",n);var a=i.default.render(s.default,{id:e.id});o&&(r.isString(o)?a.innerHTML+=o:r.isFunction(o.appendTo)?o.appendTo(a):r.isElement(o)&&a.insertAdjacentElement("beforeend",o)),i.default.one(".vc-content",t.$dom).insertAdjacentElement("beforeend",a)}),e.trigger("addTopBar",function(o){if(o)for(var n=i.default.one(".vc-topbar",t.$dom),a=function(t){var a=o[t],l=i.default.render(d.default,{name:a.name||"Undefined",className:a.className||"",pluginID:e.id});if(a.data)for(var c in a.data)l.dataset[c]=a.data[c];r.isFunction(a.onClick)&&i.default.bind(l,"click",function(t){!1===a.onClick.call(l)||(i.default.removeClass(i.default.all(".vc-topbar-"+e.id),"vc-actived"),i.default.addClass(l,"vc-actived"))}),n.insertAdjacentElement("beforeend",l)},l=0;l<o.length;l++)a(l)}),e.trigger("addTool",function(o){if(o)for(var n=i.default.one(".vc-tool-last",t.$dom),a=function(t){var a=o[t],l=i.default.render(u.default,{name:a.name||"Undefined",pluginID:e.id});1==a.global&&i.default.addClass(l,"vc-global-tool"),r.isFunction(a.onClick)&&i.default.bind(l,"click",function(e){a.onClick.call(l)}),n.parentNode.insertBefore(l,n)},l=0;l<o.length;l++)a(l)}),e.isReady=!0,e.trigger("ready")}},{key:"_triggerPluginsEvent",value:function(e){for(var t in this.pluginList)this.pluginList[t].isReady&&this.pluginList[t].trigger(e)}},{key:"_triggerPluginEvent",value:function(e,t){var o=this.pluginList[e];o&&o.isReady&&o.trigger(t)}},{key:"addPlugin",value:function(e){return void 0!==this.pluginList[e.id]?(console.debug("Plugin "+e.id+" has already been added."),!1):(this.pluginList[e.id]=e,this.isInited&&(this._initPlugin(e),1==this.tabList.length&&this.showTab(this.tabList[0])),!0)}},{key:"removePlugin",value:function(e){e=(e+"").toLowerCase();var t=this.pluginList[e];if(void 0===t)return console.debug("Plugin "+e+" does not exist."),!1;if(t.trigger("remove"),this.isInited){var o=i.default.one("#__vc_tab_"+e);o&&o.parentNode.removeChild(o);for(var n=i.default.all(".vc-topbar-"+e,this.$dom),r=0;r<n.length;r++)n[r].parentNode.removeChild(n[r]);var a=i.default.one("#__vc_log_"+e);a&&a.parentNode.removeChild(a);for(var l=i.default.all(".vc-tool-"+e,this.$dom),c=0;c<l.length;c++)l[c].parentNode.removeChild(l[c])}var s=this.tabList.indexOf(e);s>-1&&this.tabList.splice(s,1);try{delete this.pluginList[e]}catch(t){this.pluginList[e]=void 0}return this.activedTab==e&&this.tabList.length>0&&this.showTab(this.tabList[0]),!0}},{key:"show",value:function(){if(this.isInited){var e=this;i.default.one(".vc-panel",this.$dom).style.display="block",setTimeout(function(){i.default.addClass(e.$dom,"vc-toggle"),e._triggerPluginsEvent("showConsole"),i.default.one(".vc-mask",e.$dom).style.display="block"},10)}}},{key:"hide",value:function(){if(this.isInited){i.default.removeClass(this.$dom,"vc-toggle"),this._triggerPluginsEvent("hideConsole");var e=i.default.one(".vc-mask",this.$dom),t=i.default.one(".vc-panel",this.$dom);i.default.bind(e,"transitionend",function(o){e.style.display="none",t.style.display="none"})}}},{key:"showSwitch",value:function(){this.isInited&&(i.default.one(".vc-switch",this.$dom).style.display="block")}},{key:"hideSwitch",value:function(){this.isInited&&(i.default.one(".vc-switch",this.$dom).style.display="none")}},{key:"showTab",value:function(e){if(this.isInited){var t=i.default.one("#__vc_log_"+e);i.default.removeClass(i.default.all(".vc-tab",this.$dom),"vc-actived"),i.default.addClass(i.default.one("#__vc_tab_"+e),"vc-actived"),i.default.removeClass(i.default.all(".vc-logbox",this.$dom),"vc-actived"),i.default.addClass(t,"vc-actived");var o=i.default.all(".vc-topbar-"+e,this.$dom);i.default.removeClass(i.default.all(".vc-toptab",this.$dom),"vc-toggle"),i.default.addClass(o,"vc-toggle"),o.length>0?i.default.addClass(i.default.one(".vc-content",this.$dom),"vc-has-topbar"):i.default.removeClass(i.default.one(".vc-content",this.$dom),"vc-has-topbar"),i.default.removeClass(i.default.all(".vc-tool",this.$dom),"vc-toggle"),i.default.addClass(i.default.all(".vc-tool-"+e,this.$dom),"vc-toggle"),this.activedTab&&this._triggerPluginEvent(this.activedTab,"hide"),this.activedTab=e,this._triggerPluginEvent(this.activedTab,"show")}}},{key:"setOption",value:function(e,t){if(r.isString(e))this.option[e]=t,this._triggerPluginsEvent("updateOption");else if(r.isObject(e)){for(var o in e)this.option[o]=e[o];this._triggerPluginsEvent("updateOption")}else console.debug("The first parameter of vConsole.setOption() must be a string or an object.")}},{key:"destroy",value:function(){if(this.isInited){for(var e=Object.keys(this.pluginList),t=e.length-1;t>=0;t--)this.removePlugin(e[t]);this.$dom.parentNode.removeChild(this.$dom),this.isInited=!1}}}])&&_(t.prototype,o),a&&_(t,a),e}();x.VConsolePlugin=v.default,x.VConsoleLogPlugin=f.default,x.VConsoleDefaultPlugin=p.default,x.VConsoleSystemPlugin=b.default,x.VConsoleNetworkPlugin=g.default,x.VConsoleElementPlugin=h.default,x.VConsoleStoragePlugin=m.default;var k=x;o.default=k,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e){e.exports=JSON.parse('{"name":"vconsole","version":"3.3.4","description":"A lightweight, extendable front-end developer tool for mobile web page.","homepage":"https://github.com/Tencent/vConsole","main":"dist/vconsole.min.js","typings":"dist/vconsole.min.d.ts","scripts":{"test":"mocha","build":"webpack"},"keywords":["console","debug","mobile"],"repository":{"type":"git","url":"git+https://github.com/Tencent/vConsole.git"},"dependencies":{},"devDependencies":{"@babel/core":"^7.5.5","@babel/plugin-proposal-class-properties":"^7.5.5","@babel/plugin-proposal-export-namespace-from":"^7.5.2","@babel/plugin-proposal-object-rest-spread":"^7.5.5","@babel/preset-env":"^7.5.5","babel-loader":"^8.0.6","babel-plugin-add-module-exports":"^1.0.2","chai":"^4.2.0","copy-webpack-plugin":"^5.0.4","css-loader":"^3.2.0","html-loader":"^0.5.5","jsdom":"^15.1.1","json-loader":"^0.5.7","less":"^3.10.0","less-loader":"^5.0.0","mocha":"^5.2.0","style-loader":"^1.0.0","webpack":"^4.39.2","webpack-cli":"^3.3.6"},"author":"Tencent","license":"MIT"}')},function(e,t,o){var n,r,i;r=[t],void 0===(i="function"==typeof(n=function(o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.default=function(e,t,o){var n=/\{\{([^\}]+)\}\}/g,r="",i="",a=0,l=[],c=function(e,t){""!==e&&(t?e.match(/^ ?else/g)?r+="} "+e+" {\n":e.match(/\/(if|for|switch)/g)?r+="}\n":e.match(/^ ?if|for|switch/g)?r+=e+" {\n":e.match(/^ ?(break|continue) ?$/g)?r+=e+";\n":e.match(/^ ?(case|default)/g)?r+=e+":\n":r+="arr.push("+e+");\n":r+='arr.push("'+e.replace(/"/g,'\\"')+'");\n')};for(window.__mito_data=t,window.__mito_code="",window.__mito_result="",e=(e=e.replace(/(\{\{ ?switch(.+?)\}\})[\r\n\t ]+\{\{/g,"$1{{")).replace(/^[\r\n]/,"").replace(/\n/g,"\\\n").replace(/\r/g,"\\\r"),i="(function(){\n",r="var arr = [];\n";l=n.exec(e);)c(e.slice(a,l.index),!1),c(l[1],!0),a=l.index+l[0].length;c(e.substr(a,e.length-a),!1),i+=r="with (__mito_data) {\n"+(r+='__mito_result = arr.join("");')+"\n}",i+="})();";var s=document.getElementsByTagName("script"),d="";s.length>0&&(d=s[0].nonce||"");var u=document.createElement("SCRIPT");u.innerHTML=i,u.setAttribute("nonce",d),document.documentElement.appendChild(u);var v=__mito_result;if(document.documentElement.removeChild(u),!o){var f=document.createElement("DIV");f.innerHTML=v,v=f.children[0]}return v},e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n=o(12);"string"==typeof n&&(n=[[e.i,n,""]]);var r={insert:"head",singleton:!1};o(5)(n,r);n.locals&&(e.exports=n.locals)},function(e,t,o){(e.exports=o(4)(!1)).push([e.i,'#__vconsole {\n  color: #000;\n  font-size: 13px;\n  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;\n  /* global */\n  /* compoment */\n}\n#__vconsole .vc-max-height {\n  max-height: 19.23076923em;\n}\n#__vconsole .vc-max-height-line {\n  max-height: 3.38461538em;\n}\n#__vconsole .vc-min-height {\n  min-height: 3.07692308em;\n}\n#__vconsole dd,\n#__vconsole dl,\n#__vconsole pre {\n  margin: 0;\n}\n#__vconsole .vc-switch {\n  display: block;\n  position: fixed;\n  right: 0.76923077em;\n  bottom: 0.76923077em;\n  color: #FFF;\n  background-color: #04BE02;\n  line-height: 1;\n  font-size: 1.07692308em;\n  padding: 0.61538462em 1.23076923em;\n  z-index: 10000;\n  border-radius: 0.30769231em;\n  box-shadow: 0 0 0.61538462em rgba(0, 0, 0, 0.4);\n}\n#__vconsole .vc-mask {\n  display: none;\n  position: fixed;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  background: rgba(0, 0, 0, 0);\n  z-index: 10001;\n  transition: background 0.3s;\n  -webkit-tap-highlight-color: transparent;\n  overflow-y: scroll;\n}\n#__vconsole .vc-panel {\n  display: none;\n  position: fixed;\n  min-height: 85%;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  z-index: 10002;\n  background-color: #EFEFF4;\n  -webkit-transition: -webkit-transform 0.3s;\n  transition: -webkit-transform 0.3s;\n  transition: transform 0.3s;\n  transition: transform 0.3s, -webkit-transform 0.3s;\n  -webkit-transform: translate(0, 100%);\n  transform: translate(0, 100%);\n}\n#__vconsole .vc-tabbar {\n  border-bottom: 1px solid #D9D9D9;\n  overflow-x: auto;\n  height: 3em;\n  width: auto;\n  white-space: nowrap;\n}\n#__vconsole .vc-tabbar .vc-tab {\n  display: inline-block;\n  line-height: 3em;\n  padding: 0 1.15384615em;\n  border-right: 1px solid #D9D9D9;\n  text-decoration: none;\n  color: #000;\n  -webkit-tap-highlight-color: transparent;\n  -webkit-touch-callout: none;\n}\n#__vconsole .vc-tabbar .vc-tab:active {\n  background-color: rgba(0, 0, 0, 0.15);\n}\n#__vconsole .vc-tabbar .vc-tab.vc-actived {\n  background-color: #FFF;\n}\n#__vconsole .vc-content {\n  background-color: #FFF;\n  overflow-x: hidden;\n  overflow-y: auto;\n  position: absolute;\n  top: 3.07692308em;\n  left: 0;\n  right: 0;\n  bottom: 3.07692308em;\n  -webkit-overflow-scrolling: touch;\n  margin-bottom: constant(safe-area-inset-bottom);\n  margin-bottom: env(safe-area-inset-bottom);\n}\n#__vconsole .vc-content.vc-has-topbar {\n  top: 5.46153846em;\n}\n#__vconsole .vc-topbar {\n  background-color: #FBF9FE;\n  display: flex;\n  display: -webkit-box;\n  flex-direction: row;\n  flex-wrap: wrap;\n  -webkit-box-direction: row;\n  -webkit-flex-wrap: wrap;\n  width: 100%;\n}\n#__vconsole .vc-topbar .vc-toptab {\n  display: none;\n  flex: 1;\n  -webkit-box-flex: 1;\n  line-height: 2.30769231em;\n  padding: 0 1.15384615em;\n  border-bottom: 1px solid #D9D9D9;\n  text-decoration: none;\n  text-align: center;\n  color: #000;\n  -webkit-tap-highlight-color: transparent;\n  -webkit-touch-callout: none;\n}\n#__vconsole .vc-topbar .vc-toptab.vc-toggle {\n  display: block;\n}\n#__vconsole .vc-topbar .vc-toptab:active {\n  background-color: rgba(0, 0, 0, 0.15);\n}\n#__vconsole .vc-topbar .vc-toptab.vc-actived {\n  border-bottom: 1px solid #3e82f7;\n}\n#__vconsole .vc-logbox {\n  display: none;\n  position: relative;\n  min-height: 100%;\n}\n#__vconsole .vc-logbox i {\n  font-style: normal;\n}\n#__vconsole .vc-logbox .vc-log {\n  padding-bottom: 3em;\n  -webkit-tap-highlight-color: transparent;\n}\n#__vconsole .vc-logbox .vc-log:empty:before {\n  content: "Empty";\n  color: #999;\n  position: absolute;\n  top: 45%;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  font-size: 1.15384615em;\n  text-align: center;\n}\n#__vconsole .vc-logbox .vc-item {\n  margin: 0;\n  padding: 0.46153846em 0.61538462em;\n  overflow: hidden;\n  line-height: 1.3;\n  border-bottom: 1px solid #EEE;\n  word-break: break-word;\n}\n#__vconsole .vc-logbox .vc-item-info {\n  color: #6A5ACD;\n}\n#__vconsole .vc-logbox .vc-item-debug {\n  color: #DAA520;\n}\n#__vconsole .vc-logbox .vc-item-warn {\n  color: #FFA500;\n  border-color: #FFB930;\n  background-color: #FFFACD;\n}\n#__vconsole .vc-logbox .vc-item-error {\n  color: #DC143C;\n  border-color: #F4A0AB;\n  background-color: #FFE4E1;\n}\n#__vconsole .vc-logbox .vc-log.vc-log-partly .vc-item {\n  display: none;\n}\n#__vconsole .vc-logbox .vc-log.vc-log-partly-log .vc-item-log,\n#__vconsole .vc-logbox .vc-log.vc-log-partly-info .vc-item-info,\n#__vconsole .vc-logbox .vc-log.vc-log-partly-warn .vc-item-warn,\n#__vconsole .vc-logbox .vc-log.vc-log-partly-error .vc-item-error {\n  display: block;\n}\n#__vconsole .vc-logbox .vc-item .vc-item-content {\n  margin-right: 4.61538462em;\n  display: inline-block;\n}\n#__vconsole .vc-logbox .vc-item .vc-item-repeat {\n  display: inline-block;\n  margin-right: 0.30769231em;\n  padding: 0 6.5px;\n  color: #D7E0EF;\n  background-color: #42597F;\n  border-radius: 8.66666667px;\n}\n#__vconsole .vc-logbox .vc-item.vc-item-error .vc-item-repeat {\n  color: #901818;\n  background-color: #DC2727;\n}\n#__vconsole .vc-logbox .vc-item.vc-item-warn .vc-item-repeat {\n  color: #987D20;\n  background-color: #F4BD02;\n}\n#__vconsole .vc-logbox .vc-item .vc-item-code {\n  display: block;\n  white-space: pre-wrap;\n  overflow: auto;\n  position: relative;\n}\n#__vconsole .vc-logbox .vc-item .vc-item-code.vc-item-code-input,\n#__vconsole .vc-logbox .vc-item .vc-item-code.vc-item-code-output {\n  padding-left: 0.92307692em;\n}\n#__vconsole .vc-logbox .vc-item .vc-item-code.vc-item-code-input:before,\n#__vconsole .vc-logbox .vc-item .vc-item-code.vc-item-code-output:before {\n  content: "›";\n  position: absolute;\n  top: -0.23076923em;\n  left: 0;\n  font-size: 1.23076923em;\n  color: #6A5ACD;\n}\n#__vconsole .vc-logbox .vc-item .vc-item-code.vc-item-code-output:before {\n  content: "‹";\n}\n#__vconsole .vc-logbox .vc-item .vc-fold {\n  display: block;\n  overflow: auto;\n  -webkit-overflow-scrolling: touch;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-outer {\n  display: block;\n  font-style: italic;\n  padding-left: 0.76923077em;\n  position: relative;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-outer:active {\n  background-color: #E6E6E6;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-outer:before {\n  content: "";\n  position: absolute;\n  top: 0.30769231em;\n  left: 0.15384615em;\n  width: 0;\n  height: 0;\n  border: transparent solid 0.30769231em;\n  border-left-color: #000;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-outer.vc-toggle:before {\n  top: 0.46153846em;\n  left: 0;\n  border-top-color: #000;\n  border-left-color: transparent;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-inner {\n  display: none;\n  margin-left: 0.76923077em;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-inner.vc-toggle {\n  display: block;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-inner .vc-code-key {\n  margin-left: 0.76923077em;\n}\n#__vconsole .vc-logbox .vc-item .vc-fold .vc-fold-outer .vc-code-key {\n  margin-left: 0;\n}\n#__vconsole .vc-logbox .vc-code-key {\n  color: #905;\n}\n#__vconsole .vc-logbox .vc-code-private-key {\n  color: #D391B5;\n}\n#__vconsole .vc-logbox .vc-code-function {\n  color: #905;\n  font-style: italic;\n}\n#__vconsole .vc-logbox .vc-code-number,\n#__vconsole .vc-logbox .vc-code-boolean {\n  color: #0086B3;\n}\n#__vconsole .vc-logbox .vc-code-string {\n  color: #183691;\n}\n#__vconsole .vc-logbox .vc-code-null,\n#__vconsole .vc-logbox .vc-code-undefined {\n  color: #666;\n}\n#__vconsole .vc-logbox .vc-cmd {\n  position: absolute;\n  height: 3.07692308em;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  border-top: 1px solid #D9D9D9;\n  display: block!important;\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-input-wrap {\n  display: block;\n  height: 2.15384615em;\n  margin-right: 3.07692308em;\n  padding: 0.46153846em 0.61538462em;\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-input {\n  width: 100%;\n  border: none;\n  resize: none;\n  outline: none;\n  padding: 0;\n  font-size: 0.92307692em;\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-input::-webkit-input-placeholder {\n  line-height: 2.15384615em;\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-btn {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  width: 3.07692308em;\n  border: none;\n  background-color: #EFEFF4;\n  outline: none;\n  -webkit-touch-callout: none;\n  font-size: 1em;\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-btn:active {\n  background-color: rgba(0, 0, 0, 0.15);\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-prompted {\n  position: fixed;\n  width: 100%;\n  background-color: #FBF9FE;\n  border: 1px solid #D9D9D9;\n  overflow-x: scroll;\n  display: none;\n}\n#__vconsole .vc-logbox .vc-cmd .vc-cmd-prompted li {\n  list-style: none;\n  line-height: 30px;\n  padding: 0 0.46153846em;\n  border-bottom: 1px solid #D9D9D9;\n}\n#__vconsole .vc-logbox .vc-group .vc-group-preview {\n  -webkit-touch-callout: none;\n}\n#__vconsole .vc-logbox .vc-group .vc-group-preview:active {\n  background-color: #E6E6E6;\n}\n#__vconsole .vc-logbox .vc-group .vc-group-detail {\n  display: none;\n  padding: 0 0 0.76923077em 1.53846154em;\n  border-bottom: 1px solid #EEE;\n}\n#__vconsole .vc-logbox .vc-group.vc-actived .vc-group-detail {\n  display: block;\n  background-color: #FBF9FE;\n}\n#__vconsole .vc-logbox .vc-group.vc-actived .vc-table-row {\n  background-color: #FFF;\n}\n#__vconsole .vc-logbox .vc-group.vc-actived .vc-group-preview {\n  background-color: #FBF9FE;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-row {\n  display: flex;\n  display: -webkit-flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  -webkit-box-direction: row;\n  -webkit-flex-wrap: wrap;\n  overflow: hidden;\n  border-bottom: 1px solid #EEE;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-row.vc-left-border {\n  border-left: 1px solid #EEE;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col {\n  flex: 1;\n  -webkit-box-flex: 1;\n  padding: 0.23076923em 0.30769231em;\n  border-left: 1px solid #EEE;\n  overflow: auto;\n  white-space: pre-wrap;\n  word-break: break-word;\n  /*white-space: nowrap;\n        text-overflow: ellipsis;*/\n  -webkit-overflow-scrolling: touch;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col:first-child {\n  border: none;\n}\n#__vconsole .vc-logbox .vc-table .vc-small .vc-table-col {\n  padding: 0 0.30769231em;\n  font-size: 0.92307692em;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col-2 {\n  flex: 2;\n  -webkit-box-flex: 2;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col-3 {\n  flex: 3;\n  -webkit-box-flex: 3;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col-4 {\n  flex: 4;\n  -webkit-box-flex: 4;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col-5 {\n  flex: 5;\n  -webkit-box-flex: 5;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col-6 {\n  flex: 6;\n  -webkit-box-flex: 6;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-row-error {\n  border-color: #F4A0AB;\n  background-color: #FFE4E1;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-row-error .vc-table-col {\n  color: #DC143C;\n  border-color: #F4A0AB;\n}\n#__vconsole .vc-logbox .vc-table .vc-table-col-title {\n  font-weight: bold;\n}\n#__vconsole .vc-logbox.vc-actived {\n  display: block;\n}\n#__vconsole .vc-toolbar {\n  border-top: 1px solid #D9D9D9;\n  line-height: 3em;\n  position: absolute;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  display: flex;\n  display: -webkit-box;\n  flex-direction: row;\n  -webkit-box-direction: row;\n}\n#__vconsole .vc-toolbar .vc-tool {\n  display: none;\n  text-decoration: none;\n  color: #000;\n  width: 50%;\n  flex: 1;\n  -webkit-box-flex: 1;\n  text-align: center;\n  position: relative;\n  -webkit-touch-callout: none;\n}\n#__vconsole .vc-toolbar .vc-tool.vc-toggle,\n#__vconsole .vc-toolbar .vc-tool.vc-global-tool {\n  display: block;\n}\n#__vconsole .vc-toolbar .vc-tool:active {\n  background-color: rgba(0, 0, 0, 0.15);\n}\n#__vconsole .vc-toolbar .vc-tool:after {\n  content: " ";\n  position: absolute;\n  top: 0.53846154em;\n  bottom: 0.53846154em;\n  right: 0;\n  border-left: 1px solid #D9D9D9;\n}\n#__vconsole .vc-toolbar .vc-tool-last:after {\n  border: none;\n}\n@supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {\n  #__vconsole .vc-toolbar,\n  #__vconsole .vc-switch {\n    bottom: constant(safe-area-inset-bottom);\n    bottom: env(safe-area-inset-bottom);\n  }\n}\n#__vconsole.vc-toggle .vc-switch {\n  display: none;\n}\n#__vconsole.vc-toggle .vc-mask {\n  background: rgba(0, 0, 0, 0.6);\n  display: block;\n}\n#__vconsole.vc-toggle .vc-panel {\n  -webkit-transform: translate(0, 0);\n  transform: translate(0, 0);\n}\n',""])},function(e,t){e.exports='<div id="__vconsole" class="">\n  <div class="vc-switch">vConsole</div>\n  <div class="vc-mask">\n  </div>\n  <div class="vc-panel">\n    <div class="vc-tabbar">\n    </div>\n    <div class="vc-topbar">\n    </div>\n    <div class="vc-content">\n    </div>\n    <div class="vc-toolbar">\n      <a class="vc-tool vc-global-tool vc-tool-last vc-hide">Hide</a>\n    </div>\n  </div>\n</div>'},function(e,t){e.exports='<a class="vc-tab" data-tab="{{id}}" id="__vc_tab_{{id}}">{{name}}</a>'},function(e,t){e.exports='<div class="vc-logbox" id="__vc_log_{{id}}">\n  \n</div>'},function(e,t){e.exports='<a class="vc-toptab vc-topbar-{{pluginID}}{{if (className)}} {{className}}{{/if}}">{{name}}</a>'},function(e,t){e.exports='<a class="vc-tool vc-tool-{{pluginID}}">{{name}}</a>'},function(e,t){e.exports='<div id="{{_id}}" class="vc-item vc-item-{{logType}} {{style}}">\n\t<div class="vc-item-content"></div>\n</div>'},function(e,t){e.exports='<div class="vc-fold">\n  {{if (lineType == \'obj\')}}\n    <i class="vc-fold-outer">{{outer}}</i>\n    <div class="vc-fold-inner"></div>\n  {{else if (lineType == \'value\')}}\n    <i class="vc-code-{{valueType}}">{{value}}</i>\n  {{else if (lineType == \'kv\')}}\n    <i class="vc-code-key{{if (keyType)}} vc-code-{{keyType}}-key{{/if}}">{{key}}</i>: <i class="vc-code-{{valueType}}">{{value}}</i>\n  {{/if}}\n</div>'},function(e,t){e.exports='<span>\n  <i class="vc-code-key{{if (keyType)}} vc-code-{{keyType}}-key{{/if}}">{{key}}</i>: <i class="vc-code-{{valueType}}">{{value}}</i>\n</span>'},function(module,exports,__webpack_require__){var __WEBPACK_AMD_DEFINE_FACTORY__,__WEBPACK_AMD_DEFINE_ARRAY__,__WEBPACK_AMD_DEFINE_RESULT__,factory;factory=function(_exports,_query,tool,_log,_tabbox_default,_item_code){"use strict";function _interopRequireWildcard(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function _createClass(e,t,o){return t&&_defineProperties(e.prototype,t),o&&_defineProperties(e,o),e}function _possibleConstructorReturn(e,t){return!t||"object"!==_typeof(t)&&"function"!=typeof t?_assertThisInitialized(e):t}function _assertThisInitialized(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function _get(e,t,o){return(_get="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(e,t,o){var n=_superPropBase(e,t);if(n){var r=Object.getOwnPropertyDescriptor(n,t);return r.get?r.get.call(o):r.value}})(e,t,o||e)}function _superPropBase(e,t){for(;!Object.prototype.hasOwnProperty.call(e,t)&&null!==(e=_getPrototypeOf(e)););return e}function _getPrototypeOf(e){return(_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function _inherits(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&_setPrototypeOf(e,t)}function _setPrototypeOf(e,t){return(_setPrototypeOf=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_query=_interopRequireDefault(_query),tool=_interopRequireWildcard(tool),_log=_interopRequireDefault(_log),_tabbox_default=_interopRequireDefault(_tabbox_default),_item_code=_interopRequireDefault(_item_code);var VConsoleDefaultTab=function(_VConsoleLogTab){function VConsoleDefaultTab(){var e,t;_classCallCheck(this,VConsoleDefaultTab);for(var o=arguments.length,n=new Array(o),r=0;r<o;r++)n[r]=arguments[r];return(t=_possibleConstructorReturn(this,(e=_getPrototypeOf(VConsoleDefaultTab)).call.apply(e,[this].concat(n)))).tplTabbox=_tabbox_default.default,t}return _inherits(VConsoleDefaultTab,_VConsoleLogTab),_createClass(VConsoleDefaultTab,[{key:"onReady",value:function onReady(){var that=this;_get(_getPrototypeOf(VConsoleDefaultTab.prototype),"onReady",this).call(this),window.winKeys=Object.getOwnPropertyNames(window).sort(),window.keyTypes={};for(var i=0;i<winKeys.length;i++)keyTypes[winKeys[i]]=_typeof(window[winKeys[i]]);var cacheObj={},ID_REGEX=/[a-zA-Z_0-9\$\-\u00A2-\uFFFF]/,retrievePrecedingIdentifier=function(e,t,o){o=o||ID_REGEX;for(var n=[],r=t-1;r>=0&&o.test(e[r]);r--)n.push(e[r]);if(0==n.length){o=/\./;for(var i=t-1;i>=0&&o.test(e[i]);i--)n.push(e[i])}if(0===n.length){var a=e.match(/[\(\)\[\]\{\}]/gi)||[];return a[a.length-1]}return n.reverse().join("")};_query.default.bind(_query.default.one(".vc-cmd-input"),"keyup",function(e){var isDeleteKeyCode=8===e.keyCode||46===e.keyCode,$prompted=_query.default.one(".vc-cmd-prompted");$prompted.style.display="none",$prompted.innerHTML="";var tempValue=this.value,value=retrievePrecedingIdentifier(this.value,this.value.length);if(value&&value.length>0){if(/\(/.test(value)&&!isDeleteKeyCode)return void(_query.default.one(".vc-cmd-input").value+=")");if(/\[/.test(value)&&!isDeleteKeyCode)return void(_query.default.one(".vc-cmd-input").value+="]");if(/\{/.test(value)&&!isDeleteKeyCode)return void(_query.default.one(".vc-cmd-input").value+="}");if("."===value){var key=retrievePrecedingIdentifier(tempValue,tempValue.length-1);if(!cacheObj[key])try{cacheObj[key]=Object.getOwnPropertyNames(eval("("+key+")")).sort()}catch(e){}try{for(var _i3=0;_i3<cacheObj[key].length;_i3++){var $li=document.createElement("li"),_key=cacheObj[key][_i3];$li.innerHTML=_key,$li.onclick=function(){_query.default.one(".vc-cmd-input").value="",_query.default.one(".vc-cmd-input").value=tempValue+this.innerHTML,$prompted.style.display="none"},$prompted.appendChild($li)}}catch(e){}}else if("."!==value.substring(value.length-1)&&value.indexOf(".")<0){for(var _i4=0;_i4<winKeys.length;_i4++)if(winKeys[_i4].toLowerCase().indexOf(value.toLowerCase())>=0){var _$li=document.createElement("li");_$li.innerHTML=winKeys[_i4],_$li.onclick=function(){_query.default.one(".vc-cmd-input").value="",_query.default.one(".vc-cmd-input").value=this.innerHTML,"function"==keyTypes[this.innerHTML]&&(_query.default.one(".vc-cmd-input").value+="()"),$prompted.style.display="none"},$prompted.appendChild(_$li)}}else{var arr=value.split(".");if(cacheObj[arr[0]]){cacheObj[arr[0]].sort();for(var _i5=0;_i5<cacheObj[arr[0]].length;_i5++){var _$li2=document.createElement("li"),_key3=cacheObj[arr[0]][_i5];_key3.indexOf(arr[1])>=0&&(_$li2.innerHTML=_key3,_$li2.onclick=function(){_query.default.one(".vc-cmd-input").value="",_query.default.one(".vc-cmd-input").value=tempValue+this.innerHTML,$prompted.style.display="none"},$prompted.appendChild(_$li2))}}}if($prompted.children.length>0){var m=Math.min(200,31*$prompted.children.length);$prompted.style.display="block",$prompted.style.height=m+"px",$prompted.style.marginTop=-m+"px"}}else $prompted.style.display="none"}),_query.default.bind(_query.default.one(".vc-cmd",this.$tabbox),"submit",function(e){e.preventDefault();var t=_query.default.one(".vc-cmd-input",e.target),o=t.value;t.value="",""!==o&&that.evalCommand(o);var n=_query.default.one(".vc-cmd-prompted");n&&(n.style.display="none")});var code="";code+="if (!!window) {",code+="window.__vConsole_cmd_result = undefined;",code+="window.__vConsole_cmd_error = false;",code+="}";var scriptList=document.getElementsByTagName("script"),nonce="";scriptList.length>0&&(nonce=scriptList[0].nonce||"");var script=document.createElement("SCRIPT");script.innerHTML=code,script.setAttribute("nonce",nonce),document.documentElement.appendChild(script),document.documentElement.removeChild(script)}},{key:"mockConsole",value:function(){_get(_getPrototypeOf(VConsoleDefaultTab.prototype),"mockConsole",this).call(this);var e=this;tool.isFunction(window.onerror)&&(this.windowOnError=window.onerror),window.onerror=function(t,o,n,r,i){var a=t;o&&(a+="\n"+o.replace(location.origin,"")),(n||r)&&(a+=":"+n+":"+r);var l=!!i&&!!i.stack&&i.stack.toString()||"";e.printLog({logType:"error",logs:[a,l],noOrigin:!0}),tool.isFunction(e.windowOnError)&&e.windowOnError.call(window,t,o,n,r,i)}}},{key:"evalCommand",value:function(e){this.printLog({logType:"log",content:_query.default.render(_item_code.default,{content:e,type:"input"}),style:""});var t,o=void 0;try{o=eval.call(window,"("+e+")")}catch(t){try{o=eval.call(window,e)}catch(e){}}tool.isArray(o)||tool.isObject(o)?t=this.getFoldedLine(o):(tool.isNull(o)?o="null":tool.isUndefined(o)?o="undefined":tool.isFunction(o)?o="function()":tool.isString(o)&&(o='"'+o+'"'),t=_query.default.render(_item_code.default,{content:o,type:"output"})),this.printLog({logType:"log",content:t,style:""}),window.winKeys=Object.getOwnPropertyNames(window).sort()}}]),VConsoleDefaultTab}(_log.default),_default=VConsoleDefaultTab;_exports.default=_default,module.exports=exports.default},__WEBPACK_AMD_DEFINE_ARRAY__=[exports,__webpack_require__(1),__webpack_require__(0),__webpack_require__(3),__webpack_require__(22),__webpack_require__(23)],void 0===(__WEBPACK_AMD_DEFINE_RESULT__="function"==typeof(__WEBPACK_AMD_DEFINE_FACTORY__=factory)?__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports,__WEBPACK_AMD_DEFINE_ARRAY__):__WEBPACK_AMD_DEFINE_FACTORY__)||(module.exports=__WEBPACK_AMD_DEFINE_RESULT__)},function(e,t){e.exports='<div>\n  <div class="vc-log"></div>\n  <form class="vc-cmd">\n    <button class="vc-cmd-btn" type="submit">OK</button>\n    <ul class=\'vc-cmd-prompted\'></ul>\n    <div class="vc-cmd-input-wrap">\n      <textarea class="vc-cmd-input" placeholder="command..."></textarea>\n    </div>\n  </form>\n</div>'},function(e,t){e.exports='<pre class="vc-item-code vc-item-code-{{type}}">{{content}}</pre>'},function(e,t,o){var n,r,i;r=[t,o(3),o(25)],void 0===(i="function"==typeof(n=function(o,n,r){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function a(e){return(a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function l(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function c(e,t){return!t||"object"!==a(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function s(e,t,o){return(s="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(e,t,o){var n=function(e,t){for(;!Object.prototype.hasOwnProperty.call(e,t)&&null!==(e=d(e)););return e}(e,t);if(n){var r=Object.getOwnPropertyDescriptor(n,t);return r.get?r.get.call(o):r.value}})(e,t,o||e)}function d(e){return(d=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function u(e,t){return(u=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,n=i(n),r=i(r);var v=function(e){function t(){var e,o;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);for(var n=arguments.length,i=new Array(n),a=0;a<n;a++)i[a]=arguments[a];return(o=c(this,(e=d(t)).call.apply(e,[this].concat(i)))).tplTabbox=r.default,o.allowUnformattedLog=!1,o}var o,i,a;return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&u(e,t)}(t,n.default),o=t,(i=[{key:"onInit",value:function(){s(d(t.prototype),"onInit",this).call(this),this.printSystemInfo()}},{key:"printSystemInfo",value:function(){var e=navigator.userAgent,t="",o=e.match(/(ipod).*\s([\d_]+)/i),n=e.match(/(ipad).*\s([\d_]+)/i),r=e.match(/(iphone)\sos\s([\d_]+)/i),i=e.match(/(android)\s([\d\.]+)/i);t="Unknown",i?t="Android "+i[2]:r?t="iPhone, iOS "+r[2].replace(/_/g,"."):n?t="iPad, iOS "+n[2].replace(/_/g,"."):o&&(t="iPod, iOS "+o[2].replace(/_/g,"."));var a=t,l=e.match(/MicroMessenger\/([\d\.]+)/i);t="Unknown",l&&l[1]?(a+=", WeChat "+(t=l[1]),console.info("[system]","System:",a)):console.info("[system]","System:",a),t="Unknown",a=t="https:"==location.protocol?"HTTPS":"http:"==location.protocol?"HTTP":location.protocol.replace(":","");var c=e.toLowerCase().match(/ nettype\/([^ ]+)/g);t="Unknown",c&&c[0]?(a+=", "+(t=(c=c[0].split("/"))[1]),console.info("[system]","Network:",a)):console.info("[system]","Protocol:",a),console.info("[system]","UA:",e),setTimeout(function(){var e=window.performance||window.msPerformance||window.webkitPerformance;if(e&&e.timing){var t=e.timing;t.navigationStart&&console.info("[system]","navigationStart:",t.navigationStart),t.navigationStart&&t.domainLookupStart&&console.info("[system]","navigation:",t.domainLookupStart-t.navigationStart+"ms"),t.domainLookupEnd&&t.domainLookupStart&&console.info("[system]","dns:",t.domainLookupEnd-t.domainLookupStart+"ms"),t.connectEnd&&t.connectStart&&(t.connectEnd&&t.secureConnectionStart?console.info("[system]","tcp (ssl):",t.connectEnd-t.connectStart+"ms ("+(t.connectEnd-t.secureConnectionStart)+"ms)"):console.info("[system]","tcp:",t.connectEnd-t.connectStart+"ms")),t.responseStart&&t.requestStart&&console.info("[system]","request:",t.responseStart-t.requestStart+"ms"),t.responseEnd&&t.responseStart&&console.info("[system]","response:",t.responseEnd-t.responseStart+"ms"),t.domComplete&&t.domLoading&&(t.domContentLoadedEventStart&&t.domLoading?console.info("[system]","domComplete (domLoaded):",t.domComplete-t.domLoading+"ms ("+(t.domContentLoadedEventStart-t.domLoading)+"ms)"):console.info("[system]","domComplete:",t.domComplete-t.domLoading+"ms")),t.loadEventEnd&&t.loadEventStart&&console.info("[system]","loadEvent:",t.loadEventEnd-t.loadEventStart+"ms"),t.navigationStart&&t.loadEventEnd&&console.info("[system]","total (DOM):",t.loadEventEnd-t.navigationStart+"ms ("+(t.domComplete-t.navigationStart)+"ms)")}},0)}}])&&l(o.prototype,i),a&&l(o,a),t}();o.default=v,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t){e.exports='<div>\n  <div class="vc-log"></div>\n</div>'},function(e,t,o){var n,r,i;r=[t,o(1),o(0),o(2),o(27),o(28),o(29)],void 0===(i="function"==typeof(n=function(o,n,r,i,a,l,c){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}function d(e){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function u(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function v(e,t){return!t||"object"!==d(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function f(e){return(f=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,n=s(n),r=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}(r),i=s(i),a=s(a),l=s(l),c=s(c);var b=function(e){function t(){var e,o;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);for(var r=arguments.length,i=new Array(r),l=0;l<r;l++)i[l]=arguments[l];return(o=v(this,(e=f(t)).call.apply(e,[this].concat(i)))).$tabbox=n.default.render(a.default,{}),o.$header=null,o.reqList={},o.domList={},o.isReady=!1,o.isShow=!1,o.isInBottom=!0,o._open=void 0,o._send=void 0,o.mockAjax(),o}var o,s,d;return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}(t,i.default),o=t,(s=[{key:"onRenderTab",value:function(e){e(this.$tabbox)}},{key:"onAddTool",value:function(e){var t=this;e([{name:"Clear",global:!1,onClick:function(e){t.clearLog()}}])}},{key:"onReady",value:function(){var e=this;e.isReady=!0,this.renderHeader(),n.default.delegate(n.default.one(".vc-log",this.$tabbox),"click",".vc-group-preview",function(t){var o=this.dataset.reqid,r=this.parentNode;n.default.hasClass(r,"vc-actived")?(n.default.removeClass(r,"vc-actived"),e.updateRequest(o,{actived:!1})):(n.default.addClass(r,"vc-actived"),e.updateRequest(o,{actived:!0})),t.preventDefault()});var t=n.default.one(".vc-content");for(var o in n.default.bind(t,"scroll",function(o){e.isShow&&(t.scrollTop+t.offsetHeight>=t.scrollHeight?e.isInBottom=!0:e.isInBottom=!1)}),e.reqList)e.updateRequest(o,{})}},{key:"onRemove",value:function(){window.XMLHttpRequest&&(window.XMLHttpRequest.prototype.open=this._open,window.XMLHttpRequest.prototype.send=this._send,this._open=void 0,this._send=void 0)}},{key:"onShow",value:function(){this.isShow=!0,1==this.isInBottom&&this.scrollToBottom()}},{key:"onHide",value:function(){this.isShow=!1}},{key:"onShowConsole",value:function(){1==this.isInBottom&&this.scrollToBottom()}},{key:"scrollToBottom",value:function(){var e=n.default.one(".vc-content");e.scrollTop=e.scrollHeight-e.offsetHeight}},{key:"clearLog",value:function(){for(var e in this.reqList={},this.domList)this.domList[e].parentNode.removeChild(this.domList[e]),this.domList[e]=void 0;this.domList={},this.renderHeader()}},{key:"renderHeader",value:function(){var e=Object.keys(this.reqList).length,t=n.default.render(l.default,{count:e}),o=n.default.one(".vc-log",this.$tabbox);this.$header?this.$header.parentNode.replaceChild(t,this.$header):o.parentNode.insertBefore(t,o),this.$header=t}},{key:"updateRequest",value:function(e,t){var o=Object.keys(this.reqList).length,i=this.reqList[e]||{};for(var a in t)i[a]=t[a];if(this.reqList[e]=i,this.isReady){var l={id:e,url:i.url,status:i.status,method:i.method||"-",costTime:i.costTime>0?i.costTime+"ms":"-",header:i.header||null,getData:i.getData||null,postData:i.postData||null,response:null,actived:!!i.actived};switch(i.responseType){case"":case"text":if(r.isString(i.response))try{l.response=JSON.parse(i.response),l.response=JSON.stringify(l.response,null,1),l.response=r.htmlEncode(l.response)}catch(e){l.response=r.htmlEncode(i.response)}else void 0!==i.response&&(l.response=Object.prototype.toString.call(i.response));break;case"json":void 0!==i.response&&(l.response=JSON.stringify(i.response,null,1),l.response=r.htmlEncode(l.response));break;case"blob":case"document":case"arraybuffer":default:void 0!==i.response&&(l.response=Object.prototype.toString.call(i.response))}0==i.readyState||1==i.readyState?l.status="Pending":2==i.readyState||3==i.readyState?l.status="Loading":4==i.readyState||(l.status="Unknown");var s=n.default.render(c.default,l),d=this.domList[e];i.status>=400&&n.default.addClass(n.default.one(".vc-group-preview",s),"vc-table-row-error"),d?d.parentNode.replaceChild(s,d):n.default.one(".vc-log",this.$tabbox).insertAdjacentElement("beforeend",s),this.domList[e]=s,Object.keys(this.reqList).length!=o&&this.renderHeader(),this.isInBottom&&this.scrollToBottom()}}},{key:"mockAjax",value:function(){if(window.XMLHttpRequest){var e=this,t=window.XMLHttpRequest.prototype.open,o=window.XMLHttpRequest.prototype.send;e._open=t,e._send=o,window.XMLHttpRequest.prototype.open=function(){var o=this,n=[].slice.call(arguments),r=n[0],i=n[1],a=e.getUniqueID(),l=null;o._requestID=a,o._method=r,o._url=i;var c=o.onreadystatechange||function(){},s=function(){var t=e.reqList[a]||{};if(t.readyState=o.readyState,t.status=0,o.readyState>1&&(t.status=o.status),t.responseType=o.responseType,0==o.readyState)t.startTime||(t.startTime=+new Date);else if(1==o.readyState)t.startTime||(t.startTime=+new Date);else if(2==o.readyState){t.header={};for(var n=o.getAllResponseHeaders()||"",r=n.split("\n"),i=0;i<r.length;i++){var s=r[i];if(s){var d=s.split(": "),u=d[0],v=d.slice(1).join(": ");t.header[u]=v}}}else 3==o.readyState||(4==o.readyState?(clearInterval(l),t.endTime=+new Date,t.costTime=t.endTime-(t.startTime||t.endTime),t.response=o.response):clearInterval(l));return o._noVConsole||e.updateRequest(a,t),c.apply(o,arguments)};o.onreadystatechange=s;var d=-1;return l=setInterval(function(){d!=o.readyState&&(d=o.readyState,s.call(o))},10),t.apply(o,n)},window.XMLHttpRequest.prototype.send=function(){var t=this,n=[].slice.call(arguments),i=n[0],a=e.reqList[t._requestID]||{};a.method=t._method.toUpperCase();var l=t._url.split("?");if(a.url=l.shift(),l.length>0){a.getData={},l=(l=l.join("?")).split("&");var c=!0,s=!1,d=void 0;try{for(var u,v=l[Symbol.iterator]();!(c=(u=v.next()).done);c=!0){var f=u.value;f=f.split("="),a.getData[f[0]]=decodeURIComponent(f[1])}}catch(e){s=!0,d=e}finally{try{c||null==v.return||v.return()}finally{if(s)throw d}}}if("POST"==a.method)if(r.isString(i)){var p=i.split("&");a.postData={};var b=!0,g=!1,h=void 0;try{for(var m,y=p[Symbol.iterator]();!(b=(m=y.next()).done);b=!0){var _=m.value;_=_.split("="),a.postData[_[0]]=_[1]}}catch(e){g=!0,h=e}finally{try{b||null==y.return||y.return()}finally{if(g)throw h}}}else r.isPlainObject(i)&&(a.postData=i);return t._noVConsole||e.updateRequest(t._requestID,a),o.apply(t,n)}}}},{key:"getUniqueID",value:function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(e){var t=16*Math.random()|0;return("x"==e?t:3&t|8).toString(16)})}}])&&u(o.prototype,s),d&&u(o,d),t}();o.default=b,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t){e.exports='<div class="vc-table">\n  <div class="vc-log"></div>\n</div>'},function(e,t){e.exports='<dl class="vc-table-row">\n  <dd class="vc-table-col vc-table-col-4">Name {{if (count > 0)}}({{count}}){{/if}}</dd>\n  <dd class="vc-table-col">Method</dd>\n  <dd class="vc-table-col">Status</dd>\n  <dd class="vc-table-col">Time</dd>\n</dl>'},function(e,t){e.exports='<div class="vc-group {{actived ? \'vc-actived\' : \'\'}}">\n  <dl class="vc-table-row vc-group-preview" data-reqid="{{id}}">\n    <dd class="vc-table-col vc-table-col-4">{{url}}</dd>\n    <dd class="vc-table-col">{{method}}</dd>\n    <dd class="vc-table-col">{{status}}</dd>\n    <dd class="vc-table-col">{{costTime}}</dd>\n  </dl>\n  <div class="vc-group-detail">\n    {{if (header !== null)}}\n    <div>\n      <dl class="vc-table-row vc-left-border">\n        <dt class="vc-table-col vc-table-col-title">Headers</dt>\n      </dl>\n      {{for (var key in header)}}\n      <div class="vc-table-row vc-left-border vc-small">\n        <div class="vc-table-col vc-table-col-2">{{key}}</div>\n        <div class="vc-table-col vc-table-col-4 vc-max-height-line">{{header[key]}}</div>\n      </div>\n      {{/for}}\n    </div>\n    {{/if}}\n    {{if (getData !== null)}}\n    <div>\n      <dl class="vc-table-row vc-left-border">\n        <dt class="vc-table-col vc-table-col-title">Query String Parameters</dt>\n      </dl>\n      {{for (var key in getData)}}\n      <div class="vc-table-row vc-left-border vc-small">\n        <div class="vc-table-col vc-table-col-2">{{key}}</div>\n        <div class="vc-table-col vc-table-col-4 vc-max-height-line">{{getData[key]}}</div>\n      </div>\n      {{/for}}\n    </div>\n    {{/if}}\n    {{if (postData !== null)}}\n    <div>\n      <dl class="vc-table-row vc-left-border">\n        <dt class="vc-table-col vc-table-col-title">Form Data</dt>\n      </dl>\n      {{for (var key in postData)}}\n      <div class="vc-table-row vc-left-border vc-small">\n        <div class="vc-table-col vc-table-col-2">{{key}}</div>\n        <div class="vc-table-col vc-table-col-4 vc-max-height-line">{{postData[key]}}</div>\n      </div>\n      {{/for}}\n    </div>\n    {{/if}}\n    <div>\n      <dl class="vc-table-row vc-left-border">\n        <dt class="vc-table-col vc-table-col-title">Response</dt>\n      </dl>\n      <div class="vc-table-row vc-left-border vc-small">\n        <pre class="vc-table-col vc-max-height vc-min-height">{{response || \'\'}}</pre>\n      </div>\n    </div>\n  </div>\n</div>'},function(e,t,o){var n,r,i;r=[t,o(31),o(2),o(33),o(34),o(0),o(1)],void 0===(i="function"==typeof(n=function(o,n,r,i,a,l,c){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}function d(e){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function u(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function v(e){return(v=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function f(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,r=s(r),i=s(i),a=s(a),l=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}(l),c=s(c);var b=function(e){function t(){var e,o,n,r;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);for(var a=arguments.length,l=new Array(a),s=0;s<a;s++)l[s]=arguments[s];n=this,o=!(r=(e=v(t)).call.apply(e,[this].concat(l)))||"object"!==d(r)&&"function"!=typeof r?f(n):r;var u=f(o);u.isInited=!1,u.node={},u.$tabbox=c.default.render(i.default,{}),u.nodes=[],u.activedElem={};var p=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;return u.observer=new p(function(e){for(var t=0;t<e.length;t++){var o=e[t];u._isInVConsole(o.target)||u.onMutation(o)}}),o}var o,n,l;return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}(t,r.default),o=t,(n=[{key:"onRenderTab",value:function(e){e(this.$tabbox)}},{key:"onAddTool",value:function(e){var t=this;e([{name:"Expand",global:!1,onClick:function(e){if(t.activedElem)if(c.default.hasClass(t.activedElem,"vc-toggle"))for(var o=0;o<t.activedElem.childNodes.length;o++){var n=t.activedElem.childNodes[o];if(c.default.hasClass(n,"vcelm-l")&&!c.default.hasClass(n,"vcelm-noc")&&!c.default.hasClass(n,"vc-toggle")){c.default.one(".vcelm-node",n).click();break}}else c.default.one(".vcelm-node",t.activedElem).click()}},{name:"Collapse",global:!1,onClick:function(e){t.activedElem&&(c.default.hasClass(t.activedElem,"vc-toggle")?c.default.one(".vcelm-node",t.activedElem).click():t.activedElem.parentNode&&c.default.hasClass(t.activedElem.parentNode,"vcelm-l")&&c.default.one(".vcelm-node",t.activedElem.parentNode).click())}}])}},{key:"onShow",value:function(){if(!this.isInited){this.isInited=!0,this.node=this.getNode(document.documentElement);var e=this.renderView(this.node,c.default.one(".vc-log",this.$tabbox)),t=c.default.one(".vcelm-node",e);t&&t.click(),this.observer.observe(document.documentElement,{attributes:!0,childList:!0,characterData:!0,subtree:!0})}}},{key:"onRemove",value:function(){this.observer.disconnect()}},{key:"onMutation",value:function(e){switch(e.type){case"childList":e.removedNodes.length>0&&this.onChildRemove(e),e.addedNodes.length>0&&this.onChildAdd(e);break;case"attributes":this.onAttributesChange(e);break;case"characterData":this.onCharacterDataChange(e)}}},{key:"onChildRemove",value:function(e){var t=e.target;if(t.__vconsole_node){for(var o=0;o<e.removedNodes.length;o++){var n=e.removedNodes[o].__vconsole_node;n&&n.view&&n.view.parentNode.removeChild(n.view)}this.getNode(t)}}},{key:"onChildAdd",value:function(e){var t=e.target,o=t.__vconsole_node;if(o){this.getNode(t),o.view&&c.default.removeClass(o.view,"vcelm-noc");for(var n=0;n<e.addedNodes.length;n++){var r=e.addedNodes[n].__vconsole_node;if(r)if(null!==e.nextSibling){var i=e.nextSibling.__vconsole_node;i.view&&this.renderView(r,i.view,"insertBefore")}else o.view&&(o.view.lastChild?this.renderView(r,o.view.lastChild,"insertBefore"):this.renderView(r,o.view))}}}},{key:"onAttributesChange",value:function(e){var t=e.target.__vconsole_node;t&&(t=this.getNode(e.target)).view&&this.renderView(t,t.view,!0)}},{key:"onCharacterDataChange",value:function(e){var t=e.target.__vconsole_node;t&&(t=this.getNode(e.target)).view&&this.renderView(t,t.view,!0)}},{key:"renderView",value:function(e,t,o){var n=this,r=new a.default(e).get();switch(e.view=r,c.default.delegate(r,"click",".vcelm-node",function(t){t.stopPropagation();var o=this.parentNode;if(!c.default.hasClass(o,"vcelm-noc")){n.activedElem=o,c.default.hasClass(o,"vc-toggle")?c.default.removeClass(o,"vc-toggle"):c.default.addClass(o,"vc-toggle");for(var r=-1,i=0;i<o.children.length;i++){var a=o.children[i];c.default.hasClass(a,"vcelm-l")&&(r++,a.children.length>0||(e.childNodes[r]?n.renderView(e.childNodes[r],a,"replace"):a.style.display="none"))}}}),o){case"replace":t.parentNode.replaceChild(r,t);break;case"insertBefore":t.parentNode.insertBefore(r,t);break;default:t.appendChild(r)}return r}},{key:"getNode",value:function(e){if(!this._isIgnoredElement(e)){var t=e.__vconsole_node||{};if(t.nodeType=e.nodeType,t.nodeName=e.nodeName,t.tagName=e.tagName||"",t.textContent="",t.nodeType!=e.TEXT_NODE&&t.nodeType!=e.DOCUMENT_TYPE_NODE||(t.textContent=e.textContent),t.id=e.id||"",t.className=e.className||"",t.attributes=[],e.hasAttributes&&e.hasAttributes())for(var o=0;o<e.attributes.length;o++)t.attributes.push({name:e.attributes[o].name,value:e.attributes[o].value||""});if(t.childNodes=[],e.childNodes.length>0)for(var n=0;n<e.childNodes.length;n++){var r=this.getNode(e.childNodes[n]);r&&t.childNodes.push(r)}return e.__vconsole_node=t,t}}},{key:"_isIgnoredElement",value:function(e){return e.nodeType==e.TEXT_NODE&&""==e.textContent.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$|\n+/g,"")}},{key:"_isInVConsole",value:function(e){for(var t=e;null!=t;){if("__vconsole"==t.id)return!0;t=t.parentNode||void 0}return!1}}])&&u(o.prototype,n),l&&u(o,l),t}();o.default=b,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t,o){var n=o(32);"string"==typeof n&&(n=[[e.i,n,""]]);var r={insert:"head",singleton:!1};o(5)(n,r);n.locals&&(e.exports=n.locals)},function(e,t,o){(e.exports=o(4)(!1)).push([e.i,'/* color */\n.vcelm-node {\n  color: #183691;\n}\n.vcelm-k {\n  color: #0086B3;\n}\n.vcelm-v {\n  color: #905;\n}\n/* layout */\n.vcelm-l {\n  padding-left: 8px;\n  position: relative;\n  word-wrap: break-word;\n  line-height: 1;\n}\n/*.vcelm-l.vcelm-noc {\n  padding-left: 0;\n}*/\n.vcelm-l.vc-toggle > .vcelm-node {\n  display: block;\n}\n.vcelm-l .vcelm-node:active {\n  background-color: rgba(0, 0, 0, 0.15);\n}\n.vcelm-l.vcelm-noc .vcelm-node:active {\n  background-color: transparent;\n}\n.vcelm-t {\n  white-space: pre-wrap;\n  word-wrap: break-word;\n}\n/* level */\n.vcelm-l .vcelm-l {\n  display: none;\n}\n.vcelm-l.vc-toggle > .vcelm-l {\n  margin-left: 4px;\n  display: block;\n}\n/* arrow */\n.vcelm-l:before {\n  content: "";\n  display: block;\n  position: absolute;\n  top: 6px;\n  left: 3px;\n  width: 0;\n  height: 0;\n  border: transparent solid 3px;\n  border-left-color: #000;\n}\n.vcelm-l.vc-toggle:before {\n  display: block;\n  top: 6px;\n  left: 0;\n  border-top-color: #000;\n  border-left-color: transparent;\n}\n.vcelm-l.vcelm-noc:before {\n  display: none;\n}\n',""])},function(e,t){e.exports='<div>\n  <div class="vc-log"></div>\n</div>'},function(e,t,o){var n,r,i;r=[t,o(35),o(36),o(0),o(1)],void 0===(i="function"==typeof(n=function(o,n,r,i,a){"use strict";function l(e){return e&&e.__esModule?e:{default:e}}function c(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,n=l(n),r=l(r),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}(i),a=l(a);var s=function(){function e(t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.node=t,this.view=this._create(this.node)}var t,o,i;return t=e,(o=[{key:"get",value:function(){return this.view}},{key:"_create",value:function(e,t){var o=document.createElement("DIV");switch(a.default.addClass(o,"vcelm-l"),e.nodeType){case o.ELEMENT_NODE:this._createElementNode(e,o);break;case o.TEXT_NODE:this._createTextNode(e,o);break;case o.COMMENT_NODE:case o.DOCUMENT_NODE:case o.DOCUMENT_TYPE_NODE:case o.DOCUMENT_FRAGMENT_NODE:}return o}},{key:"_createTextNode",value:function(e,t){a.default.addClass(t,"vcelm-t vcelm-noc"),e.textContent&&t.appendChild(function(e){return document.createTextNode(e)}(e.textContent.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")))}},{key:"_createElementNode",value:function(e,t){var o,i=(o=(o=e.tagName)?o.toLowerCase():"",["br","hr","img","input","link","meta"].indexOf(o)>-1),l=i;0==e.childNodes.length&&(l=!0);var c=a.default.render(n.default,{node:e}),s=a.default.render(r.default,{node:e});if(l)a.default.addClass(t,"vcelm-noc"),t.appendChild(c),i||t.appendChild(s);else{t.appendChild(c);for(var d=0;d<e.childNodes.length;d++){var u=document.createElement("DIV");a.default.addClass(u,"vcelm-l"),t.appendChild(u)}i||t.appendChild(s)}}}])&&c(t.prototype,o),i&&c(t,i),e}();o.default=s,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t){e.exports='<span class="vcelm-node">&lt;{{node.tagName.toLowerCase()}}{{if (node.className || node.attributes.length)}}\n  <i class="vcelm-k">\n    {{for (var i = 0; i < node.attributes.length; i++)}}\n      {{if (node.attributes[i].value !== \'\')}}\n        {{node.attributes[i].name}}="<i class="vcelm-v">{{node.attributes[i].value}}</i>"{{else}}\n        {{node.attributes[i].name}}{{/if}}{{/for}}</i>{{/if}}&gt;</span>'},function(e,t){e.exports='<span class="vcelm-node">&lt;/{{node.tagName.toLowerCase()}}&gt;</span>'},function(e,t,o){var n,r,i;r=[t,o(2),o(38),o(39),o(0),o(1)],void 0===(i="function"==typeof(n=function(o,n,r,i,a,l){"use strict";function c(e){return e&&e.__esModule?e:{default:e}}function s(e){return(s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function d(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function u(e,t){return!t||"object"!==s(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function v(e){return(v=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function f(e,t){return(f=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0,n=c(n),r=c(r),i=c(i),a=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var n=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(e,o):{};n.get||n.set?Object.defineProperty(t,o,n):t[o]=e[o]}return t.default=e,t}(a),l=c(l);var p=function(e){function t(){var e,o;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);for(var n=arguments.length,i=new Array(n),a=0;a<n;a++)i[a]=arguments[a];return(o=u(this,(e=v(t)).call.apply(e,[this].concat(i)))).$tabbox=l.default.render(r.default,{}),o.currentType="",o.typeNameMap={cookies:"Cookies",localstorage:"LocalStorage",sessionstorage:"SessionStorage"},o}var o,c,s;return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&f(e,t)}(t,n.default),o=t,(c=[{key:"onRenderTab",value:function(e){e(this.$tabbox)}},{key:"onAddTopBar",value:function(e){for(var t=this,o=["Cookies","LocalStorage","SessionStorage"],n=[],r=0;r<o.length;r++)n.push({name:o[r],data:{type:o[r].toLowerCase()},className:"",onClick:function(){if(l.default.hasClass(this,"vc-actived"))return!1;t.currentType=this.dataset.type,t.renderStorage()}});n[0].className="vc-actived",e(n)}},{key:"onAddTool",value:function(e){var t=this;e([{name:"Refresh",global:!1,onClick:function(e){t.renderStorage()}},{name:"Clear",global:!1,onClick:function(e){t.clearLog()}}])}},{key:"onReady",value:function(){}},{key:"onShow",value:function(){""==this.currentType&&(this.currentType="cookies",this.renderStorage())}},{key:"clearLog",value:function(){if(this.currentType&&window.confirm&&!window.confirm("Remove all "+this.typeNameMap[this.currentType]+"?"))return!1;switch(this.currentType){case"cookies":this.clearCookieList();break;case"localstorage":this.clearLocalStorageList();break;case"sessionstorage":this.clearSessionStorageList();break;default:return!1}this.renderStorage()}},{key:"renderStorage",value:function(){var e=[];switch(this.currentType){case"cookies":e=this.getCookieList();break;case"localstorage":e=this.getLocalStorageList();break;case"sessionstorage":e=this.getSessionStorageList();break;default:return!1}var t=l.default.one(".vc-log",this.$tabbox);if(0==e.length)t.innerHTML="";else{for(var o=0;o<e.length;o++)e[o].name=a.htmlEncode(e[o].name),e[o].value=a.htmlEncode(e[o].value);t.innerHTML=l.default.render(i.default,{list:e},!0)}}},{key:"getCookieList",value:function(){if(!document.cookie||!navigator.cookieEnabled)return[];for(var e=[],t=document.cookie.split(";"),o=0;o<t.length;o++){var n=t[o].split("="),r=n.shift().replace(/^ /,""),i=n.join("=");try{r=decodeURIComponent(r),i=decodeURIComponent(i)}catch(e){console.log(e,r,i)}e.push({name:r,value:i})}return e}},{key:"getLocalStorageList",value:function(){if(!window.localStorage)return[];try{for(var e=[],t=0;t<localStorage.length;t++){var o=localStorage.key(t),n=localStorage.getItem(o);e.push({name:o,value:n})}return e}catch(e){return[]}}},{key:"getSessionStorageList",value:function(){if(!window.sessionStorage)return[];try{for(var e=[],t=0;t<sessionStorage.length;t++){var o=sessionStorage.key(t),n=sessionStorage.getItem(o);e.push({name:o,value:n})}return e}catch(e){return[]}}},{key:"clearCookieList",value:function(){if(document.cookie&&navigator.cookieEnabled){for(var e=window.location.hostname,t=this.getCookieList(),o=0;o<t.length;o++){var n=t[o].name;document.cookie="".concat(n,"=;expires=Thu, 01 Jan 1970 00:00:00 GMT"),document.cookie="".concat(n,"=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/"),document.cookie="".concat(n,"=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/;domain=.").concat(e.split(".").slice(-2).join("."))}this.renderStorage()}}},{key:"clearLocalStorageList",value:function(){if(window.localStorage)try{localStorage.clear(),this.renderStorage()}catch(e){alert("localStorage.clear() fail.")}}},{key:"clearSessionStorageList",value:function(){if(window.sessionStorage)try{sessionStorage.clear(),this.renderStorage()}catch(e){alert("sessionStorage.clear() fail.")}}}])&&d(o.prototype,c),s&&d(o,s),t}();o.default=p,e.exports=t.default})?n.apply(t,r):n)||(e.exports=i)},function(e,t){e.exports='<div class="vc-table">\n  <div class="vc-log"></div>\n</div>'},function(e,t){e.exports='<div>\n  <dl class="vc-table-row">\n    <dd class="vc-table-col">Name</dd>\n    <dd class="vc-table-col vc-table-col-2">Value</dd>\n  </dl>\n  {{for (var i = 0; i < list.length; i++)}}\n  <dl class="vc-table-row">\n    <dd class="vc-table-col">{{list[i].name}}</dd>\n    <dd class="vc-table-col vc-table-col-2">{{list[i].value}}</dd>\n  </dl>\n  {{/for}}\n</div>'}])});
\ No newline at end of file

From 64fa9925ff0d76e9d36b894d5bff97481adb0043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Sun, 20 Dec 2020 16:23:14 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/orderAdmin/AdminOrder/index.vue     | 63 +++++++++++++++++++++-
 pages/orderAdmin/AdminOrderList/index.vue | 65 +++++++++++++++++++++--
 utils/index.js                            |  3 ++
 3 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue
index bc1809c..52a4520 100644
--- a/pages/orderAdmin/AdminOrder/index.vue
+++ b/pages/orderAdmin/AdminOrder/index.vue
@@ -135,7 +135,9 @@
         v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
         @click="offlinePay"
       >确认付款</view>
-      <view class="bnt delivery" v-if="types == 1" @click="goGoodsDeliver(orderInfo)">去发货</view>
+      <view class="bnt delivery" v-if="title=='未发货' && types == 1" @click="goGoodsDeliver(orderInfo)">去发货</view>
+      <view class="bnt quick" v-if="title=='待核销' && types == 1" @click="storeCancellation(0)">快速核销</view>
+      <view class="bnt delivery" v-if="title=='待核销' && types == 1" @click="storeCancellation(1)">立即核销</view>
     </view>
     <PriceChange
       :change="change"
@@ -156,6 +158,7 @@ import {
   setOfflinePay,
   setOrderRefund
 } from "@/api/admin";
+import {orderVerific} from "@/api/order";
 import { required, num } from "@/utils/validate";
 import { validatorDefaultCatch } from "@/utils/dialog";
 import { copyClipboard } from "@/utils";
@@ -190,7 +193,7 @@ export default {
       }
     }
   },
-  mounted: function() {
+  onShow: function() {
     this.order_id = this.$yroute.query.oid;
     this.getIndex();
   },
@@ -349,7 +352,63 @@ export default {
           });
         }
       );
+    },
+    storeCancellation(index) {
+      const that = this;
+      that.check = true;
+      if (index == 0) {
+        uni.showModal({
+          title: "确定核销订单?",
+          content: "注意:请务必核对核销码的与客户正确性",
+          success(res) {
+            if (res.confirm) {
+              uni.showLoading({
+                title: "查询中"
+              });
+              orderVerific(that.orderInfo.verifyCode, 1)
+                  .then(res => {
+                    console.log(res)
+                    uni.hideLoading();
+                    that.iShidden = false;
+                    uni.showToast({
+                      title: res.msg,
+                      icon: 'none',
+                      duration: 1000
+                    });
+                    //最后就是返回上一个页面。
+                    setTimeout(function() {
+                      uni.navigateBack({
+                        delta: 1, // 返回上一级页面。
+                        success: function() {
+                          console.log('成功！')
+                        }
+                      })
+                    }, 1000);
+                  })
+                  .catch((err) => {
+                    console.log(err)
+                    uni.hideLoading();
+                    uni.showToast({
+                      title: err.data.msg,
+                      icon: "none",
+                      duration: 2000
+                    });
+                  });
+            }
+          }
+        });
+
+      } else {
+        that.$yrouter.push({
+          path: '/pages/orderAdmin/OrderCancellation/index'
+        })
+      }
     }
   }
 };
 </script>
+<style lang="less">
+.quick {
+  background: #F25555;
+}
+</style>
diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue
index ad161ba..3e2a3b6 100644
--- a/pages/orderAdmin/AdminOrderList/index.vue
+++ b/pages/orderAdmin/AdminOrderList/index.vue
@@ -31,7 +31,7 @@
 						<view class="money">
 							<view class="x-money">￥{{ val.productInfo.price }}</view>
 							<view class="num">x{{ val.cartNum }}</view>
-							<view class="y-money">￥{{ val.productInfo.otPrice }}</view>
+							<view class="y-money" v-if="val.productInfo.otPrice">￥{{ val.productInfo.otPrice }}</view>
 						</view>
 					</view>
 				</view>
@@ -54,7 +54,9 @@
 						<view class="bnt" @click="modify(item, 0)" v-if="where.status == 0">一键改价</view>
 						<view class="bnt" @click="modify(item, 0)" v-if="where.status == -3 && item.refundStatus === 1">立即退款</view>
 						<view class="bnt cancel" v-if="item.pay_type === 'offline' && item.paid === 0" @click="offlinePay(item)">确认付款</view>
-						<view class="bnt" v-if="where.status == 1" @click="goGoodsDeliver(item)">去发货</view>
+						<view class="bnt" v-if="where.status == 1 && item._status._title=='未发货'" @click="goGoodsDeliver(item)">去发货</view>
+            <view class="bnt cancel" v-if="item._status._title=='待核销' && where.status == 1" @click="storeCancellation(0,item.verifyCode)">快速核销</view>
+            <view class="bnt" v-if="item._status._title=='待核销' && where.status == 1" @click="storeCancellation(1,item.verifyCode)">立即核销</view>
 					</view>
 				</view>
 			</view>
@@ -75,6 +77,7 @@
 		setOfflinePay,
 		setOrderRefund
 	} from "@/api/admin";
+  import {orderVerific} from "@/api/order";
 	import {
 		required,
 		num
@@ -119,7 +122,7 @@
 				this.getIndex();
 			}
 		},
-		mounted: function() {
+    onShow: function() {
 			let that = this;
 			that.where.status = that.$yroute.query.types;
 			that.current = "";
@@ -318,10 +321,64 @@
 						});
 					}
 				);
-			}
+			},
+      storeCancellation(index,verifyCode) {
+        const that = this;
+        that.check = true;
+        if (index == 0) {
+          uni.showModal({
+            title: "确定核销订单?",
+            content: "注意:请务必核对核销码的与客户正确性",
+            success(res) {
+              if (res.confirm) {
+                uni.showLoading({
+                  title: "查询中"
+                });
+                orderVerific(verifyCode, 1)
+                    .then(res => {
+                      console.log(res)
+                      uni.hideLoading();
+                      that.iShidden = false;
+                      uni.showToast({
+                        title: res.msg,
+                        icon: 'none',
+                        duration: 1000
+                      });
+                      //最后就是返回上一个页面。
+                      setTimeout(function() {
+                        uni.navigateBack({
+                          delta: 1, // 返回上一级页面。
+                          success: function() {
+                            console.log('成功！')
+                          }
+                        })
+                      }, 1000);
+                    })
+                    .catch((err) => {
+                      console.log(err)
+                      uni.hideLoading();
+                      uni.showToast({
+                        title: err.data.msg,
+                        icon: "none",
+                        duration: 2000
+                      });
+                    });
+              }
+            }
+          });
+
+        } else {
+          that.$yrouter.push({
+            path: '/pages/orderAdmin/OrderCancellation/index'
+          })
+        }
+      }
 		}
 	};
 </script>
 
 <style lang="less">
+.quick {
+  background: #F25555;
+}
 </style>
diff --git a/utils/index.js b/utils/index.js
index 692a9c4..4eefecf 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -215,6 +215,9 @@ export const login = () => {
 						console.log(redirect)
 						if (redirect) {
 							redirect = redirect.split('/pages')[1]
+							if(!redirect){
+                                redirect="/Loading/index";
+                            }    
 							reLaunch({
 								path: '/pages' + redirect,
 							});

From 87864d675132583e496f01bb5d5d4a273b8d48cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Sat, 26 Dec 2020 16:01:33 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BFID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/order.js  |  8 ++++++++
 libs/order.js | 31 +++++++++++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/api/order.js b/api/order.js
index e7f2348..7d17603 100644
--- a/api/order.js
+++ b/api/order.js
@@ -140,3 +140,11 @@ export function payOrder(uni, paytype, from) {
 export function orderVerific(verifyCode, isConfirm) {
 	return request.post("order/order_verific", { verifyCode, isConfirm });
 }
+/**
+ * 获取订阅消息ID
+ * @param price
+ * @returns {*}
+ */
+export function getSubscribeTemplate() {
+	return request.get("/order/getSubscribeTemplate");
+}
diff --git a/libs/order.js b/libs/order.js
index dde6d5c..511f25a 100644
--- a/libs/order.js
+++ b/libs/order.js
@@ -2,7 +2,8 @@ import {
 	cancelOrder,
 	takeOrder,
 	delOrder,
-	payOrder
+	payOrder,
+	getSubscribeTemplate
 } from "@/api/order";
 import dialog from "@/utils/dialog";
 import {
@@ -194,19 +195,21 @@ export function handleOrderPayResults(data, type, payType) {
 }
 
 export function subscribeMessage() {
-	// 调用订阅
-	console.log('调用订阅')
-	uni.requestSubscribeMessage({
-		tmplIds: ['W5r2c2kzhbq8uxStkPAVx_sk-5aapMFCqe7b7KU5jXI', '2CB_1UyQrbnlyjJa5syraqJ3cfztPPDOAHe3DEXpMjg',
-			'vuztugw9VbKbKJDAAVePkjqPpT5mdoREpd4Aq7EGPRU'
-		],
-		success(res) {
-			console.log(res)
-		},
-		fail(error) {
-			console.log(error)
-		}
-	})
+  // 调用订阅
+  console.log('调用订阅')
+  getSubscribeTemplate()
+      .then(res => {
+        uni.requestSubscribeMessage({
+          tmplIds: res.data,
+          success(res) {
+            console.log(res)
+          },
+          fail(error) {
+            console.log(error)
+          }
+        })
+      })
+      .catch(err => {});
 }
 
 

From 1a9d9bcb1db0921c8699a8e444e8d1737091b946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Wed, 6 Jan 2021 20:29:35 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderSubmission/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index dbeeaa0..1d58d8f 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -125,6 +125,12 @@
             </view>
             <view class="tip">可用余额：{{ userInfo.nowMoney || 0 }}</view>
           </view>
+		  <view class="payItem acea-row row-middle" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')">
+		    <view class="name acea-row row-center-wrapper">
+		      <view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付
+		    </view>
+		    <view class="tip">可用积分：{{ userInfo.integral || 0 }}</view>
+		  </view>
         </view>
       </view>
     </view>

From 6d4fe7f4cb7a526dfc1e7f1ec271c69db7776bc5 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Tue, 12 Jan 2021 15:19:11 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/OrderGoods.vue             |   4 +-
 pages/order/MyOrder/index.vue         |   8 +-
 pages/order/OrderDetails/index.vue    | 779 +++++++++++++-------------
 pages/order/OrderSubmission/index.vue |  40 +-
 pages/shop/GoodsCon/index.vue         |  27 +-
 5 files changed, 449 insertions(+), 409 deletions(-)

diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue
index 18682ca..5669af9 100644
--- a/components/OrderGoods.vue
+++ b/components/OrderGoods.vue
@@ -15,7 +15,8 @@
             class="attr line1"
             v-if="cart.productInfo.attrInfo"
           >{{ cart.productInfo.attrInfo.sku }}</view>
-          <view class="money font-color-red">￥{{ cart.truePrice }}</view>
+          <view class="money font-color-red" v-if="!isIntegral">￥{{ cart.truePrice }}</view>
+          <view class="money font-color-red" v-if="isIntegral">{{ cart.productInfo.attrInfo.integral }}积分</view>
           <view class="evaluate" v-if="evaluate == 3 && cart.isReply==0" @click="routerGo(cart)">评价</view>
         </view>
       </view>
@@ -26,6 +27,7 @@
 export default {
   name: "OrderGoods",
   props: {
+    isIntegral:Boolean,
     evaluate: Number,
     cartInfo: {
       type: Array,
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 457bf3d..561dd70 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -90,13 +90,16 @@
             <view class="text acea-row row-between">
               <view class="name line2">{{ cart.productInfo.storeName }}</view>
               <view class="money">
-                <view>
+                <view v-if="order.payType!='integral'">
                   ￥{{
                   cart.productInfo.attrInfo
                   ? cart.productInfo.attrInfo.price
                   : cart.productInfo.price
                   }}
                 </view>
+                <view v-if="order.payType=='integral'">
+                  {{order.payIntegral}}积分
+                </view>
                 <view>x{{ cart.cartNum }}</view>
               </view>
             </view>
@@ -104,7 +107,8 @@
         </view>
         <view class="totalPrice">
           共{{ order.cartInfo.length || 0 }}件商品，总金额
-          <text class="money font-color-red">￥{{ order.payPrice }}</text>
+          <text class="money font-color-red" v-if="order.payType!='integral'">￥{{ order.payPrice }}</text>
+          <text class="money font-color-red" v-if="order.payType=='integral'">{{order.payIntegral}}积分</text>
         </view>
         <view class="bottom acea-row row-right row-middle">
           <template v-if="order._status._type == 0">
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index b2d9044..385da6f 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -18,67 +18,44 @@
           <view :class="{ on: status.type === 4 }">已完成</view>
         </view>
         <view class="progress acea-row row-between-wrapper">
-          <view
-            class="iconfont"
-            :class="[
+          <view class="iconfont" :class="[
               status.type === 0 || status.type === 9
                 ? 'icon-webicon318'
                 : 'icon-yuandianxiao',
               status.type >= 0 ? 'font-color-red' : ''
-            ]"
-          ></view>
+            ]"></view>
           <view class="line" :class="{ 'bg-color-red': status.type > 0 && status.type != 9 }"></view>
-          <view
-            class="iconfont"
-            :class="[
+          <view class="iconfont" :class="[
               status.type === 1 ? 'icon-webicon318' : 'icon-yuandianxiao',
               status.type >= 1 && status.type != 6 && status.type != 9
                 ? 'font-color-red'
                 : ''
-            ]"
-          ></view>
-          <view
-            class="line"
-            :class="{'bg-color-red':status.type > 1 && status.type != 6 && status.type != 9}"
-            v-if="orderInfo.shippingType === 1"
-          ></view>
-          <view
-            class="iconfont"
+            ]"></view>
+          <view class="line" :class="{'bg-color-red':status.type > 1 && status.type != 6 && status.type != 9}"
+            v-if="orderInfo.shippingType === 1"></view>
+          <view class="iconfont"
             :class="[status.type === 2 ? 'icon-webicon318' : 'icon-yuandianxiao',status.type >= 2 && status.type != 6 && status.type != 9? 'font-color-red': '']"
-            v-if="orderInfo.shippingType === 1"
-          ></view>
-          <view
-            class="line"
-            :class="{
+            v-if="orderInfo.shippingType === 1"></view>
+          <view class="line" :class="{
               'bg-color-red':
                 status.type > 2 && status.type != 6 && status.type != 9
-            }"
-          ></view>
-          <view
-            class="iconfont"
-            :class="[
+            }"></view>
+          <view class="iconfont" :class="[
               status.type === 3 ? 'icon-webicon318' : 'icon-yuandianxiao',
               status.type >= 3 && status.type != 6 && status.type != 9
                 ? 'font-color-red'
                 : ''
-            ]"
-          ></view>
-          <view
-            class="line"
-            :class="{
+            ]"></view>
+          <view class="line" :class="{
               'bg-color-red':
                 status.type > 3 && status.type != 6 && status.type != 9
-            }"
-          ></view>
-          <view
-            class="iconfont"
-            :class="[
+            }"></view>
+          <view class="iconfont" :class="[
               status.type == 4 ? 'icon-webicon318' : 'icon-yuandianxiao',
               status.type >= 4 && status.type != 6 && status.type != 9
                 ? 'font-color-red'
                 : ''
-            ]"
-          ></view>
+            ]"></view>
         </view>
       </view>
       <div class="writeOff" v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1">
@@ -110,15 +87,9 @@
           </div>
         </div>
       </div>
-      <div
-        class="map acea-row row-between-wrapper"
-        v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1"
-      >
+      <div class="map acea-row row-between-wrapper" v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1">
         <div>自提地址信息</div>
-        <div
-          class="place cart-color acea-row row-center-wrapper"
-          @click="showChang(orderInfo.systemStore)"
-        >
+        <div class="place cart-color acea-row row-center-wrapper" @click="showChang(orderInfo.systemStore)">
           <span class="iconfont icon-weizhi"></span>查看位置
         </div>
       </div>
@@ -134,7 +105,8 @@
         <div class="name">
           {{ system_store.name}}
           <span class="phone">{{ system_store.phone }}</span>
-          <span @click="telPhone(system_store.phone)" class="iconfont icon-tonghua font-color-red" :href="'tel:' + system_store.phone"></span>
+          <span @click="telPhone(system_store.phone)" class="iconfont icon-tonghua font-color-red"
+            :href="'tel:' + system_store.phone"></span>
         </div>
         <div>{{ system_store.address }}</div>
       </div>
@@ -142,7 +114,7 @@
         <image src="@/static/images/line.jpg" />
       </view>
     </template>
-    <OrderGoods :evaluate="status.type || 0" :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
+    <OrderGoods :evaluate="status.type || 0" isIntegral :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
     <view class="wrapper">
       <view class="item acea-row row-between">
         <view>订单编号：</view>
@@ -223,10 +195,14 @@
       </view>
     </view>
     <view class="wrapper">
-      <view class="item acea-row row-between">
+      <view class="item acea-row row-between" v-if="!isIntegral">
         <view>支付金额：</view>
         <view class="conter">￥{{ orderInfo.totalPrice }}</view>
       </view>
+      <view class="item acea-row row-between" v-if="isIntegral">
+        <view>支付积分：</view>
+        <view class="conter">{{ orderInfo.payIntegral }}积分</view>
+      </view>
       <view class="item acea-row row-between" v-if="orderInfo.couponPrice > 0">
         <view>优惠券抵扣：</view>
         <view class="conter">-￥{{ orderInfo.couponPrice }}</view>
@@ -241,7 +217,8 @@
       </view>
       <view class="actualPay acea-row row-right">
         实付款：
-        <text class="money font-color-red">￥{{ orderInfo.payPrice }}</text>
+        <text class="money font-color-red" v-if="!isIntegral">￥{{ orderInfo.payPrice }}</text>
+        <text class="money font-color-red" v-if="isIntegral">{{ orderInfo.payIntegral }}积分</text>
       </view>
     </view>
     <view style="height:100rpx;" v-if="!refundOrder && offlineStatus"></view>
@@ -255,26 +232,19 @@
       </template>
       <!--  -->
       <template v-if="orderInfo.shippingType == 1 && status.type == 2">
-        <view
-          class="bnt default"
-          @click="$yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})"
-        >查看物流</view>
+        <view class="bnt default"
+          @click="$yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})">查看物流</view>
         <view class="bnt bg-color-red" @click="takeOrder">确认收货</view>
       </template>
       <template v-if="orderInfo.shippingType == 1 && status.type == 3 && orderInfo.deliveryType == 'express'">
-        <view
-          class="bnt default"
-          @click="$yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})"
-        >查看物流</view>
+        <view class="bnt default"
+          @click="$yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})">查看物流</view>
       </template>
       <template v-if="orderInfo.shippingType == 1 && status.type == 4">
         <view class="bnt cancel" @click="delOrder">删除订单</view>
-        <view
-          class="bnt default"
-          @click="
+        <view class="bnt default" @click="
         $yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})
-        "
-        >查看物流</view>
+        ">查看物流</view>
       </template>
       <template v-if="status.type == 6">
         <view class="bnt bg-color-red" @click="goGroupRule(orderInfo)">查看拼团</view>
@@ -282,355 +252,384 @@
     </view>
     <Payment v-model="pay" :types="payType" @checked="toPay" :balance="userInfo.nowMoney"></Payment>
     <view class="geoPage" v-if="mapShow">
-      <iframe
-        width="100%"
-        height="100%"
-        frameborder="0"
-        scrolling="no"
-        :src="'https://apis.map.qq.com/uri/v1/geocoder?coord=' + system_store.latitude + ',' +system_store.longitude +'&referer=' +mapKey"
-      ></iframe>
+      <iframe width="100%" height="100%" frameborder="0" scrolling="no"
+        :src="'https://apis.map.qq.com/uri/v1/geocoder?coord=' + system_store.latitude + ',' +system_store.longitude +'&referer=' +mapKey"></iframe>
     </view>
   </view>
 </template>
 
 <script>
-import OrderGoods from "@/components/OrderGoods";
-import { orderDetail } from "@/api/order";
-import Payment from "@/components/Payment";
-import { isWeixin, copyClipboard } from "@/utils";
-import { mapGetters } from "vuex";
-import {
-  cancelOrderHandle,
-  takeOrderHandle,
-  delOrderHandle,
-  payOrderHandle,
-} from "@/libs/order";
-// import { wechatEvevt } from "@/libs/wechat";
+  import OrderGoods from "@/components/OrderGoods";
+  import {
+    orderDetail
+  } from "@/api/order";
+  import Payment from "@/components/Payment";
+  import {
+    isWeixin,
+    copyClipboard
+  } from "@/utils";
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    cancelOrderHandle,
+    takeOrderHandle,
+    delOrderHandle,
+    payOrderHandle,
+  } from "@/libs/order";
+  // import { wechatEvevt } from "@/libs/wechat";
 
-const NAME = "OrderDetails";
+  const NAME = "OrderDetails";
 
-export default {
-  name: NAME,
-  components: {
-    OrderGoods,
-    Payment,
-  },
-  data: function () {
-    return {
-      offlinePayStatus: 2,
-      orderTypeName: "普通订单",
-      orderTypeNameStatus: true,
-      offlineStatus: true,
-      id: "",
-      orderInfo: {
-        _status: {},
-      },
-      status: {},
-      pay: false,
-      payType: ["yue", "weixin"],
-      from: this.$deviceType,
-      system_store: {},
-      mapKay: "",
-      mapShow: false,
-    };
-  },
-  computed: {
-    refundOrder() {
-      return this.orderInfo.refund_status > 0;
+  export default {
+    name: NAME,
+    components: {
+      OrderGoods,
+      Payment,
     },
-    ...mapGetters(["userInfo"]),
-  },
-  onShow() {
-    this.id = this.$yroute.query.id;
-    this.getDetail();
-  },
-  mounted: function () {
-    this.id = this.$yroute.query.id;
-    // this.getDetail();
-  },
-  methods: {
-    copyClipboard,
-    goGoodsReturn(orderInfo) {
-      this.$yrouter.push({
-        path: "/pages/order/GoodsReturn/index",
-        query: {
-          id: orderInfo.orderId,
+    data: function () {
+      return {
+        offlinePayStatus: 2,
+        orderTypeName: "普通订单",
+        orderTypeNameStatus: true,
+        offlineStatus: true,
+        id: "",
+        orderInfo: {
+          _status: {},
         },
-      });
+        status: {},
+        pay: false,
+        payType: ["yue", "weixin"],
+        from: this.$deviceType,
+        system_store: {},
+        mapKay: "",
+        mapShow: false,
+        isIntegral: false
+      };
     },
-    goGroupRule(orderInfo) {
-      this.$yrouter.push({
-        path: "/pages/activity/GroupRule/index",
-        query: {
-          id: orderInfo.pinkId,
-        },
-      });
+    computed: {
+      refundOrder() {
+        return this.orderInfo.refund_status > 0;
+      },
+      ...mapGetters(["userInfo"]),
     },
-    //拨打电话
-    telPhone(phoneNumber) {
-      uni.makePhoneCall({
-        phoneNumber: phoneNumber,
-        fail() {
-          console.log("取消拨打");
-        }
-      });
+    onShow() {
+      this.id = this.$yroute.query.id;
+      this.getDetail();
     },
-    showChang: function (data) {
-      // 这里判断是不是微信小程序
-      this.$yrouter.push({
-        path: "/pages/map/index",
-        query: data,
-      });
-      // if (isWeixin()) {
-      //   let config = {
-      //     latitude: this.system_store.latitude,
-      //     longitude: this.system_store.longitude,
-      //     name: this.system_store.name,
-      //     address: this.system_store.address
-      //   };
-      // } else {
-      //   if (!this.mapKey)
-      //     uni.showToast({
-      //       title: "暂无法使用查看地图，请配置您的腾讯地图key",
-      //       icon: "none",
-      //       duration: 2000
-      //     });
-      //   return;
-      //   this.mapShow = true;
-      // }
+    mounted: function () {
+      this.id = this.$yroute.query.id;
+      // this.getDetail();
     },
-    goBack() {
-      if (this.name === "MyOrder") {
-        this.$yrouter.back();
-        return;
-      } else {
-        console.log(this);
-        this.$yrouter.replace({
-          path: "/pages/order/MyOrder/index",
+    methods: {
+      copyClipboard,
+      goGoodsReturn(orderInfo) {
+        this.$yrouter.push({
+          path: "/pages/order/GoodsReturn/index",
+          query: {
+            id: orderInfo.orderId,
+          },
         });
-        return;
-      }
-    },
-    cancelOrder() {
-      cancelOrderHandle(this.orderInfo.orderId)
-        .then(() => {
-          setTimeout(() => this.goBack(), 300);
-        })
-        .catch(() => {
+      },
+      goGroupRule(orderInfo) {
+        this.$yrouter.push({
+          path: "/pages/activity/GroupRule/index",
+          query: {
+            id: orderInfo.pinkId,
+          },
+        });
+      },
+      //拨打电话
+      telPhone(phoneNumber) {
+        uni.makePhoneCall({
+          phoneNumber: phoneNumber,
+          fail() {
+            console.log("取消拨打");
+          }
+        });
+      },
+      showChang: function (data) {
+        // 这里判断是不是微信小程序
+        this.$yrouter.push({
+          path: "/pages/map/index",
+          query: data,
+        });
+        // if (isWeixin()) {
+        //   let config = {
+        //     latitude: this.system_store.latitude,
+        //     longitude: this.system_store.longitude,
+        //     name: this.system_store.name,
+        //     address: this.system_store.address
+        //   };
+        // } else {
+        //   if (!this.mapKey)
+        //     uni.showToast({
+        //       title: "暂无法使用查看地图，请配置您的腾讯地图key",
+        //       icon: "none",
+        //       duration: 2000
+        //     });
+        //   return;
+        //   this.mapShow = true;
+        // }
+      },
+      goBack() {
+        if (this.name === "MyOrder") {
+          this.$yrouter.back();
+          return;
+        } else {
+          console.log(this);
+          this.$yrouter.replace({
+            path: "/pages/order/MyOrder/index",
+          });
+          return;
+        }
+      },
+      cancelOrder() {
+        cancelOrderHandle(this.orderInfo.orderId)
+          .then(() => {
+            setTimeout(() => this.goBack(), 300);
+          })
+          .catch(() => {
+            this.getDetail();
+          });
+      },
+      takeOrder() {
+        takeOrderHandle(this.orderInfo.orderId).finally(() => {
           this.getDetail();
         });
-    },
-    takeOrder() {
-      takeOrderHandle(this.orderInfo.orderId).finally(() => {
-        this.getDetail();
-      });
-    },
-    delOrder() {
-      delOrderHandle(this.orderInfo.orderId).then(() => {
-        setTimeout(() => this.goBack(), 300);
-      });
-    },
-    setOfflinePayStatus: function (status) {
-      var that = this;
-      that.offlinePayStatus = status;
-      if (status === 1 && that.orderTypeNameStatus === true) {
-        that.payType.push("offline");
-      }
-    },
-    getOrderStatus: function () {
-      let orderInfo = this.orderInfo || {},
-        _status = orderInfo._status || { _type: 0 },
-        status = {};
-      let type = parseInt(_status._type),
-        delivery_type = orderInfo.deliveryType,
-        seckill_id = orderInfo.seckillId ? parseInt(orderInfo.seckillId) : 0,
-        bargain_id = orderInfo.bargainId ? parseInt(orderInfo.bargainId) : 0,
-        combination_id = orderInfo.combinationId
-          ? parseInt(orderInfo.combinationId)
-          : 0;
-      status = {
-        type: type,
-        class_status: 0,
-      };
-      if (type == 1 && combination_id > 0) {
-        status.type = 6;
-        status.class_status = 1;
-      } //查看拼团
-      if (type == 2 && delivery_type == "express") status.class_status = 2; //查看物流
-      if (type == 2) status.class_status = 3; //确认收货
-      if (type == 4 || type === 0) status.class_status = 4; //删除订单
-      if (
-        !seckill_id &&
-        !bargain_id &&
-        !combination_id &&
-        (type == 3 || type == 4)
-      )
-        status.class_status = 5; //再次购买
-      if (type == 9) {
-        //线下付款
-        status.class_status = 0;
-        this.offlineStatus = false;
-      }
-      this.status = status;
-    },
-    getDetail() {
-      const id = this.id;
-      if (!id) {
-        uni.showToast({
-          title: "订单不存在",
-          icon: "none",
-          duration: 2000,
+      },
+      delOrder() {
+        delOrderHandle(this.orderInfo.orderId).then(() => {
+          setTimeout(() => this.goBack(), 300);
         });
-        return;
-      }
-      orderDetail(id)
-        .then((res) => {
-          this.orderInfo = res.data;
-          this.getOrderStatus();
-          if (this.orderInfo.combinationId > 0) {
-            this.orderTypeName = "拼团订单";
-            this.orderTypeNameStatus = false;
-          } else if (this.orderInfo.bargainId > 0) {
-            this.orderTypeName = "砍价订单";
-            this.orderTypeNameStatus = false;
-          } else if (this.orderInfo.seckillId > 0) {
-            this.orderTypeName = "秒杀订单";
-            this.orderTypeNameStatus = false;
-          }
-          this.system_store = res.data.systemStore || {};
-          this.mapKey = res.data.mapKay;
-          this.setOfflinePayStatus(this.orderInfo.offlinePayStatus);
-        })
-        .catch((err) => {
+      },
+      setOfflinePayStatus: function (status) {
+        var that = this;
+        that.offlinePayStatus = status;
+        if (status === 1 && that.orderTypeNameStatus === true) {
+          that.payType.push("offline");
+        }
+      },
+      getOrderStatus: function () {
+        let orderInfo = this.orderInfo || {},
+          _status = orderInfo._status || {
+            _type: 0
+          },
+          status = {};
+        let type = parseInt(_status._type),
+          delivery_type = orderInfo.deliveryType,
+          seckill_id = orderInfo.seckillId ? parseInt(orderInfo.seckillId) : 0,
+          bargain_id = orderInfo.bargainId ? parseInt(orderInfo.bargainId) : 0,
+          combination_id = orderInfo.combinationId ?
+          parseInt(orderInfo.combinationId) :
+          0;
+        status = {
+          type: type,
+          class_status: 0,
+        };
+        if (type == 1 && combination_id > 0) {
+          status.type = 6;
+          status.class_status = 1;
+        } //查看拼团
+        if (type == 2 && delivery_type == "express") status.class_status = 2; //查看物流
+        if (type == 2) status.class_status = 3; //确认收货
+        if (type == 4 || type === 0) status.class_status = 4; //删除订单
+        if (
+          !seckill_id &&
+          !bargain_id &&
+          !combination_id &&
+          (type == 3 || type == 4)
+        )
+          status.class_status = 5; //再次购买
+        if (type == 9) {
+          //线下付款
+          status.class_status = 0;
+          this.offlineStatus = false;
+        }
+        this.status = status;
+      },
+      getDetail() {
+        const id = this.id;
+        if (!id) {
           uni.showToast({
-            title: err.response.data.msg,
+            title: "订单不存在",
             icon: "none",
             duration: 2000,
           });
-        });
-    },
-    async toPay(type) {
-      var that = this;
-      console.log(type, "支付方式");
-      await payOrderHandle(this.orderInfo.orderId, type, that.from);
-      that.getDetail();
+          return;
+        }
+        orderDetail(id)
+          .then((res) => {
+            this.orderInfo = res.data;
+            this.getOrderStatus();
+            if (this.orderInfo.combinationId > 0) {
+              this.orderTypeName = "拼团订单";
+              this.orderTypeNameStatus = false;
+            } else if (this.orderInfo.bargainId > 0) {
+              this.orderTypeName = "砍价订单";
+              this.orderTypeNameStatus = false;
+            } else if (this.orderInfo.seckillId > 0) {
+              this.orderTypeName = "秒杀订单";
+              this.orderTypeNameStatus = false;
+            }
+            this.isIntegral = res.data.payType == 'integral'
+            if (this.isIntegral) {
+              this.orderTypeName = "积分兑换订单";
+              this.orderTypeNameStatus = false;
+            }
+
+            this.system_store = res.data.systemStore || {};
+            this.mapKey = res.data.mapKay;
+            this.setOfflinePayStatus(this.orderInfo.offlinePayStatus);
+          })
+          .catch((err) => {
+            uni.showToast({
+              title: err.response.data.msg,
+              icon: "none",
+              duration: 2000,
+            });
+          });
+      },
+      async toPay(type) {
+        var that = this;
+        console.log(type, "支付方式");
+        await payOrderHandle(this.orderInfo.orderId, type, that.from);
+        that.getDetail();
+      },
     },
-  },
-};
+  };
 </script>
 
 <style scoped lang="less">
-.geoPage {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  z-index: 10000;
-}
-.order-details .writeOff {
-  background-color: #fff;
-  margin-top: 0.13 * 100rpx;
-  padding-bottom: 0.3 * 100rpx;
-}
-.order-details .writeOff .title {
-  font-size: 0.3 * 100rpx;
-  color: #282828;
-  height: 0.87 * 100rpx;
-  border-bottom: 1px solid #f0f0f0;
-  padding: 0 0.3 * 100rpx;
-  line-height: 0.87 * 100rpx;
-}
-.order-details .writeOff .grayBg {
-  background-color: #f2f5f7;
-  width: 5.9 * 100rpx;
-  height: 3.84 * 100rpx;
-  border-radius: 0.2 * 100rpx 0.2 * 100rpx 0 0;
-  margin: 0.5 * 100rpx auto 0 auto;
-  padding-top: 0.55 * 100rpx;
-}
-.order-details .writeOff .grayBg .pictrue {
-  width: 2.9 * 100rpx;
-  height: 2.9 * 100rpx;
-  margin: 0 auto;
-}
-.order-details .writeOff .grayBg .pictrue img {
-  width: 100%;
-  height: 100%;
-  display: block;
-}
-.order-details .writeOff .gear {
-  width: 5.9 * 100rpx;
-  height: 0.3 * 100rpx;
-  margin: 0 auto;
-}
-.order-details .writeOff .gear img {
-  width: 100%;
-  height: 100%;
-  display: block;
-}
-.order-details .writeOff .num {
-  background-color: #f0c34c;
-  width: 5.9 * 100rpx;
-  height: 0.84 * 100rpx;
-  color: #282828;
-  font-size: 0.48 * 100rpx;
-  margin: 0 auto;
-  border-radius: 0 0 0.2 * 100rpx 0.2 * 100rpx;
-  text-align: center;
-  padding-top: 0.04 * 100rpx;
-}
-.order-details .writeOff .rules {
-  margin: 0.46 * 100rpx 0.3 * 100rpx 0 0.3 * 100rpx;
-  border-top: 0.01 * 100rpx solid #f0f0f0;
-  padding-top: 0.1 * 100rpx;
-}
-.order-details .writeOff .rules .item {
-  margin-top: 0.15 * 100rpx;
-}
-.order-details .writeOff .rules .item .rulesTitle {
-  font-size: 0.28 * 100rpx;
-  color: #282828;
-}
-.order-details .writeOff .rules .item .rulesTitle .iconfont {
-  font-size: 0.3 * 100rpx;
-  color: #333;
-  margin-right: 0.08 * 100rpx;
-  margin-top: 0.05 * 100rpx;
-}
-.order-details .writeOff .rules .item .info {
-  font-size: 0.28 * 100rpx;
-  color: #999;
-  margin-top: 0.05 * 100rpx;
-}
-.order-details .writeOff .rules .item .info .time {
-  margin-left: 0.2 * 100rpx;
-}
-.order-details .map {
-  height: 0.86 * 100rpx;
-  font-size: 0.3 * 100rpx;
-  color: #282828;
-  line-height: 0.86 * 100rpx;
-  border-bottom: 0.01 * 100rpx solid #f0f0f0;
-  margin-top: 0.13 * 100rpx;
-  background-color: #fff;
-  padding: 0 0.3 * 100rpx;
-}
-.order-details .map .place {
-  font-size: 0.26 * 100rpx;
-  width: 1.76 * 100rpx;
-  height: 0.5 * 100rpx;
-  border-radius: 0.25 * 100rpx;
-  line-height: 0.5 * 100rpx;
-  text-align: center;
-}
-.order-details .map .place .iconfont {
-  font-size: 0.27 * 100rpx;
-  height: 0.27 * 100rpx;
-  line-height: 0.27 * 100rpx;
-  margin: 0.02 * 100rpx 0.03 * 100rpx 0 0;
-}
-.order-details .address .name .iconfont {
-  font-size: 0.34 * 100rpx;
-  margin-left: 0.1 * 100rpx;
-}
+  .geoPage {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    z-index: 10000;
+  }
+
+  .order-details .writeOff {
+    background-color: #fff;
+    margin-top: 0.13 * 100rpx;
+    padding-bottom: 0.3 * 100rpx;
+  }
+
+  .order-details .writeOff .title {
+    font-size: 0.3 * 100rpx;
+    color: #282828;
+    height: 0.87 * 100rpx;
+    border-bottom: 1px solid #f0f0f0;
+    padding: 0 0.3 * 100rpx;
+    line-height: 0.87 * 100rpx;
+  }
+
+  .order-details .writeOff .grayBg {
+    background-color: #f2f5f7;
+    width: 5.9 * 100rpx;
+    height: 3.84 * 100rpx;
+    border-radius: 0.2 * 100rpx 0.2 * 100rpx 0 0;
+    margin: 0.5 * 100rpx auto 0 auto;
+    padding-top: 0.55 * 100rpx;
+  }
+
+  .order-details .writeOff .grayBg .pictrue {
+    width: 2.9 * 100rpx;
+    height: 2.9 * 100rpx;
+    margin: 0 auto;
+  }
+
+  .order-details .writeOff .grayBg .pictrue img {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  .order-details .writeOff .gear {
+    width: 5.9 * 100rpx;
+    height: 0.3 * 100rpx;
+    margin: 0 auto;
+  }
+
+  .order-details .writeOff .gear img {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  .order-details .writeOff .num {
+    background-color: #f0c34c;
+    width: 5.9 * 100rpx;
+    height: 0.84 * 100rpx;
+    color: #282828;
+    font-size: 0.48 * 100rpx;
+    margin: 0 auto;
+    border-radius: 0 0 0.2 * 100rpx 0.2 * 100rpx;
+    text-align: center;
+    padding-top: 0.04 * 100rpx;
+  }
+
+  .order-details .writeOff .rules {
+    margin: 0.46 * 100rpx 0.3 * 100rpx 0 0.3 * 100rpx;
+    border-top: 0.01 * 100rpx solid #f0f0f0;
+    padding-top: 0.1 * 100rpx;
+  }
+
+  .order-details .writeOff .rules .item {
+    margin-top: 0.15 * 100rpx;
+  }
+
+  .order-details .writeOff .rules .item .rulesTitle {
+    font-size: 0.28 * 100rpx;
+    color: #282828;
+  }
+
+  .order-details .writeOff .rules .item .rulesTitle .iconfont {
+    font-size: 0.3 * 100rpx;
+    color: #333;
+    margin-right: 0.08 * 100rpx;
+    margin-top: 0.05 * 100rpx;
+  }
+
+  .order-details .writeOff .rules .item .info {
+    font-size: 0.28 * 100rpx;
+    color: #999;
+    margin-top: 0.05 * 100rpx;
+  }
+
+  .order-details .writeOff .rules .item .info .time {
+    margin-left: 0.2 * 100rpx;
+  }
+
+  .order-details .map {
+    height: 0.86 * 100rpx;
+    font-size: 0.3 * 100rpx;
+    color: #282828;
+    line-height: 0.86 * 100rpx;
+    border-bottom: 0.01 * 100rpx solid #f0f0f0;
+    margin-top: 0.13 * 100rpx;
+    background-color: #fff;
+    padding: 0 0.3 * 100rpx;
+  }
+
+  .order-details .map .place {
+    font-size: 0.26 * 100rpx;
+    width: 1.76 * 100rpx;
+    height: 0.5 * 100rpx;
+    border-radius: 0.25 * 100rpx;
+    line-height: 0.5 * 100rpx;
+    text-align: center;
+  }
+
+  .order-details .map .place .iconfont {
+    font-size: 0.27 * 100rpx;
+    height: 0.27 * 100rpx;
+    line-height: 0.27 * 100rpx;
+    margin: 0.02 * 100rpx 0.03 * 100rpx 0 0;
+  }
+
+  .order-details .address .name .iconfont {
+    font-size: 0.34 * 100rpx;
+    margin-left: 0.1 * 100rpx;
+  }
 </style>
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index dbeeaa0..519bcc2 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -44,9 +44,9 @@
         <image src="@/static/images/line.jpg" />
       </view>
     </view>
-    <OrderGoods :evaluate="0" :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
+    <OrderGoods :evaluate="0" isIntegral :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
     <view class="wrapper">
-      <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false">
+      <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false  && !isIntegral">
         <view>优惠券</view>
         <view class="discount">
           {{ usableCoupon.couponTitle || "请选择" }}
@@ -65,7 +65,7 @@
                     当前积分
                     <text class="num font-color-red">{{ userInfo.integral || 0 }}</text>
                   </text>
-                  <checkbox value="true" :checked="useIntegral ? true : false"></checkbox>
+                  <checkbox value="true" v-if="!isIntegral" :checked="useIntegral ? true : false"></checkbox>
                 </label>
               </checkbox-group>
             </view>
@@ -101,7 +101,7 @@
         <textarea v-model="mark"></textarea>
       </view>
     </view>
-    <view class="wrapper">
+    <view class="wrapper" v-if="!isIntegral">
       <view class="item">
         <view>支付方式</view>
         <view class="list">
@@ -131,17 +131,18 @@
     <view class="moneyList">
       <view class="item acea-row row-between-wrapper" v-if="orderPrice.totalPrice !== undefined">
         <view>商品总价：</view>
-        <view class="money">￥{{ orderPrice.totalPrice }}</view>
+        <view class="money" v-if="!isIntegral">￥{{ orderPrice.totalPrice }}</view>
+        <view class="money" v-if="isIntegral">{{ orderPrice.payIntegral }}积分</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.payPostage > 0">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.payPostage > 0  && !isIntegral">
         <view>运费：</view>
         <view class="money">￥{{ orderPrice.payPostage }}</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.couponPrice > 0">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.couponPrice > 0  && !isIntegral">
         <view>优惠券抵扣：</view>
         <view class="money">-￥{{ orderPrice.couponPrice }}</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.deductionPrice > 0">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.deductionPrice > 0 && !isIntegral">
         <view>积分抵扣：</view>
         <view class="money">-￥{{ orderPrice.deductionPrice }}</view>
       </view>
@@ -150,7 +151,8 @@
     <view class="footer acea-row row-between-wrapper">
       <view>
         合计:
-        <text class="font-color-red">￥{{ orderPrice.payPrice }}</text>
+        <text class="font-color-red" v-if="!isIntegral">￥{{ orderPrice.payPrice }}</text>
+        <text class="font-color-red" v-if="isIntegral">{{ orderPrice.payIntegral }}积分</text>
       </view>
       <view class="settlement" @click="createOrder">立即结算</view>
     </view>
@@ -324,6 +326,7 @@
         contactsTel: "",
         storeSelfMention: 0,
         cartid: "",
+        isIntegral: false
       };
     },
     computed: mapGetters(["userInfo", "storeItems"]),
@@ -346,6 +349,8 @@
       if (that.$yroute.query.pinkid !== undefined) {
         that.pinkId = that.$yroute.query.pinkid;
       }
+      this.isIntegral = that.$yroute.query.isIntegral == 'true'
+      this.useIntegral = this.isIntegral
       if (that.$yroute.query.id !== undefined) {
         that.cartid = that.$yroute.query.id;
         console.log(that.cartid);
@@ -372,6 +377,9 @@
       },
       changeUseIntegral: function (e) {
         // this.computedPrice();
+        if (this.isIntegral) {
+          return
+        }
         this.useIntegral = e.mp.detail.value[0];
       },
       computedPrice() {
@@ -460,8 +468,20 @@
         this.computedPrice();
       },
       createOrder() {
+        if (this.isIntegral) {
+          // 积分支付
+          if (this.userInfo.integral < this.orderPrice.payIntegral) {
+            uni.showToast({
+              title: "积分不足",
+              icon: "none",
+              duration: 2000,
+            });
+            return
+          }
+          this.active = 'integral'
+        }
         let shipping_type = this.shipping_type;
-        if (!this.active) {
+        if (!this.isIntegral && !this.active) {
           uni.showToast({
             title: "请选择支付方式",
             icon: "none",
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index d554105..8ec7378 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -7,7 +7,7 @@
       <!-- 商品信息描述 -->
       <view class="wrapper">
         <view class="share acea-row row-between row-bottom">
-          <view class="money font-color-red">
+          <view class="money font-color-red" v-if="!isIntegral">
             <text>￥</text>
             <text class="num">{{
               attr.productSelect.price || storeInfo.price
@@ -16,11 +16,16 @@
               v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text>
             <image src="@/static/images/vip.png" class="image" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" />
           </view>
+          <view class="money font-color-red" v-if="isIntegral">
+            <text class="num">{{
+              attr.productSelect.integral || storeInfo.integral
+            }}积分</text>
+          </view>
           <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
         </view>
         <view class="introduce">{{ storeInfo.storeName }}</view>
         <view class="label acea-row row-between-wrapper">
-          <text>原价:￥{{ storeInfo.otPrice }}</text>
+          <text v-if="!isIntegral">原价:￥{{ storeInfo.otPrice }}</text>
           <text>库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}</text>
           <text>销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}</text>
         </view>
@@ -311,7 +316,7 @@
         qqmapsdk: null,
         productConClass: "product-con",
         tempName: "全国包邮",
-        isIntegral: "false"
+        isIntegral: false
       };
     },
     computed: mapGetters(["isLogin", "location"]),
@@ -331,6 +336,7 @@
       } else {
         this.id = this._route.query.id;
       }
+      this.isIntegral = url.isIntegral == 'true'
       this.productCon();
       this.setOpenShare();
     },
@@ -507,6 +513,7 @@
           this.$set(this.attr.productSelect, "price", productSelect.price);
           this.$set(this.attr.productSelect, "stock", productSelect.stock);
           this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this.attr.productSelect, "integral", productSelect.integral);
           this.$set(this.attr.productSelect, "cart_num", 1);
           this.$set(this, "attrValue", value.sort().join(","));
           this.$set(this, "attrTxt", "已选择");
@@ -518,6 +525,7 @@
           );
           this.$set(this.attr.productSelect, "image", this.storeInfo.image);
           this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+          this.$set(this.attr.productSelect, "integral", this.storeInfo.integral);
           this.$set(this.attr.productSelect, "stock", 0);
           this.$set(this.attr.productSelect, "unique", "");
           this.$set(this.attr.productSelect, "cart_num", 0);
@@ -532,6 +540,7 @@
           this.$set(this.attr.productSelect, "image", this.storeInfo.image);
           this.$set(this.attr.productSelect, "price", this.storeInfo.price);
           this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+          this.$set(this.attr.productSelect, "integral", this.storeInfo.integral);
           this.$set(
             this.attr.productSelect,
             "unique",
@@ -632,12 +641,14 @@
           this.$set(this.attr.productSelect, "price", productSelect.price);
           this.$set(this.attr.productSelect, "stock", productSelect.stock);
           this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this.attr.productSelect, "integral", productSelect.integral);
           this.$set(this.attr.productSelect, "cart_num", 1);
           this.$set(this, "attrValue", res.value);
           this.$set(this, "attrTxt", "已选择");
         } else {
           this.$set(this.attr.productSelect, "image", this.storeInfo.image);
           this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+          this.$set(this.attr.productSelect, "integral", this.storeInfo.price);
           this.$set(this.attr.productSelect, "stock", 0);
           this.$set(this.attr.productSelect, "unique", "");
           this.$set(this.attr.productSelect, "cart_num", 0);
@@ -698,11 +709,11 @@
           cartNum: that.attr.productSelect.cart_num,
           new: news,
           uniqueId: that.attr.productSelect !== undefined ?
-            that.attr.productSelect.unique :
-            "",
+            that.attr.productSelect.unique : "",
         };
         postCartAdd(q)
           .then(function (res) {
+            console.log(res)
             that.isOpen = false;
             that.attr.cartAttr = false;
             if (news) {
@@ -718,6 +729,7 @@
                 path: "/pages/order/OrderSubmission/index",
                 query: {
                   id: res.data.cartId,
+                  isIntegral:that.isIntegral
                 },
               });
             } else {
@@ -732,9 +744,12 @@
             }
           })
           .catch((error) => {
+            console.log(error)
             that.isOpen = false;
             uni.showToast({
-              title: error.response.data.msg,
+              title: error.msg ||
+								error.response.data.msg ||
+								error.response.data.message,
               icon: "none",
               duration: 2000,
             });

From dec56d700e0a2e04be6b65d2a2d3c86e1b76e496 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Tue, 12 Jan 2021 15:21:22 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ProductWindow.vue  | 7 ++++++-
 pages/shop/GoodsCon/index.vue | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index 3e6e79b..0dda009 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -7,11 +7,15 @@
         </view>
         <view class="text">
           <view class="line1">{{ attr.productSelect.store_name }}</view>
-          <view class="money font-color-red">
+          <view class="money font-color-red" v-if="!isIntegral">
             ￥
             <text class="num">{{ attr.productSelect.price }}</text>
             <text class="stock">库存: {{ attr.productSelect.stock }}</text>
           </view>
+          <view class="money font-color-red" v-if="isIntegral">
+            <text class="num">{{ attr.productSelect.integral }}积分</text>
+            <text class="stock">库存: {{ attr.productSelect.stock }}</text>
+          </view>
         </view>
         <view class="iconfont icon-guanbi" @click="closeAttr"></view>
       </view>
@@ -65,6 +69,7 @@
 export default {
   name: "ProductWindow",
   props: {
+    isIntegral:Boolean,
     attr: {
       type: Object,
       default: () => {},
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 8ec7378..e4e3e02 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -184,7 +184,7 @@
       <!-- 优惠券 -->
       <CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>
       <!-- 商品规格弹窗 -->
-      <ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
+      <ProductWindow isIntegral v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
       <!-- 分享海报 -->
       <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
         :posterData="posterData" :goodId="id"></StorePoster>

From 24b30dbd2fb8887c48f0d1abcd13c39c74501c56 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Tue, 12 Jan 2021 20:09:26 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue    |  2 +-
 pages/order/OrderSubmission/index.vue | 17 ++++++++++-------
 pages/shop/GoodsCon/index.vue         |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 385da6f..e123b33 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -114,7 +114,7 @@
         <image src="@/static/images/line.jpg" />
       </view>
     </template>
-    <OrderGoods :evaluate="status.type || 0" isIntegral :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
+    <OrderGoods :evaluate="status.type || 0" :isIntegral="isIntegral" :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
     <view class="wrapper">
       <view class="item acea-row row-between">
         <view>订单编号：</view>
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 18c1109..96e1e74 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -44,7 +44,7 @@
         <image src="@/static/images/line.jpg" />
       </view>
     </view>
-    <OrderGoods :evaluate="0" isIntegral :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
+    <OrderGoods :evaluate="0" :isIntegral="isIntegral" :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
     <view class="wrapper">
       <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false  && !isIntegral">
         <view>优惠券</view>
@@ -53,7 +53,7 @@
           <text class="iconfont icon-jiantou"></text>
         </view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="deduction === false && enableIntegral === true">
+      <view class="item acea-row row-between-wrapper" v-if="!isIntegral && deduction === false && enableIntegral === true">
         <view>积分抵扣</view>
         <view class="discount">
           <view class="select-btn">
@@ -65,7 +65,7 @@
                     当前积分
                     <text class="num font-color-red">{{ userInfo.integral || 0 }}</text>
                   </text>
-                  <checkbox value="true" v-if="!isIntegral" :checked="useIntegral ? true : false"></checkbox>
+                  <checkbox value="true" :checked="useIntegral ? true : false"></checkbox>
                 </label>
               </checkbox-group>
             </view>
@@ -101,25 +101,25 @@
         <textarea v-model="mark"></textarea>
       </view>
     </view>
-    <view class="wrapper" v-if="!isIntegral">
+    <view class="wrapper">
       <view class="item">
         <view>支付方式</view>
         <view class="list">
-          <view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
             v-show="isWeixin">
             <view class="name acea-row row-center-wrapper">
               <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
             </view>
             <view class="tip">微信快捷支付</view>
           </view>
-          <view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
             v-show="!isWeixin">
             <view class="name acea-row row-center-wrapper">
               <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
             </view>
             <view class="tip">微信快捷支付</view>
           </view>
-          <view class="payItem acea-row row-middle" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
             <view class="name acea-row row-center-wrapper">
               <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付
             </view>
@@ -357,6 +357,9 @@
       }
       this.isIntegral = that.$yroute.query.isIntegral == 'true'
       this.useIntegral = this.isIntegral
+      if(this.isIntegral){
+        this.active='integral'
+      }
       if (that.$yroute.query.id !== undefined) {
         that.cartid = that.$yroute.query.id;
         console.log(that.cartid);
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index d4d8edb..1e9c5ff 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -184,7 +184,7 @@
       <!-- 优惠券 -->
       <CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>
       <!-- 商品规格弹窗 -->
-      <ProductWindow isIntegral v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
+      <ProductWindow :isIntegral="isIntegral" v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
       <!-- 分享海报 -->
       <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
         :posterData="posterData" :goodId="id"></StorePoster>

From 33cff0fb8199a87112547806b11c9874da51adf4 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Wed, 27 Jan 2021 11:04:58 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=8E=B7=E5=8F=96=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CouponPop.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/CouponPop.vue b/components/CouponPop.vue
index 1fe65d4..83ed731 100644
--- a/components/CouponPop.vue
+++ b/components/CouponPop.vue
@@ -14,16 +14,16 @@
         >
           <view class="money">
             ￥
-            <text class="num">{{ item.coupon_price }}</text>
+            <text class="num">{{ item.couponPrice }}</text>
           </view>
           <view class="text">
-            <view class="condition line1">购物满{{ item.use_min_price }}元可用</view>
+            <view class="condition line1">购物满{{ item.useMinPrice }}元可用</view>
             <view class="data acea-row row-between-wrapper">
               <view v-if="item.end_time === 0">不限时</view>
-              <view v-else>{{ item.start_time }}-{{ item.end_time }}</view>
+              <view v-else>{{ item.startTime }}-{{ item.endTime }}</view>
               <view
                 class="bnt acea-row row-center-wrapper"
-                :class="!item.is_use ? 'bg-color-red' : 'gray'"
+                :class="!item.isUse ? 'bg-color-red' : 'gray'"
               >{{ !item.is_use ? "立即领取" : "已领取" }}</view>
             </view>
           </view>

From 38160460cf111791ee7d2f9ebebd22275a7931c1 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Wed, 27 Jan 2021 11:07:20 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CouponPop.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/CouponPop.vue b/components/CouponPop.vue
index 83ed731..cee117c 100644
--- a/components/CouponPop.vue
+++ b/components/CouponPop.vue
@@ -24,7 +24,7 @@
               <view
                 class="bnt acea-row row-center-wrapper"
                 :class="!item.isUse ? 'bg-color-red' : 'gray'"
-              >{{ !item.is_use ? "立即领取" : "已领取" }}</view>
+              >{{ !item.isUse ? "立即领取" : "已领取" }}</view>
             </view>
           </view>
         </view>

From 504e476e3075788234dba1cc32da9cb6d017a401 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Tue, 2 Feb 2021 20:38:50 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E4=BF=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/public.js        |   8 +
 config/index.js      |   3 +-
 package-lock.json    |  19 +
 package.json         |   2 +-
 pages/home/index.vue | 861 +++++++++++++++++++++----------------------
 5 files changed, 449 insertions(+), 444 deletions(-)

diff --git a/api/public.js b/api/public.js
index b34f64b..b4bde62 100644
--- a/api/public.js
+++ b/api/public.js
@@ -8,6 +8,14 @@ export function getHomeData() {
   return request.get("index", {}, { login: false });
 }
 
+/**
+ * 首页
+ * @returns {*}
+ */
+export function getCanvas() {
+  return request.get("/getCanvas?terminal=3", {}, { login: false });
+}
+
 /**
  * 文章 轮播列表
  * @returns {*}
diff --git a/config/index.js b/config/index.js
index 8629e6a..ade4699 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,7 +2,8 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
- export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
+ export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
+ // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
diff --git a/package-lock.json b/package-lock.json
index 4acba4f..a1f2da4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -287,6 +287,11 @@
       "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
       "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "http://192.168.1.56:8081/repository/npm-public/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha1-QukiKxAbyoLlup1aes9KFMDyY9A="
+    },
     "normalize-url": {
       "version": "4.5.0",
       "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-4.5.0.tgz?cache=0&sync_timestamp=1596373090568&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.0.tgz",
@@ -399,6 +404,11 @@
       "resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-1.0.0.tgz",
       "integrity": "sha1-zgqgwvPfat+FLvtASng+d8BHV3E="
     },
+    "transitionEnd": {
+      "version": "1.0.2",
+      "resolved": "http://192.168.1.56:8081/repository/npm-public/transitionEnd/-/transitionEnd-1.0.2.tgz",
+      "integrity": "sha1-GRTbW0Wn79w0oBr2koWjppOHFjM="
+    },
     "url-parse-lax": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/url-parse-lax/download/url-parse-lax-3.0.0.tgz",
@@ -407,6 +417,15 @@
         "prepend-http": "^2.0.0"
       }
     },
+    "vconsole": {
+      "version": "3.4.0",
+      "resolved": "http://192.168.1.56:8081/repository/npm-public/vconsole/-/vconsole-3.4.0.tgz",
+      "integrity": "sha1-LPL/qobNerc2mXoitj0FYnxqtWc=",
+      "requires": {
+        "mutation-observer": "^1.0.3",
+        "transitionEnd": "^1.0.2"
+      }
+    },
     "vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz",
diff --git a/package.json b/package.json
index 7db4ceb..297db34 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "jweixin-module": "^1.6.0",
     "miniapp-color-thief": "^1.0.5",
     "vue-ydui": "^1.2.6",
-	"vconsole": "^3.3.4",
+    "vconsole": "^3.3.4",
     "wechat-jssdk": "^5.0.4"
   },
   "devDependencies": {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index ebe34dc..556b47e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,470 +1,447 @@
 <template>
-  <view class="index">
-    <!-- 导航栏 -->
-    <!--		<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">-->
-    <!--			<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">-->
-    <!--				<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">-->
-    <!--					<view class="action">-->
-    <!--						<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>-->
-    <!--					</view>-->
-    <!--					<view class="content" :style="[{top:StatusBar + 'px'}]">-->
-
-    <!--					</view>-->
-    <!--				</view>-->
-    <!--			</view>-->
-    <!--		</view>-->
-
-    <view
-      class="head_box"
-      :style="{ background: bgcolor }"
-      :class="{ active: bgcolor }"
-    >
-      <cu-custom :isBack="true" :bgColor="bgcolor">
-        <block slot="backText">
-          <text class="nav-title shopro-selector-rect">{{ "YSHOP商城" }}</text>
-        </block>
-      </cu-custom>
-    </view>
-    <view
-      class="header header-search acea-row row-center-wrapper"
-      :style="{ background: bgcolor }"
-    >
-      <view @click="goGoodSearch()" class="search acea-row row-middle">
-        <text class="iconfont icon-xiazai5"></text>
-        搜索商品
-      </view>
-      <view class="qr" @click="startQr()">
-        <image src="@/static/images/qr.png" />
-      </view>
-    </view>
-    <Banner
-      :detail="banner"
-      v-if="banner.length > 0"
-      @getbgcolor="getbgcolor"
-    ></Banner>
-    <uni-notice-bar
-      scrollable="true"
-      @click="goRoll(singNew)"
-      single="true"
-      :speed="10"
-      showIcon="true"
-      :text="singNew.info"
-    ></uni-notice-bar>
-    <view class="content_box home_content_box">
-      <!-- 菜单 -->
-      <Menu :list="menus"></Menu>
-      <!-- 滚动新闻 -->
-      <!-- 广告 -->
-      <Adv />
-      <!-- 热门榜单 -->
-      <HotCommodity :detail="likeInfo"></HotCommodity>
-      <!-- 超值拼团 -->
-      <Groupon :detail="combinationList" />
-      <!-- 首发新品->秒杀 -->
-      <!-- <FirstNewProduct :detail="firstList"></FirstNewProduct> -->
-      <!-- 精品推荐 -->
-      <!-- <ProductsRecommended :detail="bastList"></ProductsRecommended> -->
-      <!-- 促销单品
-			<PromoteProduct :detail="benefit"></PromoteProduct> -->
-      <!-- 直播 -->
-      <!-- #ifdef MP-WEIXIN -->
-      <Live :detail="live"></Live>
-      <!-- #endif -->
-
-      <!-- 为您推荐 -->
-      <PromotionGood :benefit="benefit"></PromotionGood>
-    </view>
-    <Coupon-window
-      :coupon-list="couponList"
-      v-if="showCoupon"
-      @checked="couponClose"
-      @close="couponClose"
-    >
-    </Coupon-window>
-  </view>
+	<view class="index">
+		<view v-for="(item,index) in homeData" :key="index">
+			<view class="head_box" v-if="item.type=='header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }">
+				<cu-custom :isBack="true" :bgColor="bgcolor">
+					<block slot="backText">
+						<text class="nav-title shopro-selector-rect">{{ item.componentContent.title }}</text>
+					</block>
+				</cu-custom>
+			</view>
+			<view class="header header-search acea-row row-center-wrapper" v-if="item.type=='search'" :style="{ background: bgcolor }">
+				<view @click="goGoodSearch()" class="search acea-row row-middle">
+					<text class="iconfont icon-xiazai5"></text>
+					搜索商品
+				</view>
+				<view class="qr" @click="startQr()">
+					<image src="@/static/images/qr.png" />
+				</view>
+			</view>
+			<Banner v-if="item.type=='banner'" :detail="item.componentContent.bannerData" @getbgcolor="getbgcolor"></Banner>
+			<uni-notice-bar v-if="item.type=='noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])" single="true" :speed="10"
+			 showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar>
+			<view class="content_box home_content_box">
+				<!-- 菜单 -->
+				<Menu :list="item.componentContent.menus" v-if="item.type=='menu'"></Menu>
+				<!-- 滚动新闻 -->
+				<!-- 广告 -->
+				<Adv v-if="item.type=='adv'" />
+				<!-- 热门榜单 -->
+				<HotCommodity v-if="item.type=='hotCommodity'" :detail="likeInfo"></HotCommodity>
+				<!-- 超值拼团 -->
+				<Groupon v-if="item.type=='groupon'" :detail="combinationList" />
+				<!-- 首发新品->秒杀 -->
+				<FirstNewProduct v-if="item.type=='firstNewProduct'" :detail="firstList"></FirstNewProduct>
+				<!-- 精品推荐 -->
+				<ProductsRecommended v-if="item.type=='productsRecommended'" :detail="bastList"></ProductsRecommended>
+				<!-- 促销单品 -->
+				<PromoteProduct v-if="item.type=='promoteProduct'" :detail="benefit"></PromoteProduct>
+				<!-- 直播 -->
+				<!-- #ifdef MP-WEIXIN -->
+				<Live v-if="item.type=='live'" :detail="live"></Live>
+				<!-- #endif -->
+				<!-- 为您推荐 -->
+				<PromotionGood v-if="item.type=='promotionGood'" :benefit="benefit"></PromotionGood>
+			</view>
+			<Coupon-window :coupon-list="couponList" v-if="showCoupon" @checked="couponClose" @close="couponClose">
+			</Coupon-window>
+		</view>
+	</view>
 </template>
 <script>
-import { mapState, mapMutations, mapActions } from "vuex";
-import GoodList from "@/components/GoodList";
-import PromotionGood from "@/components/PromotionGood";
-import CouponWindow from "@/components/CouponWindow";
-import Menu from "@/components/Menu";
-import UniNoticeBar from "@/components/uni-notice-bar/uni-notice-bar";
-import Adv from "@/components/sh-adv";
-import Groupon from "@/components/sh-groupon.vue";
+	import {
+		mapState,
+		mapMutations,
+		mapActions
+	} from "vuex";
+	import GoodList from "@/components/GoodList";
+	import PromotionGood from "@/components/PromotionGood";
+	import CouponWindow from "@/components/CouponWindow";
+	import Menu from "@/components/Menu";
+	import UniNoticeBar from "@/components/uni-notice-bar/uni-notice-bar";
+	import Adv from "@/components/sh-adv";
+	import Groupon from "@/components/sh-groupon.vue";
 
-import Banner from "./components/Banner";
-import HotCommodity from "./components/HotCommodity";
-import FirstNewProduct from "./components/FirstNewProduct";
-import ProductsRecommended from "./components/ProductsRecommended";
-import Live from "./components/Live";
+	import Banner from "./components/Banner";
+	import HotCommodity from "./components/HotCommodity";
+	import FirstNewProduct from "./components/FirstNewProduct";
+	import ProductsRecommended from "./components/ProductsRecommended";
+	import Live from "./components/Live";
 
-import { getHomeData, getShare } from "@/api/public";
-import cookie from "@/utils/store/cookie";
-import { isWeixin, handleUrlParam } from "@/utils/index";
+	import {
+		getHomeData,
+		getShare,
+		getCanvas
+	} from "@/api/public";
+	import cookie from "@/utils/store/cookie";
+	import {
+		isWeixin,
+		handleUrlParam
+	} from "@/utils/index";
 
-import {
-	openShareAll,
-} from '@/libs/wechat'
+	import {
+		openShareAll,
+	} from '@/libs/wechat'
 
-const HAS_COUPON_WINDOW = "has_coupon_window";
+	const HAS_COUPON_WINDOW = "has_coupon_window";
 
-export default {
-  name: "Index",
-  components: {
-    // swiper,
-    // swiperSlide,
-    UniNoticeBar,
-    GoodList,
-    PromotionGood,
-    CouponWindow,
-    Menu,
-    Adv,
-    Groupon,
-    Banner,
-    HotCommodity,
-    FirstNewProduct,
-    ProductsRecommended,
-    Live,
-  },
-  props: {},
-  data: function () {
-    return {
-      CustomBar: this.CustomBar,
-      StatusBar: this.StatusBar,
-      formatMenus: [],
-      categoryCurrent: 0,
-      menuNum: 4,
-      bgcolor: "",
-      bgColor: "",
-      swiperCurrent: 0, //轮播下标
-      webviewId: 0,
-      showCoupon: false,
-      logoUrl: "",
-      banner: [],
-      menus: [],
-      combinationList: [],
-      roll: [],
-      activity: [],
-      activityOne: {},
-      bastList: [],
-      firstList: [],
-      info: {
-        fastList: [],
-        bastBanner: [],
+	export default {
+		name: "Index",
+		components: {
+			// swiper,
+			// swiperSlide,
+			UniNoticeBar,
+			GoodList,
+			PromotionGood,
+			CouponWindow,
+			Menu,
+			Adv,
+			Groupon,
+			Banner,
+			HotCommodity,
+			FirstNewProduct,
+			ProductsRecommended,
+			Live,
+		},
+		props: {},
+		data: function() {
+			return {
+				homeData: [],
+				CustomBar: this.CustomBar,
+				StatusBar: this.StatusBar,
+				formatMenus: [],
+				categoryCurrent: 0,
+				menuNum: 4,
+				bgcolor: "",
+				bgColor: "",
+				swiperCurrent: 0, //轮播下标
+				webviewId: 0,
+				showCoupon: false,
+				logoUrl: "",
+				banner: [],
+				menus: [],
+				combinationList: [],
+				roll: [],
+				activity: [],
+				activityOne: {},
+				bastList: [],
+				firstList: [],
+				info: {
+					fastList: [],
+					bastBanner: [],
 
-        bastList: [],
-      },
-      likeInfo: [],
-      live: [],
-      lovely: [],
-      benefit: [],
-      couponList: [],
-      swiperOption: {
-        pagination: {
-          el: ".swiper-pagination",
-          clickable: true,
-        },
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000,
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      swiperRoll: {
-        direction: "vertical",
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000,
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      swiperScroll: {
-        freeMode: true,
-        freeModeMomentum: false,
-        slidesPerView: "auto",
-        observer: true,
-        observeParents: true,
-      },
-      swiperBoutique: {
-        pagination: {
-          el: ".swiper-pagination",
-          clickable: true,
-        },
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000,
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      swiperProducts: {
-        freeMode: true,
-        freeModeMomentum: false,
-        slidesPerView: "auto",
-        observer: true,
-        observeParents: true,
-      },
-      bgImage: "",
-    };
-  },
-  computed: {
-    singNew() {
-      return this.roll.length > 0 ? this.roll[0] : "你还没添加通知哦！";
-    },
-    customStyle() {
-      var bgImage = this.bgImage;
-      // var style = `height:${this.CustomBar}px;padding-top:${0}px;background: ${this.bgcolor}`;
-      var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`;
-      if (this.bgImage) {
-        style = `${style}background-image:url(${bgImage});`;
-      }
-      return style;
-    },
-  },
-  onLoad: function () {
-    this.getLocation();
-    let that = this;
-    uni.showLoading({
-      title: "加载中",
-    });
-    getHomeData().then((res) => {
-      that.logoUrl = res.data.logoUrl;
-      res.data.banner.map((item) => (item.bgcolor = item.color || ""));
-      that.$set(that, "banner", res.data.banner);
-      that.$set(that, "menus", res.data.menus);
-      that.$set(that, "roll", res.data.roll);
-      that.$set(that, "info", res.data.info);
-      that.$set(that, "firstList", res.data.firstList);
-      that.$set(that, "bastList", res.data.bastList);
-      that.$set(that, "likeInfo", res.data.likeInfo);
-      that.$set(that, "live", res.data.liveList);
-      that.$set(that, "lovely", res.data.lovely);
-      that.$set(that, "benefit", res.data.benefit);
-      that.$set(that, "couponList", res.data.couponList);
-      that.$set(that, "combinationList", res.data.combinationList);
-      uni.hideLoading();
-      that.setOpenShare();
-      // that.doColorThief()
-    });
-  },
-  methods: {
-    ...mapActions(["getLocation"]),
-    onShareTimeline: function () {
-      return {
-        title: this.miniHomeRemark,
-        imageUrl: this.miniHomeImg,
-        path: "pages/home/index?spread=" + uni.getStorageSync("uid"),
-      };
-    },
-    onShareAppMessage: function () {
-      return {
-        title: this.miniHomeRemark,
-        imageUrl: this.miniHomeImg,
-        path: "pages/home/index?spread=" + uni.getStorageSync("uid"),
-      };
-    },
-    goRoll(item) {
-      if (item.uniapp_url) {
-        this.$yrouter.push(item.uniapp_url);
-      }
-    },
-    goGoodSearch() {
-      // this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
-      this.$yrouter.push("/pages/shop/GoodSearch/index");
-    },
-    goWxappUrl(item) {
-      this.$yrouter.push(item.uniapp_url);
-    },
-    goHotNewGoods(type) {
-      this.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type,
-        },
-      });
-    },
-    goGoodsCon(item) {
-      this.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: item.id,
-        },
-      });
-    },
-    goGoodsPromotion() {
-      this.$yrouter.push("/pages/shop/GoodsPromotion/index");
-    },
-    setOpenShare: function () {
-      if (this.$deviceType == "weixin") {
-        getShare().then((res) => {
-          var data = res.data.data;
-          var configAppMessage = {
-            desc: data.synopsis,
-            title: data.title,
-            link: location.href,
-            imgUrl: data.img,
-          };
-          openShareAll(configAppMessage);
-        });
-      }
-    },
-    startQr: function () {
-      uni.scanCode({
-        success: (res) => {
-          let option = handleUrlParam(res.result);
-          switch (option.pageType) {
-            case "good":
-              // 跳转商品详情
-              this.$yrouter.push({
-                path: "/pages/shop/GoodsCon/index",
-                query: {
-                  q: res.result,
-                },
-              });
-              break;
-            case "group":
-              // 跳转团购
-              this.$yrouter.push({
-                path: "/pages/activity/GroupRule/index",
-                query: {
-                  q: res.result,
-                },
-              });
-              break;
-            case "dargain":
-              // 跳转砍价
-              this.$yrouter.push({
-                path: "/pages/activity/DargainDetails/index",
-                query: {
-                  q: res.result,
-                },
-              });
-              break;
-            default:
-              // 跳转分销
-              this.$yrouter.push({
-                path: "/pages/Loading/index",
-                query: {},
-              });
-              break;
-          }
-        },
-      });
-    },
-    getbgcolor(e) {
-      this.bgcolor = e;
-    },
-  },
-  created: async function () {
-    // await this.doColorThief();
-  },
-};
+					bastList: [],
+				},
+				likeInfo: [],
+				live: [],
+				lovely: [],
+				benefit: [],
+				couponList: [],
+				swiperOption: {
+					pagination: {
+						el: ".swiper-pagination",
+						clickable: true,
+					},
+					autoplay: {
+						disableOnInteraction: false,
+						delay: 2000,
+					},
+					loop: true,
+					speed: 1000,
+					observer: true,
+					observeParents: true,
+				},
+				swiperRoll: {
+					direction: "vertical",
+					autoplay: {
+						disableOnInteraction: false,
+						delay: 2000,
+					},
+					loop: true,
+					speed: 1000,
+					observer: true,
+					observeParents: true,
+				},
+				swiperScroll: {
+					freeMode: true,
+					freeModeMomentum: false,
+					slidesPerView: "auto",
+					observer: true,
+					observeParents: true,
+				},
+				swiperBoutique: {
+					pagination: {
+						el: ".swiper-pagination",
+						clickable: true,
+					},
+					autoplay: {
+						disableOnInteraction: false,
+						delay: 2000,
+					},
+					loop: true,
+					speed: 1000,
+					observer: true,
+					observeParents: true,
+				},
+				swiperProducts: {
+					freeMode: true,
+					freeModeMomentum: false,
+					slidesPerView: "auto",
+					observer: true,
+					observeParents: true,
+				},
+				bgImage: "",
+			};
+		},
+		computed: {
+			singNew() {
+				return this.roll.length > 0 ? this.roll[0] : "你还没添加通知哦！";
+			},
+			customStyle() {
+				var bgImage = this.bgImage;
+				// var style = `height:${this.CustomBar}px;padding-top:${0}px;background: ${this.bgcolor}`;
+				var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`;
+				if (this.bgImage) {
+					style = `${style}background-image:url(${bgImage});`;
+				}
+				return style;
+			},
+		},
+		onLoad: function() {
+			this.getLocation();
+			let that = this;
+			// uni.showLoading({
+			//   title: "加载中",
+			// });
+			getCanvas().then(res => {
+			}).catch(error => {
+				this.homeData = JSON.parse(error.data.json)
+			})
+			getHomeData().then((res) => {
+			  that.logoUrl = res.data.logoUrl;
+			  res.data.banner.map((item) => (item.bgcolor = item.color || ""));
+			  that.$set(that, "info", res.data.info);
+			  that.$set(that, "firstList", res.data.firstList);
+			  that.$set(that, "bastList", res.data.bastList);
+			  that.$set(that, "likeInfo", res.data.likeInfo);
+			  that.$set(that, "live", res.data.liveList);
+			  that.$set(that, "lovely", res.data.lovely);
+			  that.$set(that, "benefit", res.data.benefit);
+			  that.$set(that, "couponList", res.data.couponList);
+			  that.$set(that, "combinationList", res.data.combinationList);
+			  uni.hideLoading();
+			  that.setOpenShare();
+			  // that.doColorThief()
+			});
+		},
+		methods: {
+			...mapActions(["getLocation"]),
+			onShareTimeline: function() {
+				return {
+					title: this.miniHomeRemark,
+					imageUrl: this.miniHomeImg,
+					path: "pages/home/index?spread=" + uni.getStorageSync("uid"),
+				};
+			},
+			onShareAppMessage: function() {
+				return {
+					title: this.miniHomeRemark,
+					imageUrl: this.miniHomeImg,
+					path: "pages/home/index?spread=" + uni.getStorageSync("uid"),
+				};
+			},
+			goRoll(item) {
+				if (item.uniapp_url) {
+					this.$yrouter.push(item.uniapp_url);
+				}
+			},
+			goGoodSearch() {
+				// this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
+				this.$yrouter.push("/pages/shop/GoodSearch/index");
+			},
+			goWxappUrl(item) {
+				this.$yrouter.push(item.uniapp_url);
+			},
+			goHotNewGoods(type) {
+				this.$yrouter.push({
+					path: "/pages/shop/HotNewGoods/index",
+					query: {
+						type,
+					},
+				});
+			},
+			goGoodsCon(item) {
+				this.$yrouter.push({
+					path: "/pages/shop/GoodsCon/index",
+					query: {
+						id: item.id,
+					},
+				});
+			},
+			goGoodsPromotion() {
+				this.$yrouter.push("/pages/shop/GoodsPromotion/index");
+			},
+			setOpenShare: function() {
+				if (this.$deviceType == "weixin") {
+					getShare().then((res) => {
+						var data = res.data.data;
+						var configAppMessage = {
+							desc: data.synopsis,
+							title: data.title,
+							link: location.href,
+							imgUrl: data.img,
+						};
+						openShareAll(configAppMessage);
+					});
+				}
+			},
+			startQr: function() {
+				uni.scanCode({
+					success: (res) => {
+						let option = handleUrlParam(res.result);
+						switch (option.pageType) {
+							case "good":
+								// 跳转商品详情
+								this.$yrouter.push({
+									path: "/pages/shop/GoodsCon/index",
+									query: {
+										q: res.result,
+									},
+								});
+								break;
+							case "group":
+								// 跳转团购
+								this.$yrouter.push({
+									path: "/pages/activity/GroupRule/index",
+									query: {
+										q: res.result,
+									},
+								});
+								break;
+							case "dargain":
+								// 跳转砍价
+								this.$yrouter.push({
+									path: "/pages/activity/DargainDetails/index",
+									query: {
+										q: res.result,
+									},
+								});
+								break;
+							default:
+								// 跳转分销
+								this.$yrouter.push({
+									path: "/pages/Loading/index",
+									query: {},
+								});
+								break;
+						}
+					},
+				});
+			},
+			getbgcolor(e) {
+				this.bgcolor = e;
+			},
+		},
+		created: async function() {
+			// await this.doColorThief();
+		},
+	};
 </script>
 <style scoped lang="less">
-.content_box {
-  background: #f6f6f6;
-}
+	.content_box {
+		background: #f6f6f6;
+	}
 
-.index {
-  background-color: #fff;
-}
+	.index {
+		background-color: #fff;
+	}
 
-.swiper-item {
-  height: 100%;
-}
+	.swiper-item {
+		height: 100%;
+	}
 
-.fixed-header {
-  position: fixed;
-  z-index: 99;
-  // #ifdef H5
-  top: 88rpx;
-  // #endif
+	.fixed-header {
+		position: fixed;
+		z-index: 99;
+		// #ifdef H5
+		top: 88rpx;
+		// #endif
 
-  // #ifndef H5
-  top: 0;
-  // #endif
-  left: 0;
-  right: 0;
-  background: #fff;
-  box-shadow: 0 0 20rpx -10rpx #aaa;
+		// #ifndef H5
+		top: 0;
+		// #endif
+		left: 0;
+		right: 0;
+		background: #fff;
+		box-shadow: 0 0 20rpx -10rpx #aaa;
 
-  & + .fixed-header-box {
-    height: 98rpx;
-  }
-}
+		&+.fixed-header-box {
+			height: 98rpx;
+		}
+	}
 
-.head_box {
-  width: 750rpx;
-  // background: #fff;
-  transition: all linear 0.3s;
+	.head_box {
+		width: 750rpx;
+		// background: #fff;
+		transition: all linear 0.3s;
 
-  /deep/.cuIcon-back {
-    display: none;
-  }
+		/deep/.cuIcon-back {
+			display: none;
+		}
 
-  .nav-title {
-    font-size: 38rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    color: #fff;
-  }
-}
+		.nav-title {
+			font-size: 38rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #fff;
+		}
+	}
 
-.cu-bar.fixed {
-  position: fixed;
-  width: 100%;
-  top: 0;
-  z-index: 1024;
-  // box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
-}
+	.cu-bar.fixed {
+		position: fixed;
+		width: 100%;
+		top: 0;
+		z-index: 1024;
+		// box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
+	}
 
-.cu-bar {
-  box-sizing: border-box;
+	.cu-bar {
+		box-sizing: border-box;
 
-  .index .header {
-    height: 64rpx;
-    // width: 100%;
-    // padding: 0 30rpx;
-    // box-sizing: border-box;
-  }
-}
+		.index .header {
+			height: 64rpx;
+			// width: 100%;
+			// padding: 0 30rpx;
+			// box-sizing: border-box;
+		}
+	}
 
-.header-search {
-  transition: all linear 0.3s;
-}
+	.header-search {
+		transition: all linear 0.3s;
+	}
 
-.cu-bar .action {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  height: 100%;
-  max-height: 100%;
+	.cu-bar .action {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		align-items: center;
+		height: 100%;
+		max-height: 100%;
 
-  &:first-child {
-    margin-left: 15px;
-    font-size: 15px;
-  }
-}
+		&:first-child {
+			margin-left: 15px;
+			font-size: 15px;
+		}
+	}
 
-.home_content_box {
-  margin-top: -10rpx;
-}
+	.home_content_box {
+		margin-top: -10rpx;
+	}
 
-.head_box {
-}
+	.head_box {}
 
-.nav-title {
-  margin-left: 20rpx;
-  line-height: 40px;
-}
-</style>
+	.nav-title {
+		margin-left: 20rpx;
+		line-height: 40px;
+	}
+</style>

From 41a2882fd393b7d55800c106a27be945b1446040 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Wed, 3 Feb 2021 21:01:16 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9adv=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Adv.vue   | 46 +++++++++++++++++++++++---------------------
 pages/home/index.vue |  2 +-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/components/Adv.vue b/components/Adv.vue
index d3d8146..37d777f 100644
--- a/components/Adv.vue
+++ b/components/Adv.vue
@@ -2,55 +2,55 @@
 	<view class="adv-box mx20 mb10">
 		<!-- 模板1-->
 		<view class="x-f" v-if="detail.style == 1">
-			<image style="width:710rpx;height: 220rpx;" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
+			<image style="width:710rpx;height: 220rpx;" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
 		</view>
 		<!-- 模板2-->
 		<view class="type1 x-f" v-if="detail.style == 2">
-			<image class="type1-img" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-			<image class="type1-img" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+			<image class="type1-img" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
+			<image class="type1-img" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
 		</view>
 		<!-- 模板3-->
 		<view class="type2 x-bc" v-if="detail.style == 3">
-			<image class="type2-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
+			<image class="type2-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
 			<view class="y-f type2-box">
-				<image class="type2-img2" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill" style="border-bottom:1rpx solid #f6f6f6"></image>
-				<image class="type2-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
+				<image class="type2-img2" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill" style="border-bottom:1rpx solid #f6f6f6"></image>
+				<image class="type2-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
 			</view>
 		</view>
 		<!-- 模板4-->
 		<view class="type3 x-bc" v-if="detail.style == 4">
 			<view class="type3-box y-f">
-				<image class="type3-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type3-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+				<image class="type3-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
+				<image class="type3-img1" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
 			</view>
-			<image class="type3-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
+			<image class="type3-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
 		</view>
 		<!-- 模板5-->
 		<view class="type4 y-f" v-if="detail.style == 5">
 			<view class="type4-box x-f">
-				<image class="type4-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type4-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+				<image class="type4-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
+				<image class="type4-img1" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
 			</view>
-			<image class="type4-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
+			<image class="type4-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
 		</view>
 		<!-- 模板6-->
 		<view class="type5 y-f" v-if="detail.style == 6">
-			<image class="type5-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
+			<image class="type5-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
 			<view class="type5-box x-bc">
-				<image class="type5-img2" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill" style="border-bottom:1rpx solid #f6f6f6"></image>
-				<image class="type5-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
+				<image class="type5-img2" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill" style="border-bottom:1rpx solid #f6f6f6"></image>
+				<image class="type5-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
 			</view>
 		</view>
 		<!-- 模板7-->
 		<view class="type6 y-f" v-if="detail.style == 7">
 			<view class="x-f type6-box1">
-				<image class="type6-img1" @tap="jump(detail.list[0].path)" :src="detail.list[0].image" mode="aspectFill"></image>
-				<image class="type6-img1" @tap="jump(detail.list[1].path)" :src="detail.list[1].image" mode="aspectFill"></image>
+				<image class="type6-img1" @tap="jump(detail.list[0].uniapp_url)" :src="detail.list[0].image" mode="aspectFill"></image>
+				<image class="type6-img1" @tap="jump(detail.list[1].uniapp_url)" :src="detail.list[1].image" mode="aspectFill"></image>
 			</view>
 			<view class="x-f type6-box2">
-				<image class="type6-img2" @tap="jump(detail.list[2].path)" :src="detail.list[2].image" mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[3].path)" :src="detail.list[3].image" mode="aspectFill"></image>
-				<image class="type6-img2" @tap="jump(detail.list[4].path)" :src="detail.list[4].image" mode="aspectFill"></image>
+				<image class="type6-img2" @tap="jump(detail.list[2].uniapp_url)" :src="detail.list[2].image" mode="aspectFill"></image>
+				<image class="type6-img2" @tap="jump(detail.list[3].uniapp_url)" :src="detail.list[3].image" mode="aspectFill"></image>
+				<image class="type6-img2" @tap="jump(detail.list[4].uniapp_url)" :src="detail.list[4].image" mode="aspectFill"></image>
 			</view>
 		</view>
 	</view>
@@ -63,14 +63,16 @@ export default {
 		return {};
 	},
 	props: {
-		detail: {}
+		detail: Object
 	},
 	computed: {},
 	created() {},
 	methods: {
 		// 路由跳转
 		jump(path) {
-			this.$tools.routerTo(path);
+			if (item.uniapp_url) {
+			    this.$yrouter.push(path)
+			}
 		}
 	}
 };
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 556b47e..7c16011 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -25,7 +25,7 @@
 				<Menu :list="item.componentContent.menus" v-if="item.type=='menu'"></Menu>
 				<!-- 滚动新闻 -->
 				<!-- 广告 -->
-				<Adv v-if="item.type=='adv'" />
+				<Adv v-if="item.type=='adv'" :detail="item.componentContent.detail" />
 				<!-- 热门榜单 -->
 				<HotCommodity v-if="item.type=='hotCommodity'" :detail="likeInfo"></HotCommodity>
 				<!-- 超值拼团 -->

From 67f91522c9ad7c2a0eb5663ba4273d5a97c010e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Sat, 6 Feb 2021 11:43:40 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/index.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/utils/index.js b/utils/index.js
index 4eefecf..7d511bc 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -217,7 +217,7 @@ export const login = () => {
 							redirect = redirect.split('/pages')[1]
 							if(!redirect){
                                 redirect="/Loading/index";
-                            }    
+                            }
 							reLaunch({
 								path: '/pages' + redirect,
 							});
@@ -619,13 +619,13 @@ export function routerPermissions(url, type) {
 			})
 			cookie.set('redirect', path)
 		})
-		// } else if (Vue.prototype.$deviceType == 'weixin') {
-		// wechat().then(() => oAuth());
-		// if (!type) {
-		// 	push({
-		// 		path: url,
-		// 	})
-		// }
+	} else if (Vue.prototype.$deviceType == 'weixin') {
+		wechat().then(() => oAuth());
+		if (!type) {
+			push({
+				path: url,
+			})
+		}
 	} else {
 		console.log(path)
 		// 如果不是小程序跳转到登录页

From b6e8e267beec03175b1cff840a708fd440b36773 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Wed, 10 Feb 2021 10:48:07 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                       |    7 +-
 pages.json                            |  926 +++++++-------
 pages/order/OrderSubmission/index.vue |  779 ++++++------
 pages/shop/GoodsCon/index.vue         | 1592 ++++++++++++-------------
 pages/shop/GoodsList/index.vue        |  429 ++++---
 pages/shop/IntegralGoodsCon/index.vue |  867 ++++++++++++++
 pages/user/User/index.vue             |    5 -
 7 files changed, 2676 insertions(+), 1929 deletions(-)
 create mode 100644 pages/shop/IntegralGoodsCon/index.vue

diff --git a/config/index.js b/config/index.js
index ade4699..153eca6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,9 +1,8 @@
-
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
- export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
- // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
+//  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
+export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
-export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
+export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'
diff --git a/pages.json b/pages.json
index 6bf8133..11102a0 100644
--- a/pages.json
+++ b/pages.json
@@ -1,460 +1,470 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/Loading/index",
-			"style": {
-				"navigationBarTitleText": "yshop商城"
-			}
-		},
-		{
-			"path": "pages/authorization/index",
-			"style": {
-				"navigationBarTitleText": "微信授权"
-			}
-		},
-		{
-			"path": "pages/user/Login/index",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/user/Register/index",
-			"style": {
-				"navigationBarTitleText": "注册"
-			}
-		},
-		{
-			"path": "pages/user/RetrievePassword/index",
-			"style": {
-				"navigationBarTitleText": "重置密码"
-			}
-		},
-		{
-			"path": "pages/launch/index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": "yshop商城",
-				"navigationBarTextStyle": "white",
-				// "enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/shop/GoodSearch/index",
-			"style": {
-				"navigationBarTitleText": "搜索商品"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsClass/index",
-			"style": {
-				"navigationBarTitleText": "商品分类"
-			}
-		},
-		{
-			"path": "pages/shop/ShoppingCart/index",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		{
-			"path": "pages/shop/StoreList/index",
-			"style": {
-				"navigationBarTitleText": "商家列表"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsList/index",
-			"style": {
-				"navigationBarTitleText": "商品列表"
-			}
-		},
-		{
-			"path": "pages/NotDefined/index",
-			"style": {
-				"navigationBarTitleText": "404"
-			}
-		},
-		{
-			"path": "pages/user/User/index",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsCollection/index",
-			"style": {
-				"navigationBarTitleText": "商品收藏"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsFoot/index",
-			"style": {
-				"navigationBarTitleText": "我的足迹"
-			}
-		},
-		{
-			"path": "pages/shop/news/NewsDetail/index",
-			"style": {
-				"navigationBarTitleText": "新闻详情"
-			}
-		},
-		{
-			"path": "pages/shop/news/NewsList/index",
-			"style": {
-				"navigationBarTitleText": "新闻列表"
-			}
-		},
-		{
-			"path": "pages/shop/EvaluateList/index",
-			"style": {
-				"navigationBarTitleText": "评价列表"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsEvaluate/index",
-			"style": {
-				"navigationBarTitleText": "商品评价"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsPromotion/index",
-			"style": {
-				"navigationBarTitleText": "促销商品"
-			}
-		},
-		{
-			"path": "pages/shop/HotNewGoods/index",
-			"style": {
-				"navigationBarTitleText": "热门商品"
-			}
-		},
-		{
-			"path": "pages/shop/GoodsCon/index",
-			"style": {
-				"navigationBarTitleText": "商品详情"
-			}
-		},
-		{
-			"path": "pages/user/BindingPhone/index",
-			"style": {
-				"navigationBarTitleText": "绑定手机号"
-			}
-		},
-		{
-			"path": "pages/user/address/AddAddress/index",
-			"style": {
-				"navigationBarTitleText": "新增收货地址"
-			}
-		},
-		{
-			"path": "pages/user/UserAccount/index",
-			"style": {
-				"navigationBarTitleText": "账户余额"
-			}
-		},
-		{
-			"path": "pages/user/address/AddressManagement/index",
-			"style": {
-				"navigationBarTitleText": "收货地址"
-			}
-		},
-		{
-			"path": "pages/user/promotion/Poster/index",
-			"style": {
-				"navigationBarTitleText": "推广名片"
-			}
-		},
-		{
-			"path": "pages/user/signIn/Sign/index",
-			"style": {
-				"navigationBarTitleText": "签到"
-			}
-		},
-		{
-			"path": "pages/user/signIn/SignRecord/index",
-			"style": {
-				"navigationBarTitleText": "签到记录"
-			}
-		},
-		{
-			"path": "pages/user/promotion/CashAudit/index",
-			"style": {
-				"navigationBarTitleText": "提现结果"
-			}
-		},
-		{
-			"path": "pages/user/promotion/PromoterOrder/index",
-			"style": {
-				"navigationBarTitleText": "分销详情"
-			}
-		},
-		{
-			"path": "pages/user/promotion/PromoterList/index",
-			"style": {
-				"navigationBarTitleText": "分销列表"
-			}
-		},
-		{
-			"path": "pages/user/promotion/UserPromotion/index",
-			"style": {
-				"navigationBarTitleText": "佣金"
-			}
-		},
-		{
-			"path": "pages/user/UserBill/index",
-			"style": {
-				"navigationBarTitleText": "账单记录"
-			}
-		},
-		{
-			"path": "pages/user/promotion/CashRecord/index",
-			"style": {
-				"navigationBarTitleText": "提现记录"
-			}
-		},
-		{
-			"path": "pages/user/promotion/CommissionDetails/index",
-			"style": {
-				"navigationBarTitleText": "佣金明细"
-			}
-		},
-		{
-			"path": "pages/user/signIn/Integral/index",
-			"style": {
-				"navigationBarTitleText": "我的积分"
-			}
-		},
-		{
-			"path": "pages/user/UserVip/index",
-			"style": {
-				"navigationBarTitleText": "用户vip"
-			}
-		},
-		{
-			"path": "pages/user/PersonalData/index",
-			"style": {
-				"navigationBarTitleText": "个人资料"
-			}
-		},
-		{
-			"path": "pages/user/coupon/UserCoupon/index",
-			"style": {
-				"navigationBarTitleText": "优惠券"
-			}
-		},
-		{
-			"path": "pages/user/coupon/GetCoupon/index",
-			"style": {
-				"navigationBarTitleText": "领取优惠券"
-			}
-		},
-		{
-			"path": "pages/user/promotion/UserCash/index",
-			"style": {
-				"navigationBarTitleText": "提现"
-			}
-		},
-		{
-			"path": "pages/user/CustomerList/index",
-			"style": {
-				"navigationBarTitleText": "客服列表"
-			}
-		},
-		{
-			"path": "pages/user/Recharge/index",
-			"style": {
-				"navigationBarTitleText": "充值"
-			}
-		},
-		{
-			"path": "pages/order/MyOrder/index",
-			"style": {
-				"navigationBarTitleText": "我的订单"
-			}
-		},
-		{
-			"path": "pages/order/Logistics/index",
-			"style": {
-				"navigationBarTitleText": "查看物流"
-			}
-		},
-		{
-			"path": "pages/order/OrderDetails/index",
-			"style": {
-				"navigationBarTitleText": "订单详情"
-			}
-		},
-		{
-			"path": "pages/order/OrderSubmission/index",
-			"style": {
-				"navigationBarTitleText": "提交订单"
-			}
-		},
-		{
-			"path": "pages/order/PaymentStatus/index",
-			"style": {
-				"navigationBarTitleText": "支付状态"
-			}
-		},
-		{
-			"path": "pages/order/GoodsReturn/index",
-			"style": {
-				"navigationBarTitleText": "商品退货"
-			}
-		},
-		{
-			"path": "pages/order/ReturnList/index",
-			"style": {
-				"navigationBarTitleText": "退货列表"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/OrderIndex/index",
-			"style": {
-				"navigationBarTitleText": "商家订单统计"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/AdminOrderList/index",
-			"style": {
-				"navigationBarTitleText": "订单"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/GoodsDeliver/index",
-			"style": {
-				"navigationBarTitleText": "发货"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/AdminOrder/index",
-			"style": {
-				"navigationBarTitleText": "商家订单列表"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/Statistics/index",
-			"style": {
-				"navigationBarTitleText": "商家统计数据"
-			}
-		},
-		{
-			"path": "pages/orderAdmin/OrderCancellation/index",
-			"style": {
-				"navigationBarTitleText": "商家核销订单"
-			}
-		},
-		{
-			"path": "pages/activity/Poster/index",
-			"style": {
-				"navigationBarTitleText": "推广海报"
-			}
-		},
-		{
-			"path": "pages/activity/DargainDetails/index",
-			"style": {
-				"navigationBarTitleText": "帮砍价"
-			}
-		},
-		{
-			"path": "pages/activity/GoodsBargain/index",
-			"style": {
-				"navigationBarTitleText": "砍价列表"
-			}
-		},
-		{
-			"path": "pages/activity/BargainRecord/index",
-			"style": {
-				"navigationBarTitleText": "砍价记录"
-			}
-		},
-		{
-			"path": "pages/activity/GoodsGroup/index",
-			"style": {
-				"navigationBarTitleText": "团购商品列表"
-			}
-		},
-		{
-			"path": "pages/activity/GroupDetails/index",
-			"style": {
-				"navigationBarTitleText": "团购商品详情"
-			}
-		},
-		{
-			"path": "pages/activity/GroupRule/index",
-			"style": {
-				"navigationBarTitleText": "团购规则"
-			}
-		},
-		{
-			"path": "pages/activity/GoodsSeckill/index",
-			"style": {
-				"navigationBarTitleText": "秒杀"
-			}
-		},
-		{
-			"path": "pages/activity/SeckillDetails/index",
-			"style": {
-				"navigationBarTitleText": "秒杀详情"
-			}
-		},
-		{
-			"path": "pages/map/index",
-			"style": {
-				"navigationBarTitleText": "地图"
-			}
-		},
-		{
-			"path": "pages/shop/Live/LiveList/index",
-			"style": {
-				"navigationBarTitleText": "直播列表"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "Yshop",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "default"
-
-	},
-	"tabBar": {
-		"color": "#282828",
-		"selectedColor": "#eb3729",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"height": "50px",
-		"fontSize": "10px",
-		"iconWidth": "24px",
-		"spacing": "3px",
-		"list": [{
-			"pagePath": "pages/home/index",
-			"iconPath": "static/icon-home.png",
-			"selectedIconPath": "static/icon-home-hot.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/shop/GoodsClass/index",
-			"iconPath": "static/icon-class.png",
-			"selectedIconPath": "static/icon-class-hot.png",
-			"text": "分类"
-		}, {
-			"pagePath": "pages/shop/ShoppingCart/index",
-			"iconPath": "static/icon-cart.png",
-			"selectedIconPath": "static/icon-cart-hot.png",
-			"text": "购物车"
-		}, {
-			"pagePath": "pages/user/User/index",
-			"iconPath": "static/icon-user.png",
-			"selectedIconPath": "static/icon-user-hot.png",
-			"text": "我的"
-		}]
-	}
+  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    {
+      "path": "pages/Loading/index",
+      "style": {
+        "navigationBarTitleText": "yshop商城"
+      }
+    },
+    {
+      "path": "pages/authorization/index",
+      "style": {
+        "navigationBarTitleText": "微信授权"
+      }
+    },
+    {
+      "path": "pages/user/Login/index",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/user/Register/index",
+      "style": {
+        "navigationBarTitleText": "注册"
+      }
+    },
+    {
+      "path": "pages/user/RetrievePassword/index",
+      "style": {
+        "navigationBarTitleText": "重置密码"
+      }
+    },
+    {
+      "path": "pages/launch/index",
+      "style": {
+        "navigationBarTitleText": "首页"
+      }
+    },
+    {
+      "path": "pages/home/index",
+      "style": {
+        "navigationBarTitleText": "yshop商城",
+        "navigationBarTextStyle": "white",
+        // "enablePullDownRefresh": true,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/shop/GoodSearch/index",
+      "style": {
+        "navigationBarTitleText": "搜索商品"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsClass/index",
+      "style": {
+        "navigationBarTitleText": "商品分类"
+      }
+    },
+    {
+      "path": "pages/shop/ShoppingCart/index",
+      "style": {
+        "navigationBarTitleText": "购物车"
+      }
+    },
+    {
+      "path": "pages/shop/StoreList/index",
+      "style": {
+        "navigationBarTitleText": "商家列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsList/index",
+      "style": {
+        "navigationBarTitleText": "商品列表"
+      }
+    },
+    {
+      "path": "pages/NotDefined/index",
+      "style": {
+        "navigationBarTitleText": "404"
+      }
+    },
+    {
+      "path": "pages/user/User/index",
+      "style": {
+        "navigationBarTitleText": "我的"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCollection/index",
+      "style": {
+        "navigationBarTitleText": "商品收藏"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsFoot/index",
+      "style": {
+        "navigationBarTitleText": "我的足迹"
+      }
+    },
+    {
+      "path": "pages/shop/news/NewsDetail/index",
+      "style": {
+        "navigationBarTitleText": "新闻详情"
+      }
+    },
+    {
+      "path": "pages/shop/news/NewsList/index",
+      "style": {
+        "navigationBarTitleText": "新闻列表"
+      }
+    },
+    {
+      "path": "pages/shop/EvaluateList/index",
+      "style": {
+        "navigationBarTitleText": "评价列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsEvaluate/index",
+      "style": {
+        "navigationBarTitleText": "商品评价"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsPromotion/index",
+      "style": {
+        "navigationBarTitleText": "促销商品"
+      }
+    },
+    {
+      "path": "pages/shop/HotNewGoods/index",
+      "style": {
+        "navigationBarTitleText": "热门商品"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCon/index",
+      "style": {
+        "navigationBarTitleText": "商品详情"
+      }
+    },
+    {
+      "path": "pages/shop/IntegralGoodsCon/index",
+      "style": {
+        "navigationBarTitleText": "积分商品详情"
+      }
+    },
+    {
+      "path": "pages/user/BindingPhone/index",
+      "style": {
+        "navigationBarTitleText": "绑定手机号"
+      }
+    },
+    {
+      "path": "pages/user/address/AddAddress/index",
+      "style": {
+        "navigationBarTitleText": "新增收货地址"
+      }
+    },
+    {
+      "path": "pages/user/UserAccount/index",
+      "style": {
+        "navigationBarTitleText": "账户余额"
+      }
+    },
+    {
+      "path": "pages/user/address/AddressManagement/index",
+      "style": {
+        "navigationBarTitleText": "收货地址"
+      }
+    },
+    {
+      "path": "pages/user/promotion/Poster/index",
+      "style": {
+        "navigationBarTitleText": "推广名片"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Sign/index",
+      "style": {
+        "navigationBarTitleText": "签到"
+      }
+    },
+    {
+      "path": "pages/user/signIn/SignRecord/index",
+      "style": {
+        "navigationBarTitleText": "签到记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CashAudit/index",
+      "style": {
+        "navigationBarTitleText": "提现结果"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterOrder/index",
+      "style": {
+        "navigationBarTitleText": "分销详情"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterList/index",
+      "style": {
+        "navigationBarTitleText": "分销列表"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserPromotion/index",
+      "style": {
+        "navigationBarTitleText": "佣金"
+      }
+    },
+    {
+      "path": "pages/user/UserBill/index",
+      "style": {
+        "navigationBarTitleText": "账单记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CashRecord/index",
+      "style": {
+        "navigationBarTitleText": "提现记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CommissionDetails/index",
+      "style": {
+        "navigationBarTitleText": "佣金明细"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Integral/index",
+      "style": {
+        "navigationBarTitleText": "我的积分"
+      }
+    },
+    {
+      "path": "pages/user/UserVip/index",
+      "style": {
+        "navigationBarTitleText": "用户vip"
+      }
+    },
+    {
+      "path": "pages/user/PersonalData/index",
+      "style": {
+        "navigationBarTitleText": "个人资料"
+      }
+    },
+    {
+      "path": "pages/user/coupon/UserCoupon/index",
+      "style": {
+        "navigationBarTitleText": "优惠券"
+      }
+    },
+    {
+      "path": "pages/user/coupon/GetCoupon/index",
+      "style": {
+        "navigationBarTitleText": "领取优惠券"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserCash/index",
+      "style": {
+        "navigationBarTitleText": "提现"
+      }
+    },
+    {
+      "path": "pages/user/CustomerList/index",
+      "style": {
+        "navigationBarTitleText": "客服列表"
+      }
+    },
+    {
+      "path": "pages/user/Recharge/index",
+      "style": {
+        "navigationBarTitleText": "充值"
+      }
+    },
+    {
+      "path": "pages/order/MyOrder/index",
+      "style": {
+        "navigationBarTitleText": "我的订单"
+      }
+    },
+    {
+      "path": "pages/order/Logistics/index",
+      "style": {
+        "navigationBarTitleText": "查看物流"
+      }
+    },
+    {
+      "path": "pages/order/OrderDetails/index",
+      "style": {
+        "navigationBarTitleText": "订单详情"
+      }
+    },
+    {
+      "path": "pages/order/OrderSubmission/index",
+      "style": {
+        "navigationBarTitleText": "提交订单"
+      }
+    },
+    {
+      "path": "pages/order/PaymentStatus/index",
+      "style": {
+        "navigationBarTitleText": "支付状态"
+      }
+    },
+    {
+      "path": "pages/order/GoodsReturn/index",
+      "style": {
+        "navigationBarTitleText": "商品退货"
+      }
+    },
+    {
+      "path": "pages/order/ReturnList/index",
+      "style": {
+        "navigationBarTitleText": "退货列表"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/OrderIndex/index",
+      "style": {
+        "navigationBarTitleText": "商家订单统计"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/AdminOrderList/index",
+      "style": {
+        "navigationBarTitleText": "订单"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/GoodsDeliver/index",
+      "style": {
+        "navigationBarTitleText": "发货"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/AdminOrder/index",
+      "style": {
+        "navigationBarTitleText": "商家订单列表"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/Statistics/index",
+      "style": {
+        "navigationBarTitleText": "商家统计数据"
+      }
+    },
+    {
+      "path": "pages/orderAdmin/OrderCancellation/index",
+      "style": {
+        "navigationBarTitleText": "商家核销订单"
+      }
+    },
+    {
+      "path": "pages/activity/Poster/index",
+      "style": {
+        "navigationBarTitleText": "推广海报"
+      }
+    },
+    {
+      "path": "pages/activity/DargainDetails/index",
+      "style": {
+        "navigationBarTitleText": "帮砍价"
+      }
+    },
+    {
+      "path": "pages/activity/GoodsBargain/index",
+      "style": {
+        "navigationBarTitleText": "砍价列表"
+      }
+    },
+    {
+      "path": "pages/activity/BargainRecord/index",
+      "style": {
+        "navigationBarTitleText": "砍价记录"
+      }
+    },
+    {
+      "path": "pages/activity/GoodsGroup/index",
+      "style": {
+        "navigationBarTitleText": "团购商品列表"
+      }
+    },
+    {
+      "path": "pages/activity/GroupDetails/index",
+      "style": {
+        "navigationBarTitleText": "团购商品详情"
+      }
+    },
+    {
+      "path": "pages/activity/GroupRule/index",
+      "style": {
+        "navigationBarTitleText": "团购规则"
+      }
+    },
+    {
+      "path": "pages/activity/GoodsSeckill/index",
+      "style": {
+        "navigationBarTitleText": "秒杀"
+      }
+    },
+    {
+      "path": "pages/activity/SeckillDetails/index",
+      "style": {
+        "navigationBarTitleText": "秒杀详情"
+      }
+    },
+    {
+      "path": "pages/map/index",
+      "style": {
+        "navigationBarTitleText": "地图"
+      }
+    },
+    {
+      "path": "pages/shop/Live/LiveList/index",
+      "style": {
+        "navigationBarTitleText": "直播列表"
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "Yshop",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    "navigationStyle": "default"
+  },
+  "tabBar": {
+    "color": "#282828",
+    "selectedColor": "#eb3729",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "height": "50px",
+    "fontSize": "10px",
+    "iconWidth": "24px",
+    "spacing": "3px",
+    "list": [
+      {
+        "pagePath": "pages/home/index",
+        "iconPath": "static/icon-home.png",
+        "selectedIconPath": "static/icon-home-hot.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/shop/GoodsClass/index",
+        "iconPath": "static/icon-class.png",
+        "selectedIconPath": "static/icon-class-hot.png",
+        "text": "分类"
+      },
+      {
+        "pagePath": "pages/shop/ShoppingCart/index",
+        "iconPath": "static/icon-cart.png",
+        "selectedIconPath": "static/icon-cart-hot.png",
+        "text": "购物车"
+      },
+      {
+        "pagePath": "pages/user/User/index",
+        "iconPath": "static/icon-user.png",
+        "selectedIconPath": "static/icon-user-hot.png",
+        "text": "我的"
+      }
+    ]
+  }
 }
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 96e1e74..284cd0c 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -2,10 +2,8 @@
   <view class="order-submission">
     <view class="allAddress" :style="systemStore ? '' : 'padding-top: 0.2*100rpx'">
       <view class="nav acea-row">
-        <view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)"
-          v-if="systemStore"></view>
-        <view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)"
-          v-if="systemStore"></view>
+        <view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)" v-if="systemStore"></view>
+        <view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)" v-if="systemStore && !isIntegral"></view>
       </view>
       <view class="address acea-row row-between-wrapper" v-if="shipping_type === 0" @click="addressTap">
         <view class="addressCon" v-if="addressInfo.realName">
@@ -15,7 +13,7 @@
           </view>
           <view>
             <text class="default font-color-red" v-if="addressInfo.isDefault">[默认]</text>
-            {{ addressInfo.province }}{{ addressInfo.city}}{{ addressInfo.district }}{{ addressInfo.detail }}
+            {{ addressInfo.province }}{{ addressInfo.city }}{{ addressInfo.district }}{{ addressInfo.detail }}
           </view>
         </view>
         <view class="addressCon" v-else>
@@ -27,14 +25,14 @@
         <div class="addressCon" v-if="storeItems">
           <div class="name">
             {{ storeItems.name }}
-            <span class="phone">{{storeItems.phone }}</span>
+            <span class="phone">{{ storeItems.phone }}</span>
           </div>
-          <div>{{ storeItems.address}}</div>
+          <div>{{ storeItems.address }}</div>
         </div>
         <div class="addressCon" v-else>
           <div class="name">
             {{ systemStore.name }}
-            <span class="phone">{{systemStore.phone}}</span>
+            <span class="phone">{{ systemStore.phone }}</span>
           </div>
           <div>{{ systemStore.address }}</div>
         </div>
@@ -46,10 +44,10 @@
     </view>
     <OrderGoods :evaluate="0" :isIntegral="isIntegral" :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
     <view class="wrapper">
-      <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false  && !isIntegral">
+      <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false && !isIntegral">
         <view>优惠券</view>
         <view class="discount">
-          {{ usableCoupon.couponTitle || "请选择" }}
+          {{ usableCoupon.couponTitle || '请选择' }}
           <text class="iconfont icon-jiantou"></text>
         </view>
       </view>
@@ -75,11 +73,7 @@
       <view class="item acea-row row-between-wrapper" v-if="shipping_type === 0">
         <view>快递费用</view>
         <view class="discount">
-          {{
-          orderGroupInfo.priceGroup.storePostage > 0
-          ? orderGroupInfo.priceGroup.storePostage
-          : "免运费"
-          }}
+          {{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }}
         </view>
       </view>
       <view v-if="shipping_type === 1">
@@ -105,32 +99,22 @@
       <view class="item">
         <view>支付方式</view>
         <view class="list">
-          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
-            v-show="isWeixin">
-            <view class="name acea-row row-center-wrapper">
-              <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
-            </view>
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')" v-show="isWeixin">
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 </view>
             <view class="tip">微信快捷支付</view>
           </view>
-          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
-            v-show="!isWeixin">
-            <view class="name acea-row row-center-wrapper">
-              <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
-            </view>
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')" v-show="!isWeixin">
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 </view>
             <view class="tip">微信快捷支付</view>
           </view>
           <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
-            <view class="name acea-row row-center-wrapper">
-              <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付
-            </view>
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付 </view>
             <view class="tip">可用余额：{{ userInfo.nowMoney || 0 }}</view>
           </view>
-		  <view class="payItem acea-row row-middle" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')">
-		    <view class="name acea-row row-center-wrapper">
-		      <view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付
-		    </view>
-		    <view class="tip">可用积分：{{ userInfo.integral || 0 }}</view>
-		  </view>
+          <view class="payItem acea-row row-middle" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')">
+            <view class="name acea-row row-center-wrapper"> <view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付 </view>
+            <view class="tip">可用积分：{{ userInfo.integral || 0 }}</view>
+          </view>
         </view>
       </view>
     </view>
@@ -140,11 +124,11 @@
         <view class="money" v-if="!isIntegral">￥{{ orderPrice.totalPrice }}</view>
         <view class="money" v-if="isIntegral">{{ orderPrice.payIntegral }}积分</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.payPostage > 0  && !isIntegral">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.payPostage > 0 && !isIntegral">
         <view>运费：</view>
         <view class="money">￥{{ orderPrice.payPostage }}</view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="orderPrice.couponPrice > 0  && !isIntegral">
+      <view class="item acea-row row-between-wrapper" v-if="orderPrice.couponPrice > 0 && !isIntegral">
         <view>优惠券抵扣：</view>
         <view class="money">-￥{{ orderPrice.couponPrice }}</view>
       </view>
@@ -153,7 +137,7 @@
         <view class="money">-￥{{ orderPrice.deductionPrice }}</view>
       </view>
     </view>
-    <view style="height:120rpx"></view>
+    <view style="height: 120rpx"></view>
     <view class="footer acea-row row-between-wrapper">
       <view>
         合计:
@@ -162,417 +146,396 @@
       </view>
       <view class="settlement" @click="createOrder">立即结算</view>
     </view>
-    <CouponListWindow v-on:couponchange="changecoupon($event)" v-model="showCoupon" :price="orderPrice.totalPrice"
-      :checked="usableCoupon.id" @checked="changeCoupon" :cartid="cartid"></CouponListWindow>
-    <AddressWindow @checked="changeAddress" @redirect="addressRedirect" v-model="showAddress" :checked="addressInfo.id"
-      ref="mychild"></AddressWindow>
+    <CouponListWindow v-on:couponchange="changecoupon($event)" v-model="showCoupon" :price="orderPrice.totalPrice" :checked="usableCoupon.id" @checked="changeCoupon" :cartid="cartid"></CouponListWindow>
+    <AddressWindow @checked="changeAddress" @redirect="addressRedirect" v-model="showAddress" :checked="addressInfo.id" ref="mychild"></AddressWindow>
   </view>
 </template>
 <style scoped lang="less">
-  .order-submission .wrapper .shipping select {
-    color: #999;
-    padding-right: 0.15 * 100rpx;
-  }
+.order-submission .wrapper .shipping select {
+  color: #999;
+  padding-right: 0.15 * 100rpx;
+}
 
-  .order-submission .wrapper .shipping .iconfont {
-    font-size: 0.3 * 100rpx;
-    color: #515151;
-  }
+.order-submission .wrapper .shipping .iconfont {
+  font-size: 0.3 * 100rpx;
+  color: #515151;
+}
 
-  .order-submission .allAddress {
-    width: 100%;
-    background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
-    background-image: -webkit-linear-gradient(to bottom,
-        #eb3729 0%,
-        #eb3729 100%);
-    background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
-    padding-top: 1 * 100rpx;
-  }
+.order-submission .allAddress {
+  width: 100%;
+  background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  background-image: -webkit-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
+  padding-top: 1 * 100rpx;
+}
 
-  .order-submission .allAddress .nav {
-    margin: 0 auto;
-    padding: 0 30rpx;
-    width: 100%;
-    box-sizing: border-box;
-  }
+.order-submission .allAddress .nav {
+  margin: 0 auto;
+  padding: 0 30rpx;
+  width: 100%;
+  box-sizing: border-box;
+}
 
-  .order-submission .allAddress .nav .item {
-    flex: 1;
-    position: relative;
-  }
+.order-submission .allAddress .nav .item {
+  flex: 1;
+  position: relative;
+}
 
-  .order-submission .allAddress .nav .item.on {
-    position: relative;
-  }
+.order-submission .allAddress .nav .item.on {
+  position: relative;
+}
 
-  .order-submission .allAddress .nav .item.on:before {
-    position: absolute;
-    bottom: 0;
-    content: "快递配送";
-    font-size: 0.28 * 100rpx;
-    display: block;
-    height: 0;
-    left: 0;
-    right: 0;
-    border-width: 0.4 * 100rpx;
-    border-style: solid;
-    border-color: #fff;
-    z-index: 9;
-    text-align: center;
-    line-height: 0.14 * 100rpx;
-  }
+.order-submission .allAddress .nav .item.on:before {
+  position: absolute;
+  bottom: 0;
+  content: '快递配送';
+  font-size: 0.28 * 100rpx;
+  display: block;
+  height: 0;
+  left: 0;
+  right: 0;
+  border-width: 0.4 * 100rpx;
+  border-style: solid;
+  border-color: #fff;
+  z-index: 9;
+  text-align: center;
+  line-height: 0.14 * 100rpx;
+}
 
-  .order-submission .allAddress .nav .item:nth-of-type(2).on:before {
-    content: "到店自提";
-    border-width: 0.4 * 100rpx;
-  }
+.order-submission .allAddress .nav .item:nth-of-type(2).on:before {
+  content: '到店自提';
+  border-width: 0.4 * 100rpx;
+}
 
-  .order-submission .allAddress .nav .item.on2 {
-    position: relative;
-  }
+.order-submission .allAddress .nav .item.on2 {
+  position: relative;
+}
 
-  .order-submission .allAddress .nav .item.on2:before {
-    position: absolute;
-    bottom: 0;
-    content: "到店自提";
-    font-size: 0.28 * 100rpx;
-    display: block;
-    height: 0;
-    left: 0;
-    right: 0;
-    border-width: 0.4 * 100rpx;
-    border-style: solid;
-    border-color: #d5e6e6;
-    text-align: center;
-    line-height: 0.14 * 100rpx;
-  }
+.order-submission .allAddress .nav .item.on2:before {
+  position: absolute;
+  bottom: 0;
+  content: '到店自提';
+  font-size: 0.28 * 100rpx;
+  display: block;
+  height: 0;
+  left: 0;
+  right: 0;
+  border-width: 0.4 * 100rpx;
+  border-style: solid;
+  border-color: #d5e6e6;
+  text-align: center;
+  line-height: 0.14 * 100rpx;
+}
 
-  .order-submission .allAddress .nav .item:nth-of-type(1).on2:before {
-    content: "快递配送";
-    border-width: 0.4 * 100rpx;
-  }
+.order-submission .allAddress .nav .item:nth-of-type(1).on2:before {
+  content: '快递配送';
+  border-width: 0.4 * 100rpx;
+}
 
-  .order-submission .allAddress .address {
-    width: 6.91 * 100rpx;
-    height: 1.5 * 100rpx;
-    margin: 0 auto;
-    box-sizing: border-box;
-  }
+.order-submission .allAddress .address {
+  width: 6.91 * 100rpx;
+  height: 1.5 * 100rpx;
+  margin: 0 auto;
+  box-sizing: border-box;
+}
 
-  .order-submission .allAddress .line {
-    width: 7.1 * 100rpx;
-    margin: 0 auto;
-  }
+.order-submission .allAddress .line {
+  width: 7.1 * 100rpx;
+  margin: 0 auto;
+}
 
-  .order-submission .wrapper .item .discount input::placeholder {
-    color: #ccc;
-  }
+.order-submission .wrapper .item .discount input::placeholder {
+  color: #ccc;
+}
 </style>
 <script>
-  import OrderGoods from "@/components/OrderGoods";
-  import CouponListWindow from "@/components/CouponListWindow";
-  import AddressWindow from "@/components/AddressWindow";
-  import {
-    postOrderConfirm,
-    postOrderComputed,
-    createOrder
-  } from "@/api/order";
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    handleOrderPayResults,
-    subscribeMessage
-  } from "@/libs/order";
-  import {
-    weappPay
-  } from "@/libs/wechat";
-  import {
-    isWeixin,
-    handleErrorMessage
-  } from "@/utils";
+import OrderGoods from '@/components/OrderGoods'
+import CouponListWindow from '@/components/CouponListWindow'
+import AddressWindow from '@/components/AddressWindow'
+import { postOrderConfirm, postOrderComputed, createOrder } from '@/api/order'
+import { mapGetters } from 'vuex'
+import { handleOrderPayResults, subscribeMessage } from '@/libs/order'
+import { weappPay } from '@/libs/wechat'
+import { isWeixin, handleErrorMessage } from '@/utils'
 
-  const NAME = "OrderSubmission",
-    _isWeixin = isWeixin();
-  export default {
-    name: NAME,
-    components: {
-      OrderGoods,
-      CouponListWindow,
-      AddressWindow,
-    },
-    props: {},
-    data: function () {
-      return {
-        offlinePayStatus: 2,
-        from: this.$deviceType,
-        deduction: true,
-        enableIntegral: true,
-        enableIntegralNum: 0,
-        isWeixin: _isWeixin,
-        pinkId: 0,
-        active: _isWeixin ? "weixin" : "yue",
-        showCoupon: false,
-        showAddress: false,
-        addressInfo: {},
-        couponId: 0,
-        orderGroupInfo: {
-          priceGroup: {},
-        },
-        usableCoupon: {},
-        addressLoaded: false,
-        useIntegral: false,
-        orderPrice: {
-          payPrice: "计算中",
-        },
-        mark: "",
-        systemStore: {},
-        shipping_type: 0,
-        contacts: "",
-        contactsTel: "",
-        storeSelfMention: 0,
-        cartid: "",
-        isIntegral: false
-      };
-    },
-    computed: mapGetters(["userInfo", "storeItems"]),
-    watch: {
-      useIntegral() {
-        this.computedPrice();
+const NAME = 'OrderSubmission',
+  _isWeixin = isWeixin()
+export default {
+  name: NAME,
+  components: {
+    OrderGoods,
+    CouponListWindow,
+    AddressWindow,
+  },
+  props: {},
+  data: function () {
+    return {
+      offlinePayStatus: 2,
+      from: this.$deviceType,
+      deduction: true,
+      enableIntegral: true,
+      enableIntegralNum: 0,
+      isWeixin: _isWeixin,
+      pinkId: 0,
+      active: _isWeixin ? 'weixin' : 'yue',
+      showCoupon: false,
+      showAddress: false,
+      addressInfo: {},
+      couponId: 0,
+      orderGroupInfo: {
+        priceGroup: {},
       },
-      $yroute(n) {
-        if (n.name === NAME) this.getCartInfo();
-      },
-      shipping_type() {
-        this.computedPrice();
+      usableCoupon: {},
+      addressLoaded: false,
+      useIntegral: false,
+      orderPrice: {
+        payPrice: '计算中',
       },
+      mark: '',
+      systemStore: {},
+      shipping_type: 0,
+      contacts: '',
+      contactsTel: '',
+      storeSelfMention: 0,
+      cartid: '',
+      isIntegral: false,
+    }
+  },
+  computed: mapGetters(['userInfo', 'storeItems']),
+  watch: {
+    useIntegral() {
+      this.computedPrice()
     },
-    onShow: function () {
-      let that = this;
-      this.$store.dispatch("getUser", true);
-      that.getCartInfo();
-      console.log(that.$yroute);
-      if (that.$yroute.query.pinkid !== undefined) {
-        that.pinkId = that.$yroute.query.pinkid;
-      }
-      this.isIntegral = that.$yroute.query.isIntegral == 'true'
-      this.useIntegral = this.isIntegral
-      if(this.isIntegral){
-        this.active='integral'
+    $yroute(n) {
+      if (n.name === NAME) this.getCartInfo()
+    },
+    shipping_type() {
+      this.computedPrice()
+    },
+  },
+  onShow: function () {
+    let that = this
+    this.$store.dispatch('getUser', true)
+    that.getCartInfo()
+    console.log(that.$yroute)
+    if (that.$yroute.query.pinkid !== undefined) {
+      that.pinkId = that.$yroute.query.pinkid
+    }
+    this.isIntegral = that.$yroute.query.isIntegral == 'true'
+    this.useIntegral = this.isIntegral
+    if (this.isIntegral) {
+      this.active = 'integral'
+    }
+    if (that.$yroute.query.id !== undefined) {
+      that.cartid = that.$yroute.query.id
+      console.log(that.cartid)
+    }
+  },
+  methods: {
+    showStoreList() {
+      this.$store.commit('get_to', 'orders')
+      this.$yrouter.push({
+        path: '/pages/shop/StoreList/index',
+      })
+    },
+    addressType: function (index) {
+      if (index && !this.systemStore.id) {
+        uni.showToast({
+          title: '暂无门店信息，您无法选择到店自提！',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
       }
-      if (that.$yroute.query.id !== undefined) {
-        that.cartid = that.$yroute.query.id;
-        console.log(that.cartid);
+      console.log(this)
+      this.shipping_type = index
+    },
+    changeUseIntegral: function (e) {
+      // this.computedPrice();
+      if (this.isIntegral) {
+        return
       }
+      this.useIntegral = e.mp.detail.value[0]
     },
-    methods: {
-      showStoreList() {
-        this.$store.commit("get_to", "orders");
-        this.$yrouter.push({
-          path: "/pages/shop/StoreList/index",
-        });
-      },
-      addressType: function (index) {
-        if (index && !this.systemStore.id) {
+    computedPrice() {
+      let shipping_type = this.shipping_type
+      postOrderComputed(this.orderGroupInfo.orderKey, {
+        addressId: this.addressInfo.id,
+        useIntegral: this.useIntegral ? 1 : 0,
+        couponId: this.usableCoupon.id || 0,
+        shipping_type: parseInt(shipping_type) + 1,
+      }).then(res => {
+        const data = res.data
+        if (data.status === 'EXTEND_ORDER') {
+          this.$yrouter.replace({
+            path: '/pages/order/OrderDetails/index',
+            query: {
+              id: data.result.orderId,
+            },
+          })
+        } else {
+          this.orderPrice = data.result
+        }
+      })
+    },
+    getCartInfo() {
+      const cartIds = this.$yroute.query.id
+      if (!cartIds) {
+        uni.showToast({
+          title: '参数有误',
+          icon: 'none',
+          duration: 2000,
+        })
+        return this.$yrouter.back()
+      }
+      postOrderConfirm(cartIds)
+        .then(res => {
+          console.log(res, 999999)
+          console.log(res.data.systemStore || {}, 999999)
+          this.offlinePayStatus = res.data.offline_pay_status
+          this.orderGroupInfo = res.data
+          this.deduction = res.data.deduction
+          this.usableCoupon = res.data.usableCoupon || {}
+          this.addressInfo = res.data.addressInfo || {}
+          // 用来显示到店自提的店铺地址
+          this.systemStore = res.data.systemStore || {}
+          this.storeSelfMention = res.data.storeSelfMention
+          this.computedPrice()
+        })
+        .catch(() => {
           uni.showToast({
-            title: "暂无门店信息，您无法选择到店自提！",
-            icon: "none",
+            title: '加载订单数据失败',
+            icon: 'none',
             duration: 2000,
-          });
-          return;
+          })
+        })
+    },
+    addressTap: function () {
+      this.showAddress = true
+      if (!this.addressLoaded) {
+        this.addressLoaded = true
+        this.$refs.mychild.getAddressList()
+      }
+    },
+    addressRedirect() {
+      this.addressLoaded = false
+      this.showAddress = false
+    },
+    couponTap: function () {
+      this.showCoupon = true
+    },
+    changeCoupon: function (coupon) {
+      if (!coupon) {
+        this.usableCoupon = {
+          couponTitle: '不使用优惠券',
+          id: 0,
         }
-        console.log(this);
-        this.shipping_type = index;
-      },
-      changeUseIntegral: function (e) {
-        // this.computedPrice();
-        if (this.isIntegral) {
+      } else {
+        this.usableCoupon = coupon
+      }
+      this.computedPrice()
+    },
+    payItem: function (index) {
+      this.active = index
+    },
+    changeAddress(addressInfo) {
+      this.addressInfo = addressInfo
+      this.computedPrice()
+    },
+    createOrder() {
+      if (this.isIntegral) {
+        // 积分支付
+        if (this.userInfo.integral < this.orderPrice.payIntegral) {
+          uni.showToast({
+            title: '积分不足',
+            icon: 'none',
+            duration: 2000,
+          })
           return
         }
-        this.useIntegral = e.mp.detail.value[0];
-      },
-      computedPrice() {
-        let shipping_type = this.shipping_type;
-        postOrderComputed(this.orderGroupInfo.orderKey, {
-          addressId: this.addressInfo.id,
-          useIntegral: this.useIntegral ? 1 : 0,
-          couponId: this.usableCoupon.id || 0,
-          shipping_type: parseInt(shipping_type) + 1,
-        }).then((res) => {
-          const data = res.data;
-          if (data.status === "EXTEND_ORDER") {
-            this.$yrouter.replace({
-              path: "/pages/order/OrderDetails/index",
-              query: {
-                id: data.result.orderId,
-              },
-            });
-          } else {
-            this.orderPrice = data.result;
-          }
-        });
-      },
-      getCartInfo() {
-        const cartIds = this.$yroute.query.id;
-        if (!cartIds) {
+        this.active = 'integral'
+      }
+      let shipping_type = this.shipping_type
+      if (!this.isIntegral && !this.active) {
+        uni.showToast({
+          title: '请选择支付方式',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+      if (!this.addressInfo.id && !this.shipping_type) {
+        uni.showToast({
+          title: '请选择收货地址',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+
+      if (this.shipping_type) {
+        if ((this.contacts === '' || this.contactsTel === '') && this.shipping_type) {
           uni.showToast({
-            title: "参数有误",
-            icon: "none",
+            title: '请填写联系人或联系人电话',
+            icon: 'none',
             duration: 2000,
-          });
-          return this.$yrouter.back();
-        }
-        postOrderConfirm(cartIds)
-          .then((res) => {
-            console.log(res, 999999);
-            console.log(res.data.systemStore || {}, 999999);
-            this.offlinePayStatus = res.data.offline_pay_status;
-            this.orderGroupInfo = res.data;
-            this.deduction = res.data.deduction;
-            this.usableCoupon = res.data.usableCoupon || {};
-            this.addressInfo = res.data.addressInfo || {};
-            // 用来显示到店自提的店铺地址
-            this.systemStore = res.data.systemStore || {};
-            this.storeSelfMention = res.data.storeSelfMention;
-            this.computedPrice();
           })
-          .catch(() => {
-            uni.showToast({
-              title: "加载订单数据失败",
-              icon: "none",
-              duration: 2000,
-            });
-          });
-      },
-      addressTap: function () {
-        this.showAddress = true;
-        if (!this.addressLoaded) {
-          this.addressLoaded = true;
-          this.$refs.mychild.getAddressList();
-        }
-      },
-      addressRedirect() {
-        this.addressLoaded = false;
-        this.showAddress = false;
-      },
-      couponTap: function () {
-        this.showCoupon = true;
-      },
-      changeCoupon: function (coupon) {
-        if (!coupon) {
-          this.usableCoupon = {
-            couponTitle: "不使用优惠券",
-            id: 0,
-          };
-        } else {
-          this.usableCoupon = coupon;
-        }
-        this.computedPrice();
-      },
-      payItem: function (index) {
-        this.active = index;
-      },
-      changeAddress(addressInfo) {
-        this.addressInfo = addressInfo;
-        this.computedPrice();
-      },
-      createOrder() {
-        if (this.isIntegral) {
-          // 积分支付
-          if (this.userInfo.integral < this.orderPrice.payIntegral) {
-            uni.showToast({
-              title: "积分不足",
-              icon: "none",
-              duration: 2000,
-            });
-            return
-          }
-          this.active = 'integral'
+          return
         }
-        let shipping_type = this.shipping_type;
-        if (!this.isIntegral && !this.active) {
+
+        if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) {
           uni.showToast({
-            title: "请选择支付方式",
-            icon: "none",
+            title: '请填写正确的手机号',
+            icon: 'none',
             duration: 2000,
-          });
-          return;
+          })
+          return
         }
-        if (!this.addressInfo.id && !this.shipping_type) {
+        if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) {
           uni.showToast({
-            title: "请选择收货地址",
-            icon: "none",
+            title: '请填写您的真实姓名',
+            icon: 'none',
             duration: 2000,
-          });
-          return;
-        }
-
-        if (this.shipping_type) {
-          if (
-            (this.contacts === "" || this.contactsTel === "") &&
-            this.shipping_type
-          ) {
-            uni.showToast({
-              title: "请填写联系人或联系人电话",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
-
-          if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) {
-            uni.showToast({
-              title: "请填写正确的手机号",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
-          if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) {
-            uni.showToast({
-              title: "请填写您的真实姓名",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
+          })
+          return
         }
+      }
 
-        uni.showLoading({
-          title: "生成订单中",
-        });
-        let from = {};
-        if (this.$deviceType == "app") {
-          from.from = "app";
-        }
-        // #ifdef MP-WEIXIN
-        subscribeMessage()
-        // #endif
-        createOrder(this.orderGroupInfo.orderKey, {
-            realName: this.contacts,
-            phone: this.contactsTel,
-            addressId: this.addressInfo.id,
-            useIntegral: this.useIntegral ? 1 : 0,
-            couponId: this.usableCoupon.id || 0,
-            payType: this.active,
-            pinkId: this.pinkId,
-            seckillId: this.orderGroupInfo.seckill_id,
-            combinationId: this.orderGroupInfo.combination_id,
-            bargainId: this.orderGroupInfo.bargain_id,
-            from: this.from,
-            mark: this.mark || "",
-            shippingType: parseInt(shipping_type) + 1,
-            storeId: this.storeItems ? this.storeItems.id : this.systemStore.id,
-            ...from,
-          })
-          .then((res) => {
-            uni.hideLoading();
-            handleOrderPayResults.call(this, res.data, "create", this.active);
-          })
-          .catch((err) => {
-            handleErrorMessage(err, "创建订单失败");
-          });
-      },
+      uni.showLoading({
+        title: '生成订单中',
+      })
+      let from = {}
+      if (this.$deviceType == 'app') {
+        from.from = 'app'
+      }
+      // #ifdef MP-WEIXIN
+      subscribeMessage()
+      // #endif
+      createOrder(this.orderGroupInfo.orderKey, {
+        realName: this.contacts,
+        phone: this.contactsTel,
+        addressId: this.addressInfo.id,
+        useIntegral: this.useIntegral ? 1 : 0,
+        couponId: this.usableCoupon.id || 0,
+        payType: this.active,
+        pinkId: this.pinkId,
+        seckillId: this.orderGroupInfo.seckill_id,
+        combinationId: this.orderGroupInfo.combination_id,
+        bargainId: this.orderGroupInfo.bargain_id,
+        from: this.from,
+        mark: this.mark || '',
+        shippingType: parseInt(shipping_type) + 1,
+        storeId: this.storeItems ? this.storeItems.id : this.systemStore.id,
+        ...from,
+      })
+        .then(res => {
+          uni.hideLoading()
+          handleOrderPayResults.call(this, res.data, 'create', this.active)
+        })
+        .catch(err => {
+          handleErrorMessage(err, '创建订单失败')
+        })
     },
-  };
+  },
+}
 </script>
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 1e9c5ff..b0b776a 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -9,17 +9,12 @@
         <view class="share acea-row row-between row-bottom">
           <view class="money font-color-red" v-if="!isIntegral">
             <text>￥</text>
-            <text class="num">{{
-              attr.productSelect.price || storeInfo.price
-            }}</text>
-            <text class="vip-money"
-              v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text>
+            <text class="num">{{ attr.productSelect.price || storeInfo.price }}</text>
+            <text class="vip-money" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text>
             <image src="@/static/images/vip.png" class="image" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" />
           </view>
           <view class="money font-color-red" v-if="isIntegral">
-            <text class="num">{{
-              attr.productSelect.integral || storeInfo.integral
-            }}积分</text>
+            <text class="num">{{ attr.productSelect.integral || storeInfo.integral }}积分</text>
           </view>
           <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
         </view>
@@ -32,8 +27,7 @@
         <view class="coupon acea-row row-between-wrapper" @click="couponTap" v-if="couponList.length">
           <text class="hide line1">
             <text>优惠券：</text>
-            <text class="activity" v-for="(item, couponListEq) in couponList"
-              :key="couponListEq">满{{ item.useMinPrice }}减{{ item.couponPrice }}</text>
+            <text class="activity" v-for="(item, couponListEq) in couponList" :key="couponListEq">满{{ item.useMinPrice }}减{{ item.couponPrice }}</text>
           </text>
           <view class="iconfont icon-jiantou"></view>
         </view>
@@ -98,7 +92,7 @@
       </view>
 
       <!-- 商品推荐 -->
-      <view class="superior">
+      <!-- <view class="superior">
         <view class="title acea-row row-center-wrapper">
           <image src="@/static/images/ling.png" />
           <text class="titleTxt">优品推荐</text>
@@ -122,7 +116,7 @@
             </swiper>
           </view>
         </template>
-      </view>
+      </view> -->
 
       <!-- 商品详情 -->
       <view class="product-intro">
@@ -157,17 +151,13 @@
         </view>
         <view @click="goShoppingCart()" v-if="animated" class="item animated bounceIn">
           <view class="iconfont icon-gouwuche1">
-            <text class="num bg-color-red" v-if="CartCount > 0">{{
-              CartCount
-            }}</text>
+            <text class="num bg-color-red" v-if="CartCount > 0">{{ CartCount }}</text>
           </view>
           <text>购物车</text>
         </view>
         <view @click="goShoppingCart()" class="item animated" v-if="!animated">
           <view class="iconfont icon-gouwuche1">
-            <text class="num bg-color-red" v-if="CartCount > 0">{{
-              CartCount
-            }}</text>
+            <text class="num bg-color-red" v-if="CartCount > 0">{{ CartCount }}</text>
           </view>
           <text>购物车</text>
         </view>
@@ -186,8 +176,7 @@
       <!-- 商品规格弹窗 -->
       <ProductWindow :isIntegral="isIntegral" v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
       <!-- 分享海报 -->
-      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
-        :posterData="posterData" :goodId="id"></StorePoster>
+      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData" :goodId="id"></StorePoster>
       <!-- 分享弹窗 -->
       <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
 
@@ -212,853 +201,788 @@
 </template>
 
 <script>
-  // import { swiper, swiperSlide } from "vue-awesome-swiper";
-
-  import ProductConSwiper from "@/components/ProductConSwiper";
-  import UserEvaluation from "@/components/UserEvaluation";
-  import CouponPop from "@/components/CouponPop";
-  import ProductWindow from "@/components/ProductWindow";
-  import StorePoster from "@/components/StorePoster";
-  import ShareInfo from "@/components/ShareInfo";
-  import {
-    getProductDetail,
-    postCartAdd,
-    getCartCount,
-    getProductCode,
-  } from "@/api/store";
-  import {
-    getCoupon,
-    getCollectAdd,
-    getCollectDel,
-    getUserInfo,
-  } from "@/api/user";
-  import cookie from "@/utils/store/cookie";
-  import {
-    isWeixin,
-    PosterCanvas,
-    handleQrCode,
-    handleUrlParam,
-    getCurrentPageUrlWithArgs,
-  } from "@/utils";
-  import {
-    wechatEvevt
-  } from "@/libs/wechat";
-  import {
-    imageBase64
-  } from "@/api/public";
-  import {
-    mapGetters
-  } from "vuex";
-
-  export default {
-    name: "GoodsCon",
-    components: {
-      // swiper,
-      // swiperSlide,
-      ProductConSwiper,
-      UserEvaluation,
-      CouponPop,
-      ProductWindow,
-      StorePoster,
-      ShareInfo,
+// import { swiper, swiperSlide } from "vue-awesome-swiper";
+
+import ProductConSwiper from '@/components/ProductConSwiper'
+import UserEvaluation from '@/components/UserEvaluation'
+import CouponPop from '@/components/CouponPop'
+import ProductWindow from '@/components/ProductWindow'
+import StorePoster from '@/components/StorePoster'
+import ShareInfo from '@/components/ShareInfo'
+import { getProductDetail, postCartAdd, getCartCount, getProductCode } from '@/api/store'
+import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
+import cookie from '@/utils/store/cookie'
+import { isWeixin, PosterCanvas, handleQrCode, handleUrlParam, getCurrentPageUrlWithArgs } from '@/utils'
+import { wechatEvevt } from '@/libs/wechat'
+import { imageBase64 } from '@/api/public'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'GoodsCon',
+  components: {
+    // swiper,
+    // swiperSlide,
+    ProductConSwiper,
+    UserEvaluation,
+    CouponPop,
+    ProductWindow,
+    StorePoster,
+    ShareInfo,
+  },
+  data: function () {
+    return {
+      shareInfoStatus: false,
+      weixinStatus: false,
+      mapShow: false,
+      mapKey: '',
+      posterData: {
+        image: '',
+        title: '',
+        price: '',
+        code: '',
+      },
+      posterImageStatus: false,
+      animated: false,
+      coupon: {
+        coupon: false,
+        list: [],
+      },
+      attr: {
+        cartAttr: false,
+        productAttr: [],
+        productSelect: {},
+      },
+      isOpen: false, //是否打开属性组件
+      productValue: [],
+      id: 0,
+      storeInfo: {},
+      couponList: [],
+      attrTxt: '请选择',
+      attrValue: '',
+      cart_num: 1, //购买数量
+      replyCount: '',
+      replyChance: '',
+      reply: [],
+      priceName: 0,
+      CartCount: 0,
+      posters: false,
+      banner: [{}, {}],
+      swiperRecommend: {
+        pagination: {
+          el: '.swiper-pagination',
+          clickable: true,
+        },
+        autoplay: false,
+        loop: false,
+        speed: 1000,
+        observer: true,
+        observeParents: true,
+      },
+      goodList: [],
+      systemStore: {},
+      qqmapsdk: null,
+      productConClass: 'product-con',
+      tempName: '全国包邮',
+      isIntegral: false,
+    }
+  },
+  computed: mapGetters(['isLogin', 'location']),
+  mounted: function () {
+    this.$store.commit('get_to', 'goodcon')
+    let url = handleQrCode()
+    if (!url) {
+      url = handleUrlParam(getCurrentPageUrlWithArgs())
+    }
+    this.coupons()
+    if (url && url.id) {
+      this.id = url.id
+      let urlSpread = parseInt(url.spread)
+      if (urlSpread) {
+        cookie.set('spread', urlSpread)
+      }
+    } else {
+      this.id = this._route.query.id
+    }
+    this.isIntegral = url.isIntegral == 'true'
+    this.productCon()
+    this.setOpenShare()
+  },
+  watch: {
+    posterImageStatus(status) {
+      console.log(status)
+      if (status) {
+        this.productConClass = 'noscroll product-con'
+      } else {
+        this.productConClass = 'product-con'
+      }
     },
-    data: function () {
+  },
+  methods: {
+    onShareAppMessage: function () {
       return {
-        shareInfoStatus: false,
-        weixinStatus: false,
-        mapShow: false,
-        mapKey: "",
-        posterData: {
-          image: "",
-          title: "",
-          price: "",
-          code: "",
+        title: this.storeInfo.storeName,
+        imageUrl: this.storeInfo.image,
+        path: 'pages/shop/GoodsCon/index?id=' + this.storeInfo.id + '&spread=' + uni.getStorageSync('uid') + '&pageType=good&codeType=routine',
+        success(res) {
+          uni.showToast({
+            title: '分享成功',
+          })
         },
-        posterImageStatus: false,
-        animated: false,
-        coupon: {
-          coupon: false,
-          list: [],
+        fail(res) {
+          uni.showToast({
+            title: '分享失败',
+            icon: 'none',
+          })
         },
-        attr: {
-          cartAttr: false,
-          productAttr: [],
-          productSelect: {},
+      }
+    },
+    goHome() {
+      this.$yrouter.switchTab('/pages/home/index')
+    },
+    goShoppingCart() {
+      this.$yrouter.switchTab('/pages/shop/ShoppingCart/index')
+    },
+    goCustomerList() {
+      this.$yrouter.push({
+        path: '/pages/user/CustomerList/index',
+      })
+    },
+    goStoreList() {
+      this.$yrouter.push({
+        path: '/pages/shop/StoreList/index',
+      })
+    },
+    goEvaluateList(id) {
+      this.$yrouter.push({
+        path: '/pages/shop/EvaluateList/index',
+        query: {
+          id,
         },
-        isOpen: false, //是否打开属性组件
-        productValue: [],
-        id: 0,
-        storeInfo: {},
-        couponList: [],
-        attrTxt: "请选择",
-        attrValue: "",
-        cart_num: 1, //购买数量
-        replyCount: "",
-        replyChance: "",
-        reply: [],
-        priceName: 0,
-        CartCount: 0,
-        posters: false,
-        banner: [{}, {}],
-        swiperRecommend: {
-          pagination: {
-            el: ".swiper-pagination",
-            clickable: true,
-          },
-          autoplay: false,
-          loop: false,
-          speed: 1000,
-          observer: true,
-          observeParents: true,
+      })
+    },
+    telPhone(phoneNumber) {
+      uni.makePhoneCall({
+        phoneNumber: phoneNumber,
+        fail() {
+          console.log('取消拨打')
         },
-        goodList: [],
-        systemStore: {},
-        qqmapsdk: null,
-        productConClass: "product-con",
-        tempName: "全国包邮",
-        isIntegral: false
-      };
+      })
     },
-    computed: mapGetters(["isLogin", "location"]),
-    mounted: function () {
-      this.$store.commit("get_to", "goodcon");
-      let url = handleQrCode();
-      if (!url) {
-        url = handleUrlParam(getCurrentPageUrlWithArgs());
-      }
-      this.coupons();
-      if (url && url.id) {
-        this.id = url.id;
-        let urlSpread = parseInt(url.spread);
-        if (urlSpread) {
-          cookie.set("spread", urlSpread);
-        }
-      } else {
-        this.id = this._route.query.id;
-      }
-      this.isIntegral = url.isIntegral == 'true'
-      this.productCon();
-      this.setOpenShare();
+    showChang: function (data) {
+      this.$yrouter.push({
+        path: '/pages/map/index',
+        query: data,
+      })
     },
-    watch: {
-      posterImageStatus(status) {
-        console.log(status);
-        if (status) {
-          this.productConClass = "noscroll product-con";
-        } else {
-          this.productConClass = "product-con";
-        }
-      },
+    updateTitle() {
+      // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
     },
-    methods: {
-      onShareAppMessage: function () {
-        return {
-          title: this.storeInfo.storeName,
-          imageUrl: this.storeInfo.image,
-          path: "pages/shop/GoodsCon/index?id=" +
-            this.storeInfo.id +
-            "&spread=" +
-            uni.getStorageSync("uid") +
-            "&pageType=good&codeType=routine",
-          success(res) {
-            uni.showToast({
-              title: "分享成功",
-            });
-          },
-          fail(res) {
-            uni.showToast({
-              title: "分享失败",
-              icon: "none",
-            });
-          },
-        };
-      },
-      goHome() {
-        this.$yrouter.switchTab("/pages/home/index");
-      },
-      goShoppingCart() {
-        this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
-      },
-      goCustomerList() {
-        this.$yrouter.push({
-          path: "/pages/user/CustomerList/index",
-        });
-      },
-      goStoreList() {
-        this.$yrouter.push({
-          path: "/pages/shop/StoreList/index",
-        });
-      },
-      goEvaluateList(id) {
-        this.$yrouter.push({
-          path: "/pages/shop/EvaluateList/index",
-          query: {
-            id,
-          },
-        });
-      },
-      telPhone(phoneNumber) {
-        uni.makePhoneCall({
-          phoneNumber: phoneNumber,
-          fail() {
-            console.log("取消拨打");
-          },
-        });
-      },
-      showChang: function (data) {
-        this.$yrouter.push({
-          path: "/pages/map/index",
-          query: data,
-        });
-      },
-      updateTitle() {
-        // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
-      },
-      setShareInfoStatus: function () {
-        this.shareInfoStatus = !this.shareInfoStatus;
-        this.posters = false;
-      },
-      shareCode: function () {
-        var that = this;
-        getProductCode(that.id).then((res) => {
-          that.posterData.code = res.data.code;
-          that.listenerActionSheet();
-        });
-      },
-      setPosterImageStatus: function () {
-        this.posterImageStatus = !this.posterImageStatus;
-        this.posters = false;
-      },
-      //产品详情接口；
-      productCon: function () {
-        let that = this;
-        let from = this.location;
-        if (this.$deviceType == "app") {
-          from.from = "app";
-        }
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        getProductDetail(that.id, from)
-          .then((res) => {
-            res.data.storeInfo.description = res.data.storeInfo.description.replace(
-              /\<img/gi,
-              '<img style="max-width:100%;height:auto;"'
-            );
-            that.$set(that, "storeInfo", res.data.storeInfo);
-            // 给 attr 赋值，将请求回来的规格赋值给 attr
-            that.$set(that.attr, "productAttr", res.data.productAttr);
-            that.$set(that, "productValue", res.data.productValue);
-            that.$set(that, "replyCount", res.data.replyCount);
-            that.$set(that, "replyChance", res.data.replyChance);
-            that.reply = res.data.reply ? [res.data.reply] : [];
-            that.$set(that, "reply", that.reply);
-            that.$set(that, "priceName", res.data.priceName);
-            that.$set(that, "tempName", res.data.tempName);
-            that.posterData.image = that.storeInfo.image;
-            if (that.storeInfo.storeName.length > 30) {
-              that.posterData.title =
-                that.storeInfo.storeName.substring(0, 30) + "...";
-            } else {
-              that.posterData.title = that.storeInfo.storeName;
-            }
-            that.posterData.price = that.storeInfo.price;
-            that.posterData.code = that.storeInfo.codeBase;
-            that.systemStore = res.data.systemStore;
-            let good_list = res.data.goodList || [];
-            let goodArray = [];
-            let count = Math.ceil(good_list.length / 6);
-            for (let i = 0; i < count; i++) {
-              var list = good_list.slice(i * 6, 6);
-              if (list.length)
-                goodArray.push({
-                  list: list,
-                });
-            }
-            that.mapKay = res.data.mapKay;
-            that.$set(that, "goodList", goodArray);
-            that.updateTitle();
-            that.DefaultSelect();
-            that.getCartCount();
-          })
-          .catch((err) => {
-            uni.showToast({
-              title: err.msg || err.response.data.msg || err.response.data.message,
-              icon: "none",
-              duration: 2000,
-            });
-          })
-          .finally(() => {
-            uni.hideLoading();
-          });
-      },
-      //默认选中属性；
-      DefaultSelect: function () {
-        let productAttr = this.attr.productAttr;
-        let value = [];
-        for (let i = 0; i < productAttr.length; i++) {
-          this.$set(productAttr[i], "index", 0);
-          value.push(productAttr[i].attrValueArr[0]);
-        }
-        //sort();排序函数:数字-英文-汉字；
-        let productSelect = this.productValue[value.sort().join(",")];
-        if (productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-          );
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this.attr.productSelect, "integral", productSelect.integral);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", value.sort().join(","));
-          this.$set(this, "attrTxt", "已选择");
-        } else if (!productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "integral", this.storeInfo.integral);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        } else if (!productSelect && !productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-          this.$set(this.attr.productSelect, "integral", this.storeInfo.integral);
-          this.$set(
-            this.attr.productSelect,
-            "unique",
-            this.storeInfo.unique || ""
-          );
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        }
-      },
-      //购物车；
-      ChangeCartNum: function (changeValue) {
-        //changeValue:是否 加|减
-        //获取当前变动属性
-        let productSelect = this.productValue[this.attrValue];
-        //如果没有属性,赋值给商品默认库存
-        if (productSelect === undefined && !this.attr.productAttr.length) {
-          productSelect = this.attr.productSelect;
-        }
-        //无属性值即库存为0；不存在加减；
-        if (productSelect === undefined) return;
-        let stock = productSelect.stock || 0;
-        let num = this.attr.productSelect;
-        if (changeValue) {
-          num.cart_num++;
-          if (num.cart_num > stock) {
-            this.$set(this.attr.productSelect, "cart_num", stock);
-            this.$set(this, "cart_num", stock);
+    setShareInfoStatus: function () {
+      this.shareInfoStatus = !this.shareInfoStatus
+      this.posters = false
+    },
+    shareCode: function () {
+      var that = this
+      getProductCode(that.id).then(res => {
+        that.posterData.code = res.data.code
+        that.listenerActionSheet()
+      })
+    },
+    setPosterImageStatus: function () {
+      this.posterImageStatus = !this.posterImageStatus
+      this.posters = false
+    },
+    //产品详情接口；
+    productCon: function () {
+      let that = this
+      let from = this.location
+      if (this.$deviceType == 'app') {
+        from.from = 'app'
+      }
+      uni.showLoading({
+        title: '加载中',
+        mask: true,
+      })
+      getProductDetail(that.id, from)
+        .then(res => {
+          res.data.storeInfo.description = res.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+          that.$set(that, 'storeInfo', res.data.storeInfo)
+          // 给 attr 赋值，将请求回来的规格赋值给 attr
+          that.$set(that.attr, 'productAttr', res.data.productAttr)
+          that.$set(that, 'productValue', res.data.productValue)
+          that.$set(that, 'replyCount', res.data.replyCount)
+          that.$set(that, 'replyChance', res.data.replyChance)
+          that.reply = res.data.reply ? [res.data.reply] : []
+          that.$set(that, 'reply', that.reply)
+          that.$set(that, 'priceName', res.data.priceName)
+          that.$set(that, 'tempName', res.data.tempName)
+          that.posterData.image = that.storeInfo.image
+          if (that.storeInfo.storeName.length > 30) {
+            that.posterData.title = that.storeInfo.storeName.substring(0, 30) + '...'
           } else {
-            this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-            this.$set(this, "cart_num", num.cart_num);
+            that.posterData.title = that.storeInfo.storeName
           }
-        } else {
-          num.cart_num--;
-          if (num.cart_num < 1) {
-            this.$set(this.attr.productSelect, "cart_num", 1);
-            this.$set(this, "cart_num", 1);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-            this.$set(this, "cart_num", num.cart_num);
+          that.posterData.price = that.storeInfo.price
+          that.posterData.code = that.storeInfo.codeBase
+          that.systemStore = res.data.systemStore
+          let good_list = res.data.goodList || []
+          let goodArray = []
+          let count = Math.ceil(good_list.length / 6)
+          for (let i = 0; i < count; i++) {
+            var list = good_list.slice(i * 6, 6)
+            if (list.length)
+              goodArray.push({
+                list: list,
+              })
           }
-        }
-      },
-      //将父级向子集多次传送的函数合二为一；
-      changeFun: function (opt) {
-        if (typeof opt !== "object") opt = {};
-        let action = opt.action || "";
-        let value = opt.value === undefined ? "" : opt.value;
-        this[action] && this[action](value);
-      },
-      //打开优惠券插件；
-      couponTap: function () {
-        let that = this;
-        that.coupons();
-        that.coupon.coupon = true;
-      },
-      changecoupon: function (msg) {
-        this.coupon.coupon = msg;
-        this.coupons();
-      },
-      currentcoupon: function (res) {
-        let that = this;
-        that.coupon.coupon = false;
-        that.$set(that.coupon.list[res], "is_use", true);
-      },
-      //可领取优惠券接口；
-      coupons: function () {
-        let that = this,
-          q = {
-            page: 1,
-            limit: 20,
-          };
-        getCoupon(q).then((res) => {
-          that.$set(that, "couponList", res.data || []);
-          that.$set(that.coupon, "list", res.data);
-        });
-      },
-      //打开属性插件；
-      selecAttrTap: function () {
-        this.attr.cartAttr = true;
-        this.isOpen = true;
-      },
-      changeattr: function (msg) {
-        // 修改了规格
-        console.log(msg);
-        this.attr.cartAttr = msg;
-        this.isOpen = false;
-      },
-      //选择属性；
-      ChangeAttr: function (res) {
-        // 修改了规格
-
-        let productSelect = this.productValue[res.value];
-        console.log(productSelect);
-        if (productSelect) {
-          this.attr.productAttr[res.indexw].index = res.indexn;
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this.attr.productSelect, "integral", productSelect.integral);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", res.value);
-          this.$set(this, "attrTxt", "已选择");
-        } else {
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "integral", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        }
-      },
-      //收藏商品
-      setCollect: function () {
-        let that = this,
-          id = that.storeInfo.id,
-          category = "collect";
-        if (that.storeInfo.userCollect) {
-          getCollectDel(id, category).then(function () {
-            that.storeInfo.userCollect = !that.storeInfo.userCollect;
-          });
+          that.mapKay = res.data.mapKay
+          that.$set(that, 'goodList', goodArray)
+          that.updateTitle()
+          that.DefaultSelect()
+          that.getCartCount()
+        })
+        .catch(err => {
+          uni.showToast({
+            title: err.msg || err.response.data.msg || err.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+        .finally(() => {
+          uni.hideLoading()
+        })
+    },
+    //默认选中属性；
+    DefaultSelect: function () {
+      let productAttr = this.attr.productAttr
+      let value = []
+      for (let i = 0; i < productAttr.length; i++) {
+        this.$set(productAttr[i], 'index', 0)
+        value.push(productAttr[i].attrValueArr[0])
+      }
+      //sort();排序函数:数字-英文-汉字；
+      let productSelect = this.productValue[value.sort().join(',')]
+      if (productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', value.sort().join(','))
+        this.$set(this, 'attrTxt', '已选择')
+      } else if (!productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      } else if (!productSelect && !productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', this.storeInfo.stock)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'unique', this.storeInfo.unique || '')
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //购物车；
+    ChangeCartNum: function (changeValue) {
+      //changeValue:是否 加|减
+      //获取当前变动属性
+      let productSelect = this.productValue[this.attrValue]
+      //如果没有属性,赋值给商品默认库存
+      if (productSelect === undefined && !this.attr.productAttr.length) {
+        productSelect = this.attr.productSelect
+      }
+      //无属性值即库存为0；不存在加减；
+      if (productSelect === undefined) return
+      let stock = productSelect.stock || 0
+      let num = this.attr.productSelect
+      if (changeValue) {
+        num.cart_num++
+        if (num.cart_num > stock) {
+          this.$set(this.attr.productSelect, 'cart_num', stock)
+          this.$set(this, 'cart_num', stock)
         } else {
-          getCollectAdd(id, category).then(function () {
-            that.storeInfo.userCollect = !that.storeInfo.userCollect;
-          });
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
         }
-      },
-      //  点击加入购物车按钮
-      joinCart: function () {
-        //0=加入购物车
-        this.goCat(0);
-      },
-      // 加入购物车；
-      goCat: function (news) {
-        let that = this,
-          productSelect = that.productValue[this.attrValue];
-        //打开属性
-        if (that.attrValue) {
-          //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-          that.attr.cartAttr = !that.isOpen ? true : false;
+      } else {
+        num.cart_num--
+        if (num.cart_num < 1) {
+          this.$set(this.attr.productSelect, 'cart_num', 1)
+          this.$set(this, 'cart_num', 1)
         } else {
-          if (that.isOpen) that.attr.cartAttr = true;
-          else that.attr.cartAttr = !that.attr.cartAttr;
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
         }
-        //只有关闭属性弹窗时进行加入购物车
-        if (that.attr.cartAttr === true && that.isOpen === false)
-          return (that.isOpen = true);
-        //如果有属性,没有选择,提示用户选择
-        if (
-          that.attr.productAttr.length &&
-          productSelect === undefined &&
-          that.isOpen === true
-        ) {
-          uni.showToast({
-            title: "产品库存不足，请选择其它",
-            icon: "none",
-            duration: 2000,
-          });
-          return;
+      }
+    },
+    //将父级向子集多次传送的函数合二为一；
+    changeFun: function (opt) {
+      if (typeof opt !== 'object') opt = {}
+      let action = opt.action || ''
+      let value = opt.value === undefined ? '' : opt.value
+      this[action] && this[action](value)
+    },
+    //打开优惠券插件；
+    couponTap: function () {
+      let that = this
+      that.coupons()
+      that.coupon.coupon = true
+    },
+    changecoupon: function (msg) {
+      this.coupon.coupon = msg
+      this.coupons()
+    },
+    currentcoupon: function (res) {
+      let that = this
+      that.coupon.coupon = false
+      that.$set(that.coupon.list[res], 'is_use', true)
+    },
+    //可领取优惠券接口；
+    coupons: function () {
+      let that = this,
+        q = {
+          page: 1,
+          limit: 20,
         }
-        let q = {
-          productId: that.id,
-          cartNum: that.attr.productSelect.cart_num,
-          new: news,
-          uniqueId: that.attr.productSelect !== undefined ?
-            that.attr.productSelect.unique : "",
-        };
-        postCartAdd(q)
-          .then(function (res) {
-            console.log(res)
-            that.isOpen = false;
-            that.attr.cartAttr = false;
-            if (news) {
-              if (!res.data) {
-                uni.showToast({
-                  title: res.msg || res.data.msg || res.data.message,
-                  icon: "none",
-                  duration: 2000,
-                });
-                return;
-              }
-              that.$yrouter.push({
-                path: "/pages/order/OrderSubmission/index",
-                query: {
-                  id: res.data.cartId,
-                  isIntegral:that.isIntegral
-                },
-              });
-            } else {
+      getCoupon(q).then(res => {
+        that.$set(that, 'couponList', res.data || [])
+        that.$set(that.coupon, 'list', res.data)
+      })
+    },
+    //打开属性插件；
+    selecAttrTap: function () {
+      this.attr.cartAttr = true
+      this.isOpen = true
+    },
+    changeattr: function (msg) {
+      // 修改了规格
+      console.log(msg)
+      this.attr.cartAttr = msg
+      this.isOpen = false
+    },
+    //选择属性；
+    ChangeAttr: function (res) {
+      // 修改了规格
+
+      let productSelect = this.productValue[res.value]
+      console.log(productSelect)
+      if (productSelect) {
+        this.attr.productAttr[res.indexw].index = res.indexn
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', res.value)
+        this.$set(this, 'attrTxt', '已选择')
+      } else {
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //收藏商品
+    setCollect: function () {
+      let that = this,
+        id = that.storeInfo.id,
+        category = 'collect'
+      if (that.storeInfo.userCollect) {
+        getCollectDel(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      } else {
+        getCollectAdd(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      }
+    },
+    //  点击加入购物车按钮
+    joinCart: function () {
+      //0=加入购物车
+      this.goCat(0)
+    },
+    // 加入购物车；
+    goCat: function (news) {
+      let that = this,
+        productSelect = that.productValue[this.attrValue]
+      //打开属性
+      if (that.attrValue) {
+        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+        that.attr.cartAttr = !that.isOpen ? true : false
+      } else {
+        if (that.isOpen) that.attr.cartAttr = true
+        else that.attr.cartAttr = !that.attr.cartAttr
+      }
+      //只有关闭属性弹窗时进行加入购物车
+      if (that.attr.cartAttr === true && that.isOpen === false) return (that.isOpen = true)
+      //如果有属性,没有选择,提示用户选择
+      if (that.attr.productAttr.length && productSelect === undefined && that.isOpen === true) {
+        uni.showToast({
+          title: '产品库存不足，请选择其它',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+      let q = {
+        productId: that.id,
+        cartNum: that.attr.productSelect.cart_num,
+        new: news,
+        uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '',
+      }
+      postCartAdd(q)
+        .then(function (res) {
+          console.log(res)
+          that.isOpen = false
+          that.attr.cartAttr = false
+          if (news) {
+            if (!res.data) {
               uni.showToast({
-                title: "添加购物车成功",
-                icon: "success",
+                title: res.msg || res.data.msg || res.data.message,
+                icon: 'none',
                 duration: 2000,
-                complete: () => {
-                  that.getCartCount(true);
-                },
-              });
+              })
+              return
             }
-          })
-          .catch((error) => {
-            console.log(error)
-            that.isOpen = false;
+            that.$yrouter.push({
+              path: '/pages/order/OrderSubmission/index',
+              query: {
+                id: res.data.cartId,
+                isIntegral: that.isIntegral,
+              },
+            })
+          } else {
             uni.showToast({
-              title: error.msg ||
-								error.response.data.msg ||
-								error.response.data.message,
-              icon: "none",
+              title: '添加购物车成功',
+              icon: 'success',
               duration: 2000,
-            });
-          });
-      },
-      //获取购物车数量
-      getCartCount: function (isAnima) {
-        let that = this;
-        const isLogin = that.isLogin;
-        if (isLogin) {
-          getCartCount({
-            numType: 0,
-          }).then((res) => {
-            that.CartCount = res.data.count;
-            //加入购物车后重置属性
-            if (isAnima) {
-              that.animated = true;
-              setTimeout(function () {
-                that.animated = false;
-              }, 500);
-            }
-          });
-        }
-      },
-      //立即购买；
-      tapBuy: function () {
-        //  1=直接购买
-        this.goCat(1);
-      },
-      listenerActionSheet: function () {
-        if (isWeixin() === true) {
-          this.weixinStatus = true;
-        }
-        this.posters = true;
-      },
-      listenerActionClose: function () {
-        this.posters = false;
-      },
-      setOpenShare: function () {
-        var data = this.storeInfo;
-        var href = this.location.href;
-        if (this.$deviceType == "weixin") {
-          if (this.isLogin) {
-            getUserInfo().then((res) => {
-              href =
-                href.indexOf("?") === -1 ?
-                href + "?spread=" + res.data.uid :
-                href + "&spread=" + res.data.uid;
-              var configAppMessage = {
-                desc: data.storeInfo,
-                title: data.storeName,
-                link: href,
-                imgUrl: data.image,
-              };
-              wechatEvevt(
-                  ["updateAppMessageShareData", "updateTimelineShareData"],
-                  configAppMessage
-                )
-                .then((res) => {})
-                .catch((res) => {
-                  if (res.is_ready) {
-                    res.wx.updateAppMessageShareData(configAppMessage);
-                    res.wx.updateTimelineShareData(configAppMessage);
-                  }
-                });
-            });
-          } else {
+              complete: () => {
+                that.getCartCount(true)
+              },
+            })
+          }
+        })
+        .catch(error => {
+          console.log(error)
+          that.isOpen = false
+          uni.showToast({
+            title: error.msg || error.response.data.msg || error.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+    },
+    //获取购物车数量
+    getCartCount: function (isAnima) {
+      let that = this
+      const isLogin = that.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0,
+        }).then(res => {
+          that.CartCount = res.data.count
+          //加入购物车后重置属性
+          if (isAnima) {
+            that.animated = true
+            setTimeout(function () {
+              that.animated = false
+            }, 500)
+          }
+        })
+      }
+    },
+    //立即购买；
+    tapBuy: function () {
+      //  1=直接购买
+      this.goCat(1)
+    },
+    listenerActionSheet: function () {
+      if (isWeixin() === true) {
+        this.weixinStatus = true
+      }
+      this.posters = true
+    },
+    listenerActionClose: function () {
+      this.posters = false
+    },
+    setOpenShare: function () {
+      var data = this.storeInfo
+      var href = this.location.href
+      if (this.$deviceType == 'weixin') {
+        if (this.isLogin) {
+          getUserInfo().then(res => {
+            href = href.indexOf('?') === -1 ? href + '?spread=' + res.data.uid : href + '&spread=' + res.data.uid
             var configAppMessage = {
               desc: data.storeInfo,
               title: data.storeName,
               link: href,
               imgUrl: data.image,
-            };
-            wechatEvevt(
-                ["updateAppMessageShareData", "updateTimelineShareData"],
-                configAppMessage
-              )
-              .then((res) => {})
-              .catch((res) => {
+            }
+            wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+              .then(res => {})
+              .catch(res => {
                 if (res.is_ready) {
-                  res.wx.updateAppMessageShareData(configAppMessage);
-                  res.wx.updateTimelineShareData(configAppMessage);
+                  res.wx.updateAppMessageShareData(configAppMessage)
+                  res.wx.updateTimelineShareData(configAppMessage)
                 }
-              });
+              })
+          })
+        } else {
+          var configAppMessage = {
+            desc: data.storeInfo,
+            title: data.storeName,
+            link: href,
+            imgUrl: data.image,
           }
+          wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+            .then(res => {})
+            .catch(res => {
+              if (res.is_ready) {
+                res.wx.updateAppMessageShareData(configAppMessage)
+                res.wx.updateTimelineShareData(configAppMessage)
+              }
+            })
         }
-      },
+      }
     },
-  };
+  },
+}
 </script>
 
-
 <style scoped lang="less">
-  .geoPage {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    z-index: 10000;
-  }
-
-  .product-con .store-info {
-    margin-top: 0.2 * 100rpx;
-    background-color: #fff;
-  }
-
-  .product-con .store-info .title {
-    padding: 0 0.3 * 100rpx;
-    font-size: 0.28 * 100rpx;
-    color: #282828;
-    height: 0.8 * 100rpx;
-    line-height: 0.8 * 100rpx;
-    border-bottom: 0.01 * 100rpx solid #f5f5f5;
-  }
-
-  .product-con .store-info .info {
-    padding: 0 0.3 * 100rpx;
-    height: 1.26 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt {
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-
-  .product-con .store-info .info .picTxt .pictrue {
-    width: 0.76 * 100rpx;
-    height: 0.76 * 100rpx;
-    margin-right: 0.2 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 0.06 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .text {
-    flex: 1;
-  }
-
-  .product-con .store-info .info .picTxt .text .name {
-    font-size: 0.3 * 100rpx;
-    color: #282828;
-  }
-
-  .product-con .store-info .info .picTxt .text .address {
-    font-size: 0.24 * 100rpx;
-    color: #666;
-    margin-top: 0.03 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .text .address .iconfont {
-    color: #707070;
-    font-size: 0.18 * 100rpx;
-    margin-left: 0.1 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .addressBox {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-  }
-
-  .product-con .store-info .info .picTxt .addressBox .iconfont {
-    font-size: 0.4 * 100rpx;
-  }
-
-  .product-con .store-info .info .picTxt .addressBox .addressTxt {
-    font-size: 0.24 * 100rpx;
-    color: #eb3729;
-  }
-
-  .product-con .store-info .praise {
-    font-size: 0.28 * 100rpx;
-    color: #808080;
-  }
-
-  .product-con .store-info .praise .iconfont {
-    font-size: 0.28 * 100rpx;
-  }
-
-  .product-con .superior {
-    background-color: #fff;
-    margin-top: 0.2 * 100rpx;
-  }
-
-  .product-con .superior .title {
-    height: 0.98 * 100rpx;
-  }
-
-  .product-con .superior .title image {
-    width: 0.3 * 100rpx;
-    height: 0.3 * 100rpx;
-  }
-
-  .product-con .superior .title .titleTxt {
-    margin: 0 0.2 * 100rpx;
-    font-size: 0.3 * 100rpx;
-    background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-  }
-
-  .product-con .superior .slider-banner {
-    width: 6.9 * 100rpx;
-    margin: 0 auto;
-    padding-bottom: 0.2 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list {
-    width: 100%;
-    padding-bottom: 0.2 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item {
-    width: 2.15 * 100rpx;
-    margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
-    font-size: 0.26 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-    margin-right: 0;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue {
-    width: 100%;
-    height: 2.15 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 0.06 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .name {
-    color: #282828;
-    margin-top: 0.12 * 100rpx;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet {
-    background-color: #999;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet-active {
-    background-color: #e93323;
-  }
-
-  .mask {
-    -webkit-filter: blur(2px);
-    -moz-filter: blur(2px);
-    -ms-filter: blur(2px);
-    filter: blur(2px);
-  }
-
-  .product-con .product-intro .conter view {
-    width: 100% !important;
-  }
-
-  .generate-posters {
-    width: 100%;
-    height: 1.7 * 100rpx;
-    background-color: #fff;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    z-index: 99;
-    transform: translate3d(0, 100%, 0);
-    -webkit-transform: translate3d(0, 100%, 0);
-    -ms-transform: translate3d(0, 100%, 0);
-    -moz-transform: translate3d(0, 100%, 0);
-    -o-transform: translate3d(0, 100%, 0);
-    transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  }
-
-  .generate-posters.on {
-    transform: translate3d(0, 0, 0);
-    -webkit-transform: translate3d(0, 0, 0);
-    -ms-transform: translate3d(0, 0, 0);
-    -moz-transform: translate3d(0, 0, 0);
-    -o-transform: translate3d(0, 0, 0);
-  }
-
-  .generate-posters .item {
-    flex: 50%;
-    -webkit-flex: 50%;
-    -ms-flex: 50%;
-    text-align: center;
-  }
-
-  .generate-posters .item .iconfont {
-    font-size: 0.8 * 100rpx;
-    color: #5eae72;
-  }
-
-  .generate-posters .item .iconfont.icon-haibao {
-    color: #5391f1;
-  }
-
-  .noscroll {
-    height: 100%;
-    overflow: hidden;
-  }
+.geoPage {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  z-index: 10000;
+}
+
+.product-con .store-info {
+  margin-top: 0.2 * 100rpx;
+  background-color: #fff;
+}
+
+.product-con .store-info .title {
+  padding: 0 0.3 * 100rpx;
+  font-size: 0.28 * 100rpx;
+  color: #282828;
+  height: 0.8 * 100rpx;
+  line-height: 0.8 * 100rpx;
+  border-bottom: 0.01 * 100rpx solid #f5f5f5;
+}
+
+.product-con .store-info .info {
+  padding: 0 0.3 * 100rpx;
+  height: 1.26 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.product-con .store-info .info .picTxt .pictrue {
+  width: 0.76 * 100rpx;
+  height: 0.76 * 100rpx;
+  margin-right: 0.2 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text {
+  flex: 1;
+}
+
+.product-con .store-info .info .picTxt .text .name {
+  font-size: 0.3 * 100rpx;
+  color: #282828;
+}
+
+.product-con .store-info .info .picTxt .text .address {
+  font-size: 0.24 * 100rpx;
+  color: #666;
+  margin-top: 0.03 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text .address .iconfont {
+  color: #707070;
+  font-size: 0.18 * 100rpx;
+  margin-left: 0.1 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.product-con .store-info .info .picTxt .addressBox .iconfont {
+  font-size: 0.4 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox .addressTxt {
+  font-size: 0.24 * 100rpx;
+  color: #eb3729;
+}
+
+.product-con .store-info .praise {
+  font-size: 0.28 * 100rpx;
+  color: #808080;
+}
+
+.product-con .store-info .praise .iconfont {
+  font-size: 0.28 * 100rpx;
+}
+
+.product-con .superior {
+  background-color: #fff;
+  margin-top: 0.2 * 100rpx;
+}
+
+.product-con .superior .title {
+  height: 0.98 * 100rpx;
+}
+
+.product-con .superior .title image {
+  width: 0.3 * 100rpx;
+  height: 0.3 * 100rpx;
+}
+
+.product-con .superior .title .titleTxt {
+  margin: 0 0.2 * 100rpx;
+  font-size: 0.3 * 100rpx;
+  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.product-con .superior .slider-banner {
+  width: 6.9 * 100rpx;
+  margin: 0 auto;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list {
+  width: 100%;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item {
+  width: 2.15 * 100rpx;
+  margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
+  font-size: 0.26 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+  margin-right: 0;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue {
+  width: 100%;
+  height: 2.15 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .name {
+  color: #282828;
+  margin-top: 0.12 * 100rpx;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet {
+  background-color: #999;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+  background-color: #e93323;
+}
+
+.mask {
+  -webkit-filter: blur(2px);
+  -moz-filter: blur(2px);
+  -ms-filter: blur(2px);
+  filter: blur(2px);
+}
+
+.product-con .product-intro .conter view {
+  width: 100% !important;
+}
+
+.generate-posters {
+  width: 100%;
+  height: 1.7 * 100rpx;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 99;
+  transform: translate3d(0, 100%, 0);
+  -webkit-transform: translate3d(0, 100%, 0);
+  -ms-transform: translate3d(0, 100%, 0);
+  -moz-transform: translate3d(0, 100%, 0);
+  -o-transform: translate3d(0, 100%, 0);
+  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+}
+
+.generate-posters.on {
+  transform: translate3d(0, 0, 0);
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+}
+
+.generate-posters .item {
+  flex: 50%;
+  -webkit-flex: 50%;
+  -ms-flex: 50%;
+  text-align: center;
+}
+
+.generate-posters .item .iconfont {
+  font-size: 0.8 * 100rpx;
+  color: #5eae72;
+}
+
+.generate-posters .item .iconfont.icon-haibao {
+  color: #5391f1;
+}
+
+.noscroll {
+  height: 100%;
+  overflow: hidden;
+}
 </style>
-
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index a833bfe..d8cda9f 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -10,7 +10,7 @@
       </view>
     </form>
     <view class="nav acea-row row-middle">
-      <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : "默认" }}</view>
+      <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : '默认' }}</view>
       <view class="item" @click="set_where(1)">
         价格
         <image src="@/static/images/horn.png" v-if="price === 0" />
@@ -26,10 +26,8 @@
       <!-- down -->
       <view class="item" :class="nows ? 'font-color-red' : ''" @click="set_where(3)">新品</view>
     </view>
-    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container"
-      v-if="isIntegral=='false'">
-      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
-        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container" v-if="isIntegral == 'false'">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'" v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
         <view class="pictrue" :class="Switch === true ? '' : 'on'">
           <image :src="item.image" :class="Switch === true ? '' : 'on'" />
         </view>
@@ -46,10 +44,8 @@
         </view>
       </view>
     </view>
-    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container"
-      v-if="isIntegral=='true'">
-      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
-        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container" v-if="isIntegral == 'true'">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'" v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
         <view class="pictrue" :class="Switch === true ? '' : 'on'">
           <image :src="item.image" :class="Switch === true ? '' : 'on'" />
         </view>
@@ -71,229 +67,222 @@
         <image src="@/static/images/noGood.png" class="image" />
       </view>
     </view>
-    <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading"
-      @changeRecommendLoading="changeRecommendLoading"></Recommend>
+    <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading" @changeRecommendLoading="changeRecommendLoading"></Recommend>
   </view>
 </template>
 <script>
-  import Recommend from "@/components/Recommend";
-  import {
-    getProducts,getProductsIntegral
-  } from "@/api/store";
-  import Loading from "@/components/Loading";
+import Recommend from '@/components/Recommend'
+import { getProducts, getProductsIntegral } from '@/api/store'
+import Loading from '@/components/Loading'
 
-  export default {
-    name: "GoodsList",
-    components: {
-      Recommend,
-      Loading,
-    },
-    props: {},
-    data: function () {
-      // const { s = "", id = 0, title = "" } = this.$yroute.query;
-      const s = "",
-        id = 0,
-        title = "";
+export default {
+  name: 'GoodsList',
+  components: {
+    Recommend,
+    Loading,
+  },
+  props: {},
+  data: function () {
+    // const { s = "", id = 0, title = "" } = this.$yroute.query;
+    const s = '',
+      id = 0,
+      title = ''
 
-      return {
-        hostProduct: [],
-        productList: [],
-        Switch: true,
-        where: {
-          page: 1,
-          limit: 8,
-          keyword: s,
-          sid: id, //二级分类id
-          news: 0,
-          priceOrder: "",
-          salesOrder: "",
-        },
-        title: title && id ? title : "",
-        loadTitle: "",
-        loading: false,
-        loadend: false,
-        price: 0,
-        stock: 0,
-        nows: false,
-        recommendLoading: false,
-        target: false,
-        isIntegral: false
-      };
-    },
-    watch: {
-      title() {
-        this.updateTitle();
-      },
-      $yroute(to) {
-        // if (to.name !== "GoodsList") return;
-        // const { s = "", id = 0, title = "" } = to.query;
-        // if (s !== this.where.keyword || id !== this.where.sid) {
-        //   this.where.keyword = s;
-        //   this.loadend = false;
-        //   this.loading = false;
-        //   this.where.page = 1;
-        //   this.where.sid = id;
-        //   this.title = title && id ? title : "";
-        //   this.nows = false;
-        //   this.$set(this, "productList", []);
-        //   this.price = 0;
-        //   this.stock = 0;
-        //   this.getProductList();
-        // }
+    return {
+      hostProduct: [],
+      productList: [],
+      Switch: true,
+      where: {
+        page: 1,
+        limit: 8,
+        keyword: s,
+        sid: id, //二级分类id
+        news: 0,
+        priceOrder: '',
+        salesOrder: '',
       },
+      title: title && id ? title : '',
+      loadTitle: '',
+      loading: false,
+      loadend: false,
+      price: 0,
+      stock: 0,
+      nows: false,
+      recommendLoading: false,
+      target: false,
+      isIntegral: false,
+    }
+  },
+  watch: {
+    title() {
+      this.updateTitle()
     },
-    mounted: function () {
-      const {
-        s = "", id = 0, title = "", isIntegral = false
-      } = this.$yroute.query;
-      this.where.keyword = s;
-      this.where.isIntegral = isIntegral == 'true' ? 1 : 0;
-      this.isIntegral = isIntegral
-      this.updateTitle();
-      this.getProductList();
+    $yroute(to) {
+      // if (to.name !== "GoodsList") return;
+      // const { s = "", id = 0, title = "" } = to.query;
+      // if (s !== this.where.keyword || id !== this.where.sid) {
+      //   this.where.keyword = s;
+      //   this.loadend = false;
+      //   this.loading = false;
+      //   this.where.page = 1;
+      //   this.where.sid = id;
+      //   this.title = title && id ? title : "";
+      //   this.nows = false;
+      //   this.$set(this, "productList", []);
+      //   this.price = 0;
+      //   this.stock = 0;
+      //   this.getProductList();
+      // }
     },
-    onReachBottom() {
-      this.recommendLoading = true;
-      !this.loading && this.getProductList();
+  },
+  mounted: function () {
+    const { s = '', id = 0, title = '', isIntegral = false } = this.$yroute.query
+    this.where.keyword = s
+    this.where.isIntegral = isIntegral == 'true' ? 1 : 0
+    this.isIntegral = isIntegral
+    this.updateTitle()
+    this.getProductList()
+  },
+  onReachBottom() {
+    this.recommendLoading = true
+    !this.loading && this.getProductList()
+  },
+  onHide() {
+    // this.hostProduct = [];
+    // this.productList = [];
+    // this.Switch = true;
+    // this.where = {
+    //   page: 1,
+    //   limit: 8,
+    //   keyword: s,
+    //   sid: id, //二级分类id
+    //   news: 0,
+    //   priceOrder: "",
+    //   salesOrder: ""
+    // };
+    // this.loadTitle = "";
+    // this.loading = false;
+    // this.loadend = false;
+    // this.price = 0;
+    // this.stock = 0;
+    // this.nows = fals;
+  },
+  methods: {
+    changeRecommendLoading(recommendLoading) {
+      this.recommendLoading = recommendLoading
     },
-    onHide() {
-      // this.hostProduct = [];
-      // this.productList = [];
-      // this.Switch = true;
-      // this.where = {
-      //   page: 1,
-      //   limit: 8,
-      //   keyword: s,
-      //   sid: id, //二级分类id
-      //   news: 0,
-      //   priceOrder: "",
-      //   salesOrder: ""
-      // };
-      // this.loadTitle = "";
-      // this.loading = false;
-      // this.loadend = false;
-      // this.price = 0;
-      // this.stock = 0;
-      // this.nows = fals;
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: '/pages/shop/IntegralGoodsCon/index',
+        query: {
+          id: item.id,
+          isIntegral: this.isIntegral,
+        },
+      })
     },
-    methods: {
-      changeRecommendLoading(recommendLoading) {
-        this.recommendLoading = recommendLoading;
-      },
-      goGoodsCon(item) {
-        this.$yrouter.push({
-          path: "/pages/shop/GoodsCon/index",
-          query: {
-            id: item.id,
-            isIntegral:this.isIntegral
-          },
-        });
-      },
-      updateTitle() {
-        // document.title = this.title || this.$yroute.meta.title;
-      },
-      getProductList() {
-        var that = this;
-        this.setWhere();
-        // if (to.name !== "GoodsList") return;
-        const {
-          s = "", id = 0, title = ""
-        } = this.$yroute.query;
-        if (s !== this.where.keyword || id !== this.where.sid) {
-          this.loadend = false;
-          this.loading = false;
-          this.where.page = 1;
-          this.where.sid = id;
-          this.title = title && id ? title : "";
-          this.nows = false;
-          this.$set(this, "productList", []);
-          this.price = 0;
-          this.stock = 0;
-          // this.getProductList();
-        }
-        let q = that.where;
-        let getData = this.isIntegral !== 'true' ? getProducts : getProductsIntegral
-        getData(q).then((res) => {
-          that.loading = false;
-          if (that.target) {
-            that.productList = res.data;
-          } else {
-            that.productList.push.apply(that.productList, res.data);
-          }
-          that.target = false
-          that.loadend = res.data.length < that.where.limit; //判断所有数据是否加载完成；
-          that.where.page = that.where.page + 1;
-        });
-      },
-      submitForm: function () {
-        this.$set(this, "productList", []);
-        this.where.page = 1;
-        this.loadend = false;
-        this.loading = false;
-        this.getProductList();
-      },
-      //点击事件处理
-      set_where: function (index) {
-        let that = this;
-        switch (index) {
-          case 0:
-            return that.$yrouter.push({
-              path: "/pages/shop/GoodsClass/index",
-            });
-          case 1:
-            if (that.price === 0) that.price = 1;
-            else if (that.price === 1) that.price = 2;
-            else if (that.price === 2) that.price = 0;
-            that.stock = 0;
-            break;
-          case 2:
-            if (that.stock === 0) that.stock = 1;
-            else if (that.stock === 1) that.stock = 2;
-            else if (that.stock === 2) that.stock = 0;
-            that.price = 0;
-            break;
-          case 3:
-            that.nows = !that.nows;
-            break;
-          default:
-            break;
-        }
-        this.productList = [];
-        that.$set(that, "productList", []);
-        that.where.page = 1;
-        that.target = true;
-        that.loadend = false;
-        that.getProductList();
-      },
-      //设置where条件
-      setWhere: function () {
-        let that = this;
-        if (that.price === 0) {
-          that.where.priceOrder = "";
-        } else if (that.price === 1) {
-          that.where.priceOrder = "asc";
-        } else if (that.price === 2) {
-          that.where.priceOrder = "desc";
-        }
-        if (that.stock === 0) {
-          that.where.salesOrder = "";
-        } else if (that.stock === 1) {
-          that.where.salesOrder = "asc";
-        } else if (that.stock === 2) {
-          that.where.salesOrder = "desc";
+    updateTitle() {
+      // document.title = this.title || this.$yroute.meta.title;
+    },
+    getProductList() {
+      var that = this
+      this.setWhere()
+      // if (to.name !== "GoodsList") return;
+      const { s = '', id = 0, title = '' } = this.$yroute.query
+      if (s !== this.where.keyword || id !== this.where.sid) {
+        this.loadend = false
+        this.loading = false
+        this.where.page = 1
+        this.where.sid = id
+        this.title = title && id ? title : ''
+        this.nows = false
+        this.$set(this, 'productList', [])
+        this.price = 0
+        this.stock = 0
+        // this.getProductList();
+      }
+      let q = that.where
+      let getData = this.isIntegral !== 'true' ? getProducts : getProductsIntegral
+      getData(q).then(res => {
+        that.loading = false
+        if (that.target) {
+          that.productList = res.data
+        } else {
+          that.productList.push.apply(that.productList, res.data)
         }
-        that.where.news = that.nows ? "1" : "0";
-      },
-      switchTap: function () {
-        let that = this;
-        that.Switch = !that.Switch;
-      },
+        that.target = false
+        that.loadend = res.data.length < that.where.limit //判断所有数据是否加载完成；
+        that.where.page = that.where.page + 1
+      })
+    },
+    submitForm: function () {
+      this.$set(this, 'productList', [])
+      this.where.page = 1
+      this.loadend = false
+      this.loading = false
+      this.getProductList()
+    },
+    //点击事件处理
+    set_where: function (index) {
+      let that = this
+      switch (index) {
+        case 0:
+          return that.$yrouter.push({
+            path: '/pages/shop/GoodsClass/index',
+          })
+        case 1:
+          if (that.price === 0) that.price = 1
+          else if (that.price === 1) that.price = 2
+          else if (that.price === 2) that.price = 0
+          that.stock = 0
+          break
+        case 2:
+          if (that.stock === 0) that.stock = 1
+          else if (that.stock === 1) that.stock = 2
+          else if (that.stock === 2) that.stock = 0
+          that.price = 0
+          break
+        case 3:
+          that.nows = !that.nows
+          break
+        default:
+          break
+      }
+      this.productList = []
+      that.$set(that, 'productList', [])
+      that.where.page = 1
+      that.target = true
+      that.loadend = false
+      that.getProductList()
+    },
+    //设置where条件
+    setWhere: function () {
+      let that = this
+      if (that.price === 0) {
+        that.where.priceOrder = ''
+      } else if (that.price === 1) {
+        that.where.priceOrder = 'asc'
+      } else if (that.price === 2) {
+        that.where.priceOrder = 'desc'
+      }
+      if (that.stock === 0) {
+        that.where.salesOrder = ''
+      } else if (that.stock === 1) {
+        that.where.salesOrder = 'asc'
+      } else if (that.stock === 2) {
+        that.where.salesOrder = 'desc'
+      }
+      that.where.news = that.nows ? '1' : '0'
+    },
+    switchTap: function () {
+      let that = this
+      that.Switch = !that.Switch
     },
-  };
+  },
+}
 </script>
 <style scoped lang="less">
-  .noCommodity {
-    border-top: 3px solid #f5f5f5;
-    padding-bottom: 1px;
-  }
+.noCommodity {
+  border-top: 3px solid #f5f5f5;
+  padding-bottom: 1px;
+}
 </style>
diff --git a/pages/shop/IntegralGoodsCon/index.vue b/pages/shop/IntegralGoodsCon/index.vue
new file mode 100644
index 0000000..ed13062
--- /dev/null
+++ b/pages/shop/IntegralGoodsCon/index.vue
@@ -0,0 +1,867 @@
+<template>
+  <view :class="productConClass">
+    <view v-if="storeInfo.id">
+      <!-- 轮播图 -->
+      <product-con-swiper :img-urls="storeInfo.sliderImageArr"></product-con-swiper>
+
+      <!-- 商品信息描述 -->
+      <view class="wrapper">
+        <view class="share acea-row row-between row-bottom">
+          <view class="money font-color-red">
+            <text class="num">{{ attr.productSelect.integral || storeInfo.integral }}积分</text>
+          </view>
+          <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
+        </view>
+        <view class="introduce">{{ storeInfo.storeName }}</view>
+        <view class="label acea-row row-between-wrapper">
+          <text>库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}</text>
+          <text>销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}</text>
+        </view>
+      </view>
+
+      <!-- 规格 -->
+      <view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
+        <view>
+          <text>{{ attrTxt }}：</text>
+          <text class="atterTxt">{{ attrValue }}</text>
+        </view>
+        <view class="iconfont icon-jiantou"></view>
+      </view>
+
+      <!-- 用户评价 -->
+      <view class="userEvaluation" v-if="replyCount">
+        <view class="title acea-row row-between-wrapper">
+          <view>用户评价({{ replyCount }})</view>
+          <text @click="goEvaluateList(id)" class="praise">
+            <text class="font-color-red">{{ replyChance }}%</text>好评率
+            <text class="iconfont icon-jiantou"></text>
+          </text>
+        </view>
+        <user-evaluation :reply="reply"></user-evaluation>
+      </view>
+
+      <!-- 商品详情 -->
+      <view class="product-intro">
+        <text class="title">产品介绍</text>
+        <view class="conter" v-html="storeInfo.description"></view>
+      </view>
+
+      <view style="height: 100rpx"></view>
+      <!-- 操作栏 -->
+      <view class="footer acea-row row-between-wrapper">
+        <view class="item" @click="goHome">
+          <view class="iconfont icon-shouye-xianxing"></view>
+          <text>首页</text>
+        </view>
+        <view class="bnt in-bnt acea-row">
+          <view class="buy" @click="tapBuy">
+            <text>立即购买</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 商品规格弹窗 -->
+      <ProductWindow :isIntegral="isIntegral" v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
+      <!-- 分享海报 -->
+      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData" :goodId="id"></StorePoster>
+    </view>
+  </view>
+</template>
+
+<script>
+// import { swiper, swiperSlide } from "vue-awesome-swiper";
+
+import ProductConSwiper from '@/components/ProductConSwiper'
+import UserEvaluation from '@/components/UserEvaluation'
+import CouponPop from '@/components/CouponPop'
+import ProductWindow from '@/components/ProductWindow'
+import StorePoster from '@/components/StorePoster'
+import ShareInfo from '@/components/ShareInfo'
+import { getProductDetail, postCartAdd, getCartCount, getProductCode } from '@/api/store'
+import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
+import cookie from '@/utils/store/cookie'
+import { isWeixin, PosterCanvas, handleQrCode, handleUrlParam, getCurrentPageUrlWithArgs } from '@/utils'
+import { wechatEvevt } from '@/libs/wechat'
+import { imageBase64 } from '@/api/public'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'GoodsCon',
+  components: {
+    // swiper,
+    // swiperSlide,
+    ProductConSwiper,
+    UserEvaluation,
+    CouponPop,
+    ProductWindow,
+    StorePoster,
+    ShareInfo,
+  },
+  data: function () {
+    return {
+      shareInfoStatus: false,
+      weixinStatus: false,
+      mapShow: false,
+      mapKey: '',
+      posterData: {
+        image: '',
+        title: '',
+        price: '',
+        code: '',
+      },
+      posterImageStatus: false,
+      animated: false,
+      coupon: {
+        coupon: false,
+        list: [],
+      },
+      attr: {
+        cartAttr: false,
+        productAttr: [],
+        productSelect: {},
+      },
+      isOpen: false, //是否打开属性组件
+      productValue: [],
+      id: 0,
+      storeInfo: {},
+      couponList: [],
+      attrTxt: '请选择',
+      attrValue: '',
+      cart_num: 1, //购买数量
+      replyCount: '',
+      replyChance: '',
+      reply: [],
+      priceName: 0,
+      CartCount: 0,
+      posters: false,
+      banner: [{}, {}],
+      swiperRecommend: {
+        pagination: {
+          el: '.swiper-pagination',
+          clickable: true,
+        },
+        autoplay: false,
+        loop: false,
+        speed: 1000,
+        observer: true,
+        observeParents: true,
+      },
+      goodList: [],
+      systemStore: {},
+      qqmapsdk: null,
+      productConClass: 'product-con',
+      tempName: '全国包邮',
+      isIntegral: false,
+    }
+  },
+  computed: mapGetters(['isLogin', 'location']),
+  mounted: function () {
+    this.$store.commit('get_to', 'goodcon')
+    let url = handleQrCode()
+    if (!url) {
+      url = handleUrlParam(getCurrentPageUrlWithArgs())
+    }
+    this.coupons()
+    if (url && url.id) {
+      this.id = url.id
+      let urlSpread = parseInt(url.spread)
+      if (urlSpread) {
+        cookie.set('spread', urlSpread)
+      }
+    } else {
+      this.id = this._route.query.id
+    }
+    this.isIntegral = url.isIntegral == 'true'
+    this.productCon()
+    this.setOpenShare()
+  },
+  watch: {
+    posterImageStatus(status) {
+      console.log(status)
+      if (status) {
+        this.productConClass = 'noscroll product-con'
+      } else {
+        this.productConClass = 'product-con'
+      }
+    },
+  },
+  methods: {
+    onShareAppMessage: function () {
+      return {
+        title: this.storeInfo.storeName,
+        imageUrl: this.storeInfo.image,
+        path: 'pages/shop/GoodsCon/index?id=' + this.storeInfo.id + '&spread=' + uni.getStorageSync('uid') + '&pageType=good&codeType=routine',
+        success(res) {
+          uni.showToast({
+            title: '分享成功',
+          })
+        },
+        fail(res) {
+          uni.showToast({
+            title: '分享失败',
+            icon: 'none',
+          })
+        },
+      }
+    },
+    goHome() {
+      this.$yrouter.switchTab('/pages/home/index')
+    },
+    goShoppingCart() {
+      this.$yrouter.switchTab('/pages/shop/ShoppingCart/index')
+    },
+    goCustomerList() {
+      this.$yrouter.push({
+        path: '/pages/user/CustomerList/index',
+      })
+    },
+    goStoreList() {
+      this.$yrouter.push({
+        path: '/pages/shop/StoreList/index',
+      })
+    },
+    goEvaluateList(id) {
+      this.$yrouter.push({
+        path: '/pages/shop/EvaluateList/index',
+        query: {
+          id,
+        },
+      })
+    },
+    telPhone(phoneNumber) {
+      uni.makePhoneCall({
+        phoneNumber: phoneNumber,
+        fail() {
+          console.log('取消拨打')
+        },
+      })
+    },
+    showChang: function (data) {
+      this.$yrouter.push({
+        path: '/pages/map/index',
+        query: data,
+      })
+    },
+    updateTitle() {
+      // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
+    },
+    setShareInfoStatus: function () {
+      this.shareInfoStatus = !this.shareInfoStatus
+      this.posters = false
+    },
+    shareCode: function () {
+      var that = this
+      getProductCode(that.id).then(res => {
+        that.posterData.code = res.data.code
+        that.listenerActionSheet()
+      })
+    },
+    setPosterImageStatus: function () {
+      this.posterImageStatus = !this.posterImageStatus
+      this.posters = false
+    },
+    //产品详情接口；
+    productCon: function () {
+      let that = this
+      let from = this.location
+      if (this.$deviceType == 'app') {
+        from.from = 'app'
+      }
+      uni.showLoading({
+        title: '加载中',
+        mask: true,
+      })
+      getProductDetail(that.id, from)
+        .then(res => {
+          res.data.storeInfo.description = res.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+          that.$set(that, 'storeInfo', res.data.storeInfo)
+          // 给 attr 赋值，将请求回来的规格赋值给 attr
+          that.$set(that.attr, 'productAttr', res.data.productAttr)
+          that.$set(that, 'productValue', res.data.productValue)
+          that.$set(that, 'replyCount', res.data.replyCount)
+          that.$set(that, 'replyChance', res.data.replyChance)
+          that.reply = res.data.reply ? [res.data.reply] : []
+          that.$set(that, 'reply', that.reply)
+          that.$set(that, 'priceName', res.data.priceName)
+          that.$set(that, 'tempName', res.data.tempName)
+          that.posterData.image = that.storeInfo.image
+          if (that.storeInfo.storeName.length > 30) {
+            that.posterData.title = that.storeInfo.storeName.substring(0, 30) + '...'
+          } else {
+            that.posterData.title = that.storeInfo.storeName
+          }
+          that.posterData.price = that.storeInfo.price
+          that.posterData.code = that.storeInfo.codeBase
+          that.systemStore = res.data.systemStore
+          let good_list = res.data.goodList || []
+          let goodArray = []
+          let count = Math.ceil(good_list.length / 6)
+          for (let i = 0; i < count; i++) {
+            var list = good_list.slice(i * 6, 6)
+            if (list.length)
+              goodArray.push({
+                list: list,
+              })
+          }
+          that.mapKay = res.data.mapKay
+          that.$set(that, 'goodList', goodArray)
+          that.updateTitle()
+          that.DefaultSelect()
+          that.getCartCount()
+        })
+        .catch(err => {
+          uni.showToast({
+            title: err.msg || err.response.data.msg || err.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+        .finally(() => {
+          uni.hideLoading()
+        })
+    },
+    //默认选中属性；
+    DefaultSelect: function () {
+      let productAttr = this.attr.productAttr
+      let value = []
+      for (let i = 0; i < productAttr.length; i++) {
+        this.$set(productAttr[i], 'index', 0)
+        value.push(productAttr[i].attrValueArr[0])
+      }
+      //sort();排序函数:数字-英文-汉字；
+      let productSelect = this.productValue[value.sort().join(',')]
+      if (productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', value.sort().join(','))
+        this.$set(this, 'attrTxt', '已选择')
+      } else if (!productSelect && productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      } else if (!productSelect && !productAttr.length) {
+        this.$set(this.attr.productSelect, 'store_name', this.storeInfo.storeName)
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', this.storeInfo.stock)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.integral)
+        this.$set(this.attr.productSelect, 'unique', this.storeInfo.unique || '')
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //购物车；
+    ChangeCartNum: function (changeValue) {
+      //changeValue:是否 加|减
+      //获取当前变动属性
+      let productSelect = this.productValue[this.attrValue]
+      //如果没有属性,赋值给商品默认库存
+      if (productSelect === undefined && !this.attr.productAttr.length) {
+        productSelect = this.attr.productSelect
+      }
+      //无属性值即库存为0；不存在加减；
+      if (productSelect === undefined) return
+      let stock = productSelect.stock || 0
+      let num = this.attr.productSelect
+      if (changeValue) {
+        num.cart_num++
+        if (num.cart_num > stock) {
+          this.$set(this.attr.productSelect, 'cart_num', stock)
+          this.$set(this, 'cart_num', stock)
+        } else {
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
+        }
+      } else {
+        num.cart_num--
+        if (num.cart_num < 1) {
+          this.$set(this.attr.productSelect, 'cart_num', 1)
+          this.$set(this, 'cart_num', 1)
+        } else {
+          this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
+          this.$set(this, 'cart_num', num.cart_num)
+        }
+      }
+    },
+    //将父级向子集多次传送的函数合二为一；
+    changeFun: function (opt) {
+      if (typeof opt !== 'object') opt = {}
+      let action = opt.action || ''
+      let value = opt.value === undefined ? '' : opt.value
+      this[action] && this[action](value)
+    },
+    //打开优惠券插件；
+    couponTap: function () {
+      let that = this
+      that.coupons()
+      that.coupon.coupon = true
+    },
+    changecoupon: function (msg) {
+      this.coupon.coupon = msg
+      this.coupons()
+    },
+    currentcoupon: function (res) {
+      let that = this
+      that.coupon.coupon = false
+      that.$set(that.coupon.list[res], 'is_use', true)
+    },
+    //可领取优惠券接口；
+    coupons: function () {
+      let that = this,
+        q = {
+          page: 1,
+          limit: 20,
+        }
+      getCoupon(q).then(res => {
+        that.$set(that, 'couponList', res.data || [])
+        that.$set(that.coupon, 'list', res.data)
+      })
+    },
+    //打开属性插件；
+    selecAttrTap: function () {
+      this.attr.cartAttr = true
+      this.isOpen = true
+    },
+    changeattr: function (msg) {
+      // 修改了规格
+      console.log(msg)
+      this.attr.cartAttr = msg
+      this.isOpen = false
+    },
+    //选择属性；
+    ChangeAttr: function (res) {
+      // 修改了规格
+
+      let productSelect = this.productValue[res.value]
+      console.log(productSelect)
+      if (productSelect) {
+        this.attr.productAttr[res.indexw].index = res.indexn
+        this.$set(this.attr.productSelect, 'image', productSelect.image)
+        this.$set(this.attr.productSelect, 'price', productSelect.price)
+        this.$set(this.attr.productSelect, 'stock', productSelect.stock)
+        this.$set(this.attr.productSelect, 'unique', productSelect.unique)
+        this.$set(this.attr.productSelect, 'integral', productSelect.integral)
+        this.$set(this.attr.productSelect, 'cart_num', 1)
+        this.$set(this, 'attrValue', res.value)
+        this.$set(this, 'attrTxt', '已选择')
+      } else {
+        this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
+        this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'integral', this.storeInfo.price)
+        this.$set(this.attr.productSelect, 'stock', 0)
+        this.$set(this.attr.productSelect, 'unique', '')
+        this.$set(this.attr.productSelect, 'cart_num', 0)
+        this.$set(this, 'attrValue', '')
+        this.$set(this, 'attrTxt', '请选择')
+      }
+    },
+    //收藏商品
+    setCollect: function () {
+      let that = this,
+        id = that.storeInfo.id,
+        category = 'collect'
+      if (that.storeInfo.userCollect) {
+        getCollectDel(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      } else {
+        getCollectAdd(id, category).then(function () {
+          that.storeInfo.userCollect = !that.storeInfo.userCollect
+        })
+      }
+    },
+    //  点击加入购物车按钮
+    joinCart: function () {
+      //0=加入购物车
+      this.goCat(0)
+    },
+    // 加入购物车；
+    goCat: function (news) {
+      let that = this,
+        productSelect = that.productValue[this.attrValue]
+      //打开属性
+      if (that.attrValue) {
+        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+        that.attr.cartAttr = !that.isOpen ? true : false
+      } else {
+        if (that.isOpen) that.attr.cartAttr = true
+        else that.attr.cartAttr = !that.attr.cartAttr
+      }
+      //只有关闭属性弹窗时进行加入购物车
+      if (that.attr.cartAttr === true && that.isOpen === false) return (that.isOpen = true)
+      //如果有属性,没有选择,提示用户选择
+      if (that.attr.productAttr.length && productSelect === undefined && that.isOpen === true) {
+        uni.showToast({
+          title: '产品库存不足，请选择其它',
+          icon: 'none',
+          duration: 2000,
+        })
+        return
+      }
+      let q = {
+        productId: that.id,
+        cartNum: that.attr.productSelect.cart_num,
+        new: news,
+        uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '',
+      }
+      postCartAdd(q)
+        .then(function (res) {
+          console.log(res)
+          that.isOpen = false
+          that.attr.cartAttr = false
+          if (news) {
+            if (!res.data) {
+              uni.showToast({
+                title: res.msg || res.data.msg || res.data.message,
+                icon: 'none',
+                duration: 2000,
+              })
+              return
+            }
+            that.$yrouter.push({
+              path: '/pages/order/OrderSubmission/index',
+              query: {
+                id: res.data.cartId,
+                isIntegral: that.isIntegral,
+              },
+            })
+          } else {
+            uni.showToast({
+              title: '添加购物车成功',
+              icon: 'success',
+              duration: 2000,
+              complete: () => {
+                that.getCartCount(true)
+              },
+            })
+          }
+        })
+        .catch(error => {
+          console.log(error)
+          that.isOpen = false
+          uni.showToast({
+            title: error.msg || error.response.data.msg || error.response.data.message,
+            icon: 'none',
+            duration: 2000,
+          })
+        })
+    },
+    //获取购物车数量
+    getCartCount: function (isAnima) {
+      let that = this
+      const isLogin = that.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0,
+        }).then(res => {
+          that.CartCount = res.data.count
+          //加入购物车后重置属性
+          if (isAnima) {
+            that.animated = true
+            setTimeout(function () {
+              that.animated = false
+            }, 500)
+          }
+        })
+      }
+    },
+    //立即购买；
+    tapBuy: function () {
+      //  1=直接购买
+      this.goCat(1)
+    },
+    listenerActionSheet: function () {
+      if (isWeixin() === true) {
+        this.weixinStatus = true
+      }
+      this.posters = true
+    },
+    listenerActionClose: function () {
+      this.posters = false
+    },
+    setOpenShare: function () {
+      var data = this.storeInfo
+      var href = this.location.href
+      if (this.$deviceType == 'weixin') {
+        if (this.isLogin) {
+          getUserInfo().then(res => {
+            href = href.indexOf('?') === -1 ? href + '?spread=' + res.data.uid : href + '&spread=' + res.data.uid
+            var configAppMessage = {
+              desc: data.storeInfo,
+              title: data.storeName,
+              link: href,
+              imgUrl: data.image,
+            }
+            wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+              .then(res => {})
+              .catch(res => {
+                if (res.is_ready) {
+                  res.wx.updateAppMessageShareData(configAppMessage)
+                  res.wx.updateTimelineShareData(configAppMessage)
+                }
+              })
+          })
+        } else {
+          var configAppMessage = {
+            desc: data.storeInfo,
+            title: data.storeName,
+            link: href,
+            imgUrl: data.image,
+          }
+          wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'], configAppMessage)
+            .then(res => {})
+            .catch(res => {
+              if (res.is_ready) {
+                res.wx.updateAppMessageShareData(configAppMessage)
+                res.wx.updateTimelineShareData(configAppMessage)
+              }
+            })
+        }
+      }
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+.geoPage {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  z-index: 10000;
+}
+
+.product-con .store-info {
+  margin-top: 0.2 * 100rpx;
+  background-color: #fff;
+}
+
+.product-con .store-info .title {
+  padding: 0 0.3 * 100rpx;
+  font-size: 0.28 * 100rpx;
+  color: #282828;
+  height: 0.8 * 100rpx;
+  line-height: 0.8 * 100rpx;
+  border-bottom: 0.01 * 100rpx solid #f5f5f5;
+}
+
+.product-con .store-info .info {
+  padding: 0 0.3 * 100rpx;
+  height: 1.26 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.product-con .store-info .info .picTxt .pictrue {
+  width: 0.76 * 100rpx;
+  height: 0.76 * 100rpx;
+  margin-right: 0.2 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text {
+  flex: 1;
+}
+
+.product-con .store-info .info .picTxt .text .name {
+  font-size: 0.3 * 100rpx;
+  color: #282828;
+}
+
+.product-con .store-info .info .picTxt .text .address {
+  font-size: 0.24 * 100rpx;
+  color: #666;
+  margin-top: 0.03 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .text .address .iconfont {
+  color: #707070;
+  font-size: 0.18 * 100rpx;
+  margin-left: 0.1 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.product-con .store-info .info .picTxt .addressBox .iconfont {
+  font-size: 0.4 * 100rpx;
+}
+
+.product-con .store-info .info .picTxt .addressBox .addressTxt {
+  font-size: 0.24 * 100rpx;
+  color: #eb3729;
+}
+
+.product-con .store-info .praise {
+  font-size: 0.28 * 100rpx;
+  color: #808080;
+}
+
+.product-con .store-info .praise .iconfont {
+  font-size: 0.28 * 100rpx;
+}
+
+.product-con .superior {
+  background-color: #fff;
+  margin-top: 0.2 * 100rpx;
+}
+
+.product-con .superior .title {
+  height: 0.98 * 100rpx;
+}
+
+.product-con .superior .title image {
+  width: 0.3 * 100rpx;
+  height: 0.3 * 100rpx;
+}
+
+.product-con .superior .title .titleTxt {
+  margin: 0 0.2 * 100rpx;
+  font-size: 0.3 * 100rpx;
+  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.product-con .superior .slider-banner {
+  width: 6.9 * 100rpx;
+  margin: 0 auto;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list {
+  width: 100%;
+  padding-bottom: 0.2 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item {
+  width: 2.15 * 100rpx;
+  margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
+  font-size: 0.26 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+  margin-right: 0;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue {
+  width: 100%;
+  height: 2.15 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .pictrue image {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06 * 100rpx;
+}
+
+.product-con .superior .slider-banner .list .item .name {
+  color: #282828;
+  margin-top: 0.12 * 100rpx;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet {
+  background-color: #999;
+}
+
+.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+  background-color: #e93323;
+}
+
+.mask {
+  -webkit-filter: blur(2px);
+  -moz-filter: blur(2px);
+  -ms-filter: blur(2px);
+  filter: blur(2px);
+}
+
+.product-con .product-intro .conter view {
+  width: 100% !important;
+}
+
+.generate-posters {
+  width: 100%;
+  height: 1.7 * 100rpx;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 99;
+  transform: translate3d(0, 100%, 0);
+  -webkit-transform: translate3d(0, 100%, 0);
+  -ms-transform: translate3d(0, 100%, 0);
+  -moz-transform: translate3d(0, 100%, 0);
+  -o-transform: translate3d(0, 100%, 0);
+  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+}
+
+.generate-posters.on {
+  transform: translate3d(0, 0, 0);
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+}
+
+.generate-posters .item {
+  flex: 50%;
+  -webkit-flex: 50%;
+  -ms-flex: 50%;
+  text-align: center;
+}
+
+.generate-posters .item .iconfont {
+  font-size: 0.8 * 100rpx;
+  color: #5eae72;
+}
+
+.generate-posters .item .iconfont.icon-haibao {
+  color: #5391f1;
+}
+
+.noscroll {
+  height: 100%;
+  overflow: hidden;
+}
+.product-con .footer {
+  .in-bnt {
+    width: auto;
+    flex: 1;
+    margin-left: 30rpx;
+    & > view {
+      width: 100%;
+      border-radius: 50rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 59a0943..15e7128 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -114,11 +114,6 @@
                 <text class="iconfont icon-jiantou"></text>
               </view>
             </template>
-            <view class="item" @click="goPages2()">
-              <view class="pictrue"></view>
-              <view class="cell">积分商城</view>
-              <text class="iconfont icon-jiantou"></text>
-            </view>
           </view>
         </view>
       </view>