路上库存

ghsApp/src/manifest.json

@@ -46,7 +46,8 @@
                 "permissionPhoneState" : {
                     "request" : "none",
                     "prompt" : "为保证您正常和安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
-                }
+                },
+                "targetSdkVersion" : 30
             },
             /* ios打包配置 */
             "ios" : {

hdApp/src/pagesPurchase/components/bookItem.vue

@@ -18,8 +18,12 @@
 						若干{{info.smallUnit}}/{{info.bigUnit}}
 						</block>
 					</view>
-					<view class="price" style="font-weight:bold;font-size:25upx;">
+					<view class="price" style="font-weight:bold;font-size:23upx;">
 						预付 ￥{{ info.price ? parseFloat(info.price) : 0 }}
+						<block v-if="info.myDisplay == 1">
+							<text style="margin-left:16upx;color:green;font-weight:normal;" v-if="info.myLack==0">我剩{{info.myStock?info.myStock:0}}<text style="margin-left:9upx;" v-if="info.myOnStock>0">路上{{info.myOnStock?info.myOnStock:0}}</text></text>
+							<text style="margin-left:16upx;color:#3385ff;" v-else>我剩{{info.myStock?info.myStock:0}}<text style="margin-left:9upx;" v-if="info.myOnStock>0">路上{{info.myOnStock?info.myOnStock:0}}</text></text>
+						</block>
 					</view>
 				</view>
 				<view style="text-align: right" >
@@ -140,7 +144,7 @@ export default {
 				display: flex;
 				align-items: center;
 				& .iconfont {
-					color: #3385ff;
+					color: #09C567;
 					font-size: 55upx;
 				}
 				& > .num {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -68,13 +68,25 @@
 									<view class="has-color-button">选颜色</view>
 								</view>
 								<view v-if="productItem.presell == 1 || Number(productItem.reachNum)>0" style="position:absolute;top:145upx;font-size:26upx;color:#3385ff;white-space: normal;word-wrap: break-word;">
-									<text style="font-weight:bold;">满{{productItem.reachNum}}扎 ¥{{productItem.reachPrice}}<block v-if="productItem.presell == 0">（提交订单后优惠）</block></text>
+									<text style="font-weight:bold;" v-if="Number(productItem.reachNum)>0">
+										满{{productItem.reachNum}}扎 ¥{{productItem.reachPrice}}<block v-if="productItem.presell == 0">（提交订单后优惠）</block>
+									</text>
 									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum)>0">，</block>到货日期：
 										<block v-if="!$util.isEmpty(productItem.presellDateShow)">
 											<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">，</text></text>
 										</block>
 									</block>
 								</view>
+								<view v-else style="position:absolute;top:145upx;font-size:22upx;color:#3385ff;white-space: normal;word-wrap: break-word;">
+									<block v-if="productItem.myDisplay == 1">
+										<text v-if="productItem.myLack == 0" style="color:green;font-weight:normal;">
+											我剩{{productItem.myStock?productItem.myStock:0}}<text style="margin-left:9upx;" v-if="productItem.myOnStock>0">路上{{productItem.myOnStock?productItem.myOnStock:0}}</text>
+										</text>
+										<text v-else style="color:#3385ff;font-weight:bold;">
+											我剩{{productItem.myStock?productItem.myStock:0}}<text style="margin-left:9upx;" v-if="productItem.myOnStock>0">路上{{productItem.myOnStock?productItem.myOnStock:0}}</text>
+										</text>
+									</block>
+								</view>
 							</view>
 						</template>
 					</view>