Merge branch 'master' of git.huaml.com:zhh/front-end

hdApp/src/admin/goods/list.vue

@@ -27,10 +27,10 @@
                   </view>
                   <view class="goods-det">
                     <view class="goods-det-top" style="margin-bottom:4upx;">
-                      <view class="goods-name" style="font-size:29upx;font-weight:bold;">{{ goodsItem.name }}</view>
+                      <view class="goods-name" style="font-size:29upx;font-weight:bold;">{{ goodsItem.name||'' }}</view>
                     </view>
                     <view class="operate-wrap" style="margin-bottom:15upx;">
-                      <view class="goods-price" style="font-size:23upx;">￥{{ goodsItem.price }}</view>
+                      <view class="goods-price" style="font-size:23upx;">￥{{ goodsItem.price?parseFloat(goodsItem.price):0 }}</view>
                     </view>
                     <view class="operate-wrap">
                       <view style="font-size:23upx;">

hdApp/src/admin/shop/add.vue

@@ -25,11 +25,7 @@
 					<radio-group class="tui-input" @change="stockModelChange">
 						<label class="list" for="stockModelZha">
 							<radio id="stockModelZha" value="0" style="transform:scale(0.7,0.7)" :checked="form.stockModel == 0" />
-							<span class="checkbox-text">大概</span>
-						</label>
-						<label class="list" for="stockModelZhaZhi">
-							<radio id="stockModelZhaZhi" value="1" style="transform:scale(0.7,0.7)" :checked="form.stockModel == 1" />
-							<span class="checkbox-text">精准</span>
+							<span class="checkbox-text">常规</span>
 						</label>
 					</radio-group>
 				</tui-list-cell>
@@ -397,7 +393,7 @@ export default {
 		position:fixed;
 		bottom:0upx;
 		width: calc(100% - 60upx);
-		margin: 60upx 30upx 20upx;
+		margin: 60upx 30upx 0upx;
 		z-index:99999;
 		.admin-button-com {
 			width: 100%;