二手

components/cm-module/productDetails/second-attributes.vue

@@ -10,7 +10,6 @@
 				<view class="info-viewL tui-skeleton-fillet">联系人：<text>{{product.contactName}}</text></view>
 				<view class="info-viewL tui-skeleton-fillet">联系方式：<text>{{product.contactMobile}}</text></view>
 				<view class="info-viewL tui-skeleton-fillet">商品类型：<text v-if="product.productType==1">医美</text><text v-else>非医美</text></view>
-				<view class="info-viewL tui-skeleton-fillet">所在地：<text>{{product.provinceCityDistrict}}</text></view>
 			</view>
 			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''" v-if="product.secondHandType==2">
 				<view class="info-viewL tui-skeleton-fillet">市场价：<text>{{product.normalPriceStr}}</text></view>	
@@ -18,6 +17,9 @@
 				<view class="info-viewL tui-skeleton-fillet">产品到期日：<text>{{product.maturityYears}}</text></view>	
 				<view class="info-viewL tui-skeleton-fillet">库存：<text>{{product.stock}}</text></view>	
 			</view>
+			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''">
+				<view class="info-viewL tui-skeleton-fillet">所在地：<text>{{product.provinceCityDistrict}}</text></view>
+		   </view>
 		</view>
 	</view>
 </template>

components/cm-module/productDetails/secondBrand.vue

@@ -1,7 +1,7 @@
 <template name="secondBrand">
 	<view class="secondBrand">
 		<view class="secondBrand-empty" v-if="product.brandInfo==''||product.brandInfo==null">暂无品牌信息</view>
-		<p>{{product.brandInfo}}</p>
+		<p v-else>{{product.brandInfo}}</p>
 	</view>
 </template>
 

pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
-									<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>