phperli 3 роки тому
батько
коміт
c794ea3d8d
98 змінених файлів з 32 додано та 26 видалено
  1. 6 6
      src/manifest.json
  2. 3 3
      src/pages.json
  3. BIN
      src/pages/index.zip
  4. 17 3
      src/pages/index/index.vue
  5. 6 14
      src/siteInfo.js
  6. BIN
      src/static/image.zip
  7. BIN
      src/static/image/index/HUIXIANGJIA.png
  8. BIN
      src/static/image/index/addcustomerbg.png
  9. BIN
      src/static/image/index/appointment_top.png
  10. BIN
      src/static/image/index/arrow-11.png
  11. BIN
      src/static/image/index/arrow-12.png
  12. BIN
      src/static/image/index/arrow-down-000.png
  13. BIN
      src/static/image/index/arrow-down-bottom.png
  14. BIN
      src/static/image/index/arrow-down.png
  15. BIN
      src/static/image/index/arrow-right-A18353.png
  16. BIN
      src/static/image/index/arrow-right-bgwrite.png
  17. BIN
      src/static/image/index/arrow-right-ewrte.png
  18. BIN
      src/static/image/index/arrow-right-facet-white.png
  19. BIN
      src/static/image/index/arrow-right-gray.png
  20. BIN
      src/static/image/index/arrow-right-yellow.png
  21. BIN
      src/static/image/index/arrow_right.png
  22. BIN
      src/static/image/index/auth-default.png
  23. BIN
      src/static/image/index/back.png
  24. BIN
      src/static/image/index/bottom_logo.png
  25. BIN
      src/static/image/index/camera.png
  26. BIN
      src/static/image/index/certified.png
  27. BIN
      src/static/image/index/close.png
  28. BIN
      src/static/image/index/cneterBg.png
  29. BIN
      src/static/image/index/coupon_1.png
  30. BIN
      src/static/image/index/coupon_masking.png
  31. BIN
      src/static/image/index/detail-tell.png
  32. BIN
      src/static/image/index/dq.png
  33. BIN
      src/static/image/index/fg.png
  34. BIN
      src/static/image/index/head_port.png
  35. BIN
      src/static/image/index/headbg.png
  36. BIN
      src/static/image/index/hx.png
  37. BIN
      src/static/image/index/icon-favorite-active.png
  38. BIN
      src/static/image/index/icon-favorite.png
  39. BIN
      src/static/image/index/img-coupon-bg-0.png
  40. BIN
      src/static/image/index/k.png
  41. BIN
      src/static/image/index/kehu.png
  42. BIN
      src/static/image/index/kf.png
  43. BIN
      src/static/image/index/location.png
  44. BIN
      src/static/image/index/lp.png
  45. BIN
      src/static/image/index/m.png
  46. BIN
      src/static/image/index/mj.png
  47. BIN
      src/static/image/index/msg.png
  48. BIN
      src/static/image/index/my_contract.png
  49. BIN
      src/static/image/index/my_invoice.png
  50. BIN
      src/static/image/index/no-pt-order.png
  51. BIN
      src/static/image/index/no_certified.png
  52. BIN
      src/static/image/index/order-icon.png
  53. BIN
      src/static/image/index/refresh.png
  54. BIN
      src/static/image/index/sale_bg.png
  55. BIN
      src/static/image/index/sale_top_bg.png
  56. BIN
      src/static/image/index/saler_bg.png
  57. BIN
      src/static/image/index/search.png
  58. BIN
      src/static/image/index/select_sale.png
  59. BIN
      src/static/image/index/share.png
  60. BIN
      src/static/image/index/share_y.png
  61. BIN
      src/static/image/index/temporary/jhk-1634283447190.png
  62. BIN
      src/static/image/index/temporary/jhk-1634283667210.png
  63. BIN
      src/static/image/index/temporary/jhk-1634283687206.png
  64. BIN
      src/static/image/index/temporary/jhk-1634284367308.png
  65. BIN
      src/static/image/index/temporary/jhk-1634284372084.png
  66. BIN
      src/static/image/index/tyx.png
  67. BIN
      src/static/image/index/viewmore.png
  68. BIN
      src/static/image/index/viewmore1.png
  69. BIN
      src/static/image/index/viewmore2.png
  70. BIN
      src/static/image/index/wxlogin.png
  71. BIN
      src/static/image/index/xx.png
  72. BIN
      src/static/image/index/ysm.png
  73. BIN
      src/static/image/sale/arrow_right.png
  74. BIN
      src/static/image/sale/cart.png
  75. BIN
      src/static/image/sale/cart_select.png
  76. BIN
      src/static/image/sale/edit.png
  77. BIN
      src/static/image/sale/properties_gradual.png
  78. BIN
      src/static/image/sale/sale_home.png
  79. BIN
      src/static/image/sale/sale_home_select.png
  80. BIN
      src/static/image/sale/sale_my.png
  81. BIN
      src/static/image/sale/sale_my_select.png
  82. BIN
      src/static/image/sale/sale_order.png
  83. BIN
      src/static/image/sale/sale_order_select.png
  84. BIN
      src/static/image/sale/search_icon.png
  85. BIN
      src/static/image/sale/sex0.png
  86. BIN
      src/static/image/sale/sex1.png
  87. BIN
      src/static/image/sale/shanchu.png
  88. BIN
      src/static/image/sale/tcff.png
  89. BIN
      src/static/image/sale/tianjia.png
  90. BIN
      src/static/image/sale/xcrj_login.png
  91. BIN
      src/static/image/user-center/1.png
  92. BIN
      src/static/image/user-center/arrow-bottom.png
  93. BIN
      src/static/image/user-center/arrow-top.png
  94. BIN
      src/static/image/user-center/del.png
  95. BIN
      src/static/image/user-center/evaluate1.png
  96. BIN
      src/static/image/user-center/evaluate2.png
  97. BIN
      src/static/image/user-center/evaluate3.png
  98. BIN
      src/static/image/user-center/takePicture.png

