deletedist

.gitignore

-/unpackage/
 unpackage/
\ No newline at end of file

components/AlertRecover/AlertRecover.vue

 <template>
 	<view class="container">
 		<view class="content">
-			<image class="close" src="../../static/close-gray.png" mode="" @click="close()"></image>
+			<image class="close" src="../../pagesA/static/close-gray.png" mode="" @click="close()"></image>
 			<view class="top">
 				<view class="title">卡券回收</view>
 			</view>
@@ -9,9 +9,9 @@
 				<view class="title">卡片回收方法如下：</view>
 				<view class="first">1.点击下方“确认回收”按钮，进入58同城小程序。</view>
 				<view class="second">2.在58同城小程序的搜索框中输入“卡券”进行搜索,如下图：</view>
-				<image class="third" src="../../static/recover-1.png" mode=""></image>
+				<image class="third" src="../../pagesA/static/recover-1.png" mode=""></image>
 				<view class="four">3.在搜索结果中联系商家即可上门回收，如下图：</view>
-				<image class="five" src="../../static/recover-2.png" mode=""></image>
+				<image class="five" src="../../pagesA/static/recover-2.png" mode=""></image>
 			</view>
 			<view class="buy-bottom" @click="goMini()">确认回收</view>
 		</view>

pagesA/coupon/coupon.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="top">
 			<view class="nav" :style="{'height':height+4+'px','padding-top':statusBarHeight+'px'}">
-				<image @click="$router.pop()" class="back" src="../../static/back-white.png" mode="heightFix"></image>
+				<image @click="$router.pop()" class="back" src="../static/back-white.png" mode="heightFix"></image>
 				<view class="title">
 					卡券信息
 				</view>
@@ -14,7 +14,7 @@
 			<view class="money"><text>价值</text>￥{{couponData.cardCostTotal}}</view>
 			<view class="tab">
 				<view @click="clickSelectBtn()" class="btn" :style="{'opacity': selectBtnActive?'':'0.4'}">
-					<image class="img" :src="selectBtn?'../../static/coupon-select-close.png':'../../static/coupon-select-btn.png'" mode=""></image>
+					<image class="img" :src="selectBtn?'../static/coupon-select-close.png':'../static/coupon-select-btn.png'" mode=""></image>
 					<view class="text">批量管理</view>
 				</view>
 				<view @click="clickType(100)" class="item" :class="[type==100?'active':'']">
@@ -27,12 +27,12 @@
 		</view>
 		<view class="list" v-if="list.length>0">
 			<view class="coupon-content" v-for="(item,index) in list" :key="index">
-				<image @click="addItem(item)" v-if="selectBtn" class="select-img" :src="selectCouponArray.indexOf(item.cardId)>-1?'../../static/select-h.png':'../../static/select-n.png'" mode=""></image>
+				<image @click="addItem(item)" v-if="selectBtn" class="select-img" :src="selectCouponArray.indexOf(item.cardId)>-1?'../static/select-h.png':'../static/select-n.png'" mode=""></image>
 				<view class="coupon-big">
-					<image v-if="isExpired(item)" class="expired" src="../../static/expired.png" mode=""></image>
+					<image v-if="isExpired(item)" class="expired" src="../static/expired.png" mode=""></image>
 					<view class="goods-info">
-						<image v-if="!isExpired(item)" class="bg-img" src="../../static/coupon-top-h.png" mode=""></image>
-						<image v-if="isExpired(item)" class="bg-img" src="../../static/coupon-top-gray.png" mode=""></image>
+						<image v-if="!isExpired(item)" class="bg-img" src="../static/coupon-top-h.png" mode=""></image>
+						<image v-if="isExpired(item)" class="bg-img" src="../static/coupon-top-gray.png" mode=""></image>
 						<view class="left">
 							<image class="img" :src="item.brandImg" mode=""></image>
 							<view class="info">
@@ -46,8 +46,8 @@
 						</view>
 					</view>
 					<view class="coupon-info">
