zs 1 rok temu
rodzic
commit
a9a5d37672
100 zmienionych plików z 15998 dodań i 24567 usunięć
  1. 7 3
      common/css/font-icon.css
  2. 1 1
      pages.json
  3. 1 1
      pages/good/index.vue
  4. 1 1
      pages/home/index.vue
  5. 42 25
      pagesGoods/goods/index.vue
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/procure/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map
  18. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/good/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/goods/index.js.map
  20. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/shop/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  48. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  50. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
  51. 1 1
      unpackage/dist/dev/mp-weixin/app.json
  52. 96 124
      unpackage/dist/dev/mp-weixin/common/main.js
  53. 6 3
      unpackage/dist/dev/mp-weixin/common/main.wxss
  54. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  55. 11604 18340
      unpackage/dist/dev/mp-weixin/common/vendor.js
  56. 81 119
      unpackage/dist/dev/mp-weixin/components/upload/index.js
  57. 1 1
      unpackage/dist/dev/mp-weixin/components/upload/index.wxml
  58. 97 181
      unpackage/dist/dev/mp-weixin/pages/good/index.js
  59. 1 1
      unpackage/dist/dev/mp-weixin/pages/good/index.wxml
  60. 132 305
      unpackage/dist/dev/mp-weixin/pages/home/index.js
  61. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/index.wxml
  62. 83 149
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  63. 126 207
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  64. 220 510
      unpackage/dist/dev/mp-weixin/pages/market/index.js
  65. 1 1
      unpackage/dist/dev/mp-weixin/pages/market/index.wxml
  66. 197 248
      unpackage/dist/dev/mp-weixin/pages/my/index.js
  67. 68 76
      unpackage/dist/dev/mp-weixin/pages/procure/index.js
  68. 157 309
      unpackage/dist/dev/mp-weixin/pages/register/index.js
  69. 0 404
      unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.js
  70. 357 0
      unpackage/dist/dev/mp-weixin/pagesGoods/index/index.js
  71. 2 1
      unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.json
  72. 1 1
      unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.wxml
  73. 0 0
      unpackage/dist/dev/mp-weixin/pagesGoods/index/index.wxss
  74. 126 167
      unpackage/dist/dev/mp-weixin/pagesMy/account/index.js
  75. 158 293
      unpackage/dist/dev/mp-weixin/pagesMy/account/info.js
  76. 104 170
      unpackage/dist/dev/mp-weixin/pagesMy/account/update.js
  77. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.js
  78. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.js
  79. 175 272
      unpackage/dist/dev/mp-weixin/pagesMy/goods/add.js
  80. 127 295
      unpackage/dist/dev/mp-weixin/pagesMy/goods/index.js
  81. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/goods/index.wxml
  82. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/maintenance/index.js
  83. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/order/index.js
  84. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/record/index.js
  85. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/repair/index.js
  86. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/shop/index.js
  87. 166 253
      unpackage/dist/dev/mp-weixin/pagesMy/spec/add.js
  88. 121 283
      unpackage/dist/dev/mp-weixin/pagesMy/spec/index.js
  89. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/spec/index.wxml
  90. 68 76
      unpackage/dist/dev/mp-weixin/pagesMy/user/index.js
  91. 42 38
      unpackage/dist/dev/mp-weixin/project.config.json
  92. 110 107
      unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js
  93. 147 159
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js
  94. 134 132
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js
  95. 1 1
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.wxml
  96. 165 168
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
  97. 197 194
      unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js
  98. 236 250
      unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js
  99. 112 119
      unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js

+ 7 - 3
common/css/font-icon.css

@@ -1,9 +1,9 @@
 @font-face {
 	font-family: "iconfont";
 	/* Project id 4182834 */
-	src: url('//at.alicdn.com/t/c/font_4182834_1d96fd2ql62g.woff2?t=1690533488918') format('woff2'),
-		url('//at.alicdn.com/t/c/font_4182834_1d96fd2ql62g.woff?t=1690533488918') format('woff'),
-		url('//at.alicdn.com/t/c/font_4182834_1d96fd2ql62g.ttf?t=1690533488918') format('truetype');
+	src: url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.woff2?t=1690870665503') format('woff2'),
+		url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.woff?t=1690870665503') format('woff'),
+		url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.ttf?t=1690870665503') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,10 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-icon-cross-empty:before {
+	content: "\e65c";
+}
+
 .icon-dayuhao:before {
 	content: "\e625";
 }

+ 1 - 1
pages.json