+ 6 - 6
src/manifest.json

xqd
@@ -17,17 +17,17 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxd326df8447d61d53",
+        "appid" : "wx4b3a0165fec3413d",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
-            "minified" : true
+            "minified" : true,
+            "postcss" : true
         },
         "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "请求获取您的位置信息"
-            }
+        "permission" : {},
+        "optimization" : {
+            "subPackages" : true
         }
     },
     "mp-alipay" : {

+ 3 - 3
src/pages.json

xqd xqd xqd
@@ -31,7 +31,7 @@
 		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
-			// #ifdef H5
+			//  #ifdef H5
 			,
 		"navigationStyle": "custom"
 		// #endif
@@ -1860,7 +1860,7 @@
 			}]
 		},
 		// {
-		// 	"root": "plugins/flash_sale",
+		// 	"root": "plugins/flash_sale", 
 		// 	"pages": [{
 		// 			"path": "index/index",
 		// 			"style": {
@@ -2141,6 +2141,6 @@
 				}
 			]
 		}
-		// #endif
+		//  #endif
 	]
 }

BIN
src/pages/index.zip


+ 17 - 3
src/pages/index/index.vue

xqd xqd xqd xqd xqd
@@ -54,6 +54,7 @@
 	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
 	// #ifdef H5
 	import Vue from "vue";
+	import {mapState} from 'vuex'
 	// #endif
 	export default {
 		name: 'index',
@@ -108,6 +109,19 @@
 			// #endif
 			this.pageHide = true;
 		},
+		computed:{
+			...mapState({
+				selectedProperties:state=>state.user.selectedProperties
+			})
+		},
+		watch:{
+			selectedProperties(){
+				this.loadMall()
+			},
+		},
+		created() {
+			this.loadMall();
+		},
 		onLoad(options) {
 			this.$commonLoad.onload(options);
 			this.$store.dispatch('user/isEnterSales',false);
@@ -197,7 +211,7 @@
 							})
 						}
 					});
