il y a 6 ans · 2e573548e4
--- 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.8f39e366.js></script><script src=/static/js/index.147e8d5c.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.7afd6203.js></script><script src=/static/js/index.05e33697.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.7afd6203.js
+++ b/mall/dist/build/h5/static/js/chunk-vendors.7afd6203.js
--- a/mall/dist/build/h5/static/js/chunk-vendors.8f39e366.js
+++ b/mall/dist/build/h5/static/js/chunk-vendors.8f39e366.js
--- a/mall/dist/build/h5/static/js/common-redirect.119fe3b8.js
+++ b/mall/dist/build/h5/static/js/common-redirect.119fe3b8.js
@@ -1 +0,0 @@
 
				-(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
@@ -1 +0,0 @@
 
				-(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
@@ -0,0 +1 @@
 
				+(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.05e33697.js
+++ b/mall/dist/build/h5/static/js/index.05e33697.js
--- a/mall/dist/build/h5/static/js/index.147e8d5c.js
+++ b/mall/dist/build/h5/static/js/index.147e8d5c.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.0473653a.js
+++ b/mall/dist/build/h5/static/js/pages-callback-index~pages-pay-index.0473653a.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.35f67fd5.js
+++ b/mall/dist/build/h5/static/js/pages-chat-index.35f67fd5.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.492ff699.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail.492ff699.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail.7efde1f7.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail.7efde1f7.js
--- a/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-category~pages-home-index.669ff131.js
+++ b/mall/dist/build/h5/static/js/pages-goods-detail~pages-home-category~pages-home-index.669ff131.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.9feb140b.js
+++ b/mall/dist/build/h5/static/js/pages-home-index.9feb140b.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.1b317595.js
+++ b/mall/dist/build/h5/static/js/pages-home-shop.1b317595.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.af8854be.js
+++ b/mall/dist/build/h5/static/js/pages-home-user.af8854be.js
--- a/mall/dist/build/h5/static/js/pages-home-user.fd81e955.js
+++ b/mall/dist/build/h5/static/js/pages-home-user.fd81e955.js
--- a/mall/dist/build/h5/static/js/pages-interest-invite.13b03e8e.js
+++ b/mall/dist/build/h5/static/js/pages-interest-invite.13b03e8e.js
--- a/mall/dist/build/h5/static/js/pages-interest-invite.af4c8c8d.js
+++ b/mall/dist/build/h5/static/js/pages-interest-invite.af4c8c8d.js
--- a/mall/dist/build/h5/static/js/pages-interest-level.77a65b22.js
+++ b/mall/dist/build/h5/static/js/pages-interest-level.77a65b22.js
--- a/mall/dist/build/h5/static/js/pages-interest-level.83d1f279.js
+++ b/mall/dist/build/h5/static/js/pages-interest-level.83d1f279.js
--- a/mall/dist/build/h5/static/js/pages-order-buy.5c53c7e0.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy.5c53c7e0.js
--- a/mall/dist/build/h5/static/js/pages-order-buy.bdda131a.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy.bdda131a.js
--- a/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.42ffbbc2.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.42ffbbc2.js
--- a/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.91cecb7d.js
+++ b/mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.91cecb7d.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.3916dd01.js
+++ b/mall/dist/build/h5/static/js/pages-order-detail.3916dd01.js
--- a/mall/dist/build/h5/static/js/pages-order-detail.c71424ff.js
+++ b/mall/dist/build/h5/static/js/pages-order-detail.c71424ff.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.672dcfc5.js
+++ b/mall/dist/build/h5/static/js/pages-pay-index.672dcfc5.js
--- a/mall/dist/build/h5/static/js/pages-pay-index.bb830b1b.js
+++ b/mall/dist/build/h5/static/js/pages-pay-index.bb830b1b.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/components/module/app-vip.vue
+++ b/mall/src/components/module/app-vip.vue
@@ -1,11 +1,6 @@
 
				 <template>
			
 
				   <div class="app-vip-module">
			
 
				-    <img
			
 
				-      class="vip-img"
			
 
				-      :src="`${this.$constant.imgUrl}/retail/interest/vip.png`"
			
 
				-      alt
			
 
				-      mode="widthFix"
			
 
				-    />
			
 
				+    <img class="vip-img" :src="vipImgUrl" alt mode="widthFix" />
			
 
				     <div class="vip-text">{{ text }}</div>
			
 
				   </div>
			
 
				 </template>
			
@@ -17,16 +12,14 @@ export default {
 
				     text: {
			
 
				       type: String,
			
 
				       default: "VIP"
			
 
				+    },
			
 
				+    vipImgUrl:{
			
 
				+      type:String,
			
 
				+      default:''
			
 
				     }
			
 
				   },
			
 
				   data() {
			
 
				-    return {
			
 
				-      constant: this.$constant
			
 
				-    };
			
 
				-  },
			
 
				-  onLoad(option) {
			
 
				-    console.log("查看constance....");
			
 
				-    console.log(this.$constant);
			
 
				+    return {};
			
 
				   }
			
 
				 };
			
 
				 </script>
			
--- a/mall/src/pages/home/user.vue
+++ b/mall/src/pages/home/user.vue
@@ -1,22 +1,7 @@
 
				 <template>
			
 
				   <div class="app-main app-content">
			
 
				     <div class="user-wrap">
			
 
				-      <!-- 未登录 -->
			
 
				-      <template v-if="$util.isEmpty(shopUser)">
			
 
				-        <div class="no-login-attr login-attr-wrap">
			
 
				-          <img :src="`${constant.imgUrl}/retail/user/attr-default.png`" alt mode="widthFix" />
			
 
				-        </div>
			
 
				-        <div class="button-wrap">
			
 
				-          <!-- #ifdef H5 -->
			
 
				-          <button class="button-com">申请会员</button>
			
 
				-          <!-- #endif -->
			
 
				-          <!-- #ifdef MP-WEIXIN -->
			
 
				-          <button class="button-com mini-btn">申请会员</button>
			
 
				-          <!-- #endif -->
			
 
				-        </div>
			
 
				-      </template>
			
 
				-      <!-- 已登录 -->
			
 
				-      <template v-else>
			
 
				+      <template>
			
 
				         <div class="is-login-attr">
			
 
				           <div class="user-wrap-top">
			
 
				             <div class="user-blo-left">
			
@@ -25,9 +10,10 @@
 
				                 <div class="user-level-img">
			
 
				                   <block v-if="!$util.isEmpty(shopUser)">
			
 
				                     <appVipModule
			
 
				-                      v-if="shopUser.member > 0 && mobile != '' && subscribe == 1"
			
 
				+                      v-if="shopUser.member >= 0 && mobile != '' && subscribe == 1"
			
 
				                       class="level-img"
			
 
				                       :text="`VIP${shopUser.member}`"
			
 
				+                      :vipImgUrl="`${constant.imgUrl}/retail/interest/vip.png`"
			
 
				                     />
			
 
				                     <appVipModule v-else-if="shopUser.member == 0" class="level-img" :text="`VIP`" />
			
 
				                     <div class="nomal-text" v-else>普通客户</div>
			
@@ -178,8 +164,7 @@ export default {
 
				     };
			
 
				   },
			
 
				   watch: {
			
 
				-    mobile(newVal, oldVal) {
			
 
				-    }
			
 
				+    mobile(newVal, oldVal) {}
			
 
				   },
			
 
				   computed: {
			
 
				     ...mapGetters({ shopUser: "getShopUser" }),
			
@@ -205,11 +190,15 @@ export default {
 
				   },
			
 
				   methods: {
			
 
				     init() {
			
 
				+
			
 
				+      console.log('cccccc')
			
 
				+      console.log(this.$constant)
			
 
				+
			
 
				       getShopUser().then(res => {
			
 
				+        this.mobile = res.mobile
			
 
				+        this.subscribe = res.subscribe
			
 
				         if (this.option.scan == 1) {
			
 
				           //没有注册手机号或关注公众号的
			
 
				-          this.mobile = res.mobile;
			
 
				-          this.subscribe = res.subscribe;
			
 
				           if (this.$util.isEmpty(res.mobile) || res.subscribe == 0) {
			
 
				             this.isPublic = true;
			
 
				             this.popupShow = true;