Merge branch 'pre-release' of https://gitea.lihaink.cn/mkm/shop-applet into pre-release

pages/admin/goods_details/index.vue

@@ -229,7 +229,8 @@
 								<u-line direction="col" style="margin: 0 20rpx;" length="60rpx"
 									color="#A1A1A1"></u-line>
 							</view>
-							<view class="attribute-li" v-for="item in product_attribute.attr">
+							<view class="attribute-li" v-for="item in product_attribute.attr"
+								v-if="item.label || item.value">
 								<view class="" style="display: flex;flex-direction: column;align-items: center;">
 									<view class="" style="margin-bottom: 10rpx;">
 										{{item.label}}
@@ -238,8 +239,8 @@
 										{{item.value}}
 									</view>
 								</view>
-								<u-line direction="col" style="margin: 0 20rpx;" length="60rpx"
+								<u-line direction="col" style="margin: 0 20rpx;" length="60rpx" color="#A1A1A1"
-									color="#A1A1A1"></u-line>
+									v-if="item.label || item.value"></u-line>
 							</view>
 							<view class="attribute-fixed-right" v-if="storeInfo.product_attribute.attr.length>5">
 								<u-icon name="arrow-right"></u-icon>
@@ -755,9 +756,10 @@
 				getPreviewProDetail(params).then(res => {
 					uni.hideLoading();
 					let storeInfo = res.data;
-					// this.product_attribute = res.data.product_attribute
 
-					console.log(res.data.product_attribute);
+					if (res.data.product_attribute)
+						this.product_attribute = res.data.product_attribute
+
 					this.image = res.data.image;
 
 					if (storeInfo.video_link && storeInfo.slider_image.length > 1) {

pages/product/addGood/addGood.vue

@@ -13,7 +13,7 @@
 
 			<view class="card" style="min-height: 268rpx;">
 				<u-form-item label="商品图片" prop="formData.imageList" ref="item1" labelWidth='auto'>
-					<text style="font-size:24rpx ; color:#E18C34 ;">上传时应注重真实性、清晰度</text>
+					<text style="font-size:24rpx ; color:#E18C34 ;">上传时应注重真实性、清晰度、至少上传两张</text>
 				</u-form-item>
 				<view class="" style="display: flex;flex-wrap: wrap;">
 					<view v-for="(item,index) in formData.imageList" style="margin-right: 20rpx;margin-bottom: 20rpx;">

pages/product/addGoodDetail/addGoodDetail.vue

@@ -62,7 +62,6 @@
 					</view>
 				</view>
 
-
 				<u-form-item label="商品详情" prop="formData.content.image" required>
 					<text style="color: #E18C34;font-size: 24rpx">上传时应注重真实性、清晰度</text>
 				</u-form-item>

pages/product/addGoodDetail/goodsPrice.vue

@@ -1,8 +1,6 @@
 <template>
 	<view class="content">
-		<view class="">
+
-			<u-button icon="plus" text="新增规格" @click="pushFn" class="custom-style" iconColor='#38BE41'></u-button>
-		</view>
 		<view class="card" v-for="(item,index) in attrValue">
 			<view class="card-head card-li">
 				<text style="font-size: 32rpx;">规格{{index+1}}</text>
@@ -17,13 +15,14 @@
 			<view class="">
 				<view class="" style="display: flex;align-items: center;justify-content: space-between;">
 					<u--input style="flex: 2; background-color: #F6F6F6;" placeholder="请输入商品单价" v-model="item.price"
-						type='number'></u--input>
+						placeholderStyle="font-size:26rpx;color:rgb(192, 196, 204);" type='number'></u--input>
 					<view class="" style="flex: 1;text-align: center;">
 						/
 					</view>
 					<view class="" @click="unitIptClick(index,false)" style="width: 100rpx;flex: 2.4">
 						<u--input readonly style=" background-color: #F6F6F6;pointer-events: none;"
-							placeholder="请输入计量单位" v-model="item.unit_name"></u--input>
+							placeholderStyle="font-size:26rpx;color:rgb(192, 196, 204);" placeholder="请输入计量单位"
+							v-model="item.unit_name"></u--input>
 					</view>
 
 				</view>
@@ -67,6 +66,11 @@
 				</view>
 			</view>
 		</view>
+
+		<view class="">
+			<u-button icon="plus" text="新增规格" @click="pushFn" class="custom-style" iconColor='#38BE41'></u-button>
+		</view>
+
 		<view class="submit-btn">
 			<u-button type="primary" shape="circle" text="保存" @click="submit"></u-button>
 		</view>
@@ -326,7 +330,7 @@
 
 
 		.card {
-			margin-top: 30rpx;
+			margin-bottom: 30rpx;
 			padding: 30rpx 46rpx;
 			background-color: white;
 			border-radius: 16rpx 16rpx 16rpx 16rpx;

pages/product/addGoodDetail/goodsType.vue

@@ -133,7 +133,7 @@
 
 		.left {
 			margin-right: 30rpx;
-			width: 140rpx;
+			width: 160rpx;
 			white-space: nowrap;
 			overflow: hidden;
 			text-overflow: ellipsis;

pages/product/updateStock/updateStock.vue

@@ -36,7 +36,7 @@
 				</view>
 				<view class="" style="display: flex;align-items: center;color: #FC452F;">
 					<u--input border="surround" color='#FC452F' inputAlign='right' style='padding: 0;'
-						v-model="item.stock"></u--input>个
+						v-model="item.stock"></u--input>{{item.unit_name}}
 				</view>
 			</view>
 		</view>