XSLu08042 3 天之前
父節點
當前提交
35340dbc4b
共有 4 個文件被更改,包括 24 次插入15 次删除
  1. 1 1
      common/request.js
  2. 19 10
      pages_user/complaint.vue
  3. 2 2
      pages_user/shopping/storeOrder.vue
  4. 2 2
      pages_user/shopping/storeOrderDetail.vue

+ 1 - 1
common/request.js

@@ -7,7 +7,7 @@ export default class Request {
 		// var path = 'https://userapp.his.cdwjyyh.com';
 		// var path = 'https://app.rtys.cdwjyyh.com';
 		var path = "https://userapp.bjyjbao.com/prod-api"
-		// var path = "http://u7f8b756.natappfree.cc"
+		// var path = "http://b656b9ad.natappfree.cc"
 		// var path = "http://192.168.10.126:8113"
 		let token="";
 		let type = 0

+ 19 - 10
pages_user/complaint.vue

@@ -24,7 +24,7 @@
 						</view>
 						<view :class="formdata.type == 2?'tagitem active':'tagitem'" @click="formdata.type = 2">商品
 						</view>
-						<view :class="formdata.type == 0?'tagitem active':'tagitem'" @click="formdata.type = 0">其他
+						<view v-if="formdata.complaintType == 1" :class="formdata.type == 0?'tagitem active':'tagitem'" @click="formdata.type = 0">其他
 						</view>
 					</view>
 				</view>
@@ -223,7 +223,7 @@
 				fileList1: [],
 				formdata: {
 					title: '',
-					type: 0, //0默认1店铺2商品
+					type: undefined, //0默认1店铺2商品
 					content: '',
 					images: '',
 					complaintType: '',
@@ -233,6 +233,10 @@
 						required: true,
 						message: '请选择投诉方式'
 					}],
+					type: [{
+						required: true,
+						message: '请选择投诉类型'
+					}],
 					title: [{
 						required: true,
 						message: '请输入标题'
@@ -338,7 +342,14 @@
 				if (this.fileList1.length > 0) {
 					this.formdata.images = this.fileList1.map(item=>item.url).join(',')
 				}
-				if(this.formdata.type == 1&&!this.storeId) {
+				if(this.formdata.complaintType == 2&&!this.formdata.images) {
+					uni.showToast({
+						title: '请上传凭证',
+						icon: 'none'
+					})
+					return
+				}
+				if(this.formdata.complaintType == 2&&this.formdata.type == 1&&!this.storeId) {
 					uni.showToast({
 						title: '请选择店铺',
 						icon: 'none'
@@ -367,13 +378,11 @@
 					if (res) {
 						this.$isLogin().then(res => {
 							if (res) {
-								if(this.formdata.type == 1) {
-									this.formdata = {
-										...this.formdata,
-										storeId: this.storeId,
-										orderId: this.orderId,
-										productIds: productIds
-									}
+								this.formdata = {
+									...this.formdata,
+									storeId: this.storeId || undefined,
+									orderId: this.orderId || undefined,
+									productIds: productIds || undefined
 								}
 								storeComplaint(this.formdata).then(res => {
 									if (res.code == 200) {

+ 2 - 2
pages_user/shopping/storeOrder.vue

@@ -93,8 +93,8 @@
 							</view>
 							<view class="btn-box">
 								<view v-if="item.status == 0" class="btn cancel" @click="cancel(item)">取消订单</view>
-								<view v-if="(item.status == 0&&item.isPrescribe!=1)||(item.status == 0&&item.isPrescribe==1&&item.prescribeId)" class="btn pay" @click="pay(item)">支付</view>
-								<view class="btn pay"  v-if="(item.status==0||item.status==1)&&item.isPrescribe==1&&!item.prescribeId"  @click="addPrescribe(item)">开处方</view>
+								<view v-if="(item.status == 0&&item.isPrescribe!=1)||(item.status == 0&&item.isPrescribe==1&&item.prescribeId&&item.prescriptionAuditStatus == 2)" class="btn pay" @click="pay(item)">支付</view>
+								<view class="btn pay"  v-if="(item.status==0||item.status==1)&&item.isPrescribe==1&&!item.prescribeId&&item.prescriptionAuditStatus!=3 " @click="addPrescribe(item)">开处方</view>
 								<view v-if="item.isAfterSales==1" class="btn cancel" @click="refund(item)">申请售后</view>
 								<view v-if="item.status >=2 &&item.deliveryId!=null" class="btn pay" @click.stop="showDelivery(item)">查看物流</view>
 								<view v-if="item.status == 3" class="btn pay" @click.stop="showEvaluate('/pages_shopping/evaluateDetail?orderId='+item.id)">去评价</view>

+ 2 - 2
pages_user/shopping/storeOrderDetail.vue

@@ -243,9 +243,9 @@
 		<view   class="btn-box">
 			<!-- <view class="btn cancel">联系客服</view> -->
 			<view class="btn cancel" v-if="order.status==0" @click="cancel()">取消订单</view>
-			<view class="btn pay" v-if="(order.status == 0&&order.isPrescribe!=1)||(order.status == 0&&order.isPrescribe==1&&order.prescribeId)" @click="pay()">立即付款</view>
+			<view class="btn pay" v-if="(order.status == 0&&order.isPrescribe!=1)||(order.status == 0&&order.isPrescribe==1&&order.prescribeId&&order.prescriptionAuditStatus==2)" @click="pay()">立即付款</view>
 			<view class="btn cancel"  v-if="order.isPrescribe==1&&prescribe!=null"  @click="goPrescribe()">查看处方</view>
-			<view class="btn pay"  v-if="(order.status==0||order.status==1)&&order.isPrescribe==1&&prescribe==null"  @click="addPrescribe()">开处方</view>
+			<view class="btn pay"  v-if="(order.status==0||order.status==1)&&order.isPrescribe==1&&prescribe==null&&order.prescriptionAuditStatus!=3"  @click="addPrescribe()">开处方</view>
 			<view class="btn cancel"  v-if="isAfterSales==1"  @click="refund()">申请售后</view>
 			<view class="btn pay" v-if="order.status>=2&&order.deliveryId!=null" @click="express()">查看物流</view>
 			<view class="btn pay" v-if="order.status==2&&order.payType!=1&&order.isPayRemain==0&&order.deliverySn=='SF'" @click="payRemain()">支付尾款</view>