auto commit

MP_verify_VmGApI1wOw793Pbn.txt

@@ -0,0 +1 @@
+VmGApI1wOw793Pbn

common/css/order.scss

@@ -7,6 +7,7 @@
 .consumer-code-input{border: 1px solid #007aff;padding: 10rpx;border-radius: 10rpx;}
 .hotel-info-room{display: flex;padding-bottom: 20rpx;border-bottom: 1px dotted #ebebeb;}
 .hotel-info-room .room-image{width: 150rpx;height: 150rpx;border-radius: 14rpx;margin-right: 24rpx;}
+.hotel-info-room .hotel-info-text{flex: 1;}
 .hotel-info-text-item{margin-bottom: 5rpx;}
 .hotel-info-text-room{font-size: 32rpx;}
 .hotel-info-text-service{color: #666;}

pages/index/index.vue

@@ -28,7 +28,7 @@
 						<i class="iconfont iconqueren"></i>						
 					</view>																			
 				</view>
-				<view class="operating-item">
+				<!-- <view class="operating-item">
 					<view class="operating-item-text">
 						<view class="operating-item-text-til">销售统计</view>
 						<view class="operating-item-text-subtil">查询销售数据</view>
@@ -39,8 +39,8 @@
 					<view class="operating-item-icon">
 						<i class="iconfont icontongji"></i>						
 					</view>																			
-				</view>
-				<view class="operating-item">
+				</view> -->
+				<!-- <view class="operating-item">
 					<view class="operating-item-text">
 						<view class="operating-item-text-til">核销记录</view>
 						<view class="operating-item-text-subtil">核销蝴蝶券记录</view>
@@ -51,7 +51,7 @@
 					<view class="operating-item-icon">
 						<i class="iconfont iconlianluojilu"></i>						
 					</view>																			
-				</view>
+				</view> -->
 				
 			</view>
 			<!-- operating end -->

pages/login/login.vue

@@ -11,8 +11,8 @@
 						<input class="uni-input" v-model="userName" maxlength="11" focus placeholder="手机号" />
 					</view>
 					<view class="uni-form-item">
-						<input v-model="userPwd" type="password" class="uni-input" maxlength="16" focus placeholder="密码" />
-						<button type="default" class="eyebtn password"></button>
+						<input v-model="userPwd" :type="viewpassword?'text':'password'" class="uni-input" maxlength="16" focus placeholder="密码" />
+						<button type="default" @click="eyeclick" class="eyebtn" :class="viewpassword?'text':'password'"></button>
 					</view>
 				</view>		
 				<button form-type="submit" type="primary" @click="login" class="btn">登录</button>						
@@ -44,6 +44,7 @@
 					client_id:this.config.client_id,
 					client_secret:this.config.client_secret,
 				},
+				viewpassword:false,
 				//验证的规则
 				rules:{
 					userName:{
@@ -121,6 +122,10 @@
 					return false;
 				}
 				return bool;
+			},
+			//显示隐藏密码
+			eyeclick(){
+				this.viewpassword = !this.viewpassword;
 			}
 			
 		}
@@ -132,7 +137,7 @@
 page{background-color: $uni-bg-color-grey;}
 .til{margin: $uni-spacing-col-lg 0;}
 .login{padding-top: $uni-spacing-col-lg;}
-.uni-input{border-radius:$uni-border-radius-llg;background-color: $uni-bg-color;height: 88rpx;padding-left: 80rpx;}
+.uni-input{width: 100%;box-sizing: border-box;border-radius:$uni-border-radius-llg;background-color: $uni-bg-color;height: 50px;padding-left: 80rpx;}
 .uni-form-item{position: relative;margin-bottom: 40rpx;}
 .btn{border-radius: $uni-border-radius-llg;}
 .uni-form-item-wrap{margin-bottom:  80rpx;}
@@ -140,6 +145,7 @@ page{background-color: $uni-bg-color-grey;}
 .eyebtn {position: absolute;height: 100%; width: 50px;top: 0; right: 0;background: transparent;cursor: pointer;border: 0;padding: 0;margin: 0;outline: 0;}
 .eyebtn::before,
 .eyebtn::after {content:'';position: absolute;top: 0; left: 0; bottom: 0; right: 0;margin: auto;}
+.eyebtn::after{transform-origin:unset;transform: scale(0.8);}
 .eyebtn.password::before {width: 20px;height: 20px;background: #e0e0e0;border-radius: 15px 0 15px 0;-webkit-transform: rotate(45deg);-ms-transform: rotate(45deg);transform: rotate(45deg);-webkit-transition: height .168s;transition: height .168s;}
 .eyebtn.password::after {width: 10px;height: 10px;border-radius: 50%;background: #424242;}
 .eyebtn.text::before {width: 15px;height: 15px;background: transparent;border: 3px solid #e0e0e0;border-radius: 15px 0 15px 0;-webkit-transform: rotate(45deg);-ms-transform: rotate(45deg);transform: rotate(45deg);}

pages/roomconfirm/roomconfirm.vue

@@ -1,5 +1,12 @@
 <template>
 	<view class="pages roomconfirm">
+		<view class="search-wrap wrap">
+			<view class="write-radius search-block">
+				<input type="text" class="search-input" v-model="searchparams.hotelId" value="" placeholder="酒店ID" />
+				<input type="text" class="search-input" v-model="searchparams.search" value="" placeholder="订单编号或消费码关键字" />
+				<button type="primary" @click="searchf" class="search-button">搜索</button>
+			</view>
+		</view>
 		 <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<!-- //  @init="mescrollInit" @down="downCallback" @up="upCallback"为固定值,不可删改(与mescroll-mixins保持一致) 
 			 // :down="downOption" :up="upOption" 绝大部分情况无需配置 
@@ -49,6 +56,7 @@
 				// console.log('loginRes',loginRes);
 				if(!loginRes){return false;}
 				serf.params.token=loginRes[0];
+				serf.searchparams.token=loginRes[0];
 				// uni.getStorage({
 				// 	key: 'token',
 				// 	success: function(res) {
@@ -92,7 +100,13 @@
 						}
 					},
 					// 列表数据
-					dataList: []
+					dataList: [],
+					//搜索
+					searchparams:{
+						token:'',
+						hotelId:'',
+						search:'',						
+					}
 				}
 			},
 			methods: {
@@ -161,6 +175,12 @@
 					uni.navigateTo({						
 						url: '/pages/roomconfirm/roomconfirmitem/roomconfirmitem?id=' + id
 					});
+				},
+				//搜索
+				searchf(){
+					// console.log(this.searchparams);
+					this.params = this.searchparams;
+					this.mescroll.resetUpScroll();
 				}
 			}
 		}