-					this.$storage.setStorageSync('INDEX_MALL', data);
+					// this.$storage.setStorageSync('INDEX_MALL', data);
 				}
 			},
 			async loadDiy() {
@@ -353,7 +367,7 @@
 						if (time >= 0) {
 							this.type = storage.type;
 							this.homePages = storage.home_pages;
-							this.loadMall();
+							// this.loadMall();
 						} else {
 							this.type = storage.type;
 							if (this.type === 'diy') {
@@ -379,7 +393,7 @@
 							this.is_required = false;
 						}
 					} else {
-						this.loadMall();
+						// this.loadMall();
 					}
 					//  DIY
 				} else {

+ 6 - 14
src/siteInfo.js

xqd
@@ -1,18 +1,10 @@
-// let siteInfo = {
-// 	'acid': -1,
-// 	'version': '1.0.0',
-// 	'apiroot': 'https://shop.9026.com/web/index.php?_mall_id=1',
-// 	'id': '1',
-// };
+
 module.exports = {
 	acid: -1,
 	version: "1.0.0",
-	siteroot: "https://t17.9026.com",
-	apiroot: "https://t17.9026.com//web/index.php?_mall_id=10000"
-	
-	// siteroot: "https://shop.9026.com",
-	// apiroot: "https://shop.9026.com/web/index.php?_mall_id=21999"
-	
-	// siteroot: "https://mall.fresherbaby.com",
-	// apiroot: "https://mall.fresherbaby.com/web/index.php?_mall_id=21942"
+	siteroot: "https://wechat.xcrjhuixiangjia.com",
+	apiroot: "https://wechat.xcrjhuixiangjia.com/web/index.php?_mall_id=10000"
+	// siteroot: "https://t17.9026.com",
+	// apiroot: "https://t17.9026.com//web/index.php?_mall_id=10000"
+
 };

BIN
src/static/image.zip


BIN
src/static/image/index/HUIXIANGJIA.png


BIN
src/static/image/index/addcustomerbg.png


BIN
src/static/image/index/appointment_top.png


BIN
src/static/image/index/arrow-11.png


BIN
src/static/image/index/arrow-12.png


BIN
src/static/image/index/arrow-down-000.png


BIN
src/static/image/index/arrow-down-bottom.png


BIN
src/static/image/index/arrow-down.png


BIN
src/static/image/index/arrow-right-A18353.png


BIN
src/static/image/index/arrow-right-bgwrite.png


BIN
src/static/image/index/arrow-right-ewrte.png


BIN
src/static/image/index/arrow-right-facet-white.png


BIN
src/static/image/index/arrow-right-gray.png


BIN
src/static/image/index/arrow-right-yellow.png


BIN
src/static/image/index/arrow_right.png


BIN
src/static/image/index/auth-default.png


BIN
src/static/image/index/back.png


BIN
src/static/image/index/bottom_logo.png


BIN
src/static/image/index/camera.png


BIN
src/static/image/index/certified.png


BIN
src/static/image/index/close.png


BIN
src/static/image/index/cneterBg.png


BIN
src/static/image/index/coupon_1.png


BIN
src/static/image/index/coupon_masking.png


BIN
src/static/image/index/detail-tell.png


BIN
src/static/image/index/dq.png


BIN
src/static/image/index/fg.png


BIN
src/static/image/index/head_port.png


BIN
src/static/image/index/headbg.png


BIN
src/static/image/index/hx.png


BIN
src/static/image/index/icon-favorite-active.png


BIN
src/static/image/index/icon-favorite.png


BIN
src/static/image/index/img-coupon-bg-0.png


BIN
src/static/image/index/k.png


BIN
src/static/image/index/kehu.png


BIN
src/static/image/index/kf.png


BIN
src/static/image/index/location.png


BIN
src/static/image/index/lp.png


BIN
src/static/image/index/m.png


BIN
src/static/image/index/mj.png


BIN
src/static/image/index/msg.png


BIN
src/static/image/index/my_contract.png


BIN
src/static/image/index/my_invoice.png


BIN
src/static/image/index/no-pt-order.png


BIN
src/static/image/index/no_certified.png


BIN
src/static/image/index/order-icon.png


BIN
src/static/image/index/refresh.png


BIN
src/static/image/index/sale_bg.png


BIN
src/static/image/index/sale_top_bg.png


BIN
src/static/image/index/saler_bg.png


BIN
src/static/image/index/search.png


BIN
src/static/image/index/select_sale.png


BIN
src/static/image/index/share.png


BIN
src/static/image/index/share_y.png


BIN
src/static/image/index/temporary/jhk-1634283447190.png


BIN
src/static/image/index/temporary/jhk-1634283667210.png


BIN
src/static/image/index/temporary/jhk-1634283687206.png


BIN
src/static/image/index/temporary/jhk-1634284367308.png


BIN
src/static/image/index/temporary/jhk-1634284372084.png


BIN
src/static/image/index/tyx.png


BIN
src/static/image/index/viewmore.png


BIN
src/static/image/index/viewmore1.png


BIN
src/static/image/index/viewmore2.png


BIN
src/static/image/index/wxlogin.png


BIN
src/static/image/index/xx.png


BIN
src/static/image/index/ysm.png


BIN
src/static/image/sale/arrow_right.png


BIN
src/static/image/sale/cart.png


BIN
src/static/image/sale/cart_select.png


BIN
src/static/image/sale/edit.png


BIN
src/static/image/sale/properties_gradual.png


BIN
src/static/image/sale/sale_home.png


BIN
src/static/image/sale/sale_home_select.png


BIN
src/static/image/sale/sale_my.png


BIN
src/static/image/sale/sale_my_select.png


BIN
src/static/image/sale/sale_order.png


BIN
src/static/image/sale/sale_order_select.png


BIN
src/static/image/sale/search_icon.png


BIN
src/static/image/sale/sex0.png


BIN
src/static/image/sale/sex1.png


BIN
src/static/image/sale/shanchu.png


BIN
src/static/image/sale/tcff.png


BIN
src/static/image/sale/tianjia.png


BIN
src/static/image/sale/xcrj_login.png


BIN
src/static/image/user-center/1.png


BIN
src/static/image/user-center/arrow-bottom.png


BIN
src/static/image/user-center/arrow-top.png


BIN
src/static/image/user-center/del.png


BIN
src/static/image/user-center/evaluate1.png


BIN
src/static/image/user-center/evaluate2.png


BIN
src/static/image/user-center/evaluate3.png


BIN
src/static/image/user-center/takePicture.png