Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/auth/index.vue

@@ -108,8 +108,8 @@ export default {
 					data: {
 						Source: 1,
 						OpenId: obj.OpenId,
-						Name: obj.nickName,
-						Photo: obj.avatarUrl,
+						Name: obj.Name,
+						Photo: obj.Photo,
 						Moblie: '',
 						SuperiorId: 0
 					}

components/goods/order-good-list2.vue

@@ -24,23 +24,23 @@
         <view class="tips">共{{list.length}}件</view>
       </view>
       <view class="goodbox update-goodbox" v-for="(cx, i) in list" :key="i">
-			<image :src="cx.goods_info.pic_url" style="width: 100px; height: 100px" />
+			<image :src="cx.CoverImagePath" style="width: 100px; height: 100px" />
 			<view style="width: calc(100% - 110px);height: 100px;display: flex;flex-direction: column;margin-left: 10px;justify-content: space-between;">
-				<Text class='topic_cont_text' >{{cx.goods_info.name}}</Text>
+				<Text class='topic_cont_text' >{{cx.GoodsName}}</Text>
 				<view style='width: calc(100% - 110px);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>
-					<view v-for="(attr, index2) in cx.goods_info.attr_list" :key="index2" >
-						<Text style='color: #A0A09D;font-size: 24rpx;margin-right: 5rpx;'>规格:{{attr.attr_name}}</Text>
+					<view v-for="(attr, index2) in cx.SpecificationList" :key="index2" >
+						<Text style='color: #A0A09D;font-size: 24rpx;margin-right: 5rpx;'>规格:{{attr}}</Text>
 					</view>
 				</view>
 				<view style="width: 100%;display: flex;flex-direction: row;align-items:center;justify-content: space-between;">
 					<view class="left" :style="{ color: mc }">
 					  <text class="small">￥</text>
-					  <text style='font-size: 40rpx;'>{{ cx.unit_price.split(".")[0] }}</text>
+					  <text style='font-size: 40rpx;'>{{ cx.Final_Price.toString().split(".")[0] }}</text>
 					  <text class="small"
-					    >.{{ cx.unit_price.split(".")[1] || "00" }}</text
+					    >.{{ cx.Final_Price.toString().split(".")[1] || "00" }}</text
 					  >
 					</view>
-					<Text style='color: #A0A09D;font-size: 24rpx;'>X{{cx.num}}</Text>
+					<Text style='color: #A0A09D;font-size: 24rpx;'>X{{cx.Number}}</Text>
 					
 				</view>
 			</view>

pages/goods/goods.vue

@@ -283,7 +283,11 @@ export default {
   },
   onLoad(option) {
     this.opTionObj = option;
-    this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942
+	if(option&&option.id){
+		this.id = option.id ? option.id : 29; //40887 59512 46942
+	}else{
+		this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942
+	}
     this.init();
     this.mc = this.$uiConfig.mainColor;
     this.secondary = this.$uiConfig.secondary;
@@ -484,7 +488,7 @@ export default {
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   font-size: 16px;
-  height: 40px;
+  height: 45px;
 }
 .goods .g-info .g-price-box {
   display: flex;

pages/order/index/index.vue

@@ -105,7 +105,18 @@
                   </view>
                 </view>
               </template>
-
+				<view style="width: 100%;text-align: right;">
+					<Text>应付金额：</Text>
+					<text style="font-size: 10px;">￥</text>
+					<text style="font-size: 17px;">{{
+					  item.Income.toString().split(".")[0]
+					}}</text>
+					<text style="font-size: 11px;"
+					  >.{{
+					    item.Income.toString().split(".")[1] || "00"
+					  }}</text
+					>
+				</view>
               <!-- TODO 样式结构修改-->
               <view class="handle">
                 <u-button
@@ -512,7 +523,7 @@ export default {
       this.showGoodList = false;
     },
     showGoodListHandler(i) {
-      this.goodData = this.g[i].detail;
+      this.goodData = this.g[i].DetailList;
       console.log(this.goodData);
       this.showGoodList = true;
     },

pages/order/order-detail.vue

@@ -30,6 +30,7 @@
             color="#FFF"
             size="28"
           ></u-icon>
+		  <!-- TODO返回字段 不能写死 -->
           <text style="margin-left: 5px;">交易成功14天，系统自动确认完成</text>
           <!-- TODO 交易情况说明 -->
         </view>
@@ -62,7 +63,7 @@
                 x.GoodsName
               }}</view>
               <view class="good-attr">
-                <text>数量：{{ x.Number }}</text>
+                <text>数量:{{ x.Number }}</text>
                 <text
                   v-for="(y, yi) in x.SpecificationList"
                   :key="yi"
@@ -177,6 +178,7 @@
               >-￥{{ orders.integral_deduction_price }}</view
             >
           </view> -->
+		  <view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view>
           <view class="field">
             <view class="label">&nbsp;</view>
             <view class="content right">
@@ -694,14 +696,14 @@ export default {
   height: 20px;
 }
 .orderdetail .order-info-item {
-  padding: 20px 0;
+  padding: 10px 0;
   border-bottom: 1px solid #f5f5f5;
 }
 .orderdetail .order-info-item:last-child {
   border-bottom: none;
 }
 .orderdetail .order-info-item .field {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
   display: flex;
 }
 .orderdetail .order-info-item.peisong {

pages/share/index/index.vue

@@ -120,7 +120,7 @@
 				 sharestatus:{},
 				 userinfo:{},
 				 sharedata:{},
-				 bg_img:'',
+				 
 				 showAuth:false
 			}
 		},
@@ -139,9 +139,7 @@
 			   : [];
 			   
 			
-		   this.bg_img = wx.getStorageSync("basedata")
-			 ? wx.getStorageSync("basedata").__wxapp_img.share.status
-			 : '';
+		  
 			 pages.forEach((x) => {
 			   if (x.value == u) {
 			     this.pageTitle = x.new_name ? x.new_name : x.name;