pages/roomconfirm/roomconfirmitem/roomconfirmitem.vue

@@ -28,7 +28,7 @@
 			</view>
 			<view class="write-radius pay-way">
 				<view class="pay-way-left">支付方式</view>
-				<view class="pay-way-right">电子券支付</view>
+				<view class="pay-way-right">{{hd_type == 1 ? '电子券':'实体券'}}</view>
 			</view>
 			<view class="write-radius hotel-info">
 				<view class="hotel-info-room">
@@ -136,6 +136,7 @@
 				roomstyle:'',
 				roomwindow:'',
 				havenight:'',//共几晚
+				hd_type:'',
 				
 			}
 		},
@@ -169,6 +170,7 @@
 					this.breakfirst = res.data.room.breakfirst;
 					this.roomstyle = res.data.room.roomstyle;
 					this.roomwindow = res.data.room.roomwindow;
+					this.hd_type = res.data.hd_type;
 					
 					//计算几晚
 					let day1 = Date.parse(new Date(res.data.usedate.replace(/-/g, '/'))) / 1000;

pages/writeoff/writeoff.vue

@@ -1,5 +1,12 @@
 <template>
 	<view class="pages writeoff">
+		<view class="search-wrap wrap">
+			<view class="write-radius search-block">
+				<input type="text" class="search-input" v-model="searchparams.hotelId" value="" placeholder="酒店ID" />
+				<input type="text" class="search-input" v-model="searchparams.search" value="" placeholder="订单编号或消费码关键字" />
+				<button type="primary" @click="searchf" class="search-button">搜索</button>
+			</view>
+		</view>
 		 <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<!-- //  @init="mescrollInit" @down="downCallback" @up="upCallback"为固定值,不可删改(与mescroll-mixins保持一致) 
 			 // :down="downOption" :up="upOption" 绝大部分情况无需配置 
@@ -49,6 +56,7 @@
 				// console.log('loginRes',loginRes);
 				if(!loginRes){return false;}
 				serf.params.token=loginRes[0];
+				serf.searchparams.token=loginRes[0];				
 				// uni.getStorage({
 				// 	key: 'token',
 				// 	success: function(res) {
@@ -93,6 +101,13 @@
 					},
 					// 列表数据
 					dataList: [],
+					//搜索
+					searchparams:{
+						token:'',
+						hotelId:'',
+						search:'',						
+					}
+					
 				}
 			},
 			methods: {
@@ -164,6 +179,12 @@
 					uni.navigateTo({						
 						url: '/pages/writeoff/writeoffitem/writeoffitem?id=' + id
 					});
+				},
+				//搜索
+				searchf(){
+					// console.log(this.searchparams);
+					this.params = this.searchparams;
+					this.mescroll.resetUpScroll();
 				}
 			}
 		}
