Browse Source

页面优化

zhaogongxue 9 months ago
parent
commit
5cf5498dcd
55 changed files with 810 additions and 642 deletions
  1. 16 2
      components/kj-tabbar/kj-tabbar.vue
  2. 100 10
      pageA/productdetails.vue
  3. 71 121
      pageA/rule/rule.vue
  4. 64 6
      pages/cart/cart.vue
  5. 3 0
      pages/express/express.vue
  6. 10 0
      pages/index/index.vue
  7. 1 1
      pages/shopping/shopping.vue
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  32. 0 0
      unpackage/dist/dev/mp-weixin/common/runtime.js
  33. 392 346
      unpackage/dist/dev/mp-weixin/common/vendor.js
  34. 0 10
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  35. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.wxml
  36. 1 1
      unpackage/dist/dev/mp-weixin/pageA/index.js
  37. 13 12
      unpackage/dist/dev/mp-weixin/pages/cart/cart.js
  38. 0 1
      unpackage/dist/dev/mp-weixin/pages/cart/cart.json
  39. 0 0
      unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml
  40. 3 3
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  41. 7 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  42. 2 2
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  43. 4 4
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  44. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
  45. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  46. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
  47. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
  48. 1 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  49. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  50. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  51. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  52. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
  53. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  54. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
  55. 1 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js

+ 16 - 2
components/kj-tabbar/kj-tabbar.vue

@@ -6,7 +6,7 @@
 					<u-checkbox shape="circle" :name="selectall">
 					</u-checkbox>
 				</u-checkbox-group>
-				<text>{{i18n.selectall}}</text>
+				<text class="all">{{i18n.selectall}}</text>
 			</view>
 			<view v-if="success==false" class="dle">
 				{{i18n.delete}}
@@ -19,7 +19,7 @@
 					<text class='summon' style="font-size: 36rpx;">188</text>
 					<text class='summon'>.34</text>
 				</view>
-				<view class="settle" @click="aaa">{{i18n.GotoResult}}</view>
+				<view class="settle" @click="account">{{i18n.GotoResult}}</view>
 			</view>
 		</view>
 		<u-tabbar :list="list"  active-color="#F83224" inactive-color="#333"
