1

pages/cart/cart.vue

@@ -39,7 +39,7 @@
 								<u-checkbox v-model="c.checked" shape="circle" :active-color="mc">{{ c.MallName }}</u-checkbox>
 							</u-checkbox-group>
 						</view>
-						<view class="cartList_item" v-for="(item, index) in c.GoodsList" :key="index" :name="item.GoodsName" @click="goshoopDatiles(item)" >
+						<view class="cartList_item" v-for="(item, index) in c.GoodsList" :key="index" :name="item.GoodsName"  >
 							<view style="width: 40px;text-align: center;" v-if="item.GoodsStatus == 1 || editType == true">
 								<u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)">
 									<u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox>
@@ -70,6 +70,7 @@
                   height: 150rpx;
                   margin-left: 20rpx;
                 "
+				
 							>
 								<Text
 									style="
@@ -97,7 +98,7 @@
                         font-size: 20rpx;
                         margin-right: 5rpx;
                       "
-										>
+										>	
 											{{ attr}}
 										</Text>
 									
@@ -662,12 +663,7 @@ export default {
 					url: url
 				});
 		},
-		goshoopDatiles(item){//跳转商品详情
-			console.log(item)
-			uni.navigateTo({
-			  url: "/pages/goods/goods?id=" + item.GoodsId,
-			});
-		}
+		
 	}
 };
 </script>

pages/order/order-detail.vue

@@ -74,6 +74,24 @@
                   {{y}}
                 </text>
               </view>
+			  <view style="
+			    overflow: hidden;
+			    white-space: nowrap;
+			    text-overflow: ellipsis;
+			    margin-top: 2px;
+			  "
+			  @click.native.stop="goUrl(x.FreeShippingUrl)"
+			  v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' "
+			  								>
+			  				<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
+			  					<Text style="
+			  					  font-size: 20rpx;
+			  					  margin-right: 5rpx;
+			  					">
+			  						{{x.FreeShippingRemarks}}
+			  					</Text>		
+			  				</view>
+			  </view>
               <view class="good-price">￥{{ x.Final_Price }}</view>
             </view>
           </view>