@@ -161,7 +161,7 @@
 			"root": "pagesGoods",
 			"pages": [ //分包
 				{
-					"path": "goods/index",
+					"path": "index/index",
 					"style": {
 						"navigationBarTitleText": "商品详情"
 					}

+ 1 - 1
pages/good/index.vue

@@ -193,7 +193,7 @@
 			toBuy(e) {
 				const that = this;
 				uni.navigateTo({
-					url: `/pagesGoods/goods/index?id=${e.id||e._id}`
+					url: `/pagesGoods/index/index?id=${e.id||e._id}`
 				})
 			}
 		}

+ 1 - 1
pages/home/index.vue

@@ -152,7 +152,7 @@
 			toBuy(e) {
 				const that = this;
 				uni.navigateTo({
-					url: `/pagesGoods/goods/index?id=${e.id||e._id}`
+					url: `/pagesGoods/index/index?id=${e.id||e._id}`
 				})
 			},
 			// 分页

+ 42 - 25
pagesGoods/goods/index.vue

@@ -39,6 +39,28 @@
 			<uni-goods-nav :fill="true" :options="options" :button-group="buttonGroup" @click="onClick"
 				@buttonClick="buttonClick" style="margin-top: 20px;" />
 		</view>
+		<!-- 规格弹窗 -->
+		<uni-popup ref="popup" background-color="#fff" type="bottom" :is-mask-click="false">
+			<view class="popup">
+				<view class="close">
+					<text @click="toClose" class="iconfont icon-icon-cross-empty"></text>
+				</view>
+				<!-- 规格 -->
+				<view class="specs_1" v-if="popupShow=='1'">
+					<view class="info_1">
+						<scroll-view scroll-y="true" class="scroll-view">
+							<view class="list-scroll-view">
+								<view class="one">
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+					<view class="info_2">
+						<button @tap="toMarket">加入购物车</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -46,8 +68,6 @@
 	export default {
 		data() {
 			return {
-				// 系统设置
-				config: {},
 				// 商品id
 				id: '',
 				// 当前用户信息
@@ -56,6 +76,10 @@
 				info: {},
 				// 轮播图
 				fileList: [],
+				// 规格弹框
+				popupShow: '1',
+				// 规格数组
+				specList: [],
 				// 底部商品导航
 				options: [{
 						icon: 'shop',
@@ -64,7 +88,6 @@
 					{
 						icon: 'cart',
 						text: '购物车',
-						info: 2,
 						infoBackgroundColor: '#007aff',
 						infoColor: "#f5f5f5"
 					}
@@ -73,18 +96,14 @@
 					text: '加入购物车',
 					backgroundColor: 'linear-gradient(90deg, #1E83FF, #0053B8)',
 					color: '#fff'
-				}],
+				}]
 			}
 		},
 		onLoad: async function(e) {
 			const that = this;
 			that.$set(that, `id`, e.id || '');
-			that.searchConfig();
-			await that.search();
-		},
-		onShow: async function() {
-			const that = this;
 			that.searchToken();
+			await that.search();
 		},
 		methods: {
 			searchToken() {
@@ -100,19 +119,6 @@
 					});
 				}
 			},
-			searchConfig() {
-				const that = this;
-				try {
-					const res = uni.getStorageSync('config');
-					if (res) that.$set(that, `config`, res);
-				} catch (e) {
-					uni.showToast({
-						title: err.errmsg,
-						icon: 'error',
-						duration: 2000
-					});
-				}
-			},
 			// 查询商品详情
 			async search() {
 				const that = this;
@@ -128,11 +134,15 @@
 							return a.money - b.money
 						})
 						if (data) res.data.money = data[0].money
+						that.$set(that, `specList`, data);
 						that.$set(that, `info`, res.data);
 						that.$set(that, `fileList`, res.data.file);
 					}
 				}
-
+				res = await that.$api(`/Cart/num`, 'GET', {
+					user: that.user._id
+				})
+				if (res.errcode == '0') that.$set(that.options[1], `info`, res.data);
 			},
 			onClick(e) {
 				uni.showToast({
@@ -141,8 +151,15 @@
 				})
 			},
 			buttonClick(e) {
-				console.log(e)
-			}
+				const that = this;
+				that.$set(that, `popupShow`, '1')
+				that.$refs.popup.open();
+			},
+			// 关闭弹框
+			toClose() {
+				const that = this;
+				that.$refs.popup.close();
+			},
 		}
 	}
 </script>

Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/procure/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/good/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/goods/index.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/shop/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


Plik diff jest za duży
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map


+ 1 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -33,7 +33,7 @@
     {
       "root": "pagesGoods",
       "pages": [
-        "goods/index"
+        "index/index"
       ]
     }
   ],

Plik diff jest za duży
+ 96 - 124
unpackage/dist/dev/mp-weixin/common/main.js


