Browse Source

优化 发货方式 零售&批发邮费调整

DaMowang 2 years ago
parent
commit
657ebefbb2

+ 151 - 35
src/app.scss

@@ -1,14 +1,32 @@
 /**app.wxss**/
 /**app.wxss**/
-page {min-height: 100%;}
-view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-Regular";box-sizing: border-box;}
-.container {font-family: "SourceHanSansSC-Regular", "Microsoft YaHei", "Hiragino Sans GB", tahoma, Arial;box-sizing: border-box;width: 100%;overflow: hidden;}
+page {
+    min-height: 100%;
+}
+
+view,
+text,
+div {
+    word-break: break-all;
+    color: #333;
+    font-family: "SourceHanSansSC-Regular";
+    box-sizing: border-box;
+}
+
+.container {
+    font-family: "SourceHanSansSC-Regular", "Microsoft YaHei", "Hiragino Sans GB", tahoma, Arial;
+    box-sizing: border-box;
+    width: 100%;
+    overflow: hidden;
+}
 
 
 // 文本溢出
 // 文本溢出
-.ellipsis1, .ellipsis {
+.ellipsis1,
+.ellipsis {
     white-space: nowrap;
     white-space: nowrap;
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
 }
 }
+
 .ellipsis2 {
 .ellipsis2 {
     display: -webkit-box;
     display: -webkit-box;
     overflow: hidden;
     overflow: hidden;
@@ -16,6 +34,7 @@ view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-
     -webkit-line-clamp: 2;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     -webkit-box-orient: vertical;
 }
 }
+
 .ellipsis3 {
 .ellipsis3 {
     display: -webkit-box;
     display: -webkit-box;
     overflow: hidden;
     overflow: hidden;
@@ -23,16 +42,18 @@ view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-
     -webkit-line-clamp: 3;
     -webkit-line-clamp: 3;
     -webkit-box-orient: vertical;
     -webkit-box-orient: vertical;
 }
 }
+
 //  文本溢出-end
 //  文本溢出-end
 
 
 /* CDN 服务仅供平台体验和调试使用,平台不承诺服务的稳定性,企业客户需下载字体包自行发布使用并做好备份。 */
 /* CDN 服务仅供平台体验和调试使用,平台不承诺服务的稳定性,企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
 @font-face {
     font-family: 'iconfont';  /* Project id 3748689 */
     font-family: 'iconfont';  /* Project id 3748689 */
     src: 
     src: 
-         url('//at.alicdn.com/t/c/font_3748689_4wxbfi0sqpw.woff2?t=1681285344283') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3748689_4wxbfi0sqpw.woff?t=1681285344283') format('woff'),
-         url('//at.alicdn.com/t/c/font_3748689_4wxbfi0sqpw.ttf?t=1681285344283') format('truetype');
+         url('//at.alicdn.com/t/c/font_3748689_ejdslx0rnek.woff2?t=1681724961508') format('woff2'),
+         url('//at.alicdn.com/t/c/font_3748689_ejdslx0rnek.woff?t=1681724961508') format('woff'),
+         url('//at.alicdn.com/t/c/font_3748689_ejdslx0rnek.ttf?t=1681724961508') format('truetype');
   }
   }
+
 .iconfont {
 .iconfont {
     font-family: "iconfont" !important;
     font-family: "iconfont" !important;
     font-style: normal;
     font-style: normal;
@@ -50,39 +71,122 @@ view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-
 }
 }
 
 
 // flex布局
 // flex布局