@@ -90,6 +90,11 @@
 			// const dom = uni.createSelectorQuery("#tabber")
 		},
 		methods: {
+			account(){
+				uni.navigateTo({
+					url:'/pageA/order'
+				})
+			},
 			getLabelHeight() {
 				const dom = uni.createSelectorQuery("#tabber")
 				console.log(dom)
@@ -200,6 +205,15 @@
 </script>
 
 <style lang="scss" scoped>
+	.all{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #444444;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 	.bottom {
 		width: 750rpx;
 		height: 100rpx;

+ 100 - 10
pageA/productdetails.vue

@@ -9,9 +9,15 @@
 						:inactiveStyle="{
 						color:' #666666' }"></u-tabs>
 				</view>
+				<!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
+					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
+				</view> -->
+			</view>
+			<view class="u-nav-slot u-flex" slot="right" style="display: flex;">
 				<view class="" style="margin-left: 184rpx;" @click="share = true">
 					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 				</view>
+				<view class="" style="width: 180rpx;"></view>
 			</view>
 		</u-navbar>
 		<!-- 商品图片 -->
@@ -99,7 +105,19 @@
 					{{i18n.Recommended}}
 				</view>
 				<view class="">
-					<image src="" mode=""></image>
+					<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
+						<swiper-item v-for="(parent,index) in 4" :key="index">
+							<view class="u-flex  swiper-item u-row-between">
+								<view class="" v-for="child in 3" @click="toinfo(child.id)">
+									<image src="/static/images/logo.png" style="width: 214rpx;height: 214rpx;" mode=""></image>
+									<view class="u-line-1" style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;">布兰德烘焙猫粮预售鲜肉乌骨鸡囤货</view>
+									<view class="">
+										<span style="color:rgba(204, 51, 0, 1) ;margin-top: 12rpx;font-size: 26rpx;">¥{{child.price||235.55}}</span>
+									</view>
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
 				</view>
 			</view>
 			<view class="recommend">
@@ -236,7 +254,7 @@
 						</image>
 						<view class="link">{{i18n.Copylink}}</view>
 					</view>
-					<view class="">
+					<view class="" @click="builder">
 						<image src="../static/images/index/image.png" style="width: 108rpx;height: 108rpx;" mode="">
 						</image>
 						<view class="link">{{i18n.Generatepicture}}</view>
@@ -247,6 +265,24 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-popup :show="imagea" bgColor=' rgba(244, 244, 244, 0);' mode='center' :customStyle="{alignItems: 'center'}" >
+			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(255, 255, 255, 1);border-radius: 16rpx;width: 538rpx;">
+				<view class="" style="">
+					<image src="../static/images/index/bottom2.png" style="width: 490rpx;height: 490rpx;">
+				</view>
+				<view class="money">
+					<span>¥</span>
+					<span style="font-size: 36rpx;">258</span>
+					<span>00</span>
+				</view>
+				<view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
+				<view class="" style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 44rpx;">
+					<image src="../static/images/logo.png" style="width: 132rpx;height: 132rpx;" mode=""></image>
+					<view class="view">长按识别查看</view>
+				</view>
+			</view>
+			<view class="button" style="width: 658rpx;">保存到相册</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -254,13 +290,16 @@
 	export default {
 		data() {
 			return {
+				imagea: false,
 				list1: [{
-					name: '商品',
-				}, {
-					name: '评价',
-				}, {
-					name: '详情'
-				}],
+						name: '商品',
+					}
+					// , {
+					// 	name: '评价',
+					// }, {
+					// 	name: '详情'
+					// },
+				],
 				current: 0,
 				// 购物车
 				show: false,
@@ -269,6 +308,7 @@
 				//分享
 				share: false,
 				value: 0, //步进器的值
+				swiptlist: []
 			};
 		},
 		computed: {
@@ -277,8 +317,27 @@
 			}
 		},
 		methods: {
+			//生成图片弹窗
+			builder(){
+				this.imagea = true
+				this.share = false
+			},
+			//获取推荐
+			getSeriesBooks() {
+				this.swiptlist = res.data.reduce((a, b) => {
+					let lastIndex = a.length - 1
+					if (a[lastIndex].length < 3) {
+						a[lastIndex].push(b)
+					} else {
+						a.push([b])
+					}
+					return a
+				}, [
+					[]
+				])
+			},
 			//加入购物车
-			joincart(){
+			joincart() {
 				this.show = false
 			},
 			valChange(e) {
@@ -329,6 +388,34 @@
 </script>
 
 <style lang="scss" scoped>
+	.money{
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 20rpx;
+		color: #F83224;
+		line-height: 26rpx;
+		text-align: left;
+		font-style: normal;
+	}
+	.title{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 16rpx;
+	}
+	.view{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 12rpx;
+	}
 	.actabs {
 		width: 116rpx;
 		height: 68rpx;
@@ -601,7 +688,7 @@
 				line-height: 52rpx;
 				text-align: center;
 				font-style: normal;
-				padding: 0 10rpx;
+				padding: 0 20rpx;
 				box-sizing: border-box;
 			}
 		}
@@ -769,4 +856,7 @@
 			}
 		}
 	}
+	::v-deep .u-popup__content data-v-17becaea{
+		align-items: center !important;
+	}
 </style>

+ 71 - 121
pageA/rule/rule.vue

@@ -1,145 +1,95 @@
-前端多规格选择方法
-
-实现一个多规格选择功能的完整Vue组件需要考虑几个方面:数据模型、用户界面、事件处理以及与后端的数据交互。以下是一个简单的示例,展示如何在Vue组件中实现一个基本的多规格选择功能。
-
 <template>
