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/foot/index/index.vue

@@ -319,7 +319,7 @@
 				
 			},
 			goshoping(){
-				uni.redirectTo({ url: "/pages/index/index" });
+				uni.reLaunch({ url: "/pages/index/index" });
 			},
 			clickHandler(GoodsId) {
 			  uni.navigateTo({

pages/goods/goods.vue

@@ -12,6 +12,13 @@
           @click="previewImage"
         ></u-swiper>
         <!-- TODO 分销价格未做 is_share_price -->
+		<view class="is_share" v-if='g.share>0'>
+			<image src="@/static/images/icon/WechatIMG424.png" style="width: 20px;margin-left: 12px;opacity: 1;" mode="widthFix"/>
+			<view style="display: flex;flex-direction: column;margin-left: 8px;font-size: 11px;color: #fff;opacity: 1;">
+				<Text>分销最高可赚</Text>
+				<Text>￥ {{g.share}}</Text>
+			</view>
+		</view>
       </view>
       <view class="g-info">
         <view class="g-name u-skeleton-rect">{{ g.name }}</view>
@@ -276,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;
@@ -477,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;
@@ -618,4 +629,18 @@ export default {
 .goods .detals * {
   max-width: 100%;
 }
+.goods .is_share{
+	width: 120px;
+	height: 45px;
+	border-top-left-radius: 22.5px;
+	border-bottom-left-radius: 22.5px;
+	background: #111;
+	opacity: 0.8;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	position: absolute;
+	top: 300px;
+	right: 0;
+}
 </style>

pages/index/index.vue

@@ -59,7 +59,7 @@
             :key="di"
           ></addialog>
           <quicknav
-            v-if="d.id == 'quick-nav' && d.data.navSwitch == 1"
+            v-if="d.id == 'quick-nav' && d.data.navSwitch == 1"	
             :navs="d.data"
             :key="di"
           ></quicknav>
@@ -67,6 +67,15 @@
       </view>
     </template>
     <tabbar></tabbar>
+	<view class="tips" v-if="add_show==1&& JSON.stringify(setting) != '{}'  "  :style="{
+		'border-radius':setting.add_app_bg_radius+'rpx',
+		'opacity':setting.add_app_bg_transparency/100
+		}">
+		<u-icon name="cross" color="#fff" @click="close"></u-icon>
+		<view style="width: 1px;height: 20px;margin:0 10px;background: #fff;"></view>
+		<Text style='color: #fff;'>{{setting.add_app_text}}</Text>
+		<view class="triangle-up"></view>
+	</view>
   </view>
 </template>
 
@@ -98,7 +107,9 @@ export default {
       mainColor: "",
       active: 0,
       contentHeight: 0,
-	  pageId:0
+	  pageId:0,
+	  setting:{},
+	  add_show:1,
     };
   },
   components: {
@@ -129,6 +140,14 @@ export default {
     let c = this.$uiConfig.is_bang ? 78 : 50;
     this.contentHeight = this.$utils.calcContentHeight(c);
     this.init();
+	let set = uni.getStorageSync("basedata")? uni.getStorageSync("basedata").mall.setting:{};
+	if(!uni.getStorageSync("add_top_app")){
+		uni.setStorageSync("add_top_app", {add_top_app_show:1});
+	}
+	this.add_show = uni.getStorageSync("add_top_app")?uni.getStorageSync("add_top_app").add_top_app_show:1;
+	this.setting =set;
+	console.log(this.setting)
+	
     uni.showNavigationBarLoading();
   },
   onShow() {
@@ -169,6 +188,10 @@ export default {
 		  }
         );
     },
+	close(){
+		this.add_show =2;
+		uni.setStorageSync("add_top_app", {add_top_app_show:2});
+	},
     changeHandler(i) {
       this.active = i;
     },
@@ -205,7 +228,29 @@ export default {
   justify-content: center; */
   padding-bottom:100rpx;
 }
-
+.content .tips{
+	position: fixed;
+	top:8px;
+	right: 6px;
+	height: 36px;
+	background: #000000;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	padding: 0 10px;
+	font-size: 12px;
+	
+}
+.triangle-up{
+	 width: 0;
+	height: 0;
+	border-left: 5px solid transparent;
+	border-right: 5px solid transparent;
+	border-bottom: 10px solid black;
+	position: fixed;
+	right: 65px;
+	top:0px
+}
 /* .logo {
   height: 200rpx;
   width: 200rpx;

pages/order-submit/order-submit.vue

 <template>
-	<view class="ordersubmit" v-if="!loading">
+	<view class="ordersubmit">
 		<view class="add-box" @click="chosenAddress(ds.address.id)">
 			<view v-if="address.province && address.province != ''" class="add-info">
 				<view class="address">{{ address.province + address.city + address.district }}</view>
@@ -336,7 +336,12 @@ export default {
 									that.payInfo.OrderId = res.data.OrderId;
 									that.payInfo.total_price = that.ds.total_price;
 								}
-
+								else{
+									that.$refs.uToast.show({
+										title: res.data.message,
+										type: 'warning'
+									});
+								}
 								uni.hideNavigationBarLoading();
 							}
 						);
@@ -452,7 +457,6 @@ export default {
 			this.$forceUpdate();
 			if (e && e.val) {
 				if (this.mchs[i].delivery.send_type != e.val) {
-					// this.formData.list[i].send_type = e.val;
 					this.formdata.DeliveryMethod = e.val;
 					this.init();
 				}
@@ -471,10 +475,11 @@ export default {
 		},
 		changeUseInt(e) {
 			this.userInt = e.value;
-			this.formData.list.forEach(x => {
-				x.use_integral = this.userInt ? 1 : 0;
-				this.formData.Use_Integral = this.userInt ? 1 : 0;
-			});
+			// this.formData.list.forEach(x => {
+			// 	x.use_integral = this.userInt ? 1 : 0;
+			// 	this.formData.Use_Integral = this.userInt ? 1 : 0;
+			// });
+			this.formdata.Use_Integral = this.userInt ? 1 : 0;
 			this.init();
 		},
 		initPage() {
@@ -499,12 +504,12 @@ export default {
 				},
 				res => {
 					this.loading = false;
-
 					if (res.resultCode == 1) {
 						this.address = res.data.address;
 						this.address_enable=res.data.address_enable;
 						this.mchs = res.data.mch_list;
 						this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0,10);
+						this.formdata.DeliveryMethod=this.mchs[0].delivery.send_type;
 						this.ds = res.data;
 						this.expressPrice = 0.0;
 						this.goodPrice = 0.0;
@@ -570,7 +575,7 @@ export default {
 						x.delivery.send_type_name = y.name;
 					}
 				});
-				this.goodPrice += parseFloat(x.total_goods_original_price);
+				this.goodPrice += parseFloat(x.total_goods_price);
 				this.expressPrice += parseFloat(x.express_price);
 				this.couponPrice += parseFloat(x.coupon.coupon_discount || 0.0);
 				if (x.integral.can_use) {

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">
@@ -413,14 +415,14 @@ export default {
            {
            	url: '/api/AppletOrder/SetAppletOrderGoodsReceiving',
            	data: {
-     					OrderId: that.submitId
+     					OrderId: that.orders.OrderId
      				}
            },
            (res) => {
      			  uni.showToast({
      			  	title:res.message
      			  })
-				this.init()
+				that.init()
            }
          );
        },
@@ -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/cash/cash.vue

@@ -203,7 +203,7 @@
 				this.show=false
 			},
 			getapply(){
-				// TODO 接口暂无
+				
 				if(this.msg.AppliedMoney==''){
 					
 					uni.showToast({

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;

pages/user-center/user-center.vue

@@ -96,6 +96,7 @@
 					>
 						{{ item.name }}
 					</Text>
+					<button open-type="contact" v-if="item.link_url=='contact'&& item.name=='客服' ">0</button>
 				</view>
 			</view>
 			<view class="copyright">
@@ -192,6 +193,7 @@ console.log(wx.getStorageSync('basedata'))
 			);
 		},
 		goUrl(url) {
+			
 			if(url =='/pages/order/refund/index'){
 				uni.navigateTo({
 					url: '/pages/order/after-sale/refunds-list'
@@ -224,6 +226,7 @@ console.log(wx.getStorageSync('basedata'))
 <style>
 .body {
 	background: #f3f4f6;
+	min-height:100vh
 }
 .userStyle .userBox {
 	height: 100%;
@@ -353,6 +356,16 @@ console.log(wx.getStorageSync('basedata'))
 	flex-direction: column;
 	align-items: center;
 	justify-content: space-between;
+	position: relative;
+}
+.menus_item2,.menus_item button{
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top:0;
+	opacity: 0;
+
 }
 .userStyle .menus2 .menus_item2 {
 	width: 100%;
@@ -361,6 +374,7 @@ console.log(wx.getStorageSync('basedata'))
 	flex-direction: row;
 	align-items: center;
 	margin-left: 30rpx;
+	position: relative;
 }
 .userStyle .copyright {
 	padding: 70rpx 0;