['解决打包文件冲突']

apis/index.js

@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	apiUrl	: 'https://oapi.lianshang.vip/api/', // 正式环境
-	// apiUrl	: 'http://api.ahxh.shangkelian.cn/api/', // 测试环境
+	// apiUrl	: 'https://oapi.lianshang.vip/api/', // 正式环境
+	apiUrl	: 'http://api.ahxh.shangkelian.cn/api/', // 测试环境
 	apiUrls	: 'https://storage.lianshang.vip/', // 图片路径（测试/正式）
 	timeout	: 60000
 }

pages/coupons/magDetails.vue

@@ -156,7 +156,7 @@
 				line-height: 70rpx;
 				width: 50%;
 				text-align: center;
-				color: $text-price;
+				color: $mian-color;
 				font-size: $title-size-lg;
 				font-weight: bold;
 				border-right: solid 1rpx $border-color;

pages/goods/details.vue

@@ -23,8 +23,7 @@
 							{{item.title}}
 						</view>
 					</view>
-					<view class="coupon-btn">领券<image class="coupon-btn-img" src="../../static/icons/goods_row.png"
-							mode="aspectFill"></image>
+					<view class="coupon-btn">领券<uni-icons type="arrowright" size="12" color="#e1293f"></uni-icons></image>
 					</view>
 				</view>
 				<view class="title">

pages/market/details.vue

@@ -83,6 +83,7 @@
 <script>
 	import { marketsInfo, marketsBuy, marketsPay } from '@/apis/interfaces/market'
 	import userAuth from '@/public/userAuth'
+	import cashierPay from '@/public/cashierPay'
 	export default {
 		data() {
 			return {
@@ -149,12 +150,11 @@
 				marketsPay(this.orderNo, this.payValue).then(res => {
 					switch (this.payValue){
 						case 'wechat':
-							
+							let payConfigObj = JSON.parse(res)
+							cashierPay.pay('wxpay', payConfigObj, 'market')
 							break
 						case 'alipay':
-							cashierPay.pay('alipay', res, 'market').then(payRes => {
-								console.log(payRes)
-							})
+							cashierPay.pay('alipay', res, 'market')
 							break
 					}
 				}).catch(err => {

pages/market/transfer.vue

@@ -7,7 +7,7 @@
 				<view class="title nowrap">数字权证</view>
 				<view class="text nowrap">锚定商品：{{info.goods.goods_name}}</view>
 				<view class="text nowrap">提供企业：{{info.goods.company.name}}</view>
-				<view class="text nav-goods nowrap" @click="onGoods">查看锚定商品信息<uni-icons type="arrowright" size="12" color="#e93340"></uni-icons></view>
+				<view class="text nav-goods nowrap" @click="onGoods">查看锚定商品信息<uni-icons type="arrowright" size="12" color="#8b64fd"></uni-icons></view>
 			</view>
 			<view class="info">
 				<view class="info-item">
@@ -114,7 +114,7 @@
 	// 转让权证
 	.buy-btn{
 		margin: 0 $margin;
-		background: $text-price;
+		background: $mian-color;
 		color: white;
 		height: 90rpx;
 		line-height: 90rpx;
@@ -165,7 +165,7 @@
 				height: 40rpx;
 				line-height: 40rpx;
 				&.nav-goods{
-					color: $text-price;
+					color: $mian-color;
 				}
 			}
 		}

pages/user/code.vue

@@ -371,12 +371,12 @@
 
 			.value {
 				font-size: $title-size-m;
-				color: $text-price;
+				color: $mian-color;
 			}
 		}
 
 		.button {
-			background: $text-price;
+			background: $mian-color;
 			border-radius: 0;
 			height: 90rpx;
 			line-height: 90rpx;
@@ -523,9 +523,8 @@
 				display: inline-block;
 				text-align: center;
 				color: #fff;
-
 				&-cancel {
-					background-color: $text-price;
+					background-color: $mian-color;
 				}
 			}
 		}

pages/user/partner.vue

@@ -122,8 +122,8 @@
     		height: 60rpx;
     		line-height: 60rpx;
     		&.show{
-    			color: $text-price;
-    			border-bottom: solid 4rpx $text-price;
+    			color: $mian-color;
+    			border-bottom: solid 4rpx $mian-color;
     		}
     	}
     }

pages/vip/vip.vue

@@ -267,6 +267,8 @@
 				vipOrder(identity, {
 					year: 1,
 				}).then(res => {
+					
+					
 					if (payType === 0) this.wechatAppPay(res.id)
 					if (payType === 1) this.aliPayConfig(res.id)
 				}).catch(err => {
@@ -277,7 +279,7 @@
 				})
 			},
 
-			// 支付宝支付
+			// 支付
 			aliPayConfig(orderId) {
 				getAliPayConfig(orderId, {
 					type: 'app'