6 سال پیش · 4cb0558a2c
--- a/mall/src/pages/callback/index.vue
+++ b/mall/src/pages/callback/index.vue
@@ -79,7 +79,7 @@
 
															               class="button-com"
														
 
															               @click="pageTo({
														
 
															 							url: '/pages/home/index',
														
 
															-							type: 2
														
 
															+              type:4
														
 
															 						})"
														
 
															             >返回首页</button>
														
 
															           </div>
														
@@ -182,6 +182,7 @@ export default {
 
															       if (this.$util.isEmpty(this.shopUser)) {
														
 
															         return false;
														
 
															       }
														
 
															+      console.log('this option ...',this.option)
														
 
															       return this.shopUser.userAsset.balance > this.option.totalPrice;
														
 
															     }
														
 
															   },
														
@@ -189,8 +190,6 @@ export default {
 
															   methods: {
														
 
															     init() {
														
 
															       this.pageStatus = this.option.pageStatus;
														
 
															-      console.log("pageStatus 值发生变化");
														
 
															-      console.log(this.pageStatus);
														
 
															       this.payDiscountPrice = this.option.payDiscountPrice;
														
 
															       this.payDiscountType = this.option.payDiscountType;
														
 
															       this.initClass(this.pageStatus);
														
--- a/mall/src/pages/home/components/login-popup.vue
+++ b/mall/src/pages/home/components/login-popup.vue
@@ -187,7 +187,7 @@ export default {
 
															       uni.setClipboardData({
														
 
															         data: this.merchantInfo.wxAliasName,
														
 
															         success: () => {
														
 
															-          this.$msg("复制成功，请前往关注公众号！");
														
 
															+          this.$msg("复制成功");
														
 
															           // this.hidePopup()
														
 
															         },
														
 
															         fail: () => {
														
--- a/mall/src/pages/home/user.vue
+++ b/mall/src/pages/home/user.vue
@@ -16,14 +16,14 @@
 
															                       <template v-if="shopUser.member > 0">
														
 
															                         <appVipModule
														
 
															                           class="level-img"
														
 
															-                          :vipImgUrl="`${constant.imgUrl}/retail/interest/grade/${shopUser.member}.png`"
														
 
															+                          :vipImgUrl="`${constant.imgUrl}/retail/member/grade/${shopUser.member}.png`"
														
 
															                         />
														
 
															                       </template>
														
 
															                       <template v-else>
														
 
															                         <template v-if="mobile != '' && subscribe == 1">
														
 
															                           <appVipModule
														
 
															                             class="level-img"
														
 
															-                            :vipImgUrl="`${constant.imgUrl}/retail/interest/grade/member.png`"
														
 
															+                            :vipImgUrl="`${constant.imgUrl}/retail/member/grade/member.png`"
														
 
															                           />
														
 
															                         </template>
														
 
															                         <template v-else>
														
--- a/mall/src/pages/interest/level.vue
+++ b/mall/src/pages/interest/level.vue
@@ -25,7 +25,7 @@
 
															 				<div class="level-list-blo">
														
 
															 					<div class="level-list" v-for="(item, index) in list" :key="index">
														
 
															 						<div>
														
 
															-							<appVipModule class="level-img" :vipImgUrl="`${constant.imgUrl}/retail/interest/grade/${item.level}.png`" />
														
 
															+							<appVipModule class="level-img" :vipImgUrl="`${constant.imgUrl}/retail/member/grade/${item.level}.png`" />
														
 
															 						</div>
														
 
															 						<div>{{ item.growth }}</div>
														
 
															 						<div>{{ item.discount }}</div>
														
--- a/mall/src/pages/member/detail.vue
+++ b/mall/src/pages/member/detail.vue
@@ -11,7 +11,7 @@
 
															               <app-vip-module
														
 
															                 class="level-img"
														
 
															                 v-if="data.member >= 0"
														
 
															-                :vipImgUrl="`${constant.imgUrl}/retail/interest/grade/${data.userAsset.member}.png`"
														
 
															+                :vipImgUrl="`${constant.imgUrl}/retail/member/grade/${data.userAsset.member}.png`"
														
 
															               />
														
 
															             </div>
														
 
															             <div class="app-color-3">{{ data.id }}</div>
														
--- a/shop/dist/shop/css/chunk-0a2c6782.c98eef35.css
+++ b/shop/dist/shop/css/chunk-0a2c6782.c98eef35.css
--- a/shop/dist/shop/css/chunk-14fd99b2.f8616175.css
+++ b/shop/dist/shop/css/chunk-14fd99b2.f8616175.css
--- a/shop/dist/shop/css/chunk-2979fabb.f698d4a9.css
+++ b/shop/dist/shop/css/chunk-2979fabb.f698d4a9.css
--- a/shop/dist/shop/css/chunk-3780d46e.6912c1ce.css
+++ b/shop/dist/shop/css/chunk-3780d46e.6912c1ce.css
--- a/shop/dist/shop/css/chunk-5d043645.4d5003e0.css
+++ b/shop/dist/shop/css/chunk-5d043645.4d5003e0.css
--- a/shop/dist/shop/css/chunk-633905b6.9aa87e8b.css
+++ b/shop/dist/shop/css/chunk-633905b6.9aa87e8b.css
--- a/shop/dist/shop/css/chunk-6becb88b.f48cb641.css
+++ b/shop/dist/shop/css/chunk-6becb88b.f48cb641.css
--- a/shop/dist/shop/css/chunk-76c25d84.f3f6c795.css
+++ b/shop/dist/shop/css/chunk-76c25d84.f3f6c795.css
--- a/shop/dist/shop/css/chunk-826978f2.ced0ec9a.css
+++ b/shop/dist/shop/css/chunk-826978f2.ced0ec9a.css
--- a/shop/dist/shop/css/chunk-9488372e.593f3b5d.css
+++ b/shop/dist/shop/css/chunk-9488372e.593f3b5d.css
--- a/shop/dist/shop/index.html
+++ b/shop/dist/shop/index.html
@@ -43,4 +43,4 @@
 
															 			.once .sub-title {
														
 
															 				color: #ababab;
														
 
															 				font-size: 12px;
														
 
															-			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.7c049194.js rel=preload as=script><link href=/js/chunk-libs.3aaf2719.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.3aaf2719.js></script><script src=/js/app.7c049194.js></script></body></html>
														
 
															+			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.3af60a22.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.3af60a22.js></script></body></html>
														
--- a/shop/dist/shop/js/app.3af60a22.js
+++ b/shop/dist/shop/js/app.3af60a22.js
--- a/shop/dist/shop/js/chunk-036c4844.3cba4a7c.js
+++ b/shop/dist/shop/js/chunk-036c4844.3cba4a7c.js
--- a/shop/dist/shop/js/chunk-037b87e6.4e1a6059.js
+++ b/shop/dist/shop/js/chunk-037b87e6.4e1a6059.js
--- a/shop/dist/shop/js/chunk-03ee9ed0.7c072501.js
+++ b/shop/dist/shop/js/chunk-03ee9ed0.7c072501.js
--- a/shop/dist/shop/js/chunk-040fef5b.035649e6.js
+++ b/shop/dist/shop/js/chunk-040fef5b.035649e6.js
--- a/shop/dist/shop/js/chunk-0a2c6782.f4cbc499.js
+++ b/shop/dist/shop/js/chunk-0a2c6782.f4cbc499.js
--- a/shop/dist/shop/js/chunk-0ac20a2a.8d126272.js
+++ b/shop/dist/shop/js/chunk-0ac20a2a.8d126272.js
--- a/shop/dist/shop/js/chunk-0d9ae1c7.494d7dd6.js
+++ b/shop/dist/shop/js/chunk-0d9ae1c7.494d7dd6.js
--- a/shop/dist/shop/js/chunk-10e9a039.4cce4861.js
+++ b/shop/dist/shop/js/chunk-10e9a039.4cce4861.js
--- a/shop/dist/shop/js/chunk-133d4bd4.584f3630.js
+++ b/shop/dist/shop/js/chunk-133d4bd4.584f3630.js
--- a/shop/dist/shop/js/chunk-14fd99b2.f2e762e0.js
+++ b/shop/dist/shop/js/chunk-14fd99b2.f2e762e0.js
--- a/shop/dist/shop/js/chunk-19352a22.c21e4b9e.js
+++ b/shop/dist/shop/js/chunk-19352a22.c21e4b9e.js
--- a/shop/dist/shop/js/chunk-19f2480e.8efa1c23.js
+++ b/shop/dist/shop/js/chunk-19f2480e.8efa1c23.js
--- a/shop/dist/shop/js/chunk-1ca1a330.e5e98bbb.js
+++ b/shop/dist/shop/js/chunk-1ca1a330.e5e98bbb.js
--- a/shop/dist/shop/js/chunk-1cc51bc8.01773586.js
+++ b/shop/dist/shop/js/chunk-1cc51bc8.01773586.js
--- a/shop/dist/shop/js/chunk-1cfcf692.92dcabf3.js
+++ b/shop/dist/shop/js/chunk-1cfcf692.92dcabf3.js
--- a/shop/dist/shop/js/chunk-20713222.b676e9b6.js
+++ b/shop/dist/shop/js/chunk-20713222.b676e9b6.js
--- a/shop/dist/shop/js/chunk-20bda528.12b02739.js
+++ b/shop/dist/shop/js/chunk-20bda528.12b02739.js
--- a/shop/dist/shop/js/chunk-26e88b1e.de3ae1df.js
+++ b/shop/dist/shop/js/chunk-26e88b1e.de3ae1df.js
--- a/shop/dist/shop/js/chunk-27c0cb06.928321d3.js
+++ b/shop/dist/shop/js/chunk-27c0cb06.928321d3.js
--- a/shop/dist/shop/js/chunk-2979fabb.5a271847.js
+++ b/shop/dist/shop/js/chunk-2979fabb.5a271847.js
--- a/shop/dist/shop/js/chunk-2a5681eb.0276d00f.js
+++ b/shop/dist/shop/js/chunk-2a5681eb.0276d00f.js
--- a/shop/dist/shop/js/chunk-2be725cf.e5fb1156.js
+++ b/shop/dist/shop/js/chunk-2be725cf.e5fb1156.js
--- a/shop/dist/shop/js/chunk-2d0a54f0.08eb0f64.js
+++ b/shop/dist/shop/js/chunk-2d0a54f0.08eb0f64.js
--- a/shop/dist/shop/js/chunk-2d0aec8f.cb882c1d.js
+++ b/shop/dist/shop/js/chunk-2d0aec8f.cb882c1d.js
--- a/shop/dist/shop/js/chunk-2d0aed1a.ba6ea7c3.js
+++ b/shop/dist/shop/js/chunk-2d0aed1a.ba6ea7c3.js
--- a/shop/dist/shop/js/chunk-2d0af06a.3f97d683.js
+++ b/shop/dist/shop/js/chunk-2d0af06a.3f97d683.js
--- a/shop/dist/shop/js/chunk-2d0bb21e.b5106b35.js
+++ b/shop/dist/shop/js/chunk-2d0bb21e.b5106b35.js
--- a/shop/dist/shop/js/chunk-2d0bd265.ca55b8e2.js
+++ b/shop/dist/shop/js/chunk-2d0bd265.ca55b8e2.js
--- a/shop/dist/shop/js/chunk-2d0bdf39.c7df6895.js
+++ b/shop/dist/shop/js/chunk-2d0bdf39.c7df6895.js
--- a/shop/dist/shop/js/chunk-2d0c0c02.2e6858bb.js
+++ b/shop/dist/shop/js/chunk-2d0c0c02.2e6858bb.js
--- a/shop/dist/shop/js/chunk-2d0c1f57.dcf4bbdf.js
+++ b/shop/dist/shop/js/chunk-2d0c1f57.dcf4bbdf.js
--- a/shop/dist/shop/js/chunk-2d0c8bc6.44ae7bff.js
+++ b/shop/dist/shop/js/chunk-2d0c8bc6.44ae7bff.js
--- a/shop/dist/shop/js/chunk-2d0cc684.39de6455.js
+++ b/shop/dist/shop/js/chunk-2d0cc684.39de6455.js
--- a/shop/dist/shop/js/chunk-2d0cf541.d69c5577.js
+++ b/shop/dist/shop/js/chunk-2d0cf541.d69c5577.js
--- a/shop/dist/shop/js/chunk-2d0d3ea4.e6f980dd.js
+++ b/shop/dist/shop/js/chunk-2d0d3ea4.e6f980dd.js
--- a/shop/dist/shop/js/chunk-2d0d5c2a.721842c2.js
+++ b/shop/dist/shop/js/chunk-2d0d5c2a.721842c2.js
--- a/shop/dist/shop/js/chunk-2d0d622c.42c52f30.js
+++ b/shop/dist/shop/js/chunk-2d0d622c.42c52f30.js
--- a/shop/dist/shop/js/chunk-2d0d7bed.9fb19fa7.js
+++ b/shop/dist/shop/js/chunk-2d0d7bed.9fb19fa7.js
--- a/shop/dist/shop/js/chunk-2d0dd61c.68613c24.js
+++ b/shop/dist/shop/js/chunk-2d0dd61c.68613c24.js
--- a/shop/dist/shop/js/chunk-2d0e4c8a.8ea6554f.js
+++ b/shop/dist/shop/js/chunk-2d0e4c8a.8ea6554f.js
--- a/shop/dist/shop/js/chunk-2d0e9763.96cc8e7f.js
+++ b/shop/dist/shop/js/chunk-2d0e9763.96cc8e7f.js
--- a/shop/dist/shop/js/chunk-2d2077f4.9fbaeed6.js
+++ b/shop/dist/shop/js/chunk-2d2077f4.9fbaeed6.js
--- a/shop/dist/shop/js/chunk-2d2080d9.27c494f8.js
+++ b/shop/dist/shop/js/chunk-2d2080d9.27c494f8.js
--- a/shop/dist/shop/js/chunk-2d20edf3.1c1cb33a.js
+++ b/shop/dist/shop/js/chunk-2d20edf3.1c1cb33a.js
--- a/shop/dist/shop/js/chunk-2d213755.67583978.js
+++ b/shop/dist/shop/js/chunk-2d213755.67583978.js
--- a/shop/dist/shop/js/chunk-2d2160d1.990b6e6d.js
+++ b/shop/dist/shop/js/chunk-2d2160d1.990b6e6d.js
--- a/shop/dist/shop/js/chunk-2d216596.d5171950.js
+++ b/shop/dist/shop/js/chunk-2d216596.d5171950.js
--- a/shop/dist/shop/js/chunk-2d21d104.075b8fdc.js
+++ b/shop/dist/shop/js/chunk-2d21d104.075b8fdc.js
--- a/shop/dist/shop/js/chunk-2d21e453.519ce62c.js
+++ b/shop/dist/shop/js/chunk-2d21e453.519ce62c.js
--- a/shop/dist/shop/js/chunk-2d21e5d6.17873a53.js
+++ b/shop/dist/shop/js/chunk-2d21e5d6.17873a53.js
--- a/shop/dist/shop/js/chunk-2d22271a.396955f6.js
+++ b/shop/dist/shop/js/chunk-2d22271a.396955f6.js
--- a/shop/dist/shop/js/chunk-2d2228c7.73c6cba6.js
+++ b/shop/dist/shop/js/chunk-2d2228c7.73c6cba6.js
--- a/shop/dist/shop/js/chunk-2d224c63.c1b7d46a.js
+++ b/shop/dist/shop/js/chunk-2d224c63.c1b7d46a.js
--- a/shop/dist/shop/js/chunk-2d225482.4010a3d5.js
+++ b/shop/dist/shop/js/chunk-2d225482.4010a3d5.js
--- a/shop/dist/shop/js/chunk-2d225ba5.e55b6d86.js
+++ b/shop/dist/shop/js/chunk-2d225ba5.e55b6d86.js
--- a/shop/dist/shop/js/chunk-2d2288b5.e07a89a5.js
+++ b/shop/dist/shop/js/chunk-2d2288b5.e07a89a5.js
--- a/shop/dist/shop/js/chunk-2d22891e.8283023b.js
+++ b/shop/dist/shop/js/chunk-2d22891e.8283023b.js
--- a/shop/dist/shop/js/chunk-2d22ce36.247c6cca.js
+++ b/shop/dist/shop/js/chunk-2d22ce36.247c6cca.js
--- a/shop/dist/shop/js/chunk-2d22d462.4ae1bbcc.js
+++ b/shop/dist/shop/js/chunk-2d22d462.4ae1bbcc.js
--- a/shop/dist/shop/js/chunk-2d22db4d.a52f524a.js
+++ b/shop/dist/shop/js/chunk-2d22db4d.a52f524a.js
--- a/shop/dist/shop/js/chunk-2d22e146.2bd6fd19.js
+++ b/shop/dist/shop/js/chunk-2d22e146.2bd6fd19.js
--- a/shop/dist/shop/js/chunk-2d2307dd.b1f383b9.js
+++ b/shop/dist/shop/js/chunk-2d2307dd.b1f383b9.js
--- a/shop/dist/shop/js/chunk-2d230c38.3ec13137.js
+++ b/shop/dist/shop/js/chunk-2d230c38.3ec13137.js
--- a/shop/dist/shop/js/chunk-2d8795d4.c4217a33.js
+++ b/shop/dist/shop/js/chunk-2d8795d4.c4217a33.js
--- a/shop/dist/shop/js/chunk-2e7334ee.411e7e25.js
+++ b/shop/dist/shop/js/chunk-2e7334ee.411e7e25.js
--- a/shop/dist/shop/js/chunk-30077cb9.ed725765.js
+++ b/shop/dist/shop/js/chunk-30077cb9.ed725765.js
--- a/shop/dist/shop/js/chunk-34ec081e.e290c043.js
+++ b/shop/dist/shop/js/chunk-34ec081e.e290c043.js
--- a/shop/dist/shop/js/chunk-3780d46e.da3b90d3.js
+++ b/shop/dist/shop/js/chunk-3780d46e.da3b90d3.js
--- a/shop/dist/shop/js/chunk-38aaa144.4b2025d3.js
+++ b/shop/dist/shop/js/chunk-38aaa144.4b2025d3.js
--- a/shop/dist/shop/js/chunk-39ac4097.891efbdf.js
+++ b/shop/dist/shop/js/chunk-39ac4097.891efbdf.js
--- a/shop/dist/shop/js/chunk-3d6a58c1.e56dd686.js
+++ b/shop/dist/shop/js/chunk-3d6a58c1.e56dd686.js
--- a/shop/dist/shop/js/chunk-41dc78fb.6b66e562.js
+++ b/shop/dist/shop/js/chunk-41dc78fb.6b66e562.js
--- a/shop/dist/shop/js/chunk-44545194.ec8eebc3.js
+++ b/shop/dist/shop/js/chunk-44545194.ec8eebc3.js
--- a/shop/dist/shop/js/chunk-4517db9a.b136ee06.js
+++ b/shop/dist/shop/js/chunk-4517db9a.b136ee06.js
--- a/shop/dist/shop/js/chunk-454e2dce.aabe63fe.js
+++ b/shop/dist/shop/js/chunk-454e2dce.aabe63fe.js
--- a/shop/dist/shop/js/chunk-469b67cc.ddc8d5a2.js
+++ b/shop/dist/shop/js/chunk-469b67cc.ddc8d5a2.js
--- a/shop/dist/shop/js/chunk-47603548.b2da75f8.js
+++ b/shop/dist/shop/js/chunk-47603548.b2da75f8.js
--- a/shop/dist/shop/js/chunk-4e4a63de.a40bc1f4.js
+++ b/shop/dist/shop/js/chunk-4e4a63de.a40bc1f4.js
--- a/shop/dist/shop/js/chunk-4ef9009b.1b45643a.js
+++ b/shop/dist/shop/js/chunk-4ef9009b.1b45643a.js
--- a/shop/dist/shop/js/chunk-5177b484.3b6c685a.js
+++ b/shop/dist/shop/js/chunk-5177b484.3b6c685a.js
--- a/shop/dist/shop/js/chunk-533bbaf0.30254692.js
+++ b/shop/dist/shop/js/chunk-533bbaf0.30254692.js
--- a/shop/dist/shop/js/chunk-534fb031.bdf6fc8a.js
+++ b/shop/dist/shop/js/chunk-534fb031.bdf6fc8a.js
--- a/shop/dist/shop/js/chunk-53d1a03a.16b22393.js
+++ b/shop/dist/shop/js/chunk-53d1a03a.16b22393.js