样式调整 订单状态修改

pages/index/hotelsearch.vue

@@ -81,6 +81,7 @@
 		},
 		methods: {
 			search() {
+				this.goods_list = [];
 				this.getshopdetail();
 			},
 			confirm(e) {

pages/index/index.vue

@@ -174,7 +174,7 @@
 				this.isGetLocation();  // 检查是否开启定位权限
 				this.isUserInfo();  // 检查是否允许获取用户授权
 				 // 用户授全
-				this.getswiper();   // 获取首页轮播
+				this.getswiper();   // 获取首页轮播 
 			}
 		},
 		methods: {
@@ -209,6 +209,7 @@
 					})
 					// this.showdialog = true;
 				}
			},
+			//
 			// // 关闭弹窗
 			// cancelDiaolog() {
 			// 	this.showdialog = false;
@@ -314,8 +315,8 @@
 				success: (data) => {
 					console.log(data);
 					this.location = data[0].name;
-					this.lat = data[0].latitude;
-					this.lot = data[0].longitude;
+					this.lat = data[0].latitude; // 经度
+					this.lot = data[0].longitude; // 纬度
 					this.allow = false;
 					this.gethotelist();
 					uni.hideLoading();  

pages/index/shop.vue

@@ -150,9 +150,10 @@
  						</text>
  					</view>
  				</view>
+				<!-- :max="goods_storage"  -->
 				<view class="numberchange">
 					  <span>数量</span>
-					  <uninumberbox :max="goods_storage" :min="1" @change="changestorage"/>
+					  <uninumberbox :min="1" @change="changestorage"/>
 				</view>
  			</view>
  		</view>
@@ -321,6 +322,10 @@
 			},
 			// 更改商品数量
 			changestorage(e) {
+				if(e == goods_storage) {
+					this.$msg("到达商品最大规格啦");
+					return;
+				}
 				this.shopnumber = e;
 				let firstprice = this.firstprice;
 				this.totalprice = firstprice*this.shopnumber;

pages/myOrder/index.vue

@@ -33,7 +33,8 @@
 			   <view class="topTip">
 				  <view style="font-size: 28upx;">合计：{{item.order_amount}}</view>
 				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 10">去付款</view>
-				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 20">催单</view>
+				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 20&&item.shipping_type==0">催单</view>
+				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 20&&item.shipping_type!=0">联系酒店</view>
 				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 30">确认收货</view> 
 				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view>
 				  <!-- <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> -->

pages/myOrder/reminder.vue

@@ -1,5 +1,5 @@
 <template>
-	  <view style="padding: 30upx 5%;">
+	  <view style="padding: 0upx 5%;">
 		  <TextArea ref="getValue" :tips="tips" @submitValue="submitValue"/>
 		  <view class="submitRemin" @click="submitRemin">提交</view>
 	  </view>
@@ -14,11 +14,13 @@
 		},
 		data() {
 			return{
+				tips: '填写催单内容',
 				reminder: '',
 				order_id:''
 			}
 		},
 		onLoad(e) {
+			console.log(a);
 			this.order_id = e.order_id;
 			let a = e.a;
 			if(a == 1) {

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

@@ -81,6 +81,5 @@
     "van-dialog": "/wxcomponents/dist/dialog/index",
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  },
-  "sitemapLocation": "sitemap92.json"
+  }
 }

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -757,7 +757,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8356,7 +8356,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8377,14 +8377,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -8460,7 +8460,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

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

@@ -214,6 +214,7 @@ var _default = {
   },
   methods: {
     search: function search() {
+      this.goods_list = [];
       this.getshopdetail();
     },
     confirm: function confirm(e) {

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

@@ -323,7 +323,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
       this.isGetLocation(); // 检查是否开启定位权限
       this.isUserInfo(); // 检查是否允许获取用户授权
       // 用户授全
-      this.getswiper(); // 获取首页轮播
+      this.getswiper(); // 获取首页轮播 
     } },
 
   methods: _objectSpread({},
@@ -359,6 +359,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
         // this.showdialog = true;
       }
     },
+    //
     // // 关闭弹窗
     // cancelDiaolog() {
     // 	this.showdialog = false;
@@ -464,8 +465,8 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
         success: function success(data) {
           console.log(data);
           _this3.location = data[0].name;
-          _this3.lat = data[0].latitude;
-          _this3.lot = data[0].longitude;
+          _this3.lat = data[0].latitude; // 经度
+          _this3.lot = data[0].longitude; // 纬度
           _this3.allow = false;
           _this3.gethotelist();
           uni.hideLoading();

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

@@ -220,6 +220,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 367));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var Gobacktop = function Gobacktop() {__webpack_require__.e(/*! require.ensure | component/Gobacktop */ "component/Gobacktop").then((function () {return resolve(__webpack_require__(/*! @/component/Gobacktop.vue */ 313));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =

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

@@ -147,11 +147,13 @@ __webpack_require__.r(__webpack_exports__);
 
   data: function data() {
     return {
+      tips: '填写催单内容',
       reminder: '',
       order_id: '' };
 
   },
   onLoad: function onLoad(e) {
+    console.log(a);
     this.order_id = e.order_id;
     var a = e.a;
     if (a == 1) {

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

@@ -1 +1 @@
-<view style="padding:30rpx 5%;"><text-area class="vue-ref" vue-id="1811182e-1" tips="{{tips}}" data-ref="getValue" data-event-opts="{{[['^submitValue',[['submitValue']]]]}}" bind:submitValue="__e" bind:__l="__l"></text-area><view data-event-opts="{{[['tap',[['submitRemin',['$event']]]]]}}" class="submitRemin" bindtap="__e">提交</view></view>
+<view style="padding:0rpx 5%;"><text-area class="vue-ref" vue-id="1811182e-1" tips="{{tips}}" data-ref="getValue" data-event-opts="{{[['^submitValue',[['submitValue']]]]}}" bind:submitValue="__e" bind:__l="__l"></text-area><view data-event-opts="{{[['tap',[['submitRemin',['$event']]]]]}}" class="submitRemin" bindtap="__e">提交</view></view>

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,34 +1,32 @@
 {
-	"description": "项目配置文件。",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": true,
-		"es6": true
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.9.2",
-	"appid": "wxb09388c49aeb368c",
-	"projectname": "myUinapp",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": []
-		}
-	}
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.9.2",
+  "appid": "wxb09388c49aeb368c",
+  "projectname": "myUinapp",
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
+  }
 }