+ 6 - 3
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -6,9 +6,9 @@
 @font-face {
 	font-family: "iconfont";
 	/* Project id 4182834 */
-	src: url('//at.alicdn.com/t/c/font_4182834_1d96fd2ql62g.woff2?t=1690533488918') format('woff2'),
-		url('//at.alicdn.com/t/c/font_4182834_1d96fd2ql62g.woff?t=1690533488918') format('woff'),
-		url('//at.alicdn.com/t/c/font_4182834_1d96fd2ql62g.ttf?t=1690533488918') format('truetype');
+	src: url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.woff2?t=1690870665503') format('woff2'),
+		url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.woff?t=1690870665503') format('woff'),
+		url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.ttf?t=1690870665503') format('truetype');
 }
 .iconfont {
 	font-family: "iconfont" !important;
@@ -17,6 +17,9 @@
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+.icon-icon-cross-empty:before {
+	content: "\e65c";
+}
 .icon-dayuhao:before {
 	content: "\e625";
 }

Plik diff jest za duży
+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


Plik diff jest za duży
+ 11604 - 18340
unpackage/dist/dev/mp-weixin/common/vendor.js


Plik diff jest za duży
+ 81 - 119
unpackage/dist/dev/mp-weixin/components/upload/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/components/upload/index.wxml


Plik diff jest za duży
+ 97 - 181
unpackage/dist/dev/mp-weixin/pages/good/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/good/index.wxml


Plik diff jest za duży
+ 132 - 305
unpackage/dist/dev/mp-weixin/pages/home/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/index.wxml


Plik diff jest za duży
+ 83 - 149
unpackage/dist/dev/mp-weixin/pages/index/index.js


Plik diff jest za duży
+ 126 - 207
unpackage/dist/dev/mp-weixin/pages/login/index.js


Plik diff jest za duży
+ 220 - 510
unpackage/dist/dev/mp-weixin/pages/market/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/market/index.wxml


Plik diff jest za duży
+ 197 - 248
unpackage/dist/dev/mp-weixin/pages/my/index.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pages/procure/index.js


Plik diff jest za duży
+ 157 - 309
unpackage/dist/dev/mp-weixin/pages/register/index.js


Plik diff jest za duży
+ 0 - 404
unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.js


Plik diff jest za duży
+ 357 - 0
unpackage/dist/dev/mp-weixin/pagesGoods/index/index.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "商品详情",
   "usingComponents": {
-    "uni-goods-nav": "/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav"
+    "uni-goods-nav": "/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
   }
 }

Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.wxml


unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.wxss → unpackage/dist/dev/mp-weixin/pagesGoods/index/index.wxss


Plik diff jest za duży
+ 126 - 167
unpackage/dist/dev/mp-weixin/pagesMy/account/index.js


Plik diff jest za duży
+ 158 - 293
unpackage/dist/dev/mp-weixin/pagesMy/account/info.js


Plik diff jest za duży
+ 104 - 170
unpackage/dist/dev/mp-weixin/pagesMy/account/update.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.js


Plik diff jest za duży
+ 175 - 272
unpackage/dist/dev/mp-weixin/pagesMy/goods/add.js


Plik diff jest za duży
+ 127 - 295
unpackage/dist/dev/mp-weixin/pagesMy/goods/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/goods/index.wxml


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/maintenance/index.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/order/index.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/record/index.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/repair/index.js


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/shop/index.js


Plik diff jest za duży
+ 166 - 253
unpackage/dist/dev/mp-weixin/pagesMy/spec/add.js


Plik diff jest za duży
+ 121 - 283
unpackage/dist/dev/mp-weixin/pagesMy/spec/index.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/spec/index.wxml


Plik diff jest za duży
+ 68 - 76
unpackage/dist/dev/mp-weixin/pagesMy/user/index.js


+ 42 - 38
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,39 +1,43 @@
-{
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx23c71bee5876d1b9",
-  "projectname": "test",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "系统首页",
-          "pathName": "pages/index/index",
-          "query": ""
-        }
-      ]
-    }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "wx23c71bee5876d1b9",
+  "projectname": "test",
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 0,
+      "list": [
+        {
+          "name": "系统首页",
+          "query": "",
+          "id": 0,
+          "pathName": "pages/index/index"
+        }
+      ]
+    }
+  }
 }

Plik diff jest za duży
+ 110 - 107
unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js


Plik diff jest za duży
+ 147 - 159
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js


Plik diff jest za duży
+ 134 - 132
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.wxml


Plik diff jest za duży
+ 165 - 168
unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js


Plik diff jest za duży
+ 197 - 194
unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js


Plik diff jest za duży
+ 236 - 250
unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js


Plik diff jest za duży
+ 112 - 119
unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików