订单状态修改

component/shopList.vue

@@ -32,7 +32,6 @@ export default {
     },
     methods: {
        goshop(e) {
-		   console.log(e)
 		   let id = e.goods_commonid;
 		   let store_id = e.store_id;
 		   uni.navigateTo({

component/uploadImage.vue

@@ -53,10 +53,10 @@
 					sizeType: this.sizeType,
 					count: this.imageList.length + this.count[this.countIndex] > 3 ? 3 - this.imageList.length : this.count[this.countIndex],
 					success: (res) => {
-						console.log(res);
-						const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU4OTMzNTEyOCwiZXhwIjoxNTkwMTk5MTI4LCJuYmYiOjE1ODkzMzUxMjgsInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.Uec3pKa_Btj0u_6qR95YK_MzyhL9gEcczRd3FpG9xUg';
+						const token = uni.getStorageSync('sessionId');
 						this.imageList = this.imageList.concat(res.tempFilePaths);
-						        uni.uploadFile({
+						        console.log(res.tempFilePaths);
+								uni.uploadFile({
 						             url: 'https://www.qzaiwang.com/v2/upload/tmp',
 						             filePath: res.tempFilePaths[0],
 						             name: 'file',
@@ -67,14 +67,13 @@
 						                 'user': 'test'
 						             },
 						            success: (uploadFileRes) => {
+										console.log(uploadFileRes)
 										let data = uploadFileRes.data;
 										let newdata = JSON.parse(data);
 										let url = newdata.data.file_name;
-										console.log(url)
 										let array = [];
 										array.push({})
 										array[0] = url;
-										console.log(array);
 										this.filelist = this.filelist.concat(array);
 						                this.$emit("getImg", this.filelist);
 						            }

pages/index/searchresult.vue

@@ -57,6 +57,7 @@
 			},
 			confirm(e) {
 				this.searchvalue = e.detail.value;
+				this.hotelist = [];
 				this.gethotelist();
 			},
 			// 获取酒店列表

pages/myOrder/estimate.vue

@@ -51,6 +51,7 @@
 				this.valueNumber = e.detail;
 			},
 			getImg(e) {
+				console.log(e);
 				this.imageList = e.join(',');
 			},
 			submitValue(e) {

pages/myOrder/index.vue

@@ -7,7 +7,7 @@
 		<scroll-view  v-if="order_list.length > 0" style="height: 95vh;" class="floor-list"
 		  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 		 :refresher-enabled="false">
-		  <view v-for="(item,index) in order_list" :key="index"   class="cart-list">
+		  <view v-for="(item,index) in order_list" :key="index"  class="cart-list">
 		   <view class="topTip" @click="goStore(item.store_id)">
 			   <view>
 				   <image :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_avatar" style="border-radius: 50%;
@@ -32,13 +32,11 @@
 		   </view>
 			   <view class="topTip">
 				  <view style="font-size: 28upx;">合计：{{item.order_amount}}</view>
-				<!--  <view class="deleChange" v-if="item.order_state == 10">未付款</view>
+				 <view class="deleChange" v-if="item.order_state == 10">去付款</view>
 				  <view class="deleChange" v-if="item.order_state == 20">催单</view>
-				  <view class="deleChange" v-if="item.order_state == 20">确认收货</view> uni.navigateTo({
-					url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
-				})
-				  <view class="deleChange" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view> -->
-				  <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> 
+				  <view class="deleChange" v-if="item.order_state == 30">确认收货</view> 
+				  <view class="deleChange" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view>
+				  <!-- <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> -->
 			   </view>
 		  </view>
 		
@@ -120,12 +118,7 @@
 				  this.order_list = [];
 			      this.getlist();
 			  })
-			  // 我的跳掉订单
-			  // uni.$on('getstate', (e) => {
-				 //  console.log(e);
-				 //  console.log("ss")
-			  // })
-			  // 完成支付
+			
 			  uni.$on(" finshlist",()=>{
 				  this.page = 1;
 			  	  this.order_list = [];
@@ -193,7 +186,6 @@
 			// },
 			changeselect(e) {
 				if(this.successlogion　&&　this.hasLogin) {
-					  console.log(e);
 					  this.active = e.target.name;
 					  this.page = 1;
 					  this.ispull = true;

pages/myOrder/order.vue

@@ -74,9 +74,9 @@
 			<view class="payOrder" v-if="detail.order_state == 10" @click="goPay">去付款</view>
 			<!-- detail.order_state == 40 && detail.refund_state == 0 -->
 			<view v-if=" detail.status == '已发货'" @click="cancelOrder(3)" class="deleteOrder">确认收货</view>
-			<!-- <view v-if=" detail.status == '已收货'"  class="deleteOrder">退货退款</view> -->
-			<view v-if=" detail.status == '已收货'" @click="estimate" class="deleteOrder">去评价</view>
-			<view v-if=" detail.status == '已完成' ||  detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
+			<!-- <view v-if=" detail.status == '已收货'"  evaluation_state  class="deleteOrder">退货退款</view> -->
+			<view v-if=" detail.status == '已收货' && detail.evaluation_state == 0 || detail.status == '已完成' && detail.evaluation_state == 0 " @click="estimate" class="deleteOrder">去评价</view>
+			<view v-if=" detail.status == '已完成' && detail.evaluation_state == 1 || detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
 		</view>
 		<!-- <view v-else>
 			<view v-if="detail.refund_state == 2">删除订单</view>

pages/myOrder/returndetail.vue

@@ -11,7 +11,7 @@
 			   width: 50upx;height: 50upx;vertical-align: middle;"></image>
 			  <span style="padding-left: 16upx;">{{store.store_name}}</span>
 		   </view>
-				  <view v-if="isrefash">
+				  <view>
 					  <van-card
 						title-class="changewidth"
 						price-class ="priceClass"
@@ -57,9 +57,9 @@
 			console.log(this.detail);
 			this.id = e.id;
 			this.submitRemin();
-			this.getlist();
 		},
 		methods: {
+		
 			submitRemin() {
 				this.request({
 					url: '/v3/order/refund_info',

pages/myOrder/returngood.vue

@@ -9,20 +9,17 @@
 			   width: 50upx;height: 50upx;vertical-align: middle;"></image>
 			  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
 		   </view>
-		
-		
-				  <view>
-					  <van-card
-						title-class="changewidth"
-						price-class ="priceClass"
-						:price="detail.goods_price"
-						:desc="detail.descire"
-						:title="detail.desarray"
-						:thumb="pictureUrl + '/uploads/home/store/goods/'+detail.goods_image.substr(0, detail.goods_image.indexOf('\_')) + '/' + detail.goods_image"
-					  >
-					  </van-card>
-				  </view>
-		 
+		  <view>
+			  <van-card
+				title-class="changewidth"
+				price-class ="priceClass"
+				:price="detail.goods_price"
+				:desc="detail.descire"
+				:title="detail.desarray"
+				:thumb="pictureUrl + '/uploads/home/store/goods/'+detail.goods_image.substr(0, detail.goods_image.indexOf('\_')) + '/' + detail.goods_image"
+			  >
+			  </van-card>
+		  </view>
 		 <view class="topTip">
 			  <view style="font-size: 28upx;">合计：{{detail.goods_price}}</view>
 			

unpackage/dist/dev/mp-weixin/app.json

@@ -82,5 +82,5 @@
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
   },
-  "sitemapLocation": "sitemap84.json"
+  "sitemapLocation": "sitemap67.json"
 }

unpackage/dist/dev/mp-weixin/component/shopList.js

@@ -164,7 +164,6 @@ var _default =
   },
   methods: {
     goshop: function goshop(e) {
-      console.log(e);
       var id = e.goods_commonid;
       var store_id = e.store_id;
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/component/uploadImage.js

@@ -169,9 +169,9 @@ var _default =
         sizeType: this.sizeType,
         count: this.imageList.length + this.count[this.countIndex] > 3 ? 3 - this.imageList.length : this.count[this.countIndex],
         success: function success(res) {
-          console.log(res);
-          var token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU4OTMzNTEyOCwiZXhwIjoxNTkwMTk5MTI4LCJuYmYiOjE1ODkzMzUxMjgsInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.Uec3pKa_Btj0u_6qR95YK_MzyhL9gEcczRd3FpG9xUg';
+          var token = uni.getStorageSync('sessionId');
           _this.imageList = _this.imageList.concat(res.tempFilePaths);
+          console.log(res.tempFilePaths);
           uni.uploadFile({
             url: 'https://www.qzaiwang.com/v2/upload/tmp',
             filePath: res.tempFilePaths[0],
@@ -183,14 +183,13 @@ var _default =
               'user': 'test' },
 
             success: function success(uploadFileRes) {
+              console.log(uploadFileRes);
               var data = uploadFileRes.data;
               var newdata = JSON.parse(data);
               var url = newdata.data.file_name;
-              console.log(url);
               var array = [];
               array.push({});
               array[0] = url;
-              console.log(array);
               _this.filelist = _this.filelist.concat(array);
               _this.$emit("getImg", _this.filelist);
             } });

unpackage/dist/dev/mp-weixin/pages/index/searchresult.js

@@ -190,6 +190,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     },
     confirm: function confirm(e) {
       this.searchvalue = e.detail.value;
+      this.hotelist = [];
       this.gethotelist();
     },
     // 获取酒店列表

unpackage/dist/dev/mp-weixin/pages/myOrder/estimate.js

@@ -184,6 +184,7 @@ __webpack_require__.r(__webpack_exports__);
       this.valueNumber = e.detail;
     },
     getImg: function getImg(e) {
+      console.log(e);
       this.imageList = e.join(',');
     },
     submitValue: function submitValue(e) {

unpackage/dist/dev/mp-weixin/pages/myOrder/index.js

@@ -219,8 +219,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-
 
 
 
@@ -276,12 +274,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
       _this.order_list = [];
       _this.getlist();
     });
-    // 我的跳掉订单
-    // uni.$on('getstate', (e) => {
-    //  console.log(e);
-    //  console.log("ss")
-    // })
-    // 完成支付
+
     uni.$on(" finshlist", function () {
       _this.page = 1;
       _this.order_list = [];
@@ -349,7 +342,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     // },
     changeselect: function changeselect(e) {
       if (this.successlogion && this.hasLogin) {
-        console.log(e);
         this.active = e.target.name;
         this.page = 1;
         this.ispull = true;

unpackage/dist/dev/mp-weixin/pages/myOrder/returndetail.js

@@ -199,9 +199,9 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     console.log(this.detail);
     this.id = e.id;
     this.submitRemin();
-    this.getlist();
   },
   methods: {
+
     submitRemin: function submitRemin() {var _this = this;
       this.request({
         url: '/v3/order/refund_info',

unpackage/dist/dev/mp-weixin/pages/myOrder/returndetail.wxml

@@ -1 +1 @@
-<block wx:if="{{isrefash}}"><view><view class="cart-list"><view style="padding:0 36rpx;line-height:70rpx;border-bottom:14rpx solid #F5F5F5;"><block wx:if="{{detail.status==1}}"><label class="_span">待处理</label></block><block wx:if="{{detail.status==2}}"><label class="_span">已退款</label></block><block wx:if="{{detail.status==3}}"><label class="_span">退款失败</label></block></view><view style="padding:30rpx 36rpx 15rpx 36rpx;border-bottom:1px solid #F5F5F5;"><image style="border-radius:50%;width:50rpx;height:50rpx;vertical-align:middle;" src="{{pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_avatar}}"></image><label style="padding-left:16rpx;" class="_span">{{store.store_name}}</label></view><block wx:if="{{isrefash}}"><view><van-card vue-id="ddefa102-1" title-class="changewidth" price-class="priceClass" price="{{detail.goods_price}}" desc="{{detail.descire}}" title="{{detail.desarray}}" thumb="{{pictureUrl+'/uploads/home/store/goods/'+$root.g0+'/'+detail.goods_image}}" data-com-type="wx" bind:__l="__l"></van-card></view></block><view class="topTip"><view style="font-size:28rpx;">{{"合计："+detail.goods_price}}</view></view><view style="padding:15rpx 36rpx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view><view style="padding:15rpx 36rpx;">快递单号:<text class="orderCode">{{detail.goods_price}}</text></view><view class="adressbottom"><view>申请时间:<text class="time" style="font-weight:bold;">{{detail.create_time}}</text></view><view>原因:<text class="time" style="font-weight:bold;">{{detail.refund_remark}}</text></view></view></view></view></block>
+<block wx:if="{{isrefash}}"><view><view class="cart-list"><view style="padding:0 36rpx;line-height:70rpx;border-bottom:14rpx solid #F5F5F5;"><block wx:if="{{detail.status==1}}"><label class="_span">待处理</label></block><block wx:if="{{detail.status==2}}"><label class="_span">已退款</label></block><block wx:if="{{detail.status==3}}"><label class="_span">退款失败</label></block></view><view style="padding:30rpx 36rpx 15rpx 36rpx;border-bottom:1px solid #F5F5F5;"><image style="border-radius:50%;width:50rpx;height:50rpx;vertical-align:middle;" src="{{pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_avatar}}"></image><label style="padding-left:16rpx;" class="_span">{{store.store_name}}</label></view><view><van-card vue-id="ddefa102-1" title-class="changewidth" price-class="priceClass" price="{{detail.goods_price}}" desc="{{detail.descire}}" title="{{detail.desarray}}" thumb="{{pictureUrl+'/uploads/home/store/goods/'+$root.g0+'/'+detail.goods_image}}" data-com-type="wx" bind:__l="__l"></van-card></view><view class="topTip"><view style="font-size:28rpx;">{{"合计："+detail.goods_price}}</view></view><view style="padding:15rpx 36rpx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view><view style="padding:15rpx 36rpx;">快递单号:<text class="orderCode">{{detail.goods_price}}</text></view><view class="adressbottom"><view>申请时间:<text class="time" style="font-weight:bold;">{{detail.create_time}}</text></view><view>原因:<text class="time" style="font-weight:bold;">{{detail.refund_remark}}</text></view></view></view></view></block>

unpackage/dist/dev/mp-weixin/pages/myOrder/returngood.js

@@ -176,9 +176,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-
-
 
 
 

unpackage/dist/dev/mp-weixin/sitemap67.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}