先货后款,支付流程

App.vue

@@ -290,6 +290,7 @@ import {
   @import 'static/css/base.css';
   @import 'static/iconfont/iconfont.css';
   @import 'static/iconfont/iconlihai.css';
+  @import 'static/iconfont/icontan.css';
   @import 'static/css/style.scss';
 
   view {

components/payment/index.vue

@@ -78,6 +78,7 @@
 				});
 			},
 			goPay: function(number, paytype) {
+				console.log(this.payMode);
 				if (this.isCall) {
 					return this.$emit('onChangeFun', {
 						action: 'payCheck',
@@ -98,6 +99,7 @@
 					// #endif
 				} else if (paytype == 'balance') {
 					type = 'balance';
+					console.log('123');
 				}else if(paytype == 'alipay'){
 					// #ifndef MP
 					type = 'alipay';
@@ -105,6 +107,9 @@
 					// #ifdef MP
 					type = 'alipayQr';
 					// #endif
+				}else if(paytype =='creditBuy'){
+					console.log('123123');
+					type='creditBuy'
 				}
 				if (!that.order_id) return that.$util.Tips({
 					title: '请选择要支付的订单'
@@ -375,7 +380,7 @@
 		border-radius: 16rpx 16rpx 0 0;
 		background-color: #fff;
 		padding-bottom: 60rpx;
-		z-index: 99;
+		z-index: 99999;
 		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
 		transform: translate3d(0, 100%, 0);
 	}

pages/index/index.vue

@@ -236,7 +236,7 @@
       selfLocation() {
         const that = this
         uni.getLocation({
-          type: 'gcj02',
+          type: 'wgs84',
           timeout: '10',
           success: (res) => {
             let latitude, longitude;

pages/supply_chains/supply_chains.vue

@@ -113,6 +113,7 @@
     },
     onLoad() {
       getHotBanner('good').then(res => {
+		  console.log(res);
         this.bgData = res.data
       })
       this.getArticle()

pages/users/order_confirm/index.vue

@@ -527,10 +527,10 @@
 					},
 						{
 						"name": "先货后款",
-						"icon": "icon-a-lujing17324	",
+						"icon": "tan-a-lujing17324",
-						value: 'offline',
+						value: 'creditBuy',
 						title: `结算周期：30天 日利率：0.05%`,
-						payStatus: 1,
+						payStatus: this.$store.getters.globalData.yue_pay_status,
 					},
 				],
 				tagStyle: {
@@ -1113,7 +1113,6 @@
 				}
 			},
 			payItem: function(e) {
-				console.log(e);
 				let that = this;
 				let active = e;
 				that.active = active;
@@ -1181,7 +1180,8 @@
 						orderId = res.data.result.order_id,
 						callback_key = res.data.result.pay_key,
 						jsConfig = res.data.result.config,
-						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message;
+						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message,
+						goPagesOrder='/pages/order_details/stay?order_id=' + orderId;
 					that.orderPay = true;
 					uni.hideLoading();
 					switch (status) {
@@ -1193,7 +1193,7 @@
 								title: res.message
 							}, {
 								tab: 5,
-								url: goPages
+								url: goPagesOrder
 							});
 							break;
 						case 'success':

pages/users/order_list/index.vue

@@ -241,7 +241,8 @@
 								<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
 									<text class='money p-color'>￥{{item.pay_price}}</text>
 								</view>
-								<view class="totalPrice">
+								<view class="totalPrice" v-if="item.activity_type == 98">
+									
 									共1件商品，结算周期到期后付款￥100
 								</view>
 							</view>
@@ -396,6 +397,14 @@
 						number: 0,
 						payStatus: this.$store.getters.globalData.yue_pay_status
 					}
+					,
+					{
+						name: "先货后款",
+						icon: "tan-a-lujing17324",
+						value: 'creditBuy',
+						title: '结算周期：30天,日利率：0.05%',
+						payStatus:this.$store.getters.globalData.yue_pay_status
+					}
 				],
 				pay_close: false,
 				pay_order_id: '',
@@ -412,7 +421,9 @@
 				shouhuo: {
 					index: '',
 					id: ''
-				}
+				},
+				//商品分类
+				activity_type:''
 			};
 		},
 		computed: {
@@ -660,6 +671,7 @@
 							page: that.page,
 							limit: that.limit,
 						}).then(res => {
+							console.log(res);
 							that.isReady = true;
 							let list = res.data.list || [];
 							let loadend = list.length < that.limit;
@@ -680,6 +692,7 @@
 							page: that.page,
 							limit: that.limit,
 						}).then(res => {
+							console.log(res);
 							let list = res.data.list || [];
 							let loadend = list.length < that.limit;
 							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that

static/iconfont/icontan.css

@@ -1,79 +1,82 @@
 @font-face {
   font-family: "icontan"; /* Project id 3552766 */
-  src: url('iconfont.woff2?t=1688454694052') format('woff2'),
+  src: url('//at.alicdn.com/t/c/font_3552766_bmogttr4zyj.woff2?t=1688542944134') format('woff2'),
-       url('iconfont.woff?t=1688454694052') format('woff'),
+       url('//at.alicdn.com/t/c/font_3552766_bmogttr4zyj.woff?t=1688542944134') format('woff'),
-       url('iconfont.ttf?t=1688454694052') format('truetype');
+       url('//at.alicdn.com/t/c/font_3552766_bmogttr4zyj.ttf?t=1688542944134') format('truetype');
 }
 
-.iconfont {
+.icontan {
-  font-family: "iconfont" !important;
+  font-family: "icontan" !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-a-lujing17324:before {
+.tan-a-lujing17324:before {
+  content: "\e602";
+}
+
+.tan-xianhuo:before {
   content: "\e601";
 }
 
-.icon-dianpu:before {
+.tan-dianpu:before {
   content: "\e600";
 }
 
-.icon-clock:before {
+.tan-clock:before {
   content: "\e627";
 }
 
-.icon-ditu_dingwei_o:before {
+.tan-ditu_dingwei_o:before {
   content: "\ebbb";
 }
 
-.icon-f24gl-telephone:before {
+.tan-f24gl-telephone:before {
   content: "\e953";
 }
 
-.icon-sound-Mute:before {
+.tan-sound-Mute:before {
   content: "\e766";
 }
 
-.icon-vehivles:before {
+.tan-vehivles:before {
   content: "\e76b";
 }
 
-.icon-shoes:before {
+.tan-shoes:before {
   content: "\e76c";
 }
 
-.icon-aviation:before {
+.tan-aviation:before {
   content: "\e770";
 }
 
-.icon-landtransportation:before {
+.tan-landtransportation:before {
   content: "\e773";
 }
 
-.icon-dingwei:before {
+.tan-dingwei:before {
   content: "\e8c4";
 }
 
-.icon-favorites-fill:before {
+.tan-favorites-fill:before {
   content: "\e721";
 }
 
-.icon-rmb:before {
+.tan-rmb:before {
   content: "\e761";
 }
 
-.icon-scanning:before {
+.tan-scanning:before {
   content: "\e762";
 }
 
-.icon-raw:before {
+.tan-raw:before {
   content: "\e75e";
 }
 
-.icon-service:before {
+.tan-service:before {
   content: "\e764";
 }
-