-	<div class="product-sku">
-		<div class="sku-option">
-			<label>颜色:</label>
-			<button v-for="color in colors" :key="color.id" :class="{ active: selectedColor === color.id }"
-				@click="selectColor(color.id)">
-				{{ color.name }}
-			</button>
-		</div>
-		<div class="sku-option">
-			<label>尺寸:</label>
-			<button v-for="size in sizes" :key="size.id" :class="{ active: selectedSize === size.id }"
-				@click="selectSize(size.id)">
-				{{ size.name }}
-			</button>
-		</div>
-		<div class="sku-result">
-			<p>选择的规格: {{ selectedColorName }} - {{ selectedSizeName }}</p>
-			<p v-if="selectedSku">价格: {{ selectedSku.price }}</p>
-			<p v-if="selectedSku">库存: {{ selectedSku.stock  }}</p>
-		</div>
+	<div class="product-specifications">
+		<view class="">{{all}}</view>
 	</div>
 </template>
 
 <script>
+import { nextTick } from 'vue';
 	export default {
 		data() {
 			return {
-				colors: [{
-						id: 1,
-						name: '红色'
-					},
-					{
-						id: 2,
-						name: '蓝色'
-					},
-					// 更多颜色...
-				],
-				sizes: [{
-						id: 1,
-						name: 'S'
-					},
-					{
-						id: 2,
-						name: 'M'
-					},
-					{
-						id: 3,
-						name: 'L'
-					},
-					// 更多尺寸...
+				arr: [
+					['黑色', '白色', '蓝色'],
+					['8GB', '16GB', '32GB'],
+					['大', '中', '小']
 				],
-				skus: [
-					// 假设每个SKU包含颜色ID、尺寸ID、价格和库存
-					{
-						colorId: 1,
-						sizeId: 1,
-						price: 100,
-						stock: 50,
-						name: '红色-S'
-					},
-					// 更多SKU...
-				],
-				selectedColor: null,
-				selectedSize: null,
-				selectedColorName: '',
-				selectedSizeName: '',
+				all: [],
+				allArray: [{
+					name: '颜色',
+					size: ['白色', '红色', '黑色'],
+				}, {
+					name: '尺寸',
+					size: ['X', 'XL', 'XXL']
+				}],
+				rule:[]
 			};
 		},
-		computed: {
-			selectedSku() {
-				return this.skus.find(
-					sku => sku.colorId == this.selectedColor && sku.sizeId == this.selectedSize
-				);
-			},
-		},
-		
-		// function cartesianProduct(...arrays) {
-		//   return arrays.reduce((accumulator, currentValue) => {
-		//     return accumulator.flatMap(item1 =>
-		//       currentValue.map(item2 => item1.concat(item2))
-		//     );
-		//   }, [[]]);
-		// }
-		
-		// // 示例数组
-		// const array1 = ['苹果', '香蕉'];
-		// const array2 = ['大', '小'];
-		// const array3 = ['甜', '酸'];
-		
-		// // 生成笛卡尔积
-		// const product = cartesianProduct(array1, array2, array3);
-		// console.log(product);
-		
-		
+		mounted() {
+			let colorArray = ['白色', '红色', '黑色'] //选择的颜色
+			let sizeArray = ['X', 'XL', 'XXL'] //选择的尺寸
+			//组合数组 格式为:[[],[]]
+			this.fun()
 		
+			
+		},
 		methods: {
-			selectColor(colorId) {
-				this.selectedColor = colorId;
-				this.selectedColorName = this.colors.find(color => color.id === colorId).name;
-				this.updateSku();
-			},
-			selectSize(sizeId) {
-				this.selectedSize = sizeId;
-				this.selectedSizeName = this.sizes.find(size => size.id === sizeId).name;
-				this.updateSku();
-			},
-			updateSku() {
-				if (this.selectedColor && this.selectedSize) {
-					const sku = this.selectedSku;
-					if (sku) {
-						console.log(`Selected SKU: ${sku.name}, Price: ${sku.price}, Stock: ${sku.stock}`);
-					}
-				}
+			// fun() {
+			// 	var obj = {}
+			// 	this.allArray.forEach((item) => {
+			// 		item.size.forEach((a) => {
+			// 			obj = {[item.name]: a}
+			// 			obj[item.name]
+			// 			console.log(this.allArray);    
+			// 		})
+			// 	})
+			// },
+			
+			fun(){
+				this.all = this.allArray.map(item => {
+				  // 将每个size数组中的元素转换为对象形式
+				  const transformedSize = item.size.map(size => ({ [item.name]: size }));
+				  // 返回更新后的对象
+				  return {
+				    size: transformedSize
+				  };
+				});
+				
+				this.$nextTick(()=>{
+					const rule = this.cartesianProductOf(this.all); //调用笛卡尔积方法
+				})
+				// console.log(this.all);   
 			},
-		},
-	};
-</script>
-
 
 
+			cartesianProductOf: function() { //笛卡尔积
+				return Array.prototype.reduce.call(arguments, function(a, b) {
+					var ret = [];
+					console.log(a);
+					a.forEach(function(a) {
+						b.forEach(function(b) {
+							ret.push(a.concat([b]));
+						});
+					});
+					return ret;
+				}, [
+					[]
+				]);
+			},
+		}
+	}
+</script>
 
 <style scoped>