@@ -172,6 +193,7 @@
 
 <style lang="scss" scoped>
 page{background-color: $uni-bg-color-grey;}
+// .mescroll-body{top: 100rpx;}
 .writeoff-item{margin: 24rpx;padding: 24rpx;border-radius: 24rpx;background-color: #fff;box-shadow: 0px 18px 47px -19px rgba(0, 0, 0, 0.1);}
 .writeoff-item-til{margin-bottom: 15rpx;font-size: 24rpx;}
 .writeoff-item-con{display: flex;align-items: center;}

pages/writeoff/writeoffitem/writeoffitem.vue

@@ -12,17 +12,17 @@
 					<view class="scan-hd-header-til">
 						验证蝴蝶券 {{ticket.length}}/{{resdata.hd_count}}
 					</view>
-					<button class="scan-hd-header-btn" @click="scanCode" type="default"><i class="iconfont iconsaomiao"></i>扫码</button>
+					<!-- <button class="scan-hd-header-btn" @click="scanCode" type="default"><i class="iconfont iconsaomiao"></i>扫码</button> -->
+				</view>
+				<view class="addhd">
+					<input class="addhd-input" v-model="enterHDnumber" placeholder="请输入蝴蝶券号码" type="text" value="" />
+					<button class="addhd-button" @click="enterHD" type="primary">添加</button>
 				</view>
 				<view class="scan-hd-list" v-for="(item,index) in ticket" :key="index">
 					<view class="scan-hd-list-item">
 						<view class="item-til">蝴蝶券{{index +1}}</view>
 						<view class="item-con"><input type="text" :value="item" disabled /></view>
 					</view>
-					<!-- <view class="scan-hd-list-item">
-						<view class="item-til">蝴蝶券2</view>
-						<view class="item-con"><input type="text" value="00220082715372386115" disabled /></view>
-					</view>	 -->
 				</view>
 				<view class="scan-hd-tip">还差{{ resdata.hd_count - ticket.length }}张蝴蝶券</view>				
 			</view>
@@ -105,6 +105,7 @@
 	</view>
 </template>
 <script>
+	// import $wxApi from "../../../wxapi.js";
 	export default{
 		components:{
 			
@@ -123,7 +124,8 @@
 				roomwindow:'',
 				orderId:'',//orderId 订单ID，与订单消费码必填其一  如果是电子券则等于 this.id
 				eticketno:'',//订单消费码，与订单ID必填其一
-				ticket:['12340082715372386115','12340082715372386114'],//蝴蝶券编号数组，实体券支付时必填
+				ticket:[],//蝴蝶券编号数组，实体券支付时必填
+				enterHDnumber:'',
 				writeoff_remark:'',//核销备注 
 				resdata:{},
 				params:{
@@ -175,32 +177,119 @@
 					let day2 = Date.parse(new Date(res.data.departdate.replace(/-/g, '/'))) / 1000;
 					this.havenight = Math.abs((day1 - day2) / (3600 * 24));
 					
-					console.log(JSON.parse(JSON.stringify(res.data)));
+					// console.log(JSON.parse(JSON.stringify(res.data)));
 				
 				}).catch(err => {
 				
 				});				
 			},
+			//添加蝴蝶券
+			pushHD(hd){
+				
+				let self = this;
+				Array.prototype.pushNoRepeat = function(){
+					for(var i=0; i<arguments.length; i++){
+						var ele = arguments[i];
+						if(this.indexOf(ele) == -1){
+							let codeparames ={
+								token :self.params.token,
+								code:ele
+							};
+							//验证蝴蝶券
+							self.$api.http.post(self.config.apiBaseurl+'hotel/writeoff/verify',codeparames,{
+								header: {
+									Accept:'application/json',
+									Authorization: 'Bearer '+ self.params.token, //注意Bearer后面有一空格
+								}
+							}).then(res =>{
+								if(res.data.state == 'ok'){
+									this.push(ele);
+								}else{
+									uni.showToast({
+										icon:'none',
+										title:res.data.message,
+										duration: 2000
+									});									
+								}
+								console.log(res)
+							}).catch(err =>{
+								console.log(err)
+							});						
+						}else{
+							uni.showToast({
+								icon:'none',
+								title:'该券已经添加',
+								duration: 2000
+							});
+						}
+					}
+				};
+				this.ticket.pushNoRepeat(hd);
+				
+			},
+			//手动输入蝴蝶券
+			enterHD(){				
+				this.pushHD(this.enterHDnumber)
+			},
 			//扫码蝴蝶券
-			scanCode:function(){				
-				uni.scanCode({
-				    onlyFromCamera: true,// 只允许通过相机扫码
-				    success: function (res) {
-				        console.log('条码类型：' + res.scanType);
-				        console.log('条码内容：' + res.result);
-				    }
-				});				
+			scanCode:function(){
+				
+				$wxApi.JSAPI().then(res =>{
+					alert('555'+res)
+				});
+				// alert('1111'+hdcode);
+				// document.write('1111'+hdcode);
+				console.log('$wxApi',$wxApi);
+				
+				
+				this.pushHD(res.resultStr);
+				
+				uni.showToast({
+					icon:'none',
+					title:'暂时无法使用3',
+					duration: 2000
+				});
+				
+				return;
+				
+				// wx.scanQRCode({
+				//     needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+				//     scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+				//     success: function (res) {
+				// 		var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+				// 		console.log('scanQRCode',result);
+				// 	}
+				// });
+
+
+				
+				// uni.scanCode({
+				//     onlyFromCamera: true,// 只允许通过相机扫码
+				//     success: function (res) {
+				//         console.log('条码类型：' + res.scanType);
+				//         console.log('条码内容：' + res.result);
+				//     }
+				// });				
 			},
 
 			
 			//提交
 			writeoff:function(){
-				if(this.hd_type == 1){
+				console.log(this.hd_type);
+				if(this.hd_type == 2){
 					this.orderId = this.id;
+					if(this.writeoffparams.ticket.length<this.resdata.hd_count){
+							uni.showToast({
+								icon:'none',
+								title:'蝴蝶券不足',
+								duration: 2000
+							});
+							return false;
+					};
 				};
 				this.writeoffparams.token = this.params.token;
 				this.writeoffparams = Object.assign(this.writeoffparams,{orderId:this.orderId,eticketno:this.eticketno,ticket:this.ticket});
-				console.log('this.writeoffparams',this.writeoffparams);
+				// console.log('this.writeoffparams',this.writeoffparams);
 				this.$api.http.post(this.config.apiBaseurl+'hotel/writeoff/inspection', this.writeoffparams,{
 					header: {
 						Accept:'application/json',
@@ -230,4 +319,9 @@
 <style lang="scss" scoped>
 page{background-color: $uni-bg-color-grey;}
 @import url("/common/css/order.scss");
+.addhd{margin: 40rpx 0;display: flex;justify-content: space-between;}
+.addhd-input,
+.addhd-button{height: 50rpx;line-height: 50rpx;font-size: 28rpx;}
+.addhd-button{margin: 0;}
+.addhd-input{border: 1px solid #4235B6;border-radius: 12rpx;flex: 1;margin-right: 15rpx;padding: 0 12rpx;}
 </style>

store/index.js

@@ -35,6 +35,9 @@ const store = new Vuex.Store({
 			uni.removeStorage({
 				key: "userInfo"
 			})
+			uni.removeStorage({
+				key: "token"
+			})
 		}
 	},
 	actions: {

uni.scss

@@ -94,4 +94,11 @@ body{font-size: $uni-font-size-base;}
 
 //浮底按钮
 .bottom-btn-wrap{height: 110rpx;}
-.bottom-btn{height: 110rpx;line-height: 110rpx;position: fixed;left: 0;bottom: 0;width: 100%;}
+.bottom-btn{height: 110rpx;line-height: 110rpx;position: fixed;left: 0;bottom: 0;width: 100%;}
+
+//顶部搜索
+// .search-wrap{height: 100rpx;overflow-y: auto;box-sizing: border-box;}
+.search-block{display: flex;align-items: center;}
+.search-input{border: 1px solid #666;font-size: 24rpx;height: 50rpx;line-height: 50rpx;border-radius: 12rpx;padding-left: 24rpx;}
+.search-input + .search-input{margin: 0 10rpx;}
+.search-button{width: 200rpx;height: 50rpx;line-height: 50rpx;font-size: 32rpx;}

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

@@ -14,5 +14,6 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -155,6 +155,14 @@ page{font-size: $uni-font-size-base;}
  */
 .bottom-btn-wrap{height: 110rpx;}
 .bottom-btn{height: 110rpx;line-height: 110rpx;position: fixed;left: 0;bottom: 0;width: 100%;}
+/*顶部搜索
+ */
+/* .search-wrap{height: 100rpx;overflow-y: auto;box-sizing: border-box;}
+ */
+.search-block{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;}
+.search-input{border: 1px solid #666;font-size: 24rpx;height: 50rpx;line-height: 50rpx;border-radius: 12rpx;padding-left: 24rpx;}
+.search-input + .search-input{margin: 0 10rpx;}
+.search-button{width: 200rpx;height: 50rpx;line-height: 50rpx;font-size: 32rpx;}
 uni-button[type=primary] {
   background: -webkit-linear-gradient(top, #5a52c5 0%, #8257ed 100%);
   background: linear-gradient(180deg, #5a52c5 0%, #8257ed 100%);
@@ -189,5 +197,30 @@ page {
   bottom: 0;
   width: 100%;
 }
+.search-block {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input {
+  margin: 0 10rpx;
+}
+.search-button {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 /*每个页面公共css */
 

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

@@ -7888,6 +7888,9 @@ var store = new _vuex.default.Store({
       uni.removeStorage({
         key: "userInfo" });
 
+      uni.removeStorage({
+        key: "token" });
+
     } },
 
   actions: {} });var _default =
@@ -9860,7 +9863,12 @@ MescrollMixin;exports.default = _default;
 /* 79 */,
 /* 80 */,
 /* 81 */,
-/* 82 */
+/* 82 */,
+/* 83 */,
+/* 84 */,
+/* 85 */,
+/* 86 */,
+/* 87 */
 /*!******************************************************************!*\
   !*** D:/wwwroot/HDhotel/components/mescroll-uni/mescroll-uni.js ***!
   \******************************************************************/
@@ -10659,7 +10667,7 @@ MeScroll.prototype.preventDefault = function (e) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 83 */
+/* 88 */
 /*!*************************************************************************!*\
   !*** D:/wwwroot/HDhotel/components/mescroll-uni/mescroll-uni-option.js ***!
   \*************************************************************************/
@@ -10702,7 +10710,7 @@ var GlobalOption = {
 GlobalOption;exports.default = _default;
 
 /***/ }),
-/* 84 */
+/* 89 */
 /*!****************************************************************!*\
   !*** D:/wwwroot/HDhotel/components/mescroll-uni/wxs/mixins.js ***!
   \****************************************************************/

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

@@ -58,6 +58,31 @@ page.data-v-57280228 {
   bottom: 0;
   width: 100%;
 }
+.search-block.data-v-57280228 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input.data-v-57280228 {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input.data-v-57280228 {
+  margin: 0 10rpx;
+}
+.search-button.data-v-57280228 {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 .operating.data-v-57280228 {
   margin-top: 24rpx;
 }

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

@@ -176,6 +176,7 @@ var _vuex = __webpack_require__(/*! vuex */ 13);function ownKeys(object, enumera
         client_id: this.config.client_id,
         client_secret: this.config.client_secret },
 
+      viewpassword: false,
       //验证的规则
       rules: {
         userName: {
@@ -253,6 +254,10 @@ var _vuex = __webpack_require__(/*! vuex */ 13);function ownKeys(object, enumera
         return false;
       }
       return bool;
+    },
+    //显示隐藏密码
+    eyeclick: function eyeclick() {
+      this.viewpassword = !this.viewpassword;
     } }) };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -58,6 +58,31 @@ page.data-v-b237504c {
   bottom: 0;
   width: 100%;
 }
+.search-block.data-v-b237504c {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input.data-v-b237504c {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input.data-v-b237504c {
+  margin: 0 10rpx;
+}
+.search-button.data-v-b237504c {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 /* @import url("login.scss"); */
 page.data-v-b237504c {
   background-color: #f8f8f8;
@@ -69,9 +94,11 @@ page.data-v-b237504c {
   padding-top: 24rpx;
 }
 .uni-input.data-v-b237504c {
+  width: 100%;
+  box-sizing: border-box;
   border-radius: 100rpx;
   background-color: #ffffff;
-  height: 88rpx;
+  height: 50px;
   padding-left: 80rpx;
 }
 .uni-form-item.data-v-b237504c {
@@ -107,6 +134,12 @@ page.data-v-b237504c {
   right: 0;
   margin: auto;
 }
+.eyebtn.data-v-b237504c::after {
+  -webkit-transform-origin: unset;
+          transform-origin: unset;
+  -webkit-transform: scale(0.8);
+          transform: scale(0.8);
+}
 .eyebtn.password.data-v-b237504c::before {
   width: 20px;
   height: 20px;

unpackage/dist/dev/mp-weixin/pages/roomconfirm/roomconfirm.wxss

@@ -58,6 +58,31 @@ page.data-v-1c3fd7dc {
   bottom: 0;
   width: 100%;
 }
+.search-block.data-v-1c3fd7dc {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input.data-v-1c3fd7dc {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input.data-v-1c3fd7dc {
+  margin: 0 10rpx;
+}
+.search-button.data-v-1c3fd7dc {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 page.data-v-1c3fd7dc {
   background-color: #f8f8f8;
 }

unpackage/dist/dev/mp-weixin/pages/roomconfirm/roomconfirmitem/roomconfirmitem.wxss

@@ -32,6 +32,7 @@
 .consumer-code-input.data-v-6eaa502e{border: 1px solid #007aff;padding: 10rpx;border-radius: 10rpx;}
 .hotel-info-room.data-v-6eaa502e{display: -webkit-box;display: -webkit-flex;display: flex;padding-bottom: 20rpx;border-bottom: 1px dotted #ebebeb;}
 .hotel-info-room .room-image.data-v-6eaa502e{width: 150rpx;height: 150rpx;border-radius: 14rpx;margin-right: 24rpx;}
+.hotel-info-room .hotel-info-text.data-v-6eaa502e{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;}
 .hotel-info-text-item.data-v-6eaa502e{margin-bottom: 5rpx;}
 .hotel-info-text-room.data-v-6eaa502e{font-size: 32rpx;}
 .hotel-info-text-service.data-v-6eaa502e{color: #666;}
@@ -53,6 +54,7 @@
 .scan-hd-header-btn .iconfont.data-v-6eaa502e{font-size: 28rpx;margin-right: 5rpx;}
 .scan-hd-list-item.data-v-6eaa502e{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;padding-left: 5rpx;background: #ececec;margin-bottom: 15rpx;}
 .scan-hd-list-item .item-til.data-v-6eaa502e{padding-right: 10rpx;}
+.scan-hd-list-item .item-con.data-v-6eaa502e{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;}
 .scan-hd-tip.data-v-6eaa502e{color: #999;}
 .pay-way.data-v-6eaa502e{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;}
 .radio-select uni-radio-group.data-v-6eaa502e{display: -webkit-box;display: -webkit-flex;display: flex;}
@@ -91,6 +93,31 @@ page.data-v-6eaa502e {
   bottom: 0;
   width: 100%;
 }
+.search-block.data-v-6eaa502e {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input.data-v-6eaa502e {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input.data-v-6eaa502e {
+  margin: 0 10rpx;
+}
+.search-button.data-v-6eaa502e {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 page.data-v-6eaa502e {
   background-color: #f8f8f8;
 }

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

@@ -154,6 +154,13 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -192,12 +199,19 @@ var _mescrollMixins = _interopRequireDefault(__webpack_require__(/*! @/component
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 // 引入mescroll-mixins.js
-var MescrollBody = function MescrollBody() {Promise.all(/*! require.ensure | components/mescroll-uni/mescroll-body */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/mescroll-uni/mescroll-body")]).then((function () {return resolve(__webpack_require__(/*! @/components/mescroll-uni/mescroll-body.vue */ 77));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; // 注意.vue后缀不能省
+var MescrollBody = function MescrollBody() {Promise.all(/*! require.ensure | components/mescroll-uni/mescroll-body */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/mescroll-uni/mescroll-body")]).then((function () {return resolve(__webpack_require__(/*! @/components/mescroll-uni/mescroll-body.vue */ 82));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; // 注意.vue后缀不能省
 var _default = { mixins: [_mescrollMixins.default], // 使用mixin
   components: { MescrollBody: MescrollBody }, onLoad: function onLoad() {}, onShow: function onShow() {var serf = this; //检查登录,获取token
     var loginRes = this.checkLogin('/pages/writeoff/writeoff', '2'); // console.log('loginRes',loginRes);
-    if (!loginRes) {return false;}serf.params.token = loginRes[0]; // uni.getStorage({
+    if (!loginRes) {return false;}serf.params.token = loginRes[0];serf.searchparams.token = loginRes[0]; // uni.getStorage({
     // 	key: 'token',
     // 	success: function(res) {
     // 		//数据成功获取，用户已登录
@@ -217,14 +231,15 @@ var _default = { mixins: [_mescrollMixins.default], // 使用mixin
       downOption: {// ...
       }, // 上拉加载的配置(可选, 绝大部分情况无需配置)
       upOption: { page: { size: 10 // 每页数据的数量,默认10
-        },
-        noMoreSize: 5, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
-        empty: {
-          tip: '暂无相关数据' } },
+        }, noMoreSize: 5, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+        empty: { tip: '暂无相关数据' } }, // 列表数据
+      dataList: [], //搜索
+      searchparams: {
+        token: '',
+        hotelId: '',
+        search: '' } };
 
 
-      // 列表数据
-      dataList: [] };
 
   },
   methods: {
@@ -296,6 +311,12 @@ var _default = { mixins: [_mescrollMixins.default], // 使用mixin
       uni.navigateTo({
         url: '/pages/writeoff/writeoffitem/writeoffitem?id=' + id });
 
+    },
+    //搜索
+    searchf: function searchf() {
+      // console.log(this.searchparams);
+      this.params = this.searchparams;
+      this.mescroll.resetUpScroll();
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/writeoff/writeoff.wxss

@@ -58,6 +58,31 @@ page.data-v-0567ac86 {
   bottom: 0;
   width: 100%;
 }
+.search-block.data-v-0567ac86 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input.data-v-0567ac86 {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input.data-v-0567ac86 {
+  margin: 0 10rpx;
+}
+.search-button.data-v-0567ac86 {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 page.data-v-0567ac86 {
   background-color: #f8f8f8;
 }

unpackage/dist/dev/mp-weixin/pages/writeoff/writeoffitem/writeoffitem.wxss

@@ -32,6 +32,7 @@
 .consumer-code-input.data-v-e8d13eae{border: 1px solid #007aff;padding: 10rpx;border-radius: 10rpx;}
 .hotel-info-room.data-v-e8d13eae{display: -webkit-box;display: -webkit-flex;display: flex;padding-bottom: 20rpx;border-bottom: 1px dotted #ebebeb;}
 .hotel-info-room .room-image.data-v-e8d13eae{width: 150rpx;height: 150rpx;border-radius: 14rpx;margin-right: 24rpx;}
+.hotel-info-room .hotel-info-text.data-v-e8d13eae{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;}
 .hotel-info-text-item.data-v-e8d13eae{margin-bottom: 5rpx;}
 .hotel-info-text-room.data-v-e8d13eae{font-size: 32rpx;}
 .hotel-info-text-service.data-v-e8d13eae{color: #666;}
@@ -53,6 +54,7 @@
 .scan-hd-header-btn .iconfont.data-v-e8d13eae{font-size: 28rpx;margin-right: 5rpx;}
 .scan-hd-list-item.data-v-e8d13eae{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;padding-left: 5rpx;background: #ececec;margin-bottom: 15rpx;}
 .scan-hd-list-item .item-til.data-v-e8d13eae{padding-right: 10rpx;}
+.scan-hd-list-item .item-con.data-v-e8d13eae{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;}
 .scan-hd-tip.data-v-e8d13eae{color: #999;}
 .pay-way.data-v-e8d13eae{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;}
 .radio-select uni-radio-group.data-v-e8d13eae{display: -webkit-box;display: -webkit-flex;display: flex;}
@@ -91,7 +93,59 @@ page.data-v-e8d13eae {
   bottom: 0;
   width: 100%;
 }
+.search-block.data-v-e8d13eae {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.search-input.data-v-e8d13eae {
+  border: 1px solid #666;
+  font-size: 24rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 12rpx;
+  padding-left: 24rpx;
+}
+.search-input + .search-input.data-v-e8d13eae {
+  margin: 0 10rpx;
+}
+.search-button.data-v-e8d13eae {
+  width: 200rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 32rpx;
+}
 page.data-v-e8d13eae {
   background-color: #f8f8f8;
 }
+.addhd.data-v-e8d13eae {
+  margin: 40rpx 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
+}
+.addhd-input.data-v-e8d13eae,
+.addhd-button.data-v-e8d13eae {
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 28rpx;
+}
+.addhd-button.data-v-e8d13eae {
+  margin: 0;
+}
+.addhd-input.data-v-e8d13eae {
+  border: 1px solid #4235B6;
+  border-radius: 12rpx;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  margin-right: 15rpx;
+  padding: 0 12rpx;
+}
 

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

@@ -10,11 +10,20 @@
 		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
-		"autoAudits": false,
 		"coverView": true,
+		"autoAudits": false,
 		"showShadowRootInWxmlPanel": true,
 		"scopeDataCheck": false,
-		"useCompilerModule": false
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "",

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

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

wxapi.js

@@ -1,8 +1,10 @@
 //引入微信jssdk
 const wx = require('@/js_sdk/jweixin-1.4.0.js')
 
+import { config } from './config/config';
+
 //配置注册url
-const url = '/wechat/h5/getJsapiTicket';
+const url = config.apiBaseurl + 'wechat/sign';
 
 //http方法
 import Request from '@/js_sdk/luch-request/luch-request/index.js';
@@ -12,62 +14,58 @@ const $http = new Request();
 const href = location.href.split('#')[0];
 // const href = location.href.split("?")[0]
 
-import { config } from './config/config'
+$http.get(url, {params: {url: href, list: 'scanQRCode',dataType: 'json'}}).then(res => {
+	let str = JSON.parse( res.data.config)
+	console.log( 'res.data.config',str )
+	wx.config({
+		// 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+		debug: true,
+		// 必填，公众号的唯一标识
+		appId: str.appId,
+		// 必填，生成签名的时间戳
+		timestamp: "" + str.timestamp,
+		// 必填，生成签名的随机串
+		nonceStr: str.nonceStr,
+		// 必填，签名
+		signature: str.signature,
+		// 必填，需要使用的JS接口列表，所有JS接口列表
+		jsApiList: ['checkJsApi', 'scanQRCode']
+	});
+}).catch(err => {
+	console.log(err)
+})
+
+
 
 //系统域名url
 export default {
 	...wx,
-	isOk: false,
+	isOk: true,
 	async config() {
 		wx.config({
 			debug: true,
 			jsApiList: [
-				"updateAppMessageShareData",
-				"updateTimelineShareData",
-				"onMenuShareTimeline",
-				"onMenuShareAppMessage",
-				"onMenuShareQQ",
-				"onMenuShareWeibo",
-				"onMenuShareQZone",
-				"startRecord",
-				"stopRecord",
-				"onVoiceRecordEnd",
-				"playVoice",
-				"pauseVoice",
-				"stopVoice",
-				"onVoicePlayEnd",
-				"uploadVoice",
-				"downloadVoice",
-				"chooseImage",
-				"previewImage",
-				"uploadImage",
-				"downloadImage",
-				"translateVoice",
-				"getNetworkType",
-				"openLocation",
-				"getLocation",
-				"hideOptionMenu",
-				"showOptionMenu",
-				"hideMenuItems",
-				"showMenuItems",
-				"hideAllNonBaseMenuItem",
-				"showAllNonBaseMenuItem",
-				"closeWindow",
 				"scanQRCode",
-				"chooseWXPay",
-				"openProductSpecificView",
-				"addCard",
-				"chooseCard",
-				"openCard"
 			],
-			...(await $http.get(url,{url:href})).retBody,
+			...(await JSON.parse( $http.get(url, {params: {url: href, list: 'scanQRCode',dataType: 'json'}}).data.config)),
 		});
 		wx.ready(e => {
 			this.isOk = true;
-			this.hideMenu();
+			alert('wxapi');
+			
+			wx.checkJsApi({
+				jsApiList: ['scanQRCode'],
+				success: function (res) {
+					alert('checkJsApi'+res)
+ 
+				}
+			});
+
+			// this.hideMenu();
 		});
 		wx.error(e => {
 			console.log("失败")
+			alert("出错了：" + res.errMsg);
 			this.isOk = false;
 		});
 	},
@@ -87,71 +85,26 @@ export default {
 			] // 要显示的菜单项，所有menu项见附录3
 		});
 	},
-	/**
-	 * 分享配置
-	 * @param {Object} info
-	 */
-	share(data = {}, info = {}) {
-		//添加链接时间戳
-		// data.v = new Date().getTime();
-		// console.log("shareData",data)
-		// let search = [];
-		// for (const [key, value] of Object.entries(data)) {
-		// 	// search.push(`${key}=${encodeURIComponent(value)}`);
-		// 	search.push(`${key}=${value}`);
-		// }
-		// search = "?" + search.join("&");
-		
-		let afterEndUrl = config.afterEndUrl;
-		// let afterEndUrl = 'http://tanhui.hongweisoft.com/api/wechat/h5/authorize?returnUrl='
-		// let afterEndUrl = 'http://gzhjt.gzsdzth.com/api/wechat/h5/authorize?returnUrl='
-		
-		let fullUrl = afterEndUrl + location.href.split('?')[0] + '?togetherId=' + data.togetherId + '/#/' + data.routeUrl
-		const shareInfo = {
-			title: data.nickname + '邀请你参与贵州省单株碳汇精准扶贫',
-			link: fullUrl,
-			desc: "购碳扶贫，你我同行",
-			imgUrl: href + "/static/logo.png",
-			trigger(res) {},
-			success(res) {},
-			cancel(res) {},
-			fail(res) {},
-			...info
-		};
-		console.log('shareInfo',shareInfo,'fullUrl',fullUrl)
-		//自定义“分享给朋友”及“分享到QQ”按钮的分享内容（1.4.0）
-		wx.updateAppMessageShareData(shareInfo);
-		//自定义“分享到朋友圈”及“分享到QQ空间”按钮的分享内容（1.4.0）
-		wx.updateTimelineShareData(shareInfo);
-	},
-	//拉起微信浏览器端支付
-	JSAPI(res) {
+	
+	//
+	JSAPI() {
+		console.log('1111');
+		let result;
 		return new Promise(r => {
-			wx.chooseWXPay({
-				"timestamp": res.timeStamp, //时间戳，自1970年以来的秒数     
-				"nonceStr": res.nonceStr, //随机串     
-				"package": res.packageValue,
-				"signType": res.signType, //微信签名方式：     
-				"paySign": res.paySign, //微信签名 
-				success() {
-					r({
-						code: 0,
-						msg: "成功"
-					});
+			wx.scanQRCode({
+			    needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+			    scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+			    success: function (res) {
+					alert('333'+res);
+					result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果					
+					// return result;
 				},
-				cancel() {
-					r({
-						code: 1,
-						msg: "取消"
-					});
-				},
-				fail() {
-					r({
-						code: 2,
-						msg: "失败"
-					});
+				fail:function(err){
+					alert(err)
 				}
-			});
+			});	
 		});
+		alert('444'+result);
+		return result;
 	},
 }