代码修改

common/request.js

@@ -1,10 +1,10 @@
 //测试地址
-// const baseUrl = 'http://58.56.15.138:20201/' 
-// const burl2='http://58.56.15.138:20201/' 
+const baseUrl = 'http://58.56.15.138:20201/' 
+const burl2='http://58.56.15.138:20201/' 
 
 //正式地址
- const baseUrl = 'https://apiclt.66km.com/'
-const burl2='https://apiclt.66km.com/'
+/* const baseUrl = 'https://apiclt.66km.com/'
+const burl2='https://apiclt.66km.com/' */
 
 import md5 from './MD5.js'
 

main.js

@@ -8,11 +8,15 @@ Vue.prototype.$http = request.http
 Vue.prototype.$request =request
 Vue.prototype.$common =common
 Vue.config.productionTip = false
+ import store from './store'
+Vue.prototype.$store = store // 定义成全局组件
 
 import share from '@/static/js/share.js'
 
 Vue.mixin(share)
 //https://blog.csdn.net/qq_35432904/article/details/106330079 分享
+//佳链天下养车小程序账号AppID(小程序ID)wx9ca21d7c8495757e   AppSecret(小程序密钥)   73a76c283f4c4a35a13ea8033527059b
+
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false

manifest.json

@@ -50,9 +50,9 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx693850514180f795",
+        "appid" : "wx9ca21d7c8495757e",
         "setting" : {
-            "urlCheck" : false,
+            "urlCheck" : true,
             "postcss" : true,
             "minified" : true
         },

pages/homePage/homePage.vue

@@ -68,7 +68,7 @@
 
 			<view class="btnItem" @click="goNo">
 				<image src="../../static/img/homeBtn4.png" mode="" style="width: 80rpx; height: 80rpx;"></image>
-				<view class="btnName">洗车用品</view>
+				<view class="btnName">汽车用品</view>
 			</view>
 
 			<view class="btnItem" @click="goNo">

pages/me/discountDetail.vue

@@ -6,7 +6,7 @@
 
 			<!-- firstView -->
 			<view class="firstView">
-				<view class="money">{{detailData.ActName}}</view>
+				<view class="money">{{detailData.ActMoney}}</view>
 				<view class="condition" v-if="detailData.WhereMoney != 0">满{{detailData.WhereMoney}}元可用</view>
 				<view class="condition" v-else>满任意金额可用</view>
 			</view>

pages/module/confirmOrder.vue

@@ -140,7 +140,9 @@ export default {
 			yhTotalSize:0,
 			orderShop:'',
 			brands:'',
-			 noClick:true,
+			noClick:true,
+			couponstate:'',
+			 
 		}
 	},
 	onLoad(opt) {
@@ -200,6 +202,7 @@ export default {
 	   console.log( this.packJsonArr)
 	},
 	onShow() {
+		
 		var iphoneData=uni.getStorageSync("phoneData");
 		if(iphoneData){
 			this.iphoneData=iphoneData
@@ -235,6 +238,10 @@ export default {
 			  limit:2, */
 			 },'GET').then(res => {
 				this.yhTotalSize=res.data.length
+				if(this.yhTotalSize>0){
+					this.$store.commit('mutationscouponstate',false)
+				}
+				
 			})
 		},
 		gocoupon(){
@@ -263,8 +270,10 @@ export default {
 				return false;
 			}
 			var that=this;
+			this.couponstate=this.$store.state.couponstate;
+			console.log(this.couponstate)
 			if(this.yhTotalSize>0){
-				if(this.couponID==''){
+				if(this.couponID==''&&!this.couponstate){
 					uni.showModal({
 					    title: '提示',
 					    content: '当前有可用优惠券未使用',

pages/module/maintain.vue

@@ -58,7 +58,10 @@
 										<view class="goodsCont">
 											<view class="goodsContTop">
 												<view class="goodsItemName">{{v.showName}}</view>
-												<view class="replace" @click.stop="replace(vf,index,findex,i)" v-if="vf.goodsList.length>1">更换</view>
+												<view class="replaceBox" @click.stop="replace(vf,index,findex,i)">
+													<view class="replace"  v-if="vf.goodsList.length>1">更换</view>
+												</view>
+												
 											</view>
 											<view class="goodsCOntBOttom">
 												<view class="salePrice">￥{{v.salePrice?v.salePrice:'-'}}</view>
@@ -293,9 +296,9 @@ export default {
 			}
 		},
 		goGoods(item){
-			uni.navigateTo({
+			/* uni.navigateTo({
 				url:'../module/goodsDetail?goodsId='+item.goodsID+'&type=1'+'&typeIndex=2&maintain=1'
-			})
+			}) */
 		},
 		empty(){
 			var that=this;
@@ -1030,6 +1033,9 @@ export default {
 		font-weight: 500;
 		color: #FF4F00;
 	}
+	.replaceBox{
+		width: 100rpx;
+	}
 	.replace{
 		width: 75rpx;
 		height: 37rpx;
@@ -1039,6 +1045,7 @@ export default {
 		line-height: 35rpx;
 		color: #707070;
 		font-size: 22rpx;
+		margin-left: 25rpx;
 	}
 	.contZkMain{
 		padding-top: 20rpx;

pages/module/usableDiscountCard.vue

@@ -68,11 +68,23 @@
 				this.payMoney=opt.payMoney;
 				this.myOrderCoupon()
 			}
+			this.$store.commit('mutationscouponstate',false)
 			
 		},
 		methods: {
 			ckCoupon(item){
 				console.log(item);
+				if(this.payMoney<item.ActMoney){
+					uni.showToast({
+						 title: '订单金额小于优惠券金额，暂不可使用优惠券',
+						 icon:'none',
+						 duration: 2000
+					 });
+					 this.$store.commit('mutationscouponstate',true)
+					return false;
+				}else{
+					this.$store.commit('mutationscouponstate',true)
+				}
 				uni.setStorage({
 					key: 'couponData',
 					data: item,
@@ -117,7 +129,7 @@
 				})
 			},
 			goDiscountDetail(item) {
-
+                
 				uni.navigateTo({
 					
 					url: '../me/discountDetail?couponId=' + item.ID,

store/index.js

@@ -0,0 +1,28 @@
+ import Vue from 'vue'
+ import Vuex from 'vuex'
+
+Vue.use(Vuex)
+const store = new Vuex.Store({
+    state: {
+		couponstate:true,
+	},
+	getters:{
+		getcouponstate(state){
+			return state.couponstate
+	   },
+	  
+    },
+    mutations: {
+		mutationscouponstate(state,data){
+			state.couponstate=data
+		},
+		
+	},
+    actions: {
+		actionscouponstate(context,playload){
+			context.commit('mutationscouponstate',playload)
+		},
+		
+	}
+})
+export default store