Bladeren bron

滚动优化

lilei 10 maanden geleden
bovenliggende
commit
e9028571f3
55 gewijzigde bestanden met toevoegingen van 3287 en 151 verwijderingen
  1. 232 0
      components/uni-number-box/uni-number-box.vue
  2. 11 1
      manifest.json
  3. 11 7
      pages.json
  4. 1 1
      pages/index/index.vue
  5. 1 1
      pages/promo/index.vue
  6. 69 115
      pagesA/digitalShelf/choosePart.vue
  7. 0 2
      pagesA/digitalShelf/choosePartResult.vue
  8. 102 0
      pagesA/digitalShelf/components/otherPartItem.vue
  9. 120 0
      pagesA/digitalShelf/components/vinPartItem.vue
  10. 0 2
      pagesA/digitalShelf/orderDetail.vue
  11. 1 3
      pagesA/digitalShelf/settlementManage/settlementManage.vue
  12. 0 2
      pagesA/digitalShelf/settlementManage/settlementSxDetail.vue
  13. 0 2
      pagesA/digitalShelf/settlementRecord/settlementDetail.vue
  14. 0 2
      pagesA/digitalShelf/stockPutDetail.vue
  15. 0 2
      pagesA/digitalShelf/tempOrderList/orderDetail.vue
  16. 8 2
      pagesA/qualityPolicy/creatOrder.vue
  17. 7 2
      pagesB/components/chooseProductItem.vue
  18. 191 0
      pagesB/components/chooseProductItemSkline.vue
  19. 201 0
      pagesB/components/productItemSkline.vue
  20. 2 2
      pagesB/procureOrder.vue
  21. 5 5
      pagesB/promoDetail.vue
  22. 738 0
      pagesB/promoProduct.vue
  23. BIN
      pagesB/static/add.png
  24. BIN
      pagesB/static/arrow-left.png
  25. BIN
      pagesB/static/cart.png
  26. BIN
      pagesB/static/del.png
  27. BIN
      pagesB/static/search.png
  28. 13 0
      uni_modules/uni-grid/changelog.md
  29. 127 0
      uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
  30. 142 0
      uni_modules/uni-grid/components/uni-grid/uni-grid.vue
  31. 86 0
      uni_modules/uni-grid/package.json
  32. 11 0
      uni_modules/uni-grid/readme.md
  33. 8 0
      uni_modules/uni-scss/changelog.md
  34. 1 0
      uni_modules/uni-scss/index.scss
  35. 82 0
      uni_modules/uni-scss/package.json
  36. 4 0
      uni_modules/uni-scss/readme.md
  37. 7 0
      uni_modules/uni-scss/styles/index.scss
  38. 3 0
      uni_modules/uni-scss/styles/setting/_border.scss
  39. 66 0
      uni_modules/uni-scss/styles/setting/_color.scss
  40. 55 0
      uni_modules/uni-scss/styles/setting/_radius.scss
  41. 56 0
      uni_modules/uni-scss/styles/setting/_space.scss
  42. 167 0
      uni_modules/uni-scss/styles/setting/_styles.scss
  43. 24 0
      uni_modules/uni-scss/styles/setting/_text.scss
  44. 146 0
      uni_modules/uni-scss/styles/setting/_variables.scss
  45. 19 0
      uni_modules/uni-scss/styles/tools/functions.scss
  46. 31 0
      uni_modules/uni-scss/theme.scss
  47. 62 0
      uni_modules/uni-scss/variables.scss
  48. 47 0
      uni_modules/uni-search-bar/changelog.md
  49. 4 0
      uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
  50. 8 0
      uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
  51. 4 0
      uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
  52. 4 0
      uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
  53. 309 0
      uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
  54. 87 0
      uni_modules/uni-search-bar/package.json
  55. 14 0
      uni_modules/uni-search-bar/readme.md

+ 232 - 0
components/uni-number-box/uni-number-box.vue

@@ -0,0 +1,232 @@
+<template>
+	<view class="uni-numbox">
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }"
+				:style="{color}">-</text>
+		</view>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value"
+			:type="step<1?'digit':'number'" v-model="inputValue" :style="{background, color, width:widthWithPx}" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }"
+				:style="{color}">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * NumberBox 数字输入框
+	 * @description 带加减按钮的数字输入框
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+	 * @property {Number} value 输入框当前值
+	 * @property {Number} min 最小值
+	 * @property {Number} max 最大值
+	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色(前景色)
+	 * @property {Number} width 输入框宽度(单位:px)
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @event {Function} change 输入框值改变时触发的事件,参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件,参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件,参数为 event 对象
+	 */
+
+	export default {
+		name: "UniNumberBox",
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			width: {
+				type: Number,
+				default: 40,
+			}
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			},
+			modelValue(val) {
+				this.inputValue = +val;
+			}
+		},
+		computed: {
+			widthWithPx() {
+				return this.width + 'px';
+			}
+		},
+		created() {
+			if (this.value === 1) {
+				this.inputValue = +this.modelValue;
+			}
+			if (this.modelValue === 1) {
+				this.inputValue = +this.value;
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === "minus") {
+					value -= step;
+					if (value < (this.min * scale)) {
+						return;
+					}
+					if (value > (this.max * scale)) {
+						value = this.max * scale
+					}
+				}
+
+				if (type === "plus") {
+					value += step;
+					if (value > (this.max * scale)) {
+						return;
+					}
+					if (value < (this.min * scale)) {
+						value = this.min * scale
+					}
+				}
+
+				this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+				// TODO vue2 兼容
+				this.$emit("input", +this.inputValue);
+				// TODO vue3 兼容
+				this.$emit("update:modelValue", +this.inputValue);
+				this.$emit("change", +this.inputValue);
+			},
+			_getDecimalScale() {
+
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, String(this.step).split(".")[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				this.$emit('blur', event)
+				let value = event.detail.value;
+				if (isNaN(value)) {
+					this.inputValue = this.value;
+					return;
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min;
+				}
+				const scale = this._getDecimalScale();
+				this.inputValue = value.toFixed(String(scale).length - 1);
+				this.$emit("input", +this.inputValue);
+				this.$emit("update:modelValue", +this.inputValue);
+				this.$emit("change", +this.inputValue);
+			},
+			_onFocus(event) {
+				this.$emit('focus', event)
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	$box-height: 26px;
+	$bg: #f5f5f5;
+	$br: 2px;
+	$color: #333;
+
+	.uni-numbox {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		background-color: $bg;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-numbox__value {
+		margin: 0 2px;
+		background-color: $bg;
+		width: 40px;
+		height: $box-height;
+		text-align: center;
+		font-size: 14px;
+		border-width: 0;
+		color: $color;
+	}
+
+	.uni-numbox__minus {
+		border-top-left-radius: $br;
+		border-bottom-left-radius: $br;
+	}
+
+	.uni-numbox__plus {
+		border-top-right-radius: $br;
+		border-bottom-right-radius: $br;
+	}
+
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 20px;
+		margin-bottom: 2px;
+		font-size: 20px;
+		font-weight: 300;
+		color: $color;
+	}
+
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>

+ 11 - 1
manifest.json

@@ -57,7 +57,17 @@
             "postcss" : true,
             "minified" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+		"lazyCodeLoading": "requiredComponents",
+		"rendererOptions": { 
+			"skyline": { 
+				"defaultDisplayBlock": true,
+				"defaultContentBox": true,
+				"disableABTest": true,
+				"sdkVersionBegin":"3.0.1",
+				"sdkVersionEnd": "15.255.255"
+			}
+		}
     },
     "mp-alipay" : {
         "usingComponents" : true

+ 11 - 7
pages.json

@@ -418,15 +418,19 @@
                 "enablePullDownRefresh": false
             }
             
-        },{
-			"path" : "promoDetail",
+        },
+		{
+			"path" : "promoProduct",
 			"style" : 
 			{
-				"navigationBarTitleText" : "促销产品详情",
-				"enablePullDownRefresh": false,
-				"titleView":false,
-				// 将回弹属性关掉
-				"bounce":"none"
+				"navigationBarTitleText" : "促销产品列表",
+				"navigationStyle": "custom",
+				"disableScroll": true,
+				"app-plus":{
+					"bounce":"none"
+				},
+				"renderer":"skyline",
+				"componentFramework": "glass-easel"
 			}
 		},
 		{

+ 1 - 1
pages/index/index.vue

@@ -519,7 +519,7 @@
 					// 货架促销活动
 					if(row.content.indexOf("pagesB/promoDetail") >= 0){
 						uni.navigateTo({
-							url: '/pagesB/promoDetail?promoActiveSn='+row.promoActiveSn+'&title='+row.title
+							url: '/pagesB/promoProduct?promoActiveSn='+row.promoActiveSn+'&title='+row.title
 						 })
 					}else{
 						openWebView({url:row.content})

+ 1 - 1
pages/promo/index.vue

@@ -111,7 +111,7 @@
 			// 促销活动产品列表页
 			viewRow(item){
 				 uni.navigateTo({
-				 	url: '/pagesB/promoDetail?promoActiveSn='+item.promoActiveSn+'&title='+item.title
+				 	url: '/pagesB/promoProduct?promoActiveSn='+item.promoActiveSn+'&title='+item.title
 				 })
 			},
 			// 扫描vin

+ 69 - 115
pagesA/digitalShelf/choosePart.vue

@@ -13,9 +13,6 @@
 					<div>VIN码:{{vinNumber}}</div>
 					<div class="copyText" @click="copyVin"><span>复制</span></div>
 				</div>
-				<view style="font-size: 0.8em;color: dodgerblue;margin-top: 0.5em;" v-if="dealerPhone" @click="callPhone()">
-					<u-icon size="30" name="phone" color="dodgerblue"></u-icon><text>联系汽配商</text>
-				</view>
 			</div>
 		</div>
 		<!-- 配件列表 -->
@@ -38,114 +35,45 @@
 					<!-- vin适配配件 -->
 					<view>
 						<view class="nav-right-title">适配推荐</view>
-						 <view class="nav-right-item flex" v-for="(item, index) in vinPartList" :key="item.productSn">
-						 	<view class="uni-col-2">
-						 		<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'" @click="viewImg(item)" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
-						 	</view>
-						 	<view class="item-info uni-col-10">
-						 		<view class="item-name">
-						 			<text>{{item.name}}</text>
-						 		</view>
-						 		<view class="item-detail">
-									<view class="item-detail-info">
-										<view class="flex justify_between">
-											<view>
-												<text class="item-detail-text flex_1">{{item.code}}</text>
-												<u-tag v-if="commonPartCodeList.includes(item.code)" size="mini" style="margin-left: 5px;" text="通用" mode="light" shape="circle" type="success"></u-tag>
-											</view>
-											<text class="item-detail-text" v-if="item.affiliation=='SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
-										</view>
-										<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
-											<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
-										</view>
-										<view class="flex justify_between">
-											<view class="item-detail-text flex_1">
-												<!-- 货架产品 -->
-												<view @click="openPriceModal(item,1,showShelfDetial)" v-if="item.affiliation=='SHELF'">
-													<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice&&configPrice.shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
-													<text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice&&configPrice.shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
-													<u-icon name="arrow-right" v-if="priceShowVal&&showShelfDetial"></u-icon>
-												</view>
-												<!-- 非货架 -->
-												<view @click="openPriceModal(item,1,showNonShelfDetial)" v-else>
-													<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice&&configPrice.non_shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
-													<text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice&&configPrice.non_shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
-													<u-icon name="arrow-right" v-if="priceShowVal&&showNonShelfDetial"></u-icon>
-												</view>
-											</view>
-											<view class="item-detail-text" v-if="item.currentInven">
-												<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx'}" type="primary" size="mini">
-													<u-icon name="plus" color="#fff" size="28"></u-icon>
-												</u-button>
-												<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
-											</view>
-											<view class="item-detail-text" v-if="item.affiliation=='NON_SHELF'||!item.currentInven">
-												<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要急送</text>
-												<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
-											</view>
-										</view>
-									</view>
-						 			<view class="nav-right-item-btns flex align_center justify_between">
-						 				<view>
-						 				</view>
-						 			</view>
-						 		</view>
-						 	</view>
-						 </view>
+						<vinPartItem 
+						:list="vinPartList" 
+						:commonPartCode="commonPartCodeList" 
+						:configPrice="configPrice"
+						:showCarPrice="showCarPrice"
+						:showCostPrice="showCostPrice"
+						:showShelfDetial="showShelfDetial"
+						:showNonShelfDetial="showNonShelfDetial"
+						:priceShowVal="priceShowVal"
+						@viewImg="viewImg"
+						@openPrice="openPriceModal"
+						@addPart="addPart"
+						@updateVinNums="updateVinNums"
+						></vinPartItem>
 						 <view v-if="vinPartList&&vinPartList.length==0">
 						 	<u-empty v-if="vinStatus!='loading'" :src="`/static/nodata.png`" icon-size="180" text="暂无适配推荐" mode="list" :margin-top="30"></u-empty>
 						 </view>
-						 <view style="padding: 20upx;">
-						 	<u-loadmore v-if="vinStatus=='loading'" :status="vinStatus" />
+						 <view style="padding: 20upx;" v-if="vinStatus=='loading'" >
+						 	<u-loadmore :status="vinStatus" />
 						 </view>
 					</view>
 					<!-- 其它配件 -->
-					<view class="nav-right-title flex align_center justify_between" @click="showOther=!showOther">
+					<view class="nav-right-title flex align_center justify_between" v-if="vinStatus!='loading'" @click="showOther=!showOther">
 						其它配件
 						<text>{{showOther?'隐藏':'展开'}}</text>
 					</view>
-					<view class="nav-right-item flex" v-if="showOther" v-for="(item, index) in partList" :key="item.productSn">
-						<view class="uni-col-2">
-							<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'" @click="viewImg(item)" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
-						</view>
-						<view class="item-info uni-col-10">
-							<view class="item-name">
-								<text>{{item.name}}</text>
-							</view>
-							<view class="item-detail">
-								<view class="item-detail-info">
-									<view class="flex justify_between">
-										<text class="item-detail-text flex_1">{{item.code}}</text>
-										<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
-									</view>
-									<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
-										<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
-									</view>
-									<view class="flex justify_between">
-										<view class="item-detail-text flex_1" @click="openPriceModal(item,0,showShelfDetial)">
-											<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice&&configPrice.shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
-											<text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice&&configPrice.shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
-											<u-icon name="arrow-right" v-if="priceShowVal&&showShelfDetial"></u-icon>
-										</view>
-										<view class="item-detail-text" v-if="item.currentInven">
-											<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx',background:'#066cff'}" type="primary" size="mini">
-												<u-icon name="plus" color="#fff" size="28"></u-icon>
-											</u-button>
-											<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
-										</view>
-										<view class="item-detail-text" v-else>
-											<text @click="addPart(item)" v-if="!item.checked" class="phtxt">我要急送</text>
-											<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
-										</view>
-									</view>
-								</view>
-								<view class="nav-right-item-btns flex align_center justify_between">
-									<view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
+					<otherPartItem
+					v-if="showOther"
+					:list="partList" 
+					:configPrice="configPrice"
+					:showCarPrice="showCarPrice"
+					:showCostPrice="showCostPrice"
+					:showShelfDetial="showShelfDetial"
+					:priceShowVal="priceShowVal"
+					@viewImg="viewImg"
+					@openPrice="openPriceModal"
+					@addPart="addPart"
+					@updateNums="updateNums"
+					></otherPartItem>
 					<view v-if="partList&&partList.length==0">
 						<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="150"></u-empty>
 					</view>
@@ -165,6 +93,9 @@
 			</div>
 			<view>
 				<!-- 合计:<text>¥{{totalAmount}}</text> -->
+				<view style="font-size: 0.8em;color: dodgerblue;" v-if="dealerPhone" @click="callPhone()">
+					<u-icon size="30" name="phone" color="dodgerblue"></u-icon><text>联系汽配商</text>
+				</view>
 			</view>
 			<div>
 				<u-button type="primary" :loading="saveLoading" @click="submitForm" :custom-style="{background:'#066cff',fontSize:'32rpx'}" shape="circle">确认拿货</u-button>
@@ -180,7 +111,7 @@
 				<div class="cpb_cart-list">
 					<view class="nav-right-item flex" v-for="(item, index) in partListData" :key="item.productSn">
 						<view class="uni-col-2">
-							<u-image border-radius="30" :src="item.images" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+							<u-image border-radius="30" :src="item.images" width="150" height="150" bg-color="#EBEBEB" ></u-image>
 						</view>
 						<view class="item-info uni-col-10">
 							<view class="item-name">
@@ -264,7 +195,13 @@
 <script>
 	import { getShelfProductList, getShelfProductType, queryPartCodeByVin, getShelfQueryList, shelfOrderFlowCreate, findShelfUserParam } from '@/api/shelf'
 	import { scanVinLogCopy } from '@/api/car'
+	import vinPartItem from './components/vinPartItem.vue'
+	import otherPartItem from './components/otherPartItem.vue'
 	export default {
+		components:{
+			vinPartItem,
+			otherPartItem
+		},
 		data() {
 			return {
 				showOther: false,
@@ -523,10 +460,15 @@
 				      productTypeSn: this.curLeve2 == 'all' ? '' : this.curLeve2,
 					  codeList: this.vinCode
 				  }
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
 				this.vinStatus = 'loading'
 				getShelfQueryList(params).then(res => {
 					this.vinPartList = this.fiterChecked(res.data || []) 
 					this.vinStatus = 'nomore'
+					uni.hideLoading()
 				})
 			},
 			// 过滤已选择的
@@ -552,9 +494,19 @@
 				}
 			},
 			// 添加到购物车
-			addPart(item){
-				item.checked = true
-				item.qty = 1
+			addPart(item,type){
+				if(type == 'vin'){
+					const idx = this.vinPartList.findIndex(k => k.id == item.id)
+					this.vinPartList[idx].checked = true
+					this.vinPartList[idx].qty = 1
+					this.vinPartList.splice()
+				}else{
+					const idx = this.partList.findIndex(k => k.id == item.id)
+					this.partList[idx].checked = true
+					this.partList[idx].qty = 1
+					this.partList.splice()
+				}
+				// 已选列表
 				this.partListData.unshift({
 					id: item.id,
 					productSn: item.productSn,
@@ -565,7 +517,7 @@
 					currentInven: item.currentInven,
 					code: item.code,
 					origCode: item.origCode,
-					qty: item.qty,
+					qty: 1,
 					productTypeSn: item.productTypeSn,
 					images: item.images,
 					checked: true,
@@ -807,9 +759,10 @@
 			.tabs{
 				> view{
 					border-left: 6rpx solid #F5F6F7;
-					padding: 30rpx 10rpx;
-					font-size: 30rpx;
+					padding: 20rpx 10rpx;
+					font-size: 28rpx;
 					color: #666E75;
+					text-align: center;
 				}
 				.active{
 					border-color: #0485F6;
@@ -842,7 +795,7 @@
 						padding-left: 20upx;
 						flex-grow: 1;
 						.item-name{
-							font-size: 32upx;
+							font-size: 30upx;
 							color: #191919;
 							display: flex;
 							align-items: center;
@@ -923,14 +876,14 @@
 		width: 100%;
 		z-index: 1000;
 		bottom: 0;
-		padding: 20rpx 0;
+		padding: 0;
 		border-radius: 30rpx 30rpx 0 0;
 		max-height: 70vh;
 		display: flex;
 		flex-direction: column;
 		.cpb_close{
 			position: absolute;
-			top: 20rpx;
+			top: 10rpx;
 			right: 20rpx;
 			width: 70rpx;
 			height: 70rpx;
@@ -941,16 +894,18 @@
 			text-align: center;
 			padding: 20rpx;
 			font-size: 36rpx;
+			border-bottom: 1px solid #eee;
 		}
 		.cpb_cart-list{
 			padding: 20rpx 30rpx;
 			overflow: auto;
 			flex-grow: 1;
 			> view{
-				margin-bottom: 30rpx;
+				margin-bottom: 20rpx;
+				border-bottom:2rpx solid #eee;
 			}
 			.item-name{
-				font-size: 32rpx;
+				font-size: 30rpx;
 				margin-bottom: 5px;
 				.item-tempPart{
 					background: #0055ff;
@@ -961,7 +916,6 @@
 				}
 			}
 			.item-info{
-				border-bottom:2rpx solid #f8f8f8;
 				flex-grow: 1;
 				padding-left: 0.8em;
 			}

+ 0 - 2
pagesA/digitalShelf/choosePartResult.vue

@@ -147,13 +147,11 @@
 </template>
 
 <script>
-	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { findBySnShelfOrder, takeGoods, rewardOrderFindBySn } from '@/api/shelf'
 	export default {
 	   name: 'choosePartResult',
 	   components: {
-		uniIcons,
 	   },
 	   data() {
 		   return {

+ 102 - 0
pagesA/digitalShelf/components/otherPartItem.vue

@@ -0,0 +1,102 @@
+<template>
+	<block>
+		<view class="nav-right-item flex" v-for="(item, index) in list" :key="item.productSn">
+			<view class="uni-col-2">
+				<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'" @click="viewImg(item)" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+			</view>
+			<view class="item-info uni-col-10">
+				<view class="item-name">
+					<text>{{item.name}}</text>
+				</view>
+				<view class="item-detail">
+					<view class="item-detail-info">
+						<view class="flex justify_between">
+							<text class="item-detail-text flex_1">{{item.code}}</text>
+							<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+						</view>
+						<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
+							<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
+						</view>
+						<view class="flex justify_between">
+							<view class="item-detail-text flex_1" @click="openPriceModal(item,0,showShelfDetial)">
+								<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice&&configPrice.shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
+								<text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice&&configPrice.shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
+								<u-icon name="arrow-right" v-if="priceShowVal&&showShelfDetial"></u-icon>
+							</view>
+							<view class="item-detail-text" v-if="item.currentInven">
+								<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx',background:'#066cff'}" type="primary" size="mini">
+									<u-icon name="plus" color="#fff" size="28"></u-icon>
+								</u-button>
+								<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
+							</view>
+							<view class="item-detail-text" v-else>
+								<text @click="addPart(item)" v-if="!item.checked" class="phtxt">我要急送</text>
+								<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			configPrice: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			showCarPrice: {
+				type: Boolean,
+				default: false
+			},
+			showCostPrice: {
+				type: Boolean,
+				default: false
+			},
+			showShelfDetial: {
+				type: Boolean,
+				default: false
+			},
+			showNonShelfDetial: {
+				type: Boolean,
+				default: false
+			},
+			priceShowVal: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+			}
+		},
+		methods: {
+			openPriceModal(item, type, show) {
+				this.$emit('openPrice', item, type, show)
+			},
+			addPart(item) {
+				this.$emit('addPart', item, 'other')
+			},
+			updateNums(e) {
+				this.$emit('updateNums', e)
+			},
+			viewImg(item){
+				this.$emit('viewImg',item)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 120 - 0
pagesA/digitalShelf/components/vinPartItem.vue

@@ -0,0 +1,120 @@
+<template>
+	<block>
+		<view class="nav-right-item flex" v-for="(item, index) in list" :key="item.productSn">
+			<view class="uni-col-2">
+				<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'" @click="viewImg(item)" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+			</view>
+			<view class="item-info uni-col-10">
+				<view class="item-name">
+					<text>{{item.name}}</text>
+				</view>
+				<view class="item-detail">
+					<view class="item-detail-info">
+						<view class="flex justify_between">
+							<view>
+								<text class="item-detail-text flex_1">{{item.code}}</text>
+								<u-tag v-if="commonPartCode.includes(item.code)" size="mini" style="margin-left: 5px;" text="通用" mode="light" shape="circle" type="success"></u-tag>
+							</view>
+							<text class="item-detail-text" v-if="item.affiliation=='SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+						</view>
+						<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
+							<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
+						</view>
+						<view class="flex justify_between">
+							<view class="item-detail-text flex_1">
+								<!-- 货架产品 -->
+								<view @click="openPriceModal(item,1,showShelfDetial)" v-if="item.affiliation=='SHELF'">
+									<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice&&configPrice.shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
+									<text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice&&configPrice.shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
+									<u-icon name="arrow-right" v-if="priceShowVal&&showShelfDetial"></u-icon>
+								</view>
+								<!-- 非货架 -->
+								<view @click="openPriceModal(item,1,showNonShelfDetial)" v-else>
+									<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice&&configPrice.non_shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
+									<text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice&&configPrice.non_shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
+									<u-icon name="arrow-right" v-if="priceShowVal&&showNonShelfDetial"></u-icon>
+								</view>
+							</view>
+							<view class="item-detail-text" v-if="item.currentInven">
+								<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx'}" type="primary" size="mini">
+									<u-icon name="plus" color="#fff" size="28"></u-icon>
+								</u-button>
+								<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
+							</view>
+							<view class="item-detail-text" v-if="item.affiliation=='NON_SHELF'||!item.currentInven">
+								<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要急送</text>
+								<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			commonPartCode: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			configPrice: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			showCarPrice: {
+				type: Boolean,
+				default: false
+			},
+			showCostPrice: {
+				type: Boolean,
+				default: false
+			},
+			showShelfDetial: {
+				type: Boolean,
+				default: false
+			},
+			showNonShelfDetial: {
+				type: Boolean,
+				default: false
+			},
+			priceShowVal: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+			}
+		},
+		methods: {
+			openPriceModal(item, type, show) {
+				this.$emit('openPrice', item, type, show)
+			},
+			addPart(item) {
+				this.$emit('addPart', item, 'vin')
+			},
+			updateVinNums(e) {
+				this.$emit('updateVinNums', e)
+			},
+			viewImg(item){
+				this.$emit('viewImg',item)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 0 - 2
pagesA/digitalShelf/orderDetail.vue

@@ -109,13 +109,11 @@
 
 <script>
 	import carNo from '@/components/carNo.vue'
-	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { findBySnShelfOrder, cancelShelfOrder, takeGoods } from '@/api/shelf.js'
 	export default {
 	   name: 'orderDetail-digitalShel',
 	   components: {
-		uniIcons,
 		carNo
 	   },
 	   data() {

+ 1 - 3
pagesA/digitalShelf/settlementManage/settlementManage.vue

@@ -38,7 +38,7 @@
 					<view>{{item.month}}月</view>
 					<view>
 						<text>¥{{item.settleAmount}}</text>
-						<uniIcons color="#999" size="20" type="arrowright"></uniIcons>
+						<u-icon color="#999" size="20" name="arrow-right"></u-icon>
 					</view>
 				</view>
 				<view style="padding-top: 10%;border:0" v-if="ayJsList.length==0 && status!='loading'">
@@ -53,11 +53,9 @@
 </template>
 
 <script>
-	import uniIcons from '@/components/uni-icons/uni-icons.vue';
 	import {findStoreShelfSettleRule,waitSettleForMonth} from '@/api/shelf'
 	export default {
 		components: {
-			uniIcons
 		},
 		data() {
 			return {

+ 0 - 2
pagesA/digitalShelf/settlementManage/settlementSxDetail.vue

@@ -62,11 +62,9 @@
 </template>
 
 <script>
-	import uniIcons from '@/components/uni-icons/uni-icons.vue';
 	import { waitSettleForSx,shelfSettleBillToPay,findStoreShelfSettleRule } from '@/api/shelf.js'
 	export default {
 		components: {
-			uniIcons
 		},
 		data() {
 			return {

+ 0 - 2
pagesA/digitalShelf/settlementRecord/settlementDetail.vue

@@ -68,11 +68,9 @@
 
 <script>
 	import carNo from '@/components/carNo.vue'
-	import uniIcons from '@/components/uni-icons/uni-icons.vue';
 	import { getShelfOrderList } from "@/api/shelf.js"
 	export default {
 		components: {
-			uniIcons,
 			carNo
 		},
 		data() {

+ 0 - 2
pagesA/digitalShelf/stockPutDetail.vue

@@ -66,13 +66,11 @@
 </template>
 
 <script>
-	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { findShelfReplenishBill } from '@/api/shelf.js'
 	export default {
 	   name: 'orderDetail-digitalShel',
 	   components: {
-		uniIcons,
 	   },
 	   data() {
 		   return {

+ 0 - 2
pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -86,13 +86,11 @@
 
 <script>
 	import carNo from '@/components/carNo.vue'
-	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import { getShelfTempBillDetail } from '@/api/shelf.js'
 	export default {
 	   name: 'orderDetail-digitalShel',
 	   components: {
-		uniIcons,
 		carNo
 	   },
 	   data() {

+ 8 - 2
pagesA/qualityPolicy/creatOrder.vue

@@ -80,7 +80,7 @@
 					const hasCode = await getTraceCodeQueryList({traceCode: this.uuidCode,pageSize:1,pageNo:1}).then(res => res.data)
 					console.log(hasCode)
 					// 已存在,且没有使用过
-					if(hasCode.count==0){
+					if(hasCode && hasCode.count==0){
 						uni.showToast({
 							icon: 'none',
 							title: '唯一码不存在'
@@ -88,7 +88,7 @@
 						this.loading = false
 						return
 					}
-					if(hasCode.list && hasCode.list.length > 0){
+					if(hasCode && hasCode.list && hasCode.list.length > 0){
 						if(!hasCode.list[0].warrantyState){
 							this.uuid.push(hasCode.list[0])
 						}else{
@@ -98,6 +98,12 @@
 							})
 						}
 					}
+					if(!hasCode){
+						uni.showToast({
+							icon: 'none',
+							title: '系统异常,请联系管理员!'
+						})
+					}
 					this.uuidCode = ''
 					this.loading = false
 				}else{

+ 7 - 2
pagesB/components/chooseProductItem.vue

@@ -12,8 +12,7 @@
 				<view class="choose-product-item-left-info-price">
 					<view class="price-txt">¥<text>{{item.cost}}</text></view>
 					<view>
-						{{item.qty}}
-						<!-- <u-number-box v-model="item.qty" :index="item.id" :input-width="60" :input-height="60" size="mini" :min="1" @change="changeQty"></u-number-box> -->
+						<u-number-box v-model="item.qty" :index="item.id" :input-width="60" :input-height="60" size="mini" :min="1" @change="changeQty"></u-number-box>
 					</view>
 				</view>
 			 </view>
@@ -53,6 +52,12 @@
 		justify-content: space-between;
 		padding: 20rpx 0;
 		border-bottom: 1px solid #eee;
+		.price-txt{
+			color: red;
+			text{
+				font-size: 36rpx;
+			}
+		}
 		> view{
 			 display: flex;
 			 align-items: center;

+ 191 - 0
pagesB/components/chooseProductItemSkline.vue

@@ -0,0 +1,191 @@
+<template>
+	<block>
+		<view class="choose-product-item"
+		v-for="(item, dix) in list"
+		:key="item.id" 
+		>
+			 <view>
+				 <view class="choose-product-item-img">
+					<!-- <text class="no-txt">{{index?(index*pageSize-(pageSize-fristLength))+(dix+1):(dix+1)}}</text> -->
+					<image mode="aspectFit" :src="item.productImage+'?x-oss-process=image/resize,p_50'" style="width: 100%;height: 200rpx;"></image>
+					<view class="back-price" v-if="item.promoRuleValue">返<text>{{item.promoRuleValue}}</text>元</view>
+					<view class="choose-product-item-left-info-code ellipsis-one">{{item.productCode}}</view>
+				 </view>
+				 <view class="choose-product-item-info">
+					<view class="choose-product-item-left-info-name ellipsis-two">{{item.productName}}</view>
+					<view class="choose-product-item-left-info-guige ellipsis-two">{{item.productOrigCode}}</view>
+					<view class="choose-product-item-left-info-price">
+						<view class="price-txt">¥<text>{{item.cost}}</text></view>
+						<view>
+							<uni-number-box v-if="!edit" v-model="item.qty" :min="1" :max="999999" @change="v=>{changeQty(v,item.id)}"></uni-number-box>
+							<view v-else class="edit-qty">
+								X <text>{{item.qty}}</text>
+								<image src="../static/del.png" style="width: 30px;height: 30px;" mode="aspectFit" @click="remove(item.id)"></image>
+							</view>
+						</view>
+					</view>
+				 </view>
+			 </view>
+		</view>
+	</block>
+</template>
+
+<script>
+	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue'
+	export default {
+		name: 'chooseProductItemSkline',
+		components: {
+			uniNumberBox
+		},
+		props: {
+			index: {
+				type: Number,
+				default: 0
+			},
+			list: {
+				type: Array,
+				default: () => []
+			},
+			edit: {
+				type: Boolean,
+				default: false
+			},
+			pageSize: {
+				type: Number,
+				default: 6
+			},
+			fristLength: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+			}
+		},
+		methods: {
+			changeQty(e, id) {
+				this.$emit('changeQty', e, id)
+			},
+			remove(id){
+				this.$emit('remove',id)
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.choose-product-item{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		border-bottom: 1px solid #eee;
+		.price-txt{
+			color: red;
+			display: flex;
+			align-items: center;
+			text{
+				font-size: 36rpx;
+			}
+		}
+		> view{
+			 display: flex;
+			 align-items: center;
+			 justify-content: space-between;
+			 flex-grow: 1;
+			 width: 100%;
+		}
+		.choose-product-item-img{
+			margin-right: 20rpx;
+			width: 35%;
+			position: relative;
+			overflow: hidden;
+			border: 1px solid #eee;
+			padding: 10rpx;
+			.no-txt{
+				position: absolute;
+				top: 10rpx;
+				left: 10rpx;
+				height: 30rpx;
+				min-width: 30rpx;
+				background: #9E9E9E;
+				color: #fff;
+				text-align: center;
+				line-height: 30rpx;
+				border-radius: 5rpx;
+				z-index: 100;
+			}
+			.back-price{
+				zoom: calc(0.8);
+				padding: 6rpx 65rpx;
+				background: rgba(255 ,87 ,34 , 1);
+				position: absolute;
+				top: 18rpx;
+				right: -45rpx;
+				color: #fff;
+				z-index: 2;
+				font-size: 20rpx;
+				text-align: center;
+				transform: rotate(40deg);
+				display: flex;
+				align-items: center;
+				text{
+					font-size: 28rpx;
+					margin: 0 5rpx;
+				}
+			}
+			.choose-product-item-left-info-code{
+				color: #666;
+				position: absolute;
+				width: 100%;
+				left:0;
+				bottom:0;
+				background: rgba(255,255,255,0.7);
+				text-align: center;
+			}
+		}
+		.choose-product-item-info{
+			margin-right: 10rpx;
+			width: 65%;
+			flex-grow: 1;
+			.choose-product-item-left-info-price{
+				display: flex;
+				align-items:center;
+				justify-content: space-between;
+				>view{
+					&:last-child{
+						display: flex;
+						align-items:center;
+					}
+				}
+				.edit-qty{
+					display: flex;
+					align-items:center;
+					justify-content: space-between;
+					color: #999;
+					font-size: 12px;
+					> text{
+						color: #666;
+						font-size: 14px;
+					}
+					image{
+						margin-left: 20px;
+					}
+				}
+			}
+			.choose-product-item-left-info-name{
+				font-size: 28rpx;
+				font-weight: 900;
+				color: #666;
+			}
+			.choose-product-item-left-info-guige{
+				color: #2196F3;
+				margin: 10rpx 0;
+				text{
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+</style>

+ 201 - 0
pagesB/components/productItemSkline.vue

@@ -0,0 +1,201 @@
+<template>
+	<view
+	class="product-list"
+	>
+		<view 
+		class="product-item" 
+		:style="{width:itemWidth+'px',marginTop:gap+'px'}"
+		v-for="(item,index) in list"
+	    :key="item.id" >
+			<view @click="viewPic(item.productImage)">
+				<image mode="aspectFit" :src="item.productImage+'?x-oss-process=image/resize,p_30'" style="height: 140px;width: 100%;"></image>
+				<view class="back-price" v-if="item.promoRuleValue">返<text>{{item.promoRuleValue}}</text>元</view>
+				<view class="product-code"><text class="ellipsis-one" overflow="ellipsis">{{item.productCode}}</text></view>
+			</view>
+			<view>
+				<view class="product-name">{{item.productName}}</view>
+				<view class="product-guige"><text class="ellipsis-two" max-lines="2" overflow="ellipsis">{{item.productOrigCode}}</text></view>
+				<view class="product-button">
+					<view class="price-txt">¥<text>{{item.cost}}</text></view>
+					<view>
+						<button v-if="!item.checked" @click="addToCat(item)" size="mini" type="default" class="bg-0">
+							<image style="width: 12px; height: 12px;" mode="aspectFit" src="../static/add.png"></image>
+						</button>
+						<button v-else @click="addToCat(item)" size="mini" type="primary" class="bg-1">
+							<image style="width: 12px; height: 12px;" mode="aspectFit" src="../static/add.png"></image>
+							{{item.qty}}
+						</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'productItemSkline',
+		props: {
+			list: {
+				type: Array,
+				default: () => []
+			},
+			index:{
+				type: [Number,String],
+				default: 0
+			},
+			gap:{
+				type: [Number,String],
+				default: 10
+			},
+			itemWidth:{
+				type: [Number,String],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			addToCat(item){
+				this.$emit('chooseProduct',item,this.index)
+			},
+			viewPic(img){
+				uni.previewImage({
+						urls: [img],
+						longPressActions: {
+							itemList: ['发送给朋友', '保存图片', '收藏'],
+							success: function(data) {
+								console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+							},
+							fail: function(err) {
+								console.log(err.errMsg);
+							}
+						}
+					})
+			}
+		},
+	}
+</script>
+
+<style lang="less">
+/* 显示一行省略号 */
+.ellipsis-one{
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	word-break: break-all;
+}
+/* 显示两行,省略号 */
+.ellipsis-two{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.product-list{
+	display:flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 0 3%;
+}
+.product-item{
+	background: #ffffff;
+	border-radius: 10upx;
+	box-shadow: 1px 1px 3px #EEEEEE;
+	width: 48%;
+	margin: 10px 0 0 0;
+	display: flex;
+	flex-direction: column;
+	.price-txt{
+		color: red;
+		display: flex;
+		align-items: center;
+		text{
+			font-size: 36rpx;
+		}
+	}
+	> view{
+		&:first-child{
+			position: relative;
+			overflow: hidden;
+			.product-code{
+				color: #666;
+				position: absolute;
+				width: 100%;
+				left:0;
+				bottom:0;
+				background: rgba(255,255,255,0.7);
+				text-align: center;
+			}
+		}
+		&:last-child{
+			position: relative;
+			flex-grow: 1;
+			padding: 10px 10px 40px;
+			.product-name{
+				font-size: 28rpx;
+				font-weight: 900;
+				color: #666;
+			}
+			.product-guige{
+				margin: 10rpx 0;
+				color: #2196F3;
+			}
+		}
+		.product-button{
+			position: absolute;
+			left: 5%;
+			bottom: 0;
+			width: 90%;
+			padding: 5px 0 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			button{
+				display: flex;
+				align-items: center;
+				text-align: center;
+				justify-content: center;
+				min-width:50rpx;
+				height: 50rpx;
+				font-size: 28rpx;
+				border-radius: 25rpx;
+				padding: 0 10rpx;
+				color: #fff;
+				&:active{
+					background: #2abcff;
+				}
+			}
+			.bg-0{
+				background: #066cff;
+			}
+			.bg-1{
+				background: #34aa0a;
+			}
+		}
+	}
+	.back-price{
+		padding: 6rpx 65rpx;
+		background: rgba(255 ,87 ,34 , 1);
+		position: absolute;
+		top: 18rpx;
+		right: -45rpx;
+		color: #fff;
+		z-index: 2;
+		font-size: 20rpx;
+		text-align: center;
+		transform: rotate(40deg);
+		display: flex;
+		align-items: center;
+		text{
+			font-size: 28rpx;
+			margin: 0 5rpx;
+		}
+	}
+	}
+</style>

+ 2 - 2
pagesB/procureOrder.vue

@@ -13,13 +13,13 @@
 			</view>
 		</view>
 		<view class="order-body">
-			<view class="info partList" v-if="partList.length">
+			<view class="info partList" v-if="partList.length" style="height: 50vh;overflow: auto;">
 				<view class="infoList">
 					<view class="title">
 						产品列表
 					</view>
 					<view>
-						{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
+						共<text class="redText">{{total}}</text>款
 					</view>
 				</view>
 				<view v-for="item in partList" :key="item.id" class="flex align-center item-list">

+ 5 - 5
pagesB/promoDetail.vue

@@ -75,7 +75,7 @@
 						@click="chooseClick" 
 						@open="chooseOpen"
 						:options="chooseOptions"
-						v-if="item.top > curScrollPopuTop-showScrollPopuHeight-2 && item.top < curScrollPopuTop + showScrollPopuHeight+2"
+						v-if="item.top > curScrollPopuTop-showScrollPopuHeight/2 && item.top < curScrollPopuTop + showScrollPopuHeight*1.5"
 						>
 							<chooseProductItem 
 							:item="item" 
@@ -263,7 +263,8 @@
 			},
 			// 关闭已选列表弹框
 			closePopu(){
-				this.showChoosePopu=false
+				this.showChoosePopu = false
+				this.showSwipeAction = false
 				if(this.submitOk){
 					uni.hideLoading()
 					uni.navigateTo({
@@ -303,8 +304,8 @@
 			changeQty(e){
 				const rowIndex = this.chooseList.findIndex(key => key.id == e.index)
 				if(rowIndex>=0){
-					// this.chooseList[rowIndex].qty = e.value
-					// this.chooseList.splice()
+					this.chooseList[rowIndex].qty = e.value
+					this.chooseList.splice()
 				}
 				// 更新页面产品数据
 				const aindex = this.list.findIndex(key => key.id == e.index)
@@ -516,7 +517,6 @@
 				width: 50%;
 				padding: 10upx;
 				height: 287px;
-				background: url('/static/def_imgs.png') no-repeat center center;
 			}
 		}
 		.bottom-bar{

+ 738 - 0
pagesB/promoProduct.vue

@@ -0,0 +1,738 @@
+<template>
+	<view class="scrollPage">
+		<!-- head -->
+		<view class="scrollPage-header">
+			<view :style="{height:statusBarHeight+'px'}"></view>
+			<view class="header-title">
+				<view class="header-left" @click="goBack">
+					<image style="width: 16px; height: 16px;margin-right:3px;" mode="aspectFit" src="./static/arrow-left.png"></image>
+					<text>返回</text>
+				</view>
+				<view class="header-title"><text class="ellipsis-one" overflow="ellipsis">{{title}}</text></view>
+				<view class="header-right"></view>
+			</view>
+		</view>
+		<!-- body -->
+		<scroll-view 
+		class="scrollPage-body" 
+		:style="{height: (screenHeight - statusBarHeight - safeAreaBottom - 94) + 'px'}" 
+		scroll-y="true" 
+		type="custom" 
+		@scrolltolower="reachBottom">
+			<!-- 搜索,吸顶 -->
+			<sticky-header>
+				<view class="search-head">
+					<uni-search-bar radius="100" placeholder="请输入产品名称/轮胎规格" clearButton="auto" cancelButton="none" @confirm="searchList" @clear="searchList" />
+				</view>
+			</sticky-header>
+			<!-- 产品列表 -->
+			<productItem
+			v-for="(item,index) in list"
+			:key="index" 
+			:list="item" 
+			:index="index"
+			:itemWidth="(screenWidth*0.94-screenWidth*0.03)*0.5"
+			:gap="screenWidth*0.03"
+			@chooseProduct="chooseProduct"
+			></productItem>
+			<!-- loading -->
+			<view class="loading-bar" v-if="list.length && (loading||loadEnd)">{{loadText}}</view>
+			<view class="empty-bar" v-if="total==0&&!loading">
+				<image mode="aspectFit" :src="empty.imgUrl"></image>
+				<view>{{empty.tip}}</view>
+			</view>
+		</scroll-view>
+		<!-- footer -->
+		<view class="scrollPage-footer">
+			<view>
+				<view class="bottom-bar-left">
+					<view class="bottom-bar-left-item">
+						<view class="bottom-bar-left-item-icon" @click="openChoose">
+							<image style="width: 20px; height: 20px;" mode="aspectFit" src="./static/cart.png"></image>
+							<text class="badge" v-if="totalNum">{{totalNum>99?'99+':totalNum}}</text>
+						</view>
+					</view>
+					<view class="bottom-bar-left-item">
+						<!-- 合计:<view class="price-txt">¥<text>{{totalAmount}}</text></view> -->
+					</view>
+				</view>
+				<view :class="'bottom-bar-right'" @click="submitOrder">
+					<view class="bottom-bar-right-item">去结算</view>
+				</view>
+			</view>
+			<view :style="{height:safeAreaBottom+'px'}"></view>
+		</view>
+		<!-- 已选产品 -->
+		<page-container
+		:show="showChoosePopu" 
+		:round="true"
+		:z-index="10"
+		position="bottom" 
+		custom-style="height:80%"
+		@afterenter="openRender"
+		@afterleave="closePopu">
+			<view class="popup-body" v-if="showSwipeAction">
+				<scroll-view 
+				:style="{width:screenWidth + 'px',height:'100%'}" 
+				scroll-y="true" 
+				type="custom"
+				>
+						<sticky-header>
+							<view class="choose-title">
+								<view class="choose-left">
+									<view>已选<text class="p-nums">{{chooseLength}}</text>款产品</view>
+									<button @click="claerChoose" size="mini" type="warn" plain>清空列表</button>
+									<button class="editBtn" @click="editChoose=!editChoose" size="mini" type="primary" plain>{{editChoose?'完成':'编辑'}}</button>
+								</view>
+								<view class="choose-close" @click="showChoosePopu=false">
+									<icon type="clear" size="24"></icon>
+								</view>
+							</view>
+						</sticky-header>
+						<chooseProductItem 
+						v-for="(item, index) in showList"
+						:key="item.id"  
+						:index="index"
+						:list="item" 
+						:fristLength="fristLength"
+						:pageSize="choosePageSize"
+						:edit="editChoose" 
+						@changeQty="changeQty" 
+						@remove="removeChoose">
+						</chooseProductItem>
+						<view style="min-height: 180rpx;"></view>
+				</scroll-view>
+				<view class="choose-footer">
+					<view>
+						<view class="choose-footer-left">
+							<view class="choose-footer-left-item">
+								<!-- 总数:<view><text class="p-nums">{{totalNum}}</text></view> -->
+							</view>
+							<view class="choose-footer-left-item">
+								合计:<view class="price-txt">¥<text>{{totalAmount}}</text></view>
+							</view>
+						</view>
+						<view class="choose-footer-right bg-1" @click="submitOrder">
+							<view class="choose-footer-right-item">确认采购</view>
+						</view>
+					</view>
+					<view :style="{height:safeAreaBottom+'px'}"></view>
+				</view>
+			</view>
+		</page-container>
+	</view>
+</template>
+
+<script>
+	import {
+	    mapState,
+	    mapMutations,
+	} from 'vuex'
+	import { queryPromoProductByPage } from '@/api/video.js'
+	import { purchaseSave } from '@/api/purchase.js'
+	import productItem from '@/pagesB/components/productItemSkline.vue'
+	import chooseProductItem from '@/pagesB/components/chooseProductItemSkline.vue'
+	export default {
+		components:{
+			productItem,
+			chooseProductItem
+		},
+		data() {
+			return {
+				title: '促销产品列表',
+				pageNo:1,
+				pageSize:16,
+				total:0,
+				list:[],
+				loading:false,
+				loadEnd: false,
+				loadText: '加载中...',
+				empty: {
+					tip: '暂无产品',
+					imgUrl: '/static/nodata.png'
+				},
+				queryWord:'',
+				promoActiveSn:'',
+				screenWidth: 750,
+				screenHeight: 0,
+				statusBarHeight: 44,
+				safeAreaBottom: 0,
+				// 已选弹框
+				showChoosePopu: false,
+				showSwipeAction: false,
+				chooseList:[],
+				editChoose: false,
+				choosePageSize: 12,
+				// 数量,合计
+				chooseLength: 0, //已选产品总款数
+				totalAmount: 0, //已选产品总金额
+				totalNum: 0, //已选产品总数量
+			};
+		},
+		computed: {
+			...mapState(['hasLogin']),
+			userInfo(){
+				return this.$store.state.vuex_userInfo
+			},
+			fristLength(){
+				return this.chooseList.length > 0 ? this.chooseList[0].length : 0
+			},
+			showList(){
+				return this.showSwipeAction ? this.chooseList : []
+			}
+		},
+		onLoad(opts) {
+			this.title = opts.title||'促销产品列表'
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+			this.screenWidth = uni.getSystemInfoSync().windowWidth
+			this.screenHeight = uni.getSystemInfoSync().windowHeight
+			this.safeAreaBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+			 
+			// 清空临时数据
+			this.$store.state.vuex_tempData = null
+			this.promoActiveSn = opts.promoActiveSn
+			
+			// 查询列表
+			this.getList()
+			
+			this.chooseList = this.getCacheList()
+			this.getChooseHeji()
+		},
+		onUnload(){
+			// 存储已选列表值
+			const hasCache = this.$store.state.vuex_cartList.find(k => k.sn == this.promoActiveSn)
+			if(hasCache){
+				hasCache.list = this.chooseList
+			}else{
+				this.$store.state.vuex_cartList.push({sn:this.promoActiveSn,list: this.chooseList})
+			}
+			this.$u.vuex('vuex_cartList', this.$store.state.vuex_cartList)
+			
+			// 清空数据
+			this.chooseList = null
+			this.list = null
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack();
+			},
+			// 从缓存获取数据
+			getCacheList(){
+				const cacheList = this.$store.state.vuex_cartList.find(k => k.sn == this.promoActiveSn)
+				return cacheList ? JSON.parse(JSON.stringify(cacheList.list)) : []
+			},
+			// 滚动到底部
+			reachBottom() {
+				if(!this.loading && !this.loadEnd){
+					this.pageNo++
+					this.getList()
+				}
+			},
+			// 搜索
+			searchList(event){
+				this.loadEnd = false
+				this.loadText = '加载中...'
+				this.queryWord = event.value
+				this.list = []
+				this.pageNo = 1
+				this.getList()
+			},
+			// 列表查询
+			getList(){
+				this.loading = true
+				queryPromoProductByPage({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					queryWord: this.queryWord,
+					promoActiveSn: this.promoActiveSn
+				}).then(res => {
+					this.loading = false
+					if(res.status == 200){
+						this.total = res.data.count
+						if(this.total){
+							const list = res.data.list || []
+							const ret = []
+							// 更新已选状态
+							list.forEach(k => {
+							  // 如果筛选或分页后,更新页面列表产品数量
+							  const row = this.getChooseItemById(k.id)
+							  const hasChecked = row.p>=0 && row.s>=0
+							  ret.push({
+								  id: k.id,
+								  cost: k.cost,
+								  checked: hasChecked ? true : false,
+								  qty: hasChecked ? this.chooseList[row.p][row.s].qty : 0,
+								  productCode: k.productCode,
+								  productSn: k.productSn,
+								  productImage: k.productImage,
+								  productName: k.productName,
+								  productOrigCode: k.productOrigCode,
+								  promoActiveSn: k.promoActiveSn,
+								  promoRuleSn: k.promoRuleSn,
+								  promoRuleValue: k.promoRuleValue,
+								  promoRuleType: k.promoRuleType,
+							  })
+							})
+							// 追加数据
+							this.list.push(ret)
+							// 判断是否最后一页
+							const maxPages = Math.ceil(this.total / this.pageSize)
+							if(this.pageNo >= maxPages){
+								this.loadEnd = true
+								this.loadText = '没有更多了'
+							}
+						}else{
+							this.loadEnd = false
+							this.loadText = '暂无产品'
+						}
+					}
+				}).catch(err => {
+					this.loading = false
+				})
+			},
+			// 根据id查找chooseList
+			getChooseItemById(id){
+				const a = this.chooseList.findIndex(k => k.find(s=> s.id == id))
+				const b = a>=0 ? this.chooseList[a].findIndex(s=> s.id == id) : -1
+				return {p:a,s:b}
+			},
+			// 计算总款数、合计、数量
+			getChooseHeji(){
+				this.chooseLength = 0
+				this.totalAmount = 0
+				this.totalNum = 0
+				this.chooseList.forEach(key => {
+					this.chooseLength += key.length // 总款数
+					key.forEach(item => {
+						this.totalAmount += item.cost * item.qty // 总金额
+						this.totalNum += item.qty // 总数量
+					})
+				})
+			},
+			// 选择产品
+			chooseProduct(item,index){
+				const rowItem = this.list[index].find(k => k.id == item.id)
+				// 新加
+				if(!rowItem.checked){
+					rowItem.checked = true
+					rowItem.qty = 1
+					// 存入二维数组中
+					const chooselens = this.chooseList.length
+					if(chooselens){
+						const firstRow = this.chooseList[0]
+						if(firstRow.length<this.choosePageSize){
+							firstRow.unshift(this.$u.deepClone(rowItem))
+						}else{
+							this.chooseList.unshift([this.$u.deepClone(rowItem)])
+						}
+					}else{
+						this.chooseList.unshift([this.$u.deepClone(rowItem)])
+					}
+				}else{
+					rowItem.qty = rowItem.qty + 1
+					// 已添加,则增加已选列表中的数量
+					const row = this.getChooseItemById(rowItem.id)
+					if(row.p>=0 && row.s>=0){
+						this.chooseList[row.p][row.s].qty = this.chooseList[row.p][row.s].qty + 1
+						this.chooseList[row.p].splice()
+					}
+				}
+				// 合计
+				this.getChooseHeji()
+			},
+			// 打开已选产品列表
+			openChoose(){
+				this.submitOk = false
+				if(this.chooseLength){
+					uni.showLoading({
+						title:'加载中...',
+						mask: true
+					})
+					this.showChoosePopu = true
+				}else{
+					this.$u.toast(`请选择产品`);
+				}
+			},
+			// 渲染已选产品列表
+			openRender(){
+				this.showSwipeAction = true
+				setTimeout(()=>{
+					uni.hideLoading()
+				},300)
+			},
+			// 关闭后
+			closePopu(){
+				setTimeout(()=>{
+					this.showSwipeAction = false
+				},300)
+				
+				this.showChoosePopu = false
+				this.editChoose = false
+				uni.hideLoading()
+				
+				// 提交成功
+				if(this.submitOk){
+					uni.navigateTo({
+						url: "/pagesB/procureOrder"
+					})
+				}
+			},
+			// 确定清空已选列表
+			claerChoose(){
+				const _this = this
+				uni.showModal({
+					title: '提示',
+					content: '确定清空已选列表?',
+					confirmText: '确定',
+					success(res) {
+						if(res.confirm){
+							uni.showLoading({
+								title: '正在清空...',
+								mask: true
+							})
+							_this.clearChooseData()
+						}
+					}
+				})
+			},
+			// 清空已选数据
+			clearChooseData(){
+				this.showChoosePopu = false
+				this.chooseList = []
+				// 合计
+				this.getChooseHeji()
+				
+				// 重置已选状态
+				this.list.forEach(key => {
+					key.filter(item => item.checked).forEach(item=>{
+						item.checked = false
+						item.qty = 0
+					})
+				})
+			},
+			// 根据id 获取页面list项
+			getListItemById(id){
+				const aindex = this.list.findIndex(key => key.find(a => a.id == id))
+				const aindex2 = aindex >=0 ? this.list[aindex].findIndex(a => a.id == id) : -1
+				return {p:aindex,s:aindex2}
+			},
+			// 已选产品变更数量
+			changeQty(val,id){
+				const crow = this.getChooseItemById(id)
+				if(crow.p>=0&&crow.s>=0){
+					this.chooseList[crow.p][crow.s].qty = val
+					this.chooseList[crow.p].splice()
+					// 合计
+					this.getChooseHeji()
+				}
+				
+				// 更新页面产品数据
+				const row = this.getListItemById(id)
+				if(row.p>=0 && row.s>=0){
+					this.list[row.p][row.s].qty = val
+					this.list[row.p].splice()
+				}
+			},
+			//已选产品删除
+			removeChoose(id){
+				// 删除项
+				const crow = this.getChooseItemById(id)
+				if(crow.p>=0&&crow.s>=0){
+					this.chooseList[crow.p].splice(crow.s, 1);
+					// 合计
+					this.getChooseHeji()
+				}
+				
+				// 如果没有数据了
+				if(this.chooseList.length==0){
+					this.clearChooseData()
+				}
+				
+				// 更新列表已选状态
+				const row = this.getListItemById(id)
+				if(row.p>=0 && row.s>=0){
+					this.list[row.p][row.s].qty = 0
+					this.list[row.p][row.s].checked = false
+					this.list[row.p].splice()
+				}
+			},
+			// 去结算
+			submitOrder(){
+				if(this.showChoosePopu){
+					uni.showLoading({
+						title: '提交中...',
+						mask: true
+					})
+					// 展开成一维数组
+					const detailList = []
+					this.chooseList.forEach(key => {
+						key.forEach(item => {
+							detailList.push({
+									promoActiveSn: this.promoActiveSn,
+									promoRuleSn:item.promoRuleSn,
+									productSn:item.productSn,
+									productCode:item.productCode,
+									qty:item.qty,
+									price:item.cost,
+									giveAmount:item.promoRuleValue
+							})
+						})
+					})
+					purchaseSave({
+						promoActiveSn: this.promoActiveSn,
+						detailList: detailList
+					}).then(res => {
+						if(res.status == 200){
+							res.data.detailList = []
+							this.$store.state.vuex_tempData = res.data
+							this.clearChooseData()
+							this.submitOk = true
+						}else{
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+						}
+					})
+				}else{
+					this.openChoose()
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+/* 显示一行省略号 */
+.ellipsis-one{
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	word-break: break-all;
+}
+.scrollPage{
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+	.loading-bar{
+		text-align: center;
+		padding: 10px 0;
+		color: #999999;
+	}
+	.empty-bar{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 20px 0;
+		image{
+			width: 100px;
+			height: 100px;
+		}
+		view{
+			font-size: 14px;
+			color: #999999;
+			margin-top: 10px;
+		}
+	}
+	.scrollPage-header{
+		z-index: 1;
+		.header-title{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 10px;
+			height: 44px;
+			background-color: #FFFFFF;
+			box-shadow: 0px 1px 0px 0px #E6E6E6;
+			.header-title{
+				font-size: 16px;
+				color: #333333;
+				max-width: 70%;
+			}
+			.header-left{
+				display: flex;
+				align-items: center;
+				text{
+					font-size: 14px;
+					color: #333333;
+					margin-left: 5px;
+				}
+			}
+			.header-right{
+				width: 50px;
+			}
+		}
+	}
+	.scrollPage-body{
+		flex-grow: 1;
+		height: 100%;
+		.search-head{
+			background: #fff;
+		}
+	}
+	.scrollPage-footer{
+		background: #fff;
+		z-index: 200;
+		> view{
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-size: 32upx;
+		}
+		.bottom-bar-left{
+			padding: 0 30upx;
+			flex-grow: 1;
+			display: flex;
+			align-items: center;
+		}
+		.bottom-bar-left-item{
+			padding-right: 20rpx;
+			font-size: 24rpx;
+			display: flex;
+			align-items: center;
+			.price-txt{
+				color: red;
+				display: flex;
+				align-items: center;
+				text{
+					font-size: 36rpx;
+				}
+			}
+		}
+		.bottom-bar-left-item-icon{
+			position: relative;
+			background: #2196F3;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.badge{
+				background: #f44336;
+				color: #fff;
+				position: absolute;
+				left: 50rpx;
+				top: -3px;
+				font-size: 12px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-radius: 50rpx;
+				padding: 0 10rpx;
+			}
+		}
+		.bottom-bar-right{
+			width: 35%;
+			height: 100%;
+			background: #066cff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.bottom-bar-right-item{
+				color: #fff;
+			}
+		}
+		.bg-0{
+			background: #066cff;
+		}
+		.bg-1{
+			background: #f44336;
+		}
+	}
+	
+	.choose-title{
+		display: flex;
+		align-items:center;
+		justify-content: space-between;
+		background: #fff;
+		width: 100%;
+		border-bottom: 1px solid #eee;
+		border-radius: 40rpx 40rpx 0 0;
+		> view{
+			padding: 20rpx 30rpx;
+		}
+		.choose-left{
+			display: flex;
+			align-items:center;
+			flex-grow: 1;
+			> view{
+				display: flex;
+				align-items:center;
+				flex-grow: 1;
+			}
+			button{
+				padding: 0 10px;
+				height: auto;
+				font-size: 12px;
+				margin-left: 10px;
+			}
+			.editBtn{
+				color: #2196F3;
+				border-color: #2196F3;
+			}
+		}
+		.p-nums{
+			color: #2196F3;
+			margin: 0 6rpx;
+		}
+	}
+	.popup-body{
+		height: 100%;
+		position: relative;
+	}
+	.choose-footer{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background: #fff;
+		z-index: 100;
+		width: 100%;
+		> view{
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+		.choose-footer-left{
+			flex-grow: 1;
+			display: flex;
+			align-items: center;
+			padding: 0 30rpx;
+			> view{
+				font-size: 28rpx;
+			}
+			.choose-footer-left-item{
+				display: flex;
+				align-items: center;
+				margin-right: 10px;
+				.price-txt{
+					color: red;
+					display: flex;
+					align-items: center;
+					text{
+						font-size: 36rpx;
+					}
+				}
+			}
+		}
+		.choose-footer-right{
+			width: 35%;
+			height: 100%;
+			background: #2196F3;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.choose-footer-right-item{
+				color: #fff;
+			}
+		}
+		.bg-1{
+			background: #f44336;
+		}
+	}
+}
+</style>

BIN
pagesB/static/add.png


BIN
pagesB/static/arrow-left.png


BIN
pagesB/static/cart.png


BIN
pagesB/static/del.png


BIN
pagesB/static/search.png


+ 13 - 0
uni_modules/uni-grid/changelog.md

@@ -0,0 +1,13 @@
+## 1.4.0(2021-11-19)
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-grid](https://uniapp.dcloud.io/component/uniui/uni-grid)
+## 1.3.2(2021-11-09) 
+- 新增 提供组件设计资源,组件样式调整
+## 1.3.1(2021-07-30)
+- 优化 vue3下事件警告的问题
+## 1.3.0(2021-07-13)
+- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.4(2021-05-12)
+- 新增 组件示例地址
+## 1.2.3(2021-02-05)
+- 调整为uni_modules目录规范

+ 127 - 0
uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue

@@ -0,0 +1,127 @@
+<template>
+	<view v-if="width" :style="'width:'+width+';'+(square?'height:'+width:'')" class="uni-grid-item">
+		<view :class="{ 'uni-grid-item--border': showBorder,  'uni-grid-item--border-top': showBorder && index < column, 'uni-highlight': highlight }"
+		 :style="{'border-right-color': borderColor ,'border-bottom-color': borderColor ,'border-top-color': borderColor }"
+		 class="uni-grid-item__box" @click="_onClick">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * GridItem 宫格
+	 * @description 宫格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=27
+	 * @property {Number} index 子组件的唯一标识 ,点击gird会返回当前的标识
+	 */
+	export default {
+		name: 'UniGridItem',
+		inject: ['grid'],
+		props: {
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				column: 0,
+				showBorder: true,
+				square: true,
+				highlight: true,
+				left: 0,
+				top: 0,
+				openNum: 2,
+				width: 0,
+				borderColor: '#e5e5e5'
+			}
+		},
+		created() {
+			this.column = this.grid.column
+			this.showBorder = this.grid.showBorder
+			this.square = this.grid.square
+			this.highlight = this.grid.highlight
+			this.top = this.hor === 0 ? this.grid.hor : this.hor
+			this.left = this.ver === 0 ? this.grid.ver : this.ver
+			this.borderColor = this.grid.borderColor
+			this.grid.children.push(this)
+			// this.grid.init()
+			this.width = this.grid.width
+		},
+		beforeDestroy() {
+			this.grid.children.forEach((item, index) => {
+				if (item === this) {
+					this.grid.children.splice(index, 1)
+				}
+			})
+		},
+		methods: {
+			_onClick() {
+				this.grid.change({
+					detail: {
+						index: this.index
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-grid-item {
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-grid-item__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		flex-direction: column;
+		// justify-content: center;
+		// align-items: center;
+	}
+
+	.uni-grid-item--border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-bottom-color: #D2D2D2;
+		border-bottom-style: solid;
+		border-bottom-width: 0.5px;
+		border-right-color: #D2D2D2;
+		border-right-style: solid;
+		border-right-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		z-index: 0;
+		border-bottom: 1px #D2D2D2 solid;
+		border-right: 1px #D2D2D2 solid;
+		/* #endif */
+	}
+	.uni-grid-item--border-top {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-top-color: #D2D2D2;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		border-top: 1px #D2D2D2 solid;
+		z-index: 0;
+		/* #endif */
+	}
+
+
+	.uni-highlight:active {
+		background-color: #f1f1f1;
+	}
+</style>

+ 142 - 0
uni_modules/uni-grid/components/uni-grid/uni-grid.vue

@@ -0,0 +1,142 @@
+<template>
+	<view class="uni-grid-wrap">
+		<view :id="elId" ref="uni-grid" class="uni-grid" :class="{ 'uni-grid--border': showBorder }" :style="{ 'border-left-color':borderColor}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+
+	/**
+	 * Grid 宫格
+	 * @description 宫格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=27
+	 * @property {Number} column 每列显示个数
+	 * @property {String} borderColor 边框颜色
+	 * @property {Boolean} showBorder 是否显示边框
+	 * @property {Boolean} square 是否方形显示
+	 * @property {Boolean} Boolean 点击背景是否高亮
+	 * @event {Function} change 点击 grid 触发,e={detail:{index:0}},index 为当前点击 gird 下标
+	 */
+	export default {
+		name: 'UniGrid',
+		emits:['change'],
+		props: {
+			// 每列显示个数
+			column: {
+				type: Number,
+				default: 3
+			},
+			// 是否显示边框
+			showBorder: {
+				type: Boolean,
+				default: true
+			},
+			// 边框颜色
+			borderColor: {
+				type: String,
+				default: '#D2D2D2'
+			},
+			// 是否正方形显示,默认为 true
+			square: {
+				type: Boolean,
+				default: true
+			},
+			highlight: {
+				type: Boolean,
+				default: true
+			}
+		},
+		provide() {
+			return {
+				grid: this
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				elId,
+				width: 0
+			}
+		},
+		created() {
+			this.children = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.init()
+			})
+		},
+		methods: {
+			init() {
+				setTimeout(() => {
+					this._getSize((width) => {
+						this.children.forEach((item, index) => {
+							item.width = width
+						})
+					})
+				}, 50)
+			},
+			change(e) {
+				this.$emit('change', e)
+			},
+			_getSize(fn) {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#${this.elId}`)
+					.boundingClientRect()
+					.exec(ret => {
+						this.width = parseInt((ret[0].width - 1) / this.column) + 'px'
+						fn(this.width)
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-grid'], (ret) => {
+					this.width = parseInt((ret.size.width - 1) / this.column) + 'px'
+					fn(this.width)
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-grid-wrap {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		/* #ifdef H5 */
+		width: 100%;
+		/* #endif */
+	}
+
+	.uni-grid {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.uni-grid--border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-left-color: #D2D2D2;
+		border-left-style: solid;
+		border-left-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		z-index: 1;
+		border-left: 1px #D2D2D2 solid;
+		/* #endif */
+	}
+</style>

+ 86 - 0
uni_modules/uni-grid/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-grid",
+  "displayName": "uni-grid 宫格",
+  "version": "1.4.0",
+  "description": "Grid 宫格组件,提供移动端常见的宫格布局,如九宫格。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "九宫格",
+    "表格"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss","uni-icons"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

+ 11 - 0
uni_modules/uni-grid/readme.md

@@ -0,0 +1,11 @@
+
+
+## Grid 宫格
+> **组件名:uni-grid**
+> 代码块: `uGrid`
+
+
+宫格组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-grid)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 

+ 8 - 0
uni_modules/uni-scss/changelog.md

@@ -0,0 +1,8 @@
+## 1.0.3(2022-01-21)
+- 优化 组件示例
+## 1.0.2(2021-11-22)
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1(2021-11-22)
+- 修复 vue3中scss语法兼容问题
+## 1.0.0(2021-11-18)
+- init

+ 1 - 0
uni_modules/uni-scss/index.scss

@@ -0,0 +1 @@
+@import './styles/index.scss';

+ 82 - 0
uni_modules/uni-scss/package.json

@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ,通过一些简单的类名和sass变量,实现简单的页面布局操作,比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

+ 4 - 0
uni_modules/uni-scss/readme.md

@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ,通过一些简单的类名和`sass`变量,实现简单的页面布局操作,比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 

+ 7 - 0
uni_modules/uni-scss/styles/index.scss

@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';

+ 3 - 0
uni_modules/uni-scss/styles/setting/_border.scss

@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}

+ 66 - 0
uni_modules/uni-scss/styles/setting/_color.scss

@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ,需要用户使用变量实现 ,如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}

+ 55 - 0
uni_modules/uni-scss/styles/setting/_radius.scss

@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}

+ 56 - 0
uni_modules/uni-scss/styles/setting/_space.scss

@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}

+ 167 - 0
uni_modules/uni-scss/styles/setting/_styles.scss

@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */

+ 24 - 0
uni_modules/uni-scss/styles/setting/_text.scss

@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}

+ 146 - 0
uni_modules/uni-scss/styles/setting/_variables.scss

@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;

+ 19 - 0
uni_modules/uni-scss/styles/tools/functions.scss

@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};

+ 31 - 0
uni_modules/uni-scss/theme.scss

@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);

+ 62 - 0
uni_modules/uni-scss/variables.scss

@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);

+ 47 - 0
uni_modules/uni-search-bar/changelog.md

@@ -0,0 +1,47 @@
+## 1.3.0(2024-04-22)
+- 修复 textColor默认值导致的文字不显示的bug
+## 1.2.9(2024-04-17)
+- 修复 textColor不生效的bug
+## 1.2.8(2024-02-22)
+- 修复 清空按钮emit值错误的bug
+## 1.2.7(2024-02-21)
+- 新增 设置输入框字体颜色:textColor
+## 1.2.6(2024-02-20)
+- 修复 uni-search-bar在支付宝小程序下样式兼容问题
+## 1.2.5(2024-01-31)
+- 修复 uni-search-bar居中问题,现在默认居左,并修复样式偏移问题
+## 1.2.4(2023-05-09)
+- 修复 i18n 国际化不正确的 Bug
+## 1.2.3(2022-05-24)
+- 新增 readonly 属性,组件只读
+## 1.2.2(2022-05-06)
+- 修复  vue3 input 事件不生效的bug
+## 1.2.1(2022-05-06)
+- 修复 多余代码导致的bug
+## 1.2.0(2021-11-19)
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+## 1.1.2(2021-08-30)
+- 修复 value 属性与 modelValue 属性不兼容的Bug
+## 1.1.1(2021-08-24)
+- 新增 支持国际化
+## 1.1.0(2021-07-30)
+- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9(2021-05-12)
+- 新增 项目示例地址
+## 1.0.8(2021-04-21)
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7(2021-04-15)
+- uni-ui 新增 uni-search-bar 的 focus 事件
+
+## 1.0.6(2021-02-05)
+- 优化 组件引用关系,通过uni_modules引用组件
+
+## 1.0.5(2021-02-05)
+- 调整为uni_modules目录规范
+- 新增 支持双向绑定
+- 更改 input 事件的返回值,e={value:Number} --> e=value
+- 新增 支持图标插槽
+- 新增 支持 clear、blur 事件
+- 新增 支持 focus 属性
+- 去掉组件背景色

+ 4 - 0
uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json

@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "Search enter content"
+}

+ 8 - 0
uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

+ 4 - 0
uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json

@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "请输入搜索内容"
+}

+ 4 - 0
uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json

@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "請輸入搜索內容"
+}

+ 309 - 0
uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue

@@ -0,0 +1,309 @@
+<template>
+	<view class="uni-searchbar">
+		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
+			@click="searchClick">
+			<view class="uni-searchbar__box-icon-search">
+				<slot name="searchIcon">
+					<uni-icons color="#c0c4cc" size="18" type="search" />
+				</slot>
+			</view>
+			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal" :style="{color:textColor}"
+				@confirm="confirm" @blur="blur" @focus="emitFocus"/>
+			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
+			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
+				class="uni-searchbar__box-icon-clear" @click="clear">
+				<slot name="clearIcon">
+					<uni-icons color="#c0c4cc" size="20" type="clear" />
+				</slot>
+			</view>
+		</view>
+		<text @click="cancel" class="uni-searchbar__cancel"
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * SearchBar 搜索栏
+	 * @description 搜索栏组件,通常用于搜索商品、文章等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=866
+	 * @property {Number} radius 搜索栏圆角
+	 * @property {Number} maxlength 输入最大长度
+	 * @property {String} placeholder 搜索栏Placeholder
+	 * @property {String} clearButton = [always|auto|none] 是否显示清除按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelButton = [always|auto|none] 是否显示取消按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelText 取消按钮的文字
+	 * @property {String} bgColor 输入框背景颜色
+	 * @property {String} textColor 输入文字颜色
+	 * @property {Boolean} focus 是否自动聚焦
+	 * @property {Boolean} readonly 组件只读,不能有任何操作,只做展示
+	 * @event {Function} confirm uniSearchBar 的输入框 confirm 事件,返回参数为uniSearchBar的value,e={value:Number}
+	 * @event {Function} input uniSearchBar 的 value 改变时触发事件,返回参数为uniSearchBar的value,e=value
+	 * @event {Function} cancel 点击取消按钮时触发事件,返回参数为uniSearchBar的value,e={value:Number}
+	 * @event {Function} clear 点击清除按钮时触发事件,返回参数为uniSearchBar的value,e={value:Number}
+	 * @event {Function} blur input失去焦点时触发事件,返回参数为uniSearchBar的value,e={value:Number}
+	 */
+
+	export default {
+		name: "UniSearchBar",
+		emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
+		props: {
+			placeholder: {
+				type: String,
+				default: ""
+			},
+			radius: {
+				type: [Number, String],
+				default: 5
+			},
+			clearButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelText: {
+				type: String,
+				default: ""
+			},
+			bgColor: {
+				type: String,
+				default: "#F8F8F8"
+			},
+			textColor: {
+				type: String,
+				default: "#000000"
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 100
+			},
+			value: {
+				type: [Number, String],
+				default: ""
+			},
+			modelValue: {
+				type: [Number, String],
+				default: ""
+			},
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				show: false,
+				showSync: false,
+				searchVal: ''
+			}
+		},
+		computed: {
+			cancelTextI18n() {
+				return this.cancelText || t("uni-search-bar.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-search-bar.placeholder")
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			focus: {
+				immediate: true,
+				handler(newVal) {
+					if (newVal) {
+						if(this.readonly) return
+						this.show = true;
+						this.$nextTick(() => {
+							this.showSync = true
+						})
+					}
+				}
+			},
+			searchVal(newVal, oldVal) {
+				this.$emit("input", newVal)
+				// #ifdef VUE3
+				this.$emit("update:modelValue", newVal)
+				// #endif
+			}
+		},
+		methods: {
+			searchClick() {
+				if(this.readonly) return
+				if (this.show) {
+					return
+				}
+				this.show = true;
+				this.$nextTick(() => {
+					this.showSync = true
+				})
+			},
+			clear() {
+				this.searchVal = ""
+				this.$nextTick(() => {
+					this.$emit("clear", { value: "" })
+				})
+			},
+			cancel() {
+				if(this.readonly) return
+				this.$emit("cancel", {
+					value: this.searchVal
+				});
+				this.searchVal = ""
+				this.show = false
+				this.showSync = false
+				// #ifndef APP-PLUS
+				uni.hideKeyboard()
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+			},
+			confirm() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("confirm", {
+					value: this.searchVal
+				})
+			},
+			blur() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("blur", {
+					value: this.searchVal
+				})
+			},
+			emitFocus(e) {
+				this.$emit("focus", e.detail)
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-searchbar-height: 36px;
+
+	.uni-searchbar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: relative;
+		padding: 10px;
+		// background-color: #fff;
+	}
+
+	.uni-searchbar__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		justify-content: left;
+		/* #endif */
+		overflow: hidden;
+		position: relative;
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		height: $uni-searchbar-height;
+		padding: 5px 8px 5px 0px;
+	}
+
+	.uni-searchbar__box-icon-search {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 32px;
+		padding: 0 8px;
+		justify-content: center;
+		align-items: center;
+		color: #B3B3B3;
+	}
+
+	.uni-searchbar__box-search-input {
+		flex: 1;
+		font-size: 14px;
+		color: #333;
+		margin-left: 5px;
+		margin-top: 1px;
+		/* #ifndef APP-NVUE */
+		background-color: inherit;
+		/* #endif */
+	}
+
+	.uni-searchbar__box-icon-clear {
+		align-items: center;
+		line-height: 24px;
+		padding-left: 8px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-searchbar__text-placeholder {
+		font-size: 14px;
+		color: #B3B3B3;
+		margin-left: 5px;
+		text-align: left;
+	}
+
+	.uni-searchbar__cancel {
+		padding-left: 10px;
+		line-height: $uni-searchbar-height;
+		font-size: 14px;
+		color: #333333;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+</style>

+ 87 - 0
uni_modules/uni-search-bar/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-search-bar",
+  "displayName": "uni-search-bar 搜索栏",
+  "version": "1.3.0",
+  "description": "搜索栏组件,通常用于搜索商品、文章等",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "搜索框",
+    "搜索栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

+ 14 - 0
uni_modules/uni-search-bar/readme.md

@@ -0,0 +1,14 @@
+
+
+## SearchBar 搜索栏
+
+> **组件名:uni-search-bar**
+> 代码块: `uSearchBar`
+
+
+搜索栏组件
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 
+
+