-	.sku-option button {
-		margin: 5px;
-		padding: 5px;
-		border: 1px solid #ccc;
-		border-radius: 5px;
-		background-color: #f8f8f8;
-		cursor: pointer;
+	.spec-item {
+		margin: 10px;
 	}
 
-	.sku-option button.active {
-		background-color: #42b983;
-		color: white;
+	.combinations-list {
+		margin-top: 20px;
 	}
 
-	.sku-result {
-		margin-top: 20px;
+	.combination-item {
+		margin: 5px 0;
 	}
 </style>

+ 64 - 6
pages/cart/cart.vue

@@ -28,10 +28,16 @@
 						<view class="u-flex" style="margin-top: 30rpx;width: 100%;" v-for="(chid,index) in 2"
 							:key="index">
 							<u-swipe-action-item :options="options2">
+								<!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
 								<u-checkbox shape='circle' :customStyle="{marginBottom: '8px'}" :name="shopitem">
 								</u-checkbox>
-								<image src="../../static/images/logo.png" style="width: 172rpx;height: 172rpx;" mode="">
-								</image>
+								<view class="" style="position: relative;width: 172rpx;height: 172rpx;">
+									<image src="/static/images/logo.png" style="width: 172rpx;height: 172rpx;" mode="">
+									</image>
+									<!-- 		<view class="sold">
+										商品下架
+									</view> -->
+								</view>
 								<view class="good" style="flex: 1;">
 									<view class="goodname">布兰德超级锁鲜全价主食冻干成</view>
 									<view class="goods">兔肉味-提高免疫 主食白金包</view>
@@ -46,8 +52,22 @@
 											<text class="weight">500g</text>
 										</view>
 										<view class="">
+											<!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
 											<view class="" v-if="num&&success">
-												<u-number-box v-model="value" @change="valChange"></u-number-box>
+												<!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
+												<u-number-box v-model="value">
+
+													<view slot="minus" class="minus">
+														<u-icon name="minus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+													<text slot="input"
+														style="width: 50px;text-align: center;font-size: 20rpx;"
+														class="input">{{value}}</text>
+													<view slot="plus" class="plus">
+														<u-icon name="plus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+
+												</u-number-box>
 											</view>
 											<view class="num" v-if="num==false&&success" @click="num = true">
 												x1
@@ -73,6 +93,7 @@
 	export default {
 		data() {
 			return {
+				dele: true,
 				success: true,
 				shopitem: -1,
 				checkboxValue1: [], //商品数组
@@ -118,19 +139,56 @@
 			checkAll(e) {
 				console.log('all', e);
 			},
-			aaa(){
+			aaa() {
 				console.log(this.$refs.tabbar1.getLabelHeight())
 			},
 			checkboxChange(n) {
 				console.log('change', n);
 			}
 		},
-		mounted() {
-		}
+		mounted() {}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.sold {
+		width: 108rpx;
+		height: 36rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 18rpx;
+		// padding: 0 14rpx;
+		text-align: center;
+		box-sizing: border-box;
+		line-height: 36rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		font-style: normal;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-top: -18rpx;
+		margin-left: -54rpx;
+
+	}
+
+	.delect {
+		// width: 68rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 22rpx;
+		border: 1rpx solid #FF1515;
+		padding: 0 14rpx;
+		box-sizing: border-box;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #FF1515;
+		text-align: center;
+		font-style: normal;
+	}
+
 	.allweight {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

+ 3 - 0
pages/express/express.vue

@@ -313,6 +313,9 @@
 </script>
 
 <style lang="scss" scoped>
+		page{
+			background-color: rgba(0,0,0,0)
+		}
 	.pop {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;

+ 10 - 0
pages/index/index.vue

@@ -270,6 +270,9 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		background-color: rgba(0,0,0,0)
+	}
 	.index-navbar {
 		position: sticky;
 		top: 0;
@@ -286,6 +289,13 @@
 		border-radius: 4rpx;
 		padding: 4rpx 8rpx;
 		margin-bottom: 10rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #D48700;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
 	}
 
 	.title {

+ 1 - 1
pages/shopping/shopping.vue

@@ -109,7 +109,7 @@
 
 		.item {
 			width: 340rpx;
-			height: 592rpx;
+			// height: 592rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
 

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 392 - 346
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 0 - 10
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageA/index.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageA/index"],{
+require('./common/vendor.js');(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageA/index"],{
 
 /***/ 209:
 /*!***********************************************************************************!*\

+ 13 - 12
unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -104,19 +104,16 @@ try {
       return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 651))
     },
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 757))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 759))
     },
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 765))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 767))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 771))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 773))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 783))
-    },
-    uNumberBox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 791))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 785))
     },
     uIcon: function () {
       return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 667))
@@ -146,11 +143,6 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function ($event) {
-      _vm.num = true
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -261,9 +253,18 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
+      dele: true,
       success: true,
       shopitem: -1,
       checkboxValue1: [],

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/cart/cart.json

@@ -8,7 +8,6 @@
     "u-swipe-action": "/uview-ui/components/u-swipe-action/u-swipe-action",
     "u-swipe-action-item": "/uview-ui/components/u-swipe-action-item/u-swipe-action-item",
     "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
-    "u-number-box": "/uview-ui/components/u-number-box/u-number-box",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
   }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml


+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -107,16 +107,16 @@ try {
       return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 659))
     },
     uBadge: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 734))
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 736))
     },
     uLineProgress: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 742))
+      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 744))
     },
     uPopup: function () {
       return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 692))
     },
     kjFlow: function () {
-      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 750))
+      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 752))
     },
     kjTabbar: function () {
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 700))

+ 7 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -39,6 +39,13 @@
   border-radius: 4rpx;
   padding: 4rpx 8rpx;
   margin-bottom: 10rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #D48700;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
 }
 .title.data-v-57280228 {
   font-family: SFPro, SFPro;

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 757))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 759))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 783))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 785))
     },
   }
 } catch (e) {

+ 4 - 4
unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -166,22 +166,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 706));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 708));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 713));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 715));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 720));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 722));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 727));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 729));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uStatusBar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-status-bar/u-status-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-status-bar/u-status-bar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-status-bar/u-status-bar.vue */ 1014))
+      return Promise.all(/*! import() | uview-ui/components/u-status-bar/u-status-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-status-bar/u-status-bar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-status-bar/u-status-bar.vue */ 1016))
     },
     uIcon: function () {
       return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 667))

File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js

@@ -80,10 +80,10 @@ var components
 try {
   components = {
     uLoadingIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 1022))
+      return Promise.all(/*! import() | uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 1024))
     },
     uSwiperIndicator: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swiper-indicator/u-swiper-indicator */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper-indicator/u-swiper-indicator")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue */ 1030))
+      return Promise.all(/*! import() | uview-ui/components/u-swiper-indicator/u-swiper-indicator */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper-indicator/u-swiper-indicator")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue */ 1032))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uBadge: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 734))
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 736))
     },
   }
 } catch (e) {

Some files were not shown because too many files changed in this diff