-						<image v-if="!isExpired(item)" class="bg-img" src="../../static/coupon-bottom-h.png" mode=""></image>
-						<image v-if="isExpired(item)" class="bg-img" src="../../static/coupon-bottom-gray.png" mode=""></image>
+						<image v-if="!isExpired(item)" class="bg-img" src="../static/coupon-bottom-h.png" mode=""></image>
+						<image v-if="isExpired(item)" class="bg-img" src="../static/coupon-bottom-gray.png" mode=""></image>
 						<view class="left">
 							<view v-if="item.cardAccount">卡号：{{item.cardAccount}}<text v-if="type==200" @click="copy(item.cardAccount)">复制</text></view>
 							<view>卡密：{{item.cardPasswd}}<text v-if="type==200" @click="copy(item.cardPasswd)">复制</text></view>
@@ -62,12 +62,12 @@
 		</view>
 		<uni-load-more :status="loadingType" v-if="list.length>0"></uni-load-more>
 		<view class="empty" v-if="list.length<=0 && loadingType != 'loading'">
-			<image class="empty-img" src="../../static/empty-coupon.png" mode=""></image>
+			<image class="empty-img" src="../static/empty-coupon.png" mode=""></image>
 			<view class="empty-text">暂无数据</view>
 		</view>
 		<view class="bottom" v-if="selectBtn" :style="{'height':safeAreaBottom+60+'px'}">
 			<view class="left">
-				<image @click="addAllItem()" class="img" :src="isSelectAll?'../../static/select-h.png':'../../static/select-n.png'" mode=""></image>
+				<image @click="addAllItem()" class="img" :src="isSelectAll?'../static/select-h.png':'../static/select-n.png'" mode=""></image>
 				<view class="text">全选</view>
 			</view>
 			<view class="right" @click="unLockCard()">
@@ -158,15 +158,15 @@
 			getImg(item) {
 				if (this.type === 100) {
 					if (this.isExpired(item)) {
-						return '../../static/lock-gray.png'
+						return '../static/lock-gray.png'
 					} else {
-						return '../../static/lock-h.png'
+						return '../static/lock-h.png'
 					}
 				} else {
 					if (this.isExpired(item)) {
-						return '../../static/write-gray.png'
+						return '../static/write-gray.png'
 					} else {
-						return '../../static/write-h.png'
+						return '../static/write-h.png'
 					}
 				}
 			},
@@ -337,7 +337,7 @@
 			height: 128rpx;
 			margin-top: 14rpx;
 			width: 100%;
-			background-image: url(../../static/coupon-bg-w.png);
+			background-image: url(../static/coupon-bg-w.png);
 			background-size: 100% 128rpx;
 			display: flex;
 			.btn {

pagesA/goods/goods.vue

@@ -45,9 +45,9 @@
 		
 			<!--商品介绍-->
 			<view class="good-introduction-top">
-				<image class="good-introduction-line" src="../../static/goods-left.png" mode=""></image>
+				<image class="good-introduction-line" src="../static/goods-left.png" mode=""></image>
 				<text class="good-introduction-txt">商品介绍</text>
-				<image class="good-introduction-line" src="../../static/goods-right.png" mode=""></image>
+				<image class="good-introduction-line" src="../static/goods-right.png" mode=""></image>
 			</view>
 			<view class="good-introduction" id="good-introduction">
 				<rich-text :nodes="formatRichText(goods.skuDetail&&goods.skuDetail.info||'')" class="rich-text"></rich-text>
@@ -56,11 +56,11 @@
 		<!--商品详情底部功能-->
 		<view class="good-detail-bottom">
 			<view class="function-area" @click="goHome">
-				<image class="function-icon" src="../../static/goods-home.png"></image>
+				<image class="function-icon" src="../static/goods-home.png"></image>
 				<text class="function-txt">首页</text>
 			</view>
 			<view class="function-area"  @click="clickCustomer()">
-				<image class="function-icon" src="../../static/goods-customer.png"></image>
+				<image class="function-icon" src="../static/goods-customer.png"></image>
 				<text class="function-txt">客服</text>
 			</view>
 			<view class="exchange" @click="showSkuDialog"><text class="exchange-txt">立即兑换</text></view>

pagesA/submitOrder/submitOrder.vue

@@ -127,7 +127,10 @@
 				this.$net.post('/payment', {'orderId':this.orderId,'payPasswd':e}).then(res=>{
 					if (res.code === 200) {
 						this.showPwdAlert = false
+						this.toast('支付成功', 1000)
+						ssetTimeout(function() {
 							this.$router.push('OrderDetail',{'orderId':res.data.orderId})
+						}, 1000);
 					} else {
 						this.toast(res.message)
 					}