-.flex_grow{flex:1;}
-.flex_wrap{flex-wrap: wrap;}
-.flex_ac{align-items: center;}
-.flex_ae{align-items: flex-end;}
-.flex_as{align-items: flex-start;}
-.flex_jc{justify-content: center;}
-.flex_je{justify-content: flex-end;}
-.flex_js{justify-content: flex-start;}
-.flex_jb{justify-content: space-between;}
-.flex_r{display: flex;flex-direction: row;}
-.flex_c{display: flex;flex-direction: column;}
+.flex_grow {
+    flex: 1;
+}
+
+.flex_wrap {
+    flex-wrap: wrap;
+}
+
+.flex_ac {
+    align-items: center;
+}
+
+.flex_ae {
+    align-items: flex-end;
+}
+
+.flex_as {
+    align-items: flex-start;
+}
+
+.flex_jc {
+    justify-content: center;
+}
+
+.flex_je {
+    justify-content: flex-end;
+}
+
+.flex_js {
+    justify-content: flex-start;
+}
+
+.flex_jb {
+    justify-content: space-between;
+}
+
+.flex_jse {
+    justify-content: space-evenly;
+}
+
+.flex_r {
+    display: flex;
+    flex-direction: row;
+}
+
+.flex_c {
+    display: flex;
+    flex-direction: column;
+}
+
 // flex布局-end
 // flex布局-end
 
 
 
 
 // 边距
 // 边距
-.padd20{padding:20rpx 0;}
-.mar_t10{margin-top: 10rpx;}
-.mar_t20{margin-top: 20rpx;}
-.mar_t30{margin-top: 30rpx;}
-.mar_t36{margin-top: 36rpx;}
-.mar_t50{margin-top: 50rpx;}
-.mar_t16{margin-top: 16rpx;}
-.mar_t-10{margin-top: -10rpx;}
-.padd_t30{padding-top: 30rpx;}
-.mar_b10{margin-bottom: 10rpx;}
-.mar_b20{margin-bottom: 20rpx;}
-.mar_b30{margin-bottom: 30rpx;}
-.padd_b0{padding-bottom: 0 !important;}
+.padd20 {
+    padding: 20rpx 0;
+}
+
+.mar_t10 {
+    margin-top: 10rpx;
+}
+
+.mar_t20 {
+    margin-top: 20rpx;
+}
+
+.mar_t30 {
+    margin-top: 30rpx;
+}
+
+.mar_t36 {
+    margin-top: 36rpx;
+}
+
+.mar_t50 {
+    margin-top: 50rpx;
+}
+
+.mar_t16 {
+    margin-top: 16rpx;
+}
+
+.mar_t-10 {
+    margin-top: -10rpx;
+}
+
+.padd_t30 {
+    padding-top: 30rpx;
+}
+
+.mar_b10 {
+    margin-bottom: 10rpx;
+}
+
+.mar_b20 {
+    margin-bottom: 20rpx;
+}
+
+.mar_b30 {
+    margin-bottom: 30rpx;
+}
+
+.padd_b0 {
+    padding-bottom: 0 !important;
+}
+
 // 边距-end
 // 边距-end
 
 
 
 
 // 底部提示
 // 底部提示
-.fz_w_text{color: #bcbcbc;font-size: 24rpx;text-align: center;width: 100%;}
+.fz_w_text {
+    color: #bcbcbc;
+    font-size: 24rpx;
+    text-align: center;
+    width: 100%;
+}
 
 
 .no_data {
 .no_data {
     text-align: center;
     text-align: center;
@@ -98,7 +202,7 @@ view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
 }
 }
 
 
-.imgs_bar{
+.imgs_bar {
     width: 100%;
     width: 100%;
     overflow: hidden;
     overflow: hidden;
     display: flex;
     display: flex;
@@ -110,11 +214,23 @@ view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-
 uni-input {
 uni-input {
     box-sizing: content-box;
     box-sizing: content-box;
 }
 }
-.noticeBar .uni-noticebar{
+
+.noticeBar .uni-noticebar {
     margin: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
     padding: 0 !important;
 }
 }
 
 
-.corFE2C15{
+.corFE2C15 {
     color: #FE2C15 !important;
     color: #FE2C15 !important;
+}
+
+// 暂无信息/数据/列表
+.zanwu {
+    text-align: center;
+}
+
+.zanwutxt {
+    margin-top: 16rpx;
+    font-size: 28rpx;
+    color: #888;
 }
 }

+ 7 - 3
src/components/lcw-select-address/lcw-select-address.vue

@@ -484,7 +484,7 @@ export default {
 	border-top-left-radius: 20rpx;
 	border-top-left-radius: 20rpx;
 	border-top-right-radius: 20rpx;
 	border-top-right-radius: 20rpx;
 	background-color: #fff;
 	background-color: #fff;
-	padding: 30rpx 0;
+	// padding: 30rpx 0;
 
 
 	.header-box {
 	.header-box {
 		display: flex;
 		display: flex;
@@ -492,7 +492,9 @@ export default {
 		font-size: 32rpx;
 		font-size: 32rpx;
 		font-weight: bold;
 		font-weight: bold;
 		color: #333;
 		color: #333;
-		margin-bottom: 40rpx;
+		// margin-bottom: 40rpx;
+		height: 80rpx;
+		line-height: 80rpx;
 		padding: 0 20rpx;
 		padding: 0 20rpx;
 
 
 		> .title-box {
 		> .title-box {
@@ -501,10 +503,12 @@ export default {
 
 
 		.iconfont {
 		.iconfont {
 			color: #72899b;
 			color: #72899b;
+			padding: 0 20rpx;
 		}
 		}
 	}
 	}
 
 
 	.main-box {
 	.main-box {
+		height: calc(100% - 80rpx);
 		.address-info {
 		.address-info {
 			padding: 0 20rpx;
 			padding: 0 20rpx;
 
 
@@ -575,7 +579,7 @@ export default {
 		}
 		}
 
 
 		.address-select-box {
 		.address-select-box {
-			padding: 20rpx 20rpx;
+			padding: 20rpx 20rpx 0;
 			border-top: 2rpx solid #d4d4d4;
 			border-top: 2rpx solid #d4d4d4;
 
 
 			.content-box {
 			.content-box {

+ 2 - 2
src/pages.json

@@ -99,7 +99,7 @@
 		{
 		{
 			"path": "pages/account/conversion",
 			"path": "pages/account/conversion",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "余额转化"
+				"navigationBarTitleText": "转化"
 			}
 			}
 		},
 		},
 		{
 		{
@@ -268,7 +268,7 @@
 		{
 		{
 			"path": "pages/consultation-list/index",
 			"path": "pages/consultation-list/index",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "资讯列表"
+				"navigationBarTitleText": "通告列表"
 			}
 			}
 		}
 		}
 	],
 	],

+ 1 - 1
src/pages/consultation-list/index.vue

@@ -39,7 +39,7 @@ export default {
             }
             }
         })
         })
     },
     },
-    //跳转资讯详情
+    //跳转通告详情
     toDetail(id) {
     toDetail(id) {
       this.goto("/pages/notice/detail", { id });
       this.goto("/pages/notice/detail", { id });
     },
     },

+ 3 - 3
src/pages/my/index.vue

@@ -57,8 +57,8 @@
             <view class="price_num f_dinB">{{ userinfo.user_money }}</view>
             <view class="price_num f_dinB">{{ userinfo.user_money }}</view>
           </view>
           </view>
           <view class="C flex_r">
           <view class="C flex_r">
+            <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/top-up/index" hover-class="none">充值</navigator>
             <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/account/conversion" hover-class="none">转化</navigator>
             <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/account/conversion" hover-class="none">转化</navigator>
-            <!-- <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/top-up/index" hover-class="none">充值</navigator> -->
             <view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash">提现</view>
             <view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash">提现</view>
           </view>
           </view>
         </view>
         </view>
@@ -217,7 +217,7 @@ export default {
       isShiMing: true, //未实名提示弹窗
       isShiMing: true, //未实名提示弹窗
       agentName: "", // 缘起
       agentName: "", // 缘起
       user_id: undefined,
       user_id: undefined,
-      userinfo: undefined, // 获取用户信息
+      userinfo: {}, // 获取用户信息
 
 
       unid: "",
       unid: "",
 
 
@@ -608,7 +608,6 @@ page {
   font-size: 26rpx;
   font-size: 26rpx;
   color: #11a375;
   color: #11a375;
   font-family: "SourceHanSansSC-Medium";
   font-family: "SourceHanSansSC-Medium";
-  margin-left: 20rpx;
 }
 }
 
 
 .recharge {
 .recharge {
@@ -620,6 +619,7 @@ page {
   font-family: "SourceHanSansSC-Medium";
   font-family: "SourceHanSansSC-Medium";
   border-radius: 27rpx;
   border-radius: 27rpx;
   font-size: 26rpx;
   font-size: 26rpx;
+  margin-right: 16rpx;
 }
 }
 
 
 .regional{
 .regional{

+ 14 - 14
src/pages/product/p_details.vue

@@ -130,29 +130,29 @@
             <view class="num_str flex_r flex_je" v-else>x 1</view>
             <view class="num_str flex_r flex_je" v-else>x 1</view>
           </view>
           </view>
         </view>
         </view>
-        <view class="goods_option flex_r flex_ac flex_jc" v-if="type == 2">
-          <view class="goods_raido flex_r flex_ac" @tap="setWay('1')">
+        <view class="goods_option flex_r flex_ac flex_jse" v-if="type == 2">
+          <view class="goods_raido flex_r flex_ac" @tap="setWay('0')">
             <view
             <view
               class="raido_img"
               class="raido_img"
-              :class="pfway == '1' ? 'raido_box' : ''"
+              :class="pfway == '0' ? 'raido_box' : ''"
             ></view>
             ></view>
-            <view class="raido_text">申请寄卖</view>
+            <view class="raido_text">发货邮寄</view>
           </view>
           </view>
-          <view class="goods_raido flex_r flex_ac" @tap="setWay('0')">
+          <view class="goods_raido flex_r flex_ac" @tap="setWay('1')">
             <view
             <view
               class="raido_img"
               class="raido_img"
-              :class="pfway == '0' ? 'raido_box' : ''"
+              :class="pfway == '1' ? 'raido_box' : ''"
             ></view>
             ></view>
-            <view class="raido_text">发货邮寄</view>
+            <view class="raido_text">申请寄卖</view>
           </view>
           </view>
         </view>
         </view>
-        <view class="goods_option flex_r flex_ac flex_jc" v-if="type == 1 || type == 3 || type == 5">
+        <!-- <view class="goods_option flex_r flex_ac flex_jse" v-if="type != 2">
           <view class="goods_raido flex_r flex_ac" @tap="setQhWay('0')">
           <view class="goods_raido flex_r flex_ac" @tap="setQhWay('0')">
             <view
             <view
               class="raido_img"
               class="raido_img"
               :class="qhway == '0' ? 'raido_box' : ''"
               :class="qhway == '0' ? 'raido_box' : ''"
             ></view>
             ></view>
-            <view class="raido_text">发货邮寄</view>
+            <view class="raido_text">快递邮寄</view>
           </view>
           </view>
           <view class="goods_raido flex_r flex_ac" @tap="setQhWay('1')">
           <view class="goods_raido flex_r flex_ac" @tap="setQhWay('1')">
             <view
             <view
@@ -161,7 +161,7 @@
             ></view>
             ></view>
             <view class="raido_text">到店自提</view>
             <view class="raido_text">到店自提</view>
           </view>
           </view>
-        </view>
+        </view> -->
         <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
         <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
           <label class="option_box">
           <label class="option_box">
             <checkbox
             <checkbox
@@ -261,7 +261,7 @@ export default {
       checked: false, //是否选中协议
       checked: false, //是否选中协议
       buyNum: 1, //购买数量
       buyNum: 1, //购买数量
       pfway: "1", // 批发
       pfway: "1", // 批发
-      qhway:"0", //提货方式
+      qhway: "0", //提货方式
       shopInfo: {}, // 商铺信息
       shopInfo: {}, // 商铺信息
       showAuth: false,
       showAuth: false,
 
 
@@ -320,8 +320,8 @@ export default {
     toPayOrder: function () {
     toPayOrder: function () {
       let da = {
       let da = {
         ...this.goodsDa,
         ...this.goodsDa,
-        prom_type:this.qhway,
         num: Number(this.buyNum),
         num: Number(this.buyNum),
+        // prom_type:this.qhway,
         is_sell: this.type == 2 ? this.pfway : "0",
         is_sell: this.type == 2 ? this.pfway : "0",
       };
       };
       this.goto("/pages/to-pay-list/index", da);
       this.goto("/pages/to-pay-list/index", da);
@@ -613,7 +613,7 @@ page {
 }
 }
 
 
 .goods_raido {
 .goods_raido {
-  margin-right: 180rpx;
+  // margin-right: 180rpx;
 }
 }
 
 
 .close_img {
 .close_img {
@@ -656,7 +656,7 @@ page {
 .raido_text {
 .raido_text {
   font-size: 26rpx;
   font-size: 26rpx;
   color: #545454;
   color: #545454;
-  margin-left: 30rpx;
+  margin-left: 18rpx;
 }
 }
 
 
 .goods_con {
 .goods_con {

+ 1 - 1
src/pages/sign/index.vue

@@ -172,7 +172,7 @@ export default {
       }
       }
     },
     },
 
 
-    // 获取今日值得买
+    // 获取甄选好物
     goodsDay() {
     goodsDay() {
       let that = this;
       let that = this;
       let data = {
       let data = {

+ 1 - 1
src/pages/szw-order-list/index.vue

@@ -268,7 +268,7 @@ export default {
           case 3:
           case 3:
             return "精品优选";
             return "精品优选";
           case 4:
           case 4:
-            return "今日值得买";
+            return "甄选好物";
           case 5:
           case 5:
             return "茶宝兑换";
             return "茶宝兑换";
           case 6:
           case 6:

+ 89 - 15
src/pages/to-pay-list/index.vue

@@ -1,7 +1,29 @@
 <template>
 <template>
   <view class="container">
   <view class="container">
+    <template v-if="Data.is_sell != 1">
+      <div class="qtmd mar_b20" v-if="goodsInfo.shipping_method == 2">
+        <view class="order_list flex_r flex_ac flex_jb">
+          <view class="list_name">发货方式</view>
+          <view class="list_con flex_r flex_jb">
+            <div class="select_tab" @click="onprom(0)" :class="{st_active:prom_type===0}">快递邮寄</div>
+            <div class="select_tab" @click="onprom(1)" :class="{st_active:prom_type===1}">到店自提</div>
+          </view>
+        </view>
+      </div>
+      <div class="qtmd mar_b20" v-else>
+        <view class="order_list flex_r flex_ac flex_jb">
+          <view class="list_name">发货方式</view>
+          <view class="list_con flex_r flex_jb">
+            <div class="list_con" v-if="prom_type==0">快递邮寄</div>
+            <div class="list_con" v-else>到店自提</div>
+          </view>
+        
+        </view>
+      </div>
+    </template>
+    
     <!-- 收货地址 -->
     <!-- 收货地址 -->
-    <view class="address" v-if="Data.is_sell != 1 && Data.prom_type == 0">
+    <view class="address mar_b20" v-if="Data.is_sell != 1 && prom_type != 1">
       <block v-if="DefaultAddress.name" >
       <block v-if="DefaultAddress.name" >
         <view class="add_head flex_r flex_ac flex_jb">
         <view class="add_head flex_r flex_ac flex_jb">
           <view class="user_info flex_r flex_ac">
           <view class="user_info flex_r flex_ac">
@@ -17,7 +39,7 @@
             <view class="set_text">修改</view>
             <view class="set_text">修改</view>
           </view>
           </view>
         </view>
         </view>
-        <view class="add_name mar_t20">{{ DefaultAddress.address }}</view>
+        <view class="add_name mar_t20">{{ DefaultAddress.province + ' ' + DefaultAddress.city + ' ' + DefaultAddress.area + ' ' + DefaultAddress.street + ' ' + DefaultAddress.address }}</view>
       </block>
       </block>
       <block v-else>
       <block v-else>
         <view class="add_address flex_c flex_ac flex_jc" @tap="chooseWXaddress('add')">
         <view class="add_address flex_c flex_ac flex_jc" @tap="chooseWXaddress('add')">
@@ -27,8 +49,9 @@
       </block>
       </block>
     </view>
     </view>
     <!-- 收货地址-end -->
     <!-- 收货地址-end -->
+
     <!-- 商品信息 -->
     <!-- 商品信息 -->
-    <view class="goods_info mar_t20">
+    <view class="goods_info mar_b20">
       <view class="info_type">{{ modularName }}</view>
       <view class="info_type">{{ modularName }}</view>
       <view class="goods flex_r">
       <view class="goods flex_r">
         <image class="goods_img" :src="goodsInfo.original_img" mode=""></image>
         <image class="goods_img" :src="goodsInfo.original_img" mode=""></image>
@@ -46,12 +69,12 @@
     </view>
     </view>
     <!-- 商品信息-end -->
     <!-- 商品信息-end -->
     <!-- 订单信息 -->
     <!-- 订单信息 -->
-    <view class="order mar_t20">
+    <view class="order">
       <view class="order_list flex_r flex_ac flex_jb">
       <view class="order_list flex_r flex_ac flex_jb">
         <view class="list_name">数量</view>
         <view class="list_name">数量</view>
         <view class="list_con">{{ Data.num }}</view>
         <view class="list_con">{{ Data.num }}</view>
       </view>
       </view>
-      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1 && Data.prom_type == 0">
+      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1 && prom_type != 1">
         <view class="flex_r flex_ac">
         <view class="flex_r flex_ac">
           <view class="list_name">运费</view>
           <view class="list_name">运费</view>
           <view class="list_con p_color">({{ freight }}元/每套)</view>
           <view class="list_con p_color">({{ freight }}元/每套)</view>
@@ -136,6 +159,8 @@ export default {
       freight: 0, //运费
       freight: 0, //运费
       userinfo: {},
       userinfo: {},
       obligation: 0, //待支付
       obligation: 0, //待支付
+
+      prom_type: 0,
     };
     };
   },
   },
   components: {
   components: {
@@ -143,9 +168,11 @@ export default {
   },
   },
   onLoad(e) {
   onLoad(e) {
     this.Data = e;
     this.Data = e;
-    this.loadData(e);
+    this.getuserInfo();
     this.loadAddress();
     this.loadAddress();
-    this.userinfo = uni.getStorageSync("userinfo");
+    this.loadData(e);
+    // this.userinfo = uni.getStorageSync("userinfo");
+
     // 1零售 2批发 3精品 4今日值买
     // 1零售 2批发 3精品 4今日值买
     this.modularName = this.tidyTpye(e.type);
     this.modularName = this.tidyTpye(e.type);
   },
   },
@@ -153,19 +180,27 @@ export default {
     // this.$refs.popup.open('top');
     // this.$refs.popup.open('top');
   },
   },
   methods: {
   methods: {
+    onprom(va){
+      this.prom_type = va
+      this.loadData(this.Data);
+    },
     loadData(da) {
     loadData(da) {
       post("goods/goodsDetail", da).then((res) => {
       post("goods/goodsDetail", da).then((res) => {
         if (res.code === 0) {
         if (res.code === 0) {
           this.goodsInfo = res.data.data;
           this.goodsInfo = res.data.data;
-          post("goods/freight", { type: da.type }).then((res) => {
+          if(this.goodsInfo.shipping_method != 2) this.prom_type = this.goodsInfo.shipping_method
+          post("goods/freight", { type: da.type, id: da.id }).then((res) => {
             if (res.code === 0) this.freight = res.data.freight;
             if (res.code === 0) this.freight = res.data.freight;
 
 
             // 计算待支付
             // 计算待支付
             let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
             let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
-            let y = (this.Data.is_sell == 1 || this.Data.prom_type == 1) ? 0 : this.freight; // 运费   寄卖的话退运费为0
-            let a = this.$h.Mul(p,this.Data.num) + this.$h.Mul(y,this.Data.num); //商品总价
+            let y = (this.Data.is_sell == 1 || this.prom_type == 1) ? 0 : this.freight; // 运费   寄卖、自提 运费为0
+            let a1 = this.$h.Mul(p,this.Data.num); //商品总价
+            let a = this.$h.Add(this.$h.Mul(p,this.Data.num), this.$h.Mul(y,this.Data.num)); //商品总价加运费
+            let b1 = this.$h.Sub(a1,this.userinfo.user_money); //待支付金额 零售&批发   运费必须现金支付
             let b = this.$h.Sub(a,this.userinfo.user_money); //待支付金额
             let b = this.$h.Sub(a,this.userinfo.user_money); //待支付金额
             if (["4", "5", "6"].includes(this.Data.type)) this.obligation = a;
             if (["4", "5", "6"].includes(this.Data.type)) this.obligation = a;
+            else if (["1", "2"].includes(this.Data.type)) this.obligation = b1 > 0 ? this.$h.Add(b1, y) : y;
             else this.obligation = b > 0 ? b : 0;
             else this.obligation = b > 0 ? b : 0;
           });
           });
         }
         }
@@ -220,12 +255,10 @@ export default {
     },
     },
 
 
     chooseWXaddress(va) {
     chooseWXaddress(va) {
-      // this.getwexinAddress()
       let a = va != "add" ? this.DefaultAddress.id : "add";
       let a = va != "add" ? this.DefaultAddress.id : "add";
       this.$refs.userAddress.open(a);
       this.$refs.userAddress.open(a);
-
-      // this.goto("/pages/xghc-addrress/userAddress");
     },
     },
+
     // 支付
     // 支付
     payment() {
     payment() {
       let type = "H5";
       let type = "H5";
@@ -258,6 +291,7 @@ export default {
                 address_id: that.DefaultAddress.id || '',
                 address_id: that.DefaultAddress.id || '',
 					      regional_code: that.DefaultAddress.regional_code || '',
 					      regional_code: that.DefaultAddress.regional_code || '',
                 trade_type: type,
                 trade_type: type,
+                prom_type: that.prom_type,
                 price: that.goodsInfo.cost_price,
                 price: that.goodsInfo.cost_price,
               }).then((res) => {
               }).then((res) => {
                 if (res.code === 0) {
                 if (res.code === 0) {
@@ -301,6 +335,7 @@ export default {
           address_id: that.DefaultAddress.id || '',
           address_id: that.DefaultAddress.id || '',
           regional_code: that.DefaultAddress.regional_code || '',
           regional_code: that.DefaultAddress.regional_code || '',
           trade_type: type,
           trade_type: type,
+          prom_type: that.prom_type,
           price: that.goodsInfo.cost_price,
           price: that.goodsInfo.cost_price,
         }).then((res) => {
         }).then((res) => {
           if (res.code === 0) {
           if (res.code === 0) {
@@ -341,6 +376,15 @@ export default {
     loadDa(da) {
     loadDa(da) {
       this.DefaultAddress = da;
       this.DefaultAddress = da;
     },
     },
+
+    // 获取userinfo
+    async getuserInfo() {
+      let res = await post("/user/userinfo")
+      if (res.code === 0) {
+        uni.setStorageSync("userinfo", res.data.data);
+        this.userinfo = res.data.data;
+      }
+    },
   },
   },
 };
 };
 </script>
 </script>
@@ -393,8 +437,8 @@ page {
 }
 }
 
 
 .add_name {
 .add_name {
-  width: 448rpx;
-  overflow: hidden;
+  // width: 448rpx;
+  // overflow: hidden;
   font-size: 24rpx;
   font-size: 24rpx;
   color: #868686;
   color: #868686;
 }
 }
@@ -575,4 +619,34 @@ page {
 }
 }
 
 
 // 底部操作栏-end
 // 底部操作栏-end
+
+.qtmd{
+  width: 100%;
+  padding: 28rpx;
+  box-sizing: border-box;
+  background: #fff;
+  border-radius: 12rpx;
+  .select_tab{
+    margin-left: 30rpx;
+    font-size: 28rpx;
+    &:first-child{
+      margin-left: 0;
+    }
+    &::before{
+      content: "";
+      display: inline-block;
+      width: 32rpx;
+      height: 32rpx;
+      background-image: url("~@/static/img/weixuanzhong_icon.png");
+      background-size: 100% 100%;
+      vertical-align: middle;
+      margin-right: 6rpx;
+    }
+  }
+  .st_active{
+    &::before{
+      background-image: url("~@/static/img/xuanzhong_icon.png");
+    }
+  }
+}
 </style>
 </style>

+ 5 - 4
src/pages/top-up/index.vue

@@ -148,21 +148,22 @@ export default {
         appEv.errTips("请阅读并同意相关协议");
         appEv.errTips("请阅读并同意相关协议");
         return;
         return;
       } else {
       } else {
-        // #ifdef  H5
         let type = "H5";
         let type = "H5";
+        // #ifdef  H5
+        type = "H5";
         // #endif
         // #endif
         // #ifdef  APP
         // #ifdef  APP
-        let type = "app";
+        type = "app";
         // #endif
         // #endif
         // #ifdef  MP-WEIXIN
         // #ifdef  MP-WEIXIN
-        let type = "jsapi";
+        type = "jsapi";
         // #endif
         // #endif
         let data = {
         let data = {
           trade_type: type,
           trade_type: type,
           amount: this.price,
           amount: this.price,
         };
         };
 
 
-        post("/user/recharge", data).then((res) => {
+        post("user/recharge", data).then((res) => {
           toPayOpre.toPay(res.data.data, (rea) => {
           toPayOpre.toPay(res.data.data, (rea) => {
             if (!rea) {
             if (!rea) {
               // 支付成功
               // 支付成功

+ 1 - 1
src/pages/xghc-addrress/userAddress.vue

@@ -59,7 +59,7 @@
                                         <text>{{i.mobile}}</text>
                                         <text>{{i.mobile}}</text>
                                         <text v-if="i.status == 1" class="defaultAddress">默认</text>
                                         <text v-if="i.status == 1" class="defaultAddress">默认</text>
                                     </view>
                                     </view>
-                                    <view class="address">{{i.address}}</view>
+                                    <view class="address">{{i.province + ' ' + i.city + ' ' + i.area + ' ' + i.street + ' ' + i.address}}</view>
                                 </view>
                                 </view>
                             </view>
                             </view>
                             <template v-slot:right>
                             <template v-slot:right>

+ 0 - 8
src/pagesB/address/list.vue

@@ -203,12 +203,4 @@ export default {
   text-align: center;
   text-align: center;
   line-height: 80rpx;
   line-height: 80rpx;
 }
 }
-.zanwu{
-  text-align: center;
-  .zanwutxt{
-    margin-top: 16rpx;
-    font-size: 28rpx;
-    color: #888;
-  }
-}
 </style>
 </style>

+ 5 - 1
src/pagesB/invoice/invoiceList.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="iApp">
   <div class="iApp">
-    <div class="log_list">
+    <div class="log_list" v-if="list.length">
       <div class="list_box" v-for="(item, index) of list" :key="index" @click="toDetail(item.fpqqlsh)">
       <div class="list_box" v-for="(item, index) of list" :key="index" @click="toDetail(item.fpqqlsh)">
         <div class="list_item">
         <div class="list_item">
             <div class="p1 flex_r flex_jb c05">
             <div class="p1 flex_r flex_jb c05">
@@ -14,6 +14,10 @@
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
+    <div class="zanwu" v-else>
+      <img src="@/static/img/zanwu.png" alt="" class="zanwuimg">
+      <view class="zanwutxt">暂无开票历史</view>
+    </div>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>

+ 6 - 2
src/pagesB/my/assistant.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="iApp">
   <div class="iApp">
-    <div class="log_list">
+    <div class="log_list" v-if="list.length">
       <!-- <div class="history">
       <!-- <div class="history">
         <div class="btn" @click="toHistory">
         <div class="btn" @click="toHistory">
           <span>开票历史</span>
           <span>开票历史</span>
@@ -41,7 +41,11 @@
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
-    <div class="bottom">
+    <div class="zanwu" v-else>
+      <img src="@/static/img/zanwu.png" alt="" class="zanwuimg">
+      <view class="zanwutxt">暂无可开票订单</view>
+    </div>
+    <div class="bottom" v-if="list.length">
       <div class="left">
       <div class="left">
         <span>共</span>
         <span>共</span>
         <span class="green">{{ trueTotal }}</span>
         <span class="green">{{ trueTotal }}</span>

+ 1 - 1
src/utils/myfun.js

@@ -96,7 +96,7 @@ export function tidyTpye(va) {
     case '1': return "零售专区";
     case '1': return "零售专区";
     case '2': return "批发专区";
     case '2': return "批发专区";
     case '3': return "精品优选";
     case '3': return "精品优选";
-    case '4': return "今日值得买";
+    case '4': return "甄选好物";
     case '5': return "茶宝兑换";
     case '5': return "茶宝兑换";
     case '6': return "天天捡漏";
     case '6': return "天天捡漏";
     default: return ""
     default: return ""