6 лет назад · 7ecdcd783e
--- a/mall/dist/build/h5/index.html
+++ b/mall/dist/build/h5/index.html
@@ -1,3 +1,3 @@
 
				 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>花卉宝</title><script>document.addEventListener('DOMContentLoaded', function() {
			
 
				 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
			
 
				-			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.223f0a00.js></script><script src=/static/js/index.af1340b7.js></script></body></html>
			
 
				+			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.02d5b90b.js></script><script src=/static/js/index.e142d5ba.js></script></body></html>
			
--- a/mall/dist/build/h5/static/index.css
+++ b/mall/dist/build/h5/static/index.css
--- a/mall/dist/build/h5/static/js/chunk-vendors.02d5b90b.js
+++ b/mall/dist/build/h5/static/js/chunk-vendors.02d5b90b.js
--- a/mall/dist/build/h5/static/js/chunk-vendors.223f0a00.js
+++ b/mall/dist/build/h5/static/js/chunk-vendors.223f0a00.js
--- a/mall/dist/build/h5/static/js/common-redirect.119fe3b8.js
+++ b/mall/dist/build/h5/static/js/common-redirect.119fe3b8.js
@@ -0,0 +1 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["common-redirect"],{"1d95":function(n,t,e){"use strict";e.r(t);var o=e("55f3"),r=e.n(o);for(var a in o)"default"!==a&&function(n){e.d(t,n,(function(){return o[n]}))}(a);t["default"]=r.a},"306c":function(n,t,e){var o=e("abd8");t=o(!1),t.push([n.i,'@charset "UTF-8";\n/***\r\n全局scss 变量和方法 存放处\r\n */\n/* 引入minxin */\n/* 颜色变量 */\n/*图片地址*/\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */.prompt-text[data-v-2eafd1ca]{padding-top:%?200?%;text-align:center}',""]),n.exports=t},"55f3":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;e("8876"),e("b26e");var o={data:function(){return{}},computed:{},onLoad:function(n){uni.showLoading({title:"加载中..."}),n.redirectUrl&&this.compatible()},methods:{compatible:function(){uni.hideLoading(),"invite"==this.option.type&&(location.href=decodeURIComponent(this.option.redirectUrl))}}};t.default=o},"8a05":function(n,t,e){"use strict";var o=e("d485"),r=e.n(o);r.a},"982e":function(n,t,e){"use strict";var o;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return o}));var r=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"app-content"})},a=[]},b171:function(n,t,e){"use strict";e.r(t);var o=e("982e"),r=e("1d95");for(var a in r)"default"!==a&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("8a05");var i,c=e("c444"),u=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"2eafd1ca",null,!1,o["a"],i);t["default"]=u.exports},d485:function(n,t,e){var o=e("306c");"string"===typeof o&&(o=[[n.i,o,""]]),o.locals&&(n.exports=o.locals);var r=e("f17f").default;r("6a7bcd64",o,!0,{sourceMap:!1,shadowMode:!1})}}]);
			
--- a/mall/dist/build/h5/static/js/common-redirect.62256323.js
+++ b/mall/dist/build/h5/static/js/common-redirect.62256323.js
--- a/mall/dist/build/h5/static/js/common-webview.7e38f665.js
+++ b/mall/dist/build/h5/static/js/common-webview.7e38f665.js
@@ -0,0 +1 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["common-webview"],{"44fa":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;t("8876");var r={data:function(){return{src:"",roleName:""}},computed:{},onLoad:function(n){},onShareAppMessage:function(n){var e={};return e={title:this.userInfo.nick_name+this.userInfo.role_name,path:"/pages/design/designCompany/indexNew?".concat(params)},e}};e.default=r},5535:function(n,e,t){"use strict";t.r(e);var r=t("44fa"),u=t.n(r);for(var a in r)"default"!==a&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"737d":function(n,e,t){"use strict";var r;t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return r}));var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("v-uni-web-view",{attrs:{src:n.src}})},a=[]},e76d:function(n,e,t){"use strict";t.r(e);var r=t("737d"),u=t("5535");for(var a in u)"default"!==a&&function(n){t.d(e,n,(function(){return u[n]}))}(a);var o,c=t("c444"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"67f405be",null,!1,r["a"],o);e["default"]=i.exports}}]);
			
--- a/mall/dist/build/h5/static/js/common-webview.af8e50b5.js
+++ b/mall/dist/build/h5/static/js/common-webview.af8e50b5.js
@@ -1 +0,0 @@
 
				-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["common-webview"],{5535:function(n,e,t){"use strict";t.r(e);var r=t("f32e"),u=t.n(r);for(var a in r)"default"!==a&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"737d":function(n,e,t){"use strict";var r;t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return r}));var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("v-uni-web-view",{attrs:{src:n.src}})},a=[]},e76d:function(n,e,t){"use strict";t.r(e);var r=t("737d"),u=t("5535");for(var a in u)"default"!==a&&function(n){t.d(e,n,(function(){return u[n]}))}(a);var o,i=t("31fa"),c=Object(i["a"])(u["default"],r["b"],r["c"],!1,null,"67f405be",null,!1,r["a"],o);e["default"]=c.exports},f32e:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;t("9660");var r={data:function(){return{src:"",roleName:""}},computed:{},onLoad:function(n){},onShareAppMessage:function(n){var e={};return e={title:this.userInfo.nick_name+this.userInfo.role_name,path:"/pages/design/designCompany/indexNew?".concat(params)},e}};e.default=r}}]);
			
--- a/mall/dist/build/h5/static/js/index.af1340b7.js
+++ b/mall/dist/build/h5/static/js/index.af1340b7.js
--- a/mall/dist/build/h5/static/js/index.e142d5ba.js
+++ b/mall/dist/build/h5/static/js/index.e142d5ba.js
--- a/mall/dist/build/h5/static/js/pages-callback-index.829998a1.js
+++ b/mall/dist/build/h5/static/js/pages-callback-index.829998a1.js
--- a/mall/dist/build/h5/static/js/pages-callback-index.9492f33e.js
+++ b/mall/dist/build/h5/static/js/pages-callback-index.9492f33e.js
--- a/mall/dist/build/h5/static/js/pages-callback-index~pages-pay-index.58291fc5.js
+++ b/mall/dist/build/h5/static/js/pages-callback-index~pages-pay-index.58291fc5.js
--- a/mall/dist/build/h5/static/js/pages-callback-index~pages-pay-index.9d1bfc79.js
+++ b/mall/dist/build/h5/static/js/pages-callback-index~pages-pay-index.9d1bfc79.js
--- a/mall/dist/build/h5/static/js/pages-chat-index.a49eedcb.js
+++ b/mall/dist/build/h5/static/js/pages-chat-index.a49eedcb.js
--- a/mall/dist/build/h5/static/js/pages-chat-index.c8e2a57c.js
+++ b/mall/dist/build/h5/static/js/pages-chat-index.c8e2a57c.js
--- a/mall/dist/build/h5/static/js/pages-coupon-list.889d67be.js
+++ b/mall/dist/build/h5/static/js/pages-coupon-list.889d67be.js
--- a/mall/dist/build/h5/static/js/pages-coupon-list.92bf93ae.js
+++ b/mall/dist/build/h5/static/js/pages-coupon-list.92bf93ae.js
--- a/mall/dist/build/h5/static/js/pages-coupon-list~pages-home-category~pages-interest-invite~pages-order-list.02bebfbd.js
+++ b/mall/dist/build/h5/static/js/pages-coupon-list~pages-home-category~pages-interest-invite~pages-order-list.02bebfbd.js
--- a/mall/dist/build/h5/static/js/pages-coupon-list~pages-home-category~pages-interest-invite~pages-order-list.fe7094c6.js
+++ b/mall/dist/build/h5/static/js/pages-coupon-list~pages-home-category~pages-interest-invite~pages-order-list.fe7094c6.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail.0a9d2a70.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail.0a9d2a70.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail.bf49c90c.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail.bf49c90c.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-category~pages-home-index.0bf5facc.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-category~pages-home-index.0bf5facc.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-user~pages-order-buy~pages-pay-index.67f2781a.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-user~pages-order-buy~pages-pay-index.67f2781a.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-user~pages-order-buy~pages-pay-index.86b74af4.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-user~pages-order-buy~pages-pay-index.86b74af4.js
--- a/mall/dist/build/h5/static/js/pages-home-category.099d3968.js
+++ b/mall/dist/build/h5/static/js/pages-home-category.099d3968.js
--- a/mall/dist/build/h5/static/js/pages-home-category.3605e8a5.js
+++ b/mall/dist/build/h5/static/js/pages-home-category.3605e8a5.js
--- a/mall/dist/build/h5/static/js/pages-home-index.639c8e0e.js
+++ b/mall/dist/build/h5/static/js/pages-home-index.639c8e0e.js
--- a/mall/dist/build/h5/static/js/pages-home-index.ef9d251d.js
+++ b/mall/dist/build/h5/static/js/pages-home-index.ef9d251d.js
--- a/mall/dist/build/h5/static/js/pages-home-shop.a2b64c4a.js
+++ b/mall/dist/build/h5/static/js/pages-home-shop.a2b64c4a.js
--- a/mall/dist/build/h5/static/js/pages-home-shop.b051f0c7.js
+++ b/mall/dist/build/h5/static/js/pages-home-shop.b051f0c7.js
--- a/mall/dist/build/h5/static/js/pages-home-user.582c4466.js
+++ b/mall/dist/build/h5/static/js/pages-home-user.582c4466.js
--- a/mall/dist/build/h5/static/js/pages-home-user.c2d6006e.js
+++ b/mall/dist/build/h5/static/js/pages-home-user.c2d6006e.js
--- a/mall/dist/build/h5/static/js/pages-interest-invite.28908d13.js
+++ b/mall/dist/build/h5/static/js/pages-interest-invite.28908d13.js
--- a/mall/dist/build/h5/static/js/pages-interest-invite.50984fe4.js
+++ b/mall/dist/build/h5/static/js/pages-interest-invite.50984fe4.js
--- a/mall/dist/build/h5/static/js/pages-interest-level.775d0130.js
+++ b/mall/dist/build/h5/static/js/pages-interest-level.775d0130.js
--- a/mall/dist/build/h5/static/js/pages-interest-level.c9d9aa53.js
+++ b/mall/dist/build/h5/static/js/pages-interest-level.c9d9aa53.js
--- a/mall/dist/build/h5/static/js/pages-order-buy.a8b2fdff.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy.a8b2fdff.js
--- a/mall/dist/build/h5/static/js/pages-order-buy.d3c3d6b2.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy.d3c3d6b2.js
--- a/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.e9be7bdc.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.e9be7bdc.js
--- a/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.ef7fbc45.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.ef7fbc45.js
--- a/mall/dist/build/h5/static/js/pages-order-buy~pages-user-password~pages-user-register.2f7f7159.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy~pages-user-password~pages-user-register.2f7f7159.js
--- a/mall/dist/build/h5/static/js/pages-order-buy~pages-user-password~pages-user-register.c893330a.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy~pages-user-password~pages-user-register.c893330a.js
--- a/mall/dist/build/h5/static/js/pages-order-comment.9bee96c2.js
+++ b/mall/dist/build/h5/static/js/pages-order-comment.9bee96c2.js
--- a/mall/dist/build/h5/static/js/pages-order-comment.dbc6f0ce.js
+++ b/mall/dist/build/h5/static/js/pages-order-comment.dbc6f0ce.js
--- a/mall/dist/build/h5/static/js/pages-order-detail.0ea45ebd.js
+++ b/mall/dist/build/h5/static/js/pages-order-detail.0ea45ebd.js
--- a/mall/dist/build/h5/static/js/pages-order-detail.c11b23db.js
+++ b/mall/dist/build/h5/static/js/pages-order-detail.c11b23db.js
--- a/mall/dist/build/h5/static/js/pages-order-list.52ab775b.js
+++ b/mall/dist/build/h5/static/js/pages-order-list.52ab775b.js
--- a/mall/dist/build/h5/static/js/pages-order-list.ddca3147.js
+++ b/mall/dist/build/h5/static/js/pages-order-list.ddca3147.js
--- a/mall/dist/build/h5/static/js/pages-pay-index.106457d0.js
+++ b/mall/dist/build/h5/static/js/pages-pay-index.106457d0.js
--- a/mall/dist/build/h5/static/js/pages-pay-index.323bd126.js
+++ b/mall/dist/build/h5/static/js/pages-pay-index.323bd126.js
--- a/mall/dist/build/h5/static/js/pages-user-password.2720d15e.js
+++ b/mall/dist/build/h5/static/js/pages-user-password.2720d15e.js
--- a/mall/dist/build/h5/static/js/pages-user-password.a7c17c9b.js
+++ b/mall/dist/build/h5/static/js/pages-user-password.a7c17c9b.js
--- a/mall/dist/build/h5/static/js/pages-user-register.6e07ccc4.js
+++ b/mall/dist/build/h5/static/js/pages-user-register.6e07ccc4.js
--- a/mall/dist/build/h5/static/js/pages-user-register.a34a24e0.js
+++ b/mall/dist/build/h5/static/js/pages-user-register.a34a24e0.js
--- a/mall/src/pages/goods/components/sel-popup.vue
+++ b/mall/src/pages/goods/components/sel-popup.vue
@@ -1,230 +1,239 @@
 
				 <template>
			
 
				-	<div class="sel-popup">
			
 
				-        <bottom-popup  class="popup-wrap" :show="show" @close="close">
			
 
				-            <app-close @close="close" />
			
 
				-            <div class="tui-popup-box">
			
 
				-				<div class="tui-product-box">
			
 
				-					<img :src="imgNormal" class="tui-popup-img" />
			
 
				-					<div class="tui-popup-price" v-if="!$util.isEmpty(info.goodsStyleList)">
			
 
				-                        <div class="goods-tit app-bold app-font-size-30">{{ info.goodsStyleList[selIndex].styleName }}</div>
			
 
				-						<div class="tui-amount tui-bold">￥{{ info.goodsStyleList[selIndex].price }}</div>
			
 
				-					</div>
			
 
				-					<div class="tui-popup-price" v-else>
			
 
				-                        <div class="goods-tit app-bold app-font-size-30">{{ info.goodsName }}</div>
			
 
				-						<div class="tui-amount tui-bold">￥{{ info.price }}</div>
			
 
				-					</div>
			
 
				-				</div>
			
 
				-				<scroll-view scroll-y class="tui-popup-scroll">
			
 
				-					<div class="tui-scrolldiv-box">
			
 
				-						<div class="tui-bold tui-attr-title">款式</div>
			
 
				-						<div class="tui-attr-box">
			
 
				-							<div class="tui-attr-item" :class="{'tui-attr-active': selIndex == index}" v-for="(item, index) in info.goodsStyleList" :key="index" @click="changeStyleFn(index)">{{ item.styleName }}</div>
			
 
				-						</div>
			
 
				-
			
 
				-						<div class="tui-number-box tui-bold tui-attr-title">
			
 
				-							<div class="tui-attr-title">数量</div>
			
 
				-							<number-box :max="info.stock" :min="1" :value="buyNum" @change="change"></number-box>
			
 
				-						</div>
			
 
				-					</div>
			
 
				-				</scroll-view>
			
 
				-				<div class="tui-popup-btn">
			
 
				-                    <button class="button-com red" @click="nextFn">下一步</button>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-        </bottom-popup>
			
 
				-    </div>
			
 
				+  <div class="sel-popup">
			
 
				+    <bottom-popup class="popup-wrap" :show="show" @close="close">
			
 
				+      <app-close @close="close" />
			
 
				+      <div class="tui-popup-box">
			
 
				+        <div class="tui-product-box">
			
 
				+          <img :src="imgNormal" class="tui-popup-img" />
			
 
				+          <div class="tui-popup-price" v-if="!$util.isEmpty(info.goodsStyleList)">
			
 
				+            <div
			
 
				+              class="goods-tit app-bold app-font-size-30"
			
 
				+            >{{ info.goodsStyleList[selIndex].styleName }}</div>
			
 
				+            <div class="tui-amount tui-bold">￥{{ info.goodsStyleList[selIndex].price }}</div>
			
 
				+          </div>
			
 
				+          <div class="tui-popup-price" v-else>
			
 
				+            <div class="goods-tit app-bold app-font-size-30">{{ info.goodsName }}</div>
			
 
				+            <div class="tui-amount tui-bold">￥{{ info.price }}</div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+        <scroll-view scroll-y class="tui-popup-scroll">
			
 
				+          <div class="tui-scrolldiv-box">
			
 
				+            <template v-if="$util.isEmpty(info.goodsStyleList) == false">
			
 
				+              <div class="tui-bold tui-attr-title">款式</div>
			
 
				+              <div class="tui-attr-box">
			
 
				+                <div
			
 
				+                  class="tui-attr-item"
			
 
				+                  :class="{'tui-attr-active': selIndex == index}"
			
 
				+                  v-for="(item, index) in info.goodsStyleList"
			
 
				+                  :key="index"
			
 
				+                  @click="changeStyleFn(index)"
			
 
				+                >{{ item.styleName }}</div>
			
 
				+              </div>
			
 
				+            </template>
			
 
				+
			
 
				+            <div class="tui-number-box tui-bold tui-attr-title">
			
 
				+              <div class="tui-attr-title">数量</div>
			
 
				+              <number-box :max="maxStock" :min="1" :value="buyNum" @change="change"></number-box>
			
 
				+            </div>
			
 
				+          </div>
			
 
				+        </scroll-view>
			
 
				+        <div class="tui-popup-btn">
			
 
				+          <button class="button-com red" @click="nextFn">下一步</button>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </bottom-popup>
			
 
				+  </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				-import BottomPopup from '@/components/plugin/bottom-popup'
			
 
				-import NumberBox from '@/components/plugin/number-box'
			
 
				-import AppClose from '@/components/module/app-close'
			
 
				+import BottomPopup from "@/components/plugin/bottom-popup";
			
 
				+import NumberBox from "@/components/plugin/number-box";
			
 
				+import AppClose from "@/components/module/app-close";
			
 
				 export default {
			
 
				-	name: 'sel-popup',
			
 
				-	components: {
			
 
				-		BottomPopup,
			
 
				-		NumberBox,
			
 
				-		AppClose
			
 
				+  name: "sel-popup",
			
 
				+  components: {
			
 
				+    BottomPopup,
			
 
				+    NumberBox,
			
 
				+    AppClose
			
 
				+  },
			
 
				+  props: {
			
 
				+    // 信息
			
 
				+    info: {
			
 
				+      type: Object,
			
 
				+      default: () => {
			
 
				+        return {};
			
 
				+      }
			
 
				+    },
			
 
				+    buyNum: {
			
 
				+      type: Number,
			
 
				+      default: 1
			
 
				+    },
			
 
				+    show: {
			
 
				+      type: Boolean,
			
 
				+      default: true
			
 
				+    }
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      selIndex: 0
			
 
				+    };
			
 
				+  },
			
 
				+  computed: {
			
 
				+    imgNormal() {
			
 
				+      if (!this.$util.isEmpty(this.info)) {
			
 
				+        return this.info.smallImgList[0];
			
 
				+      } else {
			
 
				+        return "";
			
 
				+      }
			
 
				 	},
			
 
				-	props: {
			
 
				-		// 信息
			
 
				-		info: {
			
 
				-			type: Object,
			
 
				-			default: () => {
			
 
				-				return {}
			
 
				-			}
			
 
				-		},
			
 
				-		// selIndex: {
			
 
				-		// 	type: Number,
			
 
				-		// 	default: 0
			
 
				-		// },
			
 
				-		buyNum: {
			
 
				-			type: Number,
			
 
				-			default: 1
			
 
				-		},
			
 
				-		show: {
			
 
				-			type: Boolean,
			
 
				-			default: true
			
 
				-		}
			
 
				-	},
			
 
				-	data() {
			
 
				-		return {
			
 
				-			selIndex: 0
			
 
				-		}
			
 
				-	},
			
 
				-	computed: {
			
 
				-		imgNormal() {
			
 
				-			if (!this.$util.isEmpty(this.info)) {
			
 
				-				return this.info.smallImgList[0]
			
 
				-			} else {
			
 
				-				return ''
			
 
				-			}
			
 
				-		}
			
 
				-	},
			
 
				-	methods: {
			
 
				-		change(e) {
			
 
				-			this.$emit('change', e)
			
 
				-		},
			
 
				-		close() {
			
 
				-			this.$emit('close')
			
 
				-		},
			
 
				-		changeStyleFn(index) {
			
 
				-			this.selIndex = index
			
 
				-		},
			
 
				-		nextFn() {
			
 
				-			uni.setStorageSync('buyGoodsDetil', this.info)
			
 
				-			this.$util.pageTo({
			
 
				-				url: '/pages/order/buy',
			
 
				-				query: {
			
 
				-					goodsId: this.info.id,
			
 
				-					goodsStyleId: this.$util.isEmpty(this.info.goodsStyleList) ? '' : this.info.goodsStyleList[this.selIndex].id,
			
 
				-					goodsNum: this.buyNum,
			
 
				-					selIndex: this.selIndex
			
 
				-				}
			
 
				-			})
			
 
				-		}
			
 
				-	}
			
 
				-}
			
 
				+	maxStock(){
			
 
				+		return this.info.stock == -1 ? 99999 : this.info.stock
			
 
				+	}
			
 
				+  },
			
 
				+  methods: {
			
 
				+    change(e) {
			
 
				+      this.$emit("change", e);
			
 
				+    },
			
 
				+    close() {
			
 
				+      this.$emit("close");
			
 
				+    },
			
 
				+    changeStyleFn(index) {
			
 
				+      this.selIndex = index;
			
 
				+    },
			
 
				+    nextFn() {
			
 
				+      uni.setStorageSync("buyGoodsDetil", this.info);
			
 
				+      this.$util.pageTo({
			
 
				+        url: "/pages/order/buy",
			
 
				+        query: {
			
 
				+          goodsId: this.info.id,
			
 
				+          goodsStyleId: this.$util.isEmpty(this.info.goodsStyleList)
			
 
				+            ? ""
			
 
				+            : this.info.goodsStyleList[this.selIndex].id,
			
 
				+          goodsNum: this.buyNum,
			
 
				+          selIndex: this.selIndex
			
 
				+        }
			
 
				+      });
			
 
				+    }
			
 
				+  }
			
 
				+};
			
 
				 </script>
			
 
				 
			
 
				 <style lang="scss" scoped>
			
 
				 /deep/.popup-wrap {
			
 
				-	.tui-popup-class {
			
 
				-		border-top-left-radius: 24rpx;
			
 
				-        border-top-right-radius: 24rpx;
			
 
				-        // 适配iphoneX
			
 
				-		padding-bottom: env(safe-area-inset-bottom);
			
 
				-	}
			
 
				-
			
 
				-	.tui-popup-box {
			
 
				-		position: relative;
			
 
				-		padding: 30rpx 30px 100rpx;
			
 
				-	}
			
 
				-
			
 
				-	.tui-popup-btn {
			
 
				-		width: 100%;
			
 
				-		position: absolute;
			
 
				-		left: 0;
			
 
				-        bottom: 0;
			
 
				-        padding: 14px 0;
			
 
				-        @include disFlex(center, center);
			
 
				-        border-top: 1px solid $borderColor;
			
 
				-        .button-com {
			
 
				-            width: 80%;
			
 
				-            font-size: 32px;
			
 
				-            // padding-top: 12px;
			
 
				-            // padding-bottom: 12px;
			
 
				-        }
			
 
				-	}
			
 
				-
			
 
				-	.tui-product-box {
			
 
				-		display: flex;
			
 
				-		align-items: center;
			
 
				-		font-size: 24rpx;
			
 
				-		padding-bottom: 30rpx;
			
 
				-	}
			
 
				-
			
 
				-	.tui-popup-img {
			
 
				-		height: 200rpx;
			
 
				-		width: 200rpx;
			
 
				-		border-radius: 24rpx;
			
 
				-		display: block;
			
 
				-	}
			
 
				-
			
 
				-	.tui-popup-price {
			
 
				-		padding-left: 20rpx;
			
 
				-        padding-bottom: 8rpx;
			
 
				-        .goods-tit {
			
 
				-            margin-bottom: 75px;
			
 
				-        }
			
 
				-	}
			
 
				-
			
 
				-	.tui-amount {
			
 
				-		color: #ff201f;
			
 
				-		font-size: 36rpx;
			
 
				-	}
			
 
				-
			
 
				-	.tui-popup-scroll {
			
 
				-		height: 380rpx;
			
 
				-		font-size: 26rpx;
			
 
				-	}
			
 
				-
			
 
				-	.tui-scrollview-box {
			
 
				-		padding: 0 30rpx 60rpx 30rpx;
			
 
				-		box-sizing: border-box;
			
 
				-	}
			
 
				-
			
 
				-	.tui-attr-title {
			
 
				-		padding: 10rpx 0;
			
 
				-		color: #333;
			
 
				-	}
			
 
				-
			
 
				-	.tui-attr-box {
			
 
				-		font-size: 0;
			
 
				-		padding: 20rpx 0;
			
 
				-	}
			
 
				-
			
 
				-	.tui-attr-item {
			
 
				-		max-width: 100%;
			
 
				-		min-width: 200rpx;
			
 
				-		height: 64rpx;
			
 
				-		display: -webkit-inline-flex;
			
 
				-		display: inline-flex;
			
 
				-		align-items: center;
			
 
				-		justify-content: center;
			
 
				-		background: #f7f7f7;
			
 
				-		padding: 0 26rpx;
			
 
				-		box-sizing: border-box;
			
 
				-		border-radius: 32rpx;
			
 
				-		margin-right: 20rpx;
			
 
				-		margin-bottom: 20rpx;
			
 
				-		font-size: 26rpx;
			
 
				-	}
			
 
				-
			
 
				-	.tui-attr-active {
			
 
				-		background: #fcedea !important;
			
 
				-		color: #e41f19;
			
 
				-		font-weight: bold;
			
 
				-		position: relative;
			
 
				-	}
			
 
				-
			
 
				-	.tui-attr-active::after {
			
 
				-		content: "";
			
 
				-		position: absolute;
			
 
				-		border: 1rpx solid #e41f19;
			
 
				-		width: 100%;
			
 
				-		height: 100%;
			
 
				-		border-radius: 40rpx;
			
 
				-		left: 0;
			
 
				-		top: 0;
			
 
				-	}
			
 
				-
			
 
				-	.tui-number-box {
			
 
				-		display: flex;
			
 
				-		align-items: center;
			
 
				-		justify-content: space-between;
			
 
				-		padding: 20rpx 0 30rpx 0;
			
 
				-		box-sizing: border-box;
			
 
				-	}
			
 
				+  .tui-popup-class {
			
 
				+    border-top-left-radius: 24rpx;
			
 
				+    border-top-right-radius: 24rpx;
			
 
				+    // 适配iphoneX
			
 
				+    padding-bottom: env(safe-area-inset-bottom);
			
 
				+  }
			
 
				+
			
 
				+  .tui-popup-box {
			
 
				+    position: relative;
			
 
				+    padding: 30rpx 30px 100rpx;
			
 
				+  }
			
 
				+
			
 
				+  .tui-popup-btn {
			
 
				+    width: 100%;
			
 
				+    position: absolute;
			
 
				+    left: 0;
			
 
				+    bottom: 0;
			
 
				+    padding: 14px 0;
			
 
				+    @include disFlex(center, center);
			
 
				+    border-top: 1px solid $borderColor;
			
 
				+    .button-com {
			
 
				+      width: 80%;
			
 
				+      font-size: 32px;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  .tui-product-box {
			
 
				+    display: flex;
			
 
				+    align-items: center;
			
 
				+    font-size: 24rpx;
			
 
				+    padding-bottom: 30rpx;
			
 
				+  }
			
 
				+
			
 
				+  .tui-popup-img {
			
 
				+    height: 200rpx;
			
 
				+    width: 200rpx;
			
 
				+    border-radius: 24rpx;
			
 
				+    display: block;
			
 
				+  }
			
 
				+
			
 
				+  .tui-popup-price {
			
 
				+    padding-left: 20rpx;
			
 
				+    padding-bottom: 8rpx;
			
 
				+    .goods-tit {
			
 
				+      margin-bottom: 75px;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  .tui-amount {
			
 
				+    color: #ff201f;
			
 
				+    font-size: 36rpx;
			
 
				+  }
			
 
				+
			
 
				+  .tui-popup-scroll {
			
 
				+    max-height: 380rpx;
			
 
				+    font-size: 26rpx;
			
 
				+  }
			
 
				+
			
 
				+  .tui-scrollview-box {
			
 
				+    padding: 0 30rpx 60rpx 30rpx;
			
 
				+    box-sizing: border-box;
			
 
				+  }
			
 
				+
			
 
				+  .tui-attr-title {
			
 
				+    padding: 10rpx 0;
			
 
				+    color: #333;
			
 
				+  }
			
 
				+
			
 
				+  .tui-attr-box {
			
 
				+    font-size: 0;
			
 
				+    padding: 20rpx 0;
			
 
				+  }
			
 
				+
			
 
				+  .tui-attr-item {
			
 
				+    max-width: 100%;
			
 
				+    min-width: 200rpx;
			
 
				+    height: 64rpx;
			
 
				+    display: -webkit-inline-flex;
			
 
				+    display: inline-flex;
			
 
				+    align-items: center;
			
 
				+    justify-content: center;
			
 
				+    background: #f7f7f7;
			
 
				+    padding: 0 26rpx;
			
 
				+    box-sizing: border-box;
			
 
				+    border-radius: 32rpx;
			
 
				+    margin-right: 20rpx;
			
 
				+    margin-bottom: 20rpx;
			
 
				+    font-size: 26rpx;
			
 
				+  }
			
 
				+
			
 
				+  .tui-attr-active {
			
 
				+    background: #fcedea !important;
			
 
				+    color: #e41f19;
			
 
				+    font-weight: bold;
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .tui-attr-active::after {
			
 
				+    content: "";
			
 
				+    position: absolute;
			
 
				+    border: 1rpx solid #e41f19;
			
 
				+    width: 100%;
			
 
				+    height: 100%;
			
 
				+    border-radius: 40rpx;
			
 
				+    left: 0;
			
 
				+    top: 0;
			
 
				+  }
			
 
				+
			
 
				+  .tui-number-box {
			
 
				+    display: flex;
			
 
				+    align-items: center;
			
 
				+    justify-content: space-between;
			
 
				+    padding: 20rpx 0 30rpx 0;
			
 
				+    box-sizing: border-box;
			
 
				+  }
			
 
				 }
			
 
				 </style>
			
--- a/mall/src/pages/goods/detail.vue
+++ b/mall/src/pages/goods/detail.vue
@@ -45,7 +45,9 @@
 
				       <div class="module-tit app-size-30">商品详情</div>
			
 
				       <div class="module-det">
			
 
				         <!-- <app-img :src="imgNormal" alt mode="widthFix" /> -->
			
 
				-        <div class="module-det-text" v-html="data.content"></div>
			
 
				+        <div class="module-det-text">
			
 
				+<rich-text :nodes="data.content"></rich-text>
			
 
				+        </div>
			
 
				       </div>
			
 
				     </div>
			
 
				     <!-- 商品详情 -->
			
@@ -53,7 +55,9 @@
 
				     <div class="module-wrap shop-desc">
			
 
				       <div class="module-tit app-size-30">简要说明</div>
			
 
				       <div class="module-det">
			
 
				-        <div class="module-det-text">{{ data.commonIntro }}</div>
			
 
				+        <div class="module-det-text">
			
 
				+          <rich-text :nodes="data.commonIntro"></rich-text>
			
 
				+        </div>
			
 
				       </div>
			
 
				     </div>
			
 
				     <!-- 简要说明 -->
			
@@ -186,8 +190,9 @@ export default {
 
				     },
			
 
				     // 分享
			
 
				     shareFn() {
			
 
				-      console.log("asdfasdf");
			
 
				+      // #ifdef H5
			
 
				       this.showShare = true;
			
 
				+      // #endif
			
 
				     },
			
 
				     hideShare() {
			
 
				       this.showShare = false;
			
--- a/mall/src/pages/home/components/goods-list-big.vue
+++ b/mall/src/pages/home/components/goods-list-big.vue
@@ -3,7 +3,6 @@
 
				 		<div class="title-tag">
			
 
				 			<div class="title-text">{{ info.categoryName }}</div>
			
 
				 			<div class="title-img">
			
 
				-				<!-- <img :src="`${constant.imgUrl}/retail/home/goods-small-tit.png`" alt /> -->
			
 
				 				<img :src="`${constant.imgUrl}/retail/home/goods-big-tit.png`" alt mode="widthFix" />
			
 
				 			</div>
			
 
				 		</div>
			
@@ -16,7 +15,7 @@
 
				 					}
			
 
				 				})">
			
 
				 					<div class="goods-img">
			
 
				-						<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" :height="534" />
			
 
				+						<app-img :src="item.smallImgList[0]" mode="aspectFit" style="width:100%" />
			
 
				 					</div>
			
 
				 					<div class="goods-det">
			
 
				 						<div class="goods-left">
			
--- a/mall/src/pages/home/components/goods-list-middle.vue
+++ b/mall/src/pages/home/components/goods-list-middle.vue
@@ -9,7 +9,7 @@
 
				 		<div class="goods-wrap">
			
 
				 			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">
			
 
				 				<div class="goods-img">
			
 
				-					<img :src="item.img" alt="商品图片" mode="aspectFit" :height="346" />
			
 
				+					<img :src="item.img" alt="商品图片" mode="aspectFit" style="width:100%" />
			
 
				 				</div>
			
 
				 				<div class="goods-det">
			
 
				 					<div class="goods-left">
			
--- a/mall/src/pages/home/components/goods-list-small.vue
+++ b/mall/src/pages/home/components/goods-list-small.vue
@@ -9,7 +9,7 @@
 
				 		<div class="goods-wrap">
			
 
				 			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">
			
 
				 				<div class="goods-img">
			
 
				-					<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" :height="246" />
			
 
				+					<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" style="width:100%" />
			
 
				 				</div>
			
 
				 				<div class="goods-det">
			
 
				 					<div class="goods-left">
			
--- a/mall/src/pages/home/index.vue
+++ b/mall/src/pages/home/index.vue
@@ -1,102 +1,86 @@
 
				 <template>
			
 
				-	<div class="app-main app-content">
			
 
				-		<app-swiper v-if="!$util.isEmpty(ad)" :list="ad" @detail="adDetailFn" />
			
 
				-		<block v-if="!$util.isEmpty(category)">
			
 
				-			<div class="goods-module" v-for="(item, index) in category" :key="index">
			
 
				-				<goods-list-big v-if="item.showRow == 1" :info="item" />
			
 
				-				<goods-list-small v-if="item.showRow == 2" :info="item" />
			
 
				-			</div>
			
 
				-		</block>
			
 
				-		<app-trademark />
			
 
				-	</div>
			
 
				+  <div class="app-main app-content">
			
 
				+    <app-swiper v-if="!$util.isEmpty(ad)" :list="ad" @detail="adDetailFn" />
			
 
				+    <block v-if="!$util.isEmpty(category)">
			
 
				+      <div class="goods-module" v-for="(item, index) in category" :key="index">
			
 
				+        <goods-list-big v-if="item.showRow == 1" :info="item" />
			
 
				+        <goods-list-small v-if="item.showRow == 2" :info="item" />
			
 
				+      </div>
			
 
				+    </block>
			
 
				+    <app-trademark />
			
 
				+  </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				-	import { mapGetters } from 'vuex'
			
 
				-	import AppSwiper from '@/components/app-swiper'
			
 
				-	import AppTrademark from '@/components/module/app-trademark'
			
 
				-	// 商品组件
			
 
				-	import goodsListBig from '@/pages/home/components/goods-list-big'
			
 
				-	import goodsListMiddle from '@/pages/home/components/goods-list-middle'
			
 
				-	import goodsListSmall from '@/pages/home/components/goods-list-small'
			
 
				-	// import AppFooter from '@/components/app-footer'
			
 
				-	// api
			
 
				-	import { getMainIndex } from '@/api/home'
			
 
				-	import { getOrderShop } from '@/utils/config'
			
 
				-	export default {
			
 
				-		name: 'home',
			
 
				-		components: {
			
 
				-			AppSwiper,
			
 
				-			AppTrademark,
			
 
				-			goodsListBig,
			
 
				-			goodsListMiddle,
			
 
				-			goodsListSmall
			
 
				-			// AppFooter
			
 
				-		},
			
 
				-		data() {
			
 
				-			return {
			
 
				-				data: {},
			
 
				-				ad: [],
			
 
				-				category: [],
			
 
				-				columnStyle: null
			
 
				-			}
			
 
				-		},
			
 
				-		computed: {
			
 
				-			...mapGetters({ orderShop: 'getOrderShop' })
			
 
				-		},
			
 
				-		onLoad(option) {
			
 
				-			// if (this.$util.isLogin()) {
			
 
				-			// 	this.init()
			
 
				-			// }
			
 
				-		},
			
 
				-		mounted() {},
			
 
				-		methods: {
			
 
				-			init() {
			
 
				-				getOrderShop().then(res => {
			
 
				-					uni.setNavigationBarTitle({
			
 
				-						title: `${res.shop.merchantName}`
			
 
				-					})
			
 
				-				})
			
 
				-				// uni.setNavigationBarTitle({
			
 
				-				// 	title: '国兰花尚'
			
 
				-				// })
			
 
				-				this._detail()
			
 
				-			},
			
 
				-			_detail() {
			
 
				-				getMainIndex().then(res => {
			
 
				-					this.data = res.data
			
 
				-					if (this.$util.isEmpty(res.data)) return false
			
 
				-					this.ad = res.data.ad.map(e => {
			
 
				-						e.img = e.adImg
			
 
				-						return e
			
 
				-					})
			
 
				-					this.category = res.data.category
			
 
				-					this.columnStyle = res.data.columnStyle
			
 
				-				})
			
 
				-			},
			
 
				-			// operate
			
 
				-			adDetailFn(item) {
			
 
				-				// #ifdef H5
			
 
				-				location.href = item.url
			
 
				-				// #endif
			
 
				-				// #ifndef H5
			
 
				-				// #endif
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				+import { mapGetters } from "vuex";
			
 
				+import AppSwiper from "@/components/app-swiper";
			
 
				+import AppTrademark from "@/components/module/app-trademark";
			
 
				+// 商品组件
			
 
				+import goodsListBig from "@/pages/home/components/goods-list-big";
			
 
				+import goodsListMiddle from "@/pages/home/components/goods-list-middle";
			
 
				+import goodsListSmall from "@/pages/home/components/goods-list-small";
			
 
				+import { getMainIndex } from "@/api/home";
			
 
				+import { getOrderShop } from "@/utils/config";
			
 
				+export default {
			
 
				+  name: "home",
			
 
				+  components: {
			
 
				+    AppSwiper,
			
 
				+    AppTrademark,
			
 
				+    goodsListBig,
			
 
				+    goodsListMiddle,
			
 
				+    goodsListSmall
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      data: {},
			
 
				+      ad: [],
			
 
				+      category: [],
			
 
				+      columnStyle: null
			
 
				+    };
			
 
				+  },
			
 
				+  computed: {
			
 
				+    ...mapGetters({ orderShop: "getOrderShop" })
			
 
				+  },
			
 
				+  onLoad(option) {},
			
 
				+  mounted() {},
			
 
				+  methods: {
			
 
				+    init() {
			
 
				+      getOrderShop().then(res => {
			
 
				+        uni.setNavigationBarTitle({
			
 
				+          title: `${res.shop.merchantName}`
			
 
				+        });
			
 
				+      });
			
 
				+      this._detail();
			
 
				+    },
			
 
				+    _detail() {
			
 
				+      getMainIndex().then(res => {
			
 
				+        this.data = res.data;
			
 
				+        if (this.$util.isEmpty(res.data)) return false;
			
 
				+        this.ad = res.data.ad.map(e => {
			
 
				+          e.img = e.adImg;
			
 
				+          return e;
			
 
				+        });
			
 
				+        this.category = res.data.category;
			
 
				+        this.columnStyle = res.data.columnStyle;
			
 
				+      });
			
 
				+    },
			
 
				+    adDetailFn(item) {
			
 
				+      // #ifdef H5
			
 
				+      location.href = item.url;
			
 
				+      // #endif
			
 
				+    }
			
 
				+  }
			
 
				+};
			
 
				 </script>
			
 
				 
			
 
				 <style lang="scss" scoped>
			
 
				-	.app-content {
			
 
				-		// padding-bottom: 100px;
			
 
				-	}
			
 
				-	.goods-module {
			
 
				-		padding: 0 20px;
			
 
				-		margin-top: 40px;
			
 
				-		/deep/.buy-com-btn {
			
 
				-			font-size: 24px;
			
 
				-			padding: 10px 20px 12px;
			
 
				-			box-shadow: 8px 8px 20px #eee;
			
 
				-		}
			
 
				-	}
			
 
				+.goods-module {
			
 
				+  padding: 0 20px;
			
 
				+  margin-top: 40px;
			
 
				+  /deep/.buy-com-btn {
			
 
				+    font-size: 24px;
			
 
				+    padding: 10px 20px 12px;
			
 
				+    box-shadow: 8px 8px 20px #eee;
			
 
				+  }
			
 
				+}
			
 
				 </style>
			
--- a/mall/src/pages/pay/index.vue
+++ b/mall/src/pages/pay/index.vue
@@ -23,10 +23,7 @@
 
				         </div>
			
 
				       </div>
			
 
				       <!-- 查看更多 -->
			
 
				-      <div 
			
 
				-        class="view-more" 
			
 
				-        :class="{'open' : tabIndex == 1}" 
			
 
				-        @click="changeDelivery">
			
 
				+      <div class="view-more" :class="{'open' : tabIndex == 1}" @click="changeDelivery">
			
 
				         <div class="view-more-text">{{ tabIndex == 0 ? '帮我送' : '收起' }}</div>
			
 
				         <i class="iconfont iconjiantouxia"></i>
			
 
				       </div>
			
@@ -189,9 +186,12 @@ export default {
 
				         uni.setNavigationBarTitle({
			
 
				           title: `您正在向【${res.shop.merchantName}】付款`
			
 
				         });
			
 
				-        this.$refs.couponSel._getUserDiscount().then(status => {
			
 
				-          this.discountArr = status;
			
 
				-        });
			
 
				+        //没有登陆不取优惠
			
 
				+        if (isLogin()) {
			
 
				+          this.$refs.couponSel._getUserDiscount().then(discountData => {
			
 
				+            this.discountArr = discountData;
			
 
				+          });
			
 
				+        }
			
 
				       });
			
 
				       if (isLogin()) {
			
 
				         getShopUser(true).then(res => {
			
@@ -343,8 +343,8 @@ export default {
 
				     },
			
 
				     changeDelivery() {
			
 
				       this.tabIndex = this.tabIndex == 0 ? 1 : 0;
			
 
				-      if(this.tabIndex === 1) {
			
 
				-         this.inpFocus = false;
			
 
				+      if (this.tabIndex === 1) {
			
 
				+        this.inpFocus = false;
			
 
				       }
			
 
				     }
			
 
				   }