9-27-1

pages/index/zngs.vue

@@ -178,7 +178,7 @@
 						规格
 					</view>
 					<view class="zj">
-						{{chang}}m*{{kuan}}m*{{gao}}m={{chang*kuan*gao}}吨冷水箱, {{2*(chang*kuan + chang*gao + kuan*gao)}}平方
+						{{chang}}m*{{kuan}}m*{{gao}}m={{chang*kuan*gao}}吨{{isBaowen == '是'?'保温水箱': '冷水箱'}}, {{2*(chang*kuan + chang*gao + kuan*gao)}}平方
 					</view>
 				</view>
 				<view class="new-bg">
@@ -492,54 +492,58 @@
 				if (obj.gebanname == '') {
 					return obj.$api.msg('请选择是否需要隔板')
 				}
+				if(obj.type== 1) {
+					obj.tabcurrent = 1
+				}else {
+					getDefault({
+						high: obj.gao
+					}).then(res => {
+						console.log(res,'999999',res.data)
+						// 处理默认值
+						if(res.data.roof) {
+							console.log('处理默认值')
+							console.log(res.data.roof)
+							obj.roof = res.data.roof.name
+							obj.roofId = res.data.roof.id
+						}else {
+							console.log('清除默认')
+							obj.roof = ''
+							obj.roofId = ''
+						}
+						if(res.data.floor) {
+							obj.floor = res.data.floor.name
+							obj.floorId = res.data.floor.id
+						}else {
+							obj.floor = ''
+							obj.floorId = ''
+						}
+						if(res.data.side_plate) {
+							obj.sideplate = res.data.side_plate
+						}else {
+							obj.sideplate = []
+						}
+						if(res.data.column) {
+							obj.column = res.data.column.name
+							obj.columnId = res.data.column.id
+						}else {
+							obj.column = ''
+							obj.columnId = ''
+						}
+						if(res.data.lacing) {
+							obj.lacing = res.data.lacing
+						}else {
+							obj.lacing = []
+						}
+						if(res.data.fula) {
+							obj.fula = res.data.fula
+						}else {
+							obj.fula = []
+						}
+						obj.tabcurrent = 1
+					})
+				}
+				
 				
-				getDefault({
-					high: obj.gao
-				}).then(res => {
-					console.log(res,'999999',res.data)
-					// 处理默认值
-					if(res.data.roof) {
-						console.log('处理默认值')
-						console.log(res.data.roof)
-						obj.roof = res.data.roof.name
-						obj.roofId = res.data.roof.id
-					}else {
-						console.log('清除默认')
-						obj.roof = ''
-						obj.roofId = ''
-					}
-					if(res.data.floor) {
-						obj.floor = res.data.floor.name
-						obj.floorId = res.data.floor.id
-					}else {
-						obj.floor = ''
-						obj.floorId = ''
-					}
-					if(res.data.side_plate) {
-						obj.sideplate = res.data.side_plate
-					}else {
-						obj.sideplate = []
-					}
-					if(res.data.column) {
-						obj.column = res.data.column.name
-						obj.columnId = res.data.column.id
-					}else {
-						obj.column = ''
-						obj.columnId = ''
-					}
-					if(res.data.lacing) {
-						obj.lacing = res.data.lacing
-					}else {
-						obj.lacing = []
-					}
-					if(res.data.fula) {
-						obj.fula = res.data.fula
-					}else {
-						obj.fula = []
-					}
-					
-				})
-				obj.tabcurrent = 1
 			},
 			too() {
 				let obj = this
@@ -559,6 +563,29 @@
 				let side_plate = obj.sideplate.map(item => {
 					return item.id
 				})
+				if(obj.roof == '') {
+					return obj.$api.msg('请选择顶板厚度')
+				}
+				if(obj.floor == '') {
+					return obj.$api.msg('请选择底板厚度')
+				}
+				// 判断侧板是否完整
+				let cblen = Math.ceil(obj.gao)
+				if(side_plate.length < cblen) {
+					return obj.$api.msg('请选择侧板厚度')
+				}
+				if(obj.column == '') {
+					return obj.$api.msg('请选择立柱厚度')
+				}
+				//判断辅拉，主拉是否完整
+				let lalen = Math.ceil(obj.gao)-1
+				console.log(lalen,'lalen')
+				if(lacing.length < lalen) {
+					return obj.$api.msg('请选择主拉厚度' )
+				}
+				if(fula.length < lalen) {
+					return obj.$api.msg('请选择辅拉厚度')
+				}
 				console.log(lacing, 'lacing++++')
 				obj.loading = true
 				uni.showLoading({
@@ -960,7 +987,7 @@
 		background-color: #fff;
 		padding: 0 10rpx;
 		.bg-line {
-			height: 90rpx;
+			height: 100rpx;
 			font-size: 26rpx;
 			justify-content: flex-start;
 			border-bottom: 1px solid #eeeeee;
@@ -969,7 +996,7 @@
 			}
 			view {
 				text-align: center;
-				height: 90rpx;
+				height: 100rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;

pages/user/jsxq.vue

@@ -8,7 +8,7 @@
 				规格
 			</view>
 			<view class="zj">
-				{{long}}m*{{wide}}m*{{high}}m={{high*wide*long}}吨冷水箱 {{2*(long*wide + long*high + wide*high)}}平方
+				{{long}}m*{{wide}}m*{{high}}m={{high*wide*long}}吨{{iswarm == 1?'保温水箱': '冷水箱'}}, {{2*(long*wide + long*high + wide*high)}}平方
 			</view>
 		</view>
 		<view class="new-bg">
@@ -137,7 +137,8 @@
 				weight: '',
 				high: '',
 				wide: '',
-				long: ''
+				long: '',
+				iswarm: 0,
 			}
 		},
 		onLoad(opt) {
@@ -165,6 +166,9 @@
 				this.long = opt.long*1
 				console.log(this.long)
 			}
+			if(opt.iswarm) {
+				this.iswarm = opt.iswarm
+			}
 		},
 		onShow() {
 
@@ -443,7 +447,7 @@
 		background-color: #fff;
 		padding: 0 10rpx;
 		.bg-line {
-			height: 90rpx;
+			height: 100rpx;
 			font-size: 26rpx;
 			justify-content: flex-start;
 			border-bottom: 1px solid #eeeeee;
@@ -453,7 +457,7 @@
 			view {
 				border-top: 1px solid #eee;
 				text-align: center;
-				height: 90rpx;
+				height: 100rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;

pages/user/myjslis.vue

@@ -28,7 +28,7 @@
 <!-- 						<view class="sc btn" @click="showSc(item)">
 							删除
 						</view> -->
-						<view class="xq btn" @click="navto('/pages/user/jsxq?id=' + item.id + '&price=' + item.price + '&weight=' + item.weight + '&long=' + item.long + '&wide=' + item.wide + '&high=' + item.high)">
+						<view class="xq btn" @click="navto('/pages/user/jsxq?id=' + item.id + '&price=' + item.price + '&weight=' + item.weight + '&long=' + item.long + '&wide=' + item.wide + '&high=' + item.high + '&iswarm=' + item.is_warm)">
 							详情
 						</view>
 					</view>

static/css/cmy.css

@@ -4,7 +4,7 @@
 	/* project id 1482221 */
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		/* url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'), */
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');

unpackage/dist/build/mp-weixin/pages/user/myjslis.wxml

@@ -1 +1 @@
-<view class="content"><block wx:if="{{list.length>0}}"><view class="list-top flex"><view class="list-left">规格</view><view class="list-mid">预估价格</view><view class="list-right">操作</view></view></block><view class="jg"></view><scroll-view class="scroll-wrap" style="{{'height:'+(height)+';'}}" scroll-y="true" data-event-opts="{{[['scrolltolower',[['getList',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__"><view class="list-box"><view class="list-item flex list-top"><view class="list-left clamp">长:<text>{{item.long*1}}</text>宽:<text>{{item.wide*1}}</text>高:<text>{{item.high*1}}</text></view><view class="list-mid"><text>{{"￥"+item.price*1}}</text></view><view class="list-right flex"><view data-event-opts="{{[['tap',[['navto',['/pages/user/jsxq?id='+item.id+'&price='+item.price+'&weight='+item.weight+'&long='+item.long+'&wide='+item.wide+'&high='+item.high]]]]]}}" class="xq btn" bindtap="__e">详情</view></view></view></view></block><uni-load-more vue-id="bcc98de0-1" status="{{loadingType}}" bind:__l="__l"></uni-load-more></scroll-view></view>
+<view class="content"><block wx:if="{{list.length>0}}"><view class="list-top flex"><view class="list-left">规格</view><view class="list-mid">预估价格</view><view class="list-right">操作</view></view></block><view class="jg"></view><scroll-view class="scroll-wrap" style="{{'height:'+(height)+';'}}" scroll-y="true" data-event-opts="{{[['scrolltolower',[['getList',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__"><view class="list-box"><view class="list-item flex list-top"><view class="list-left clamp">长:<text>{{item.long*1}}</text>宽:<text>{{item.wide*1}}</text>高:<text>{{item.high*1}}</text></view><view class="list-mid"><text>{{"￥"+item.price*1}}</text></view><view class="list-right flex"><view data-event-opts="{{[['tap',[['navto',['/pages/user/jsxq?id='+item.id+'&price='+item.price+'&weight='+item.weight+'&long='+item.long+'&wide='+item.wide+'&high='+item.high+'&iswarm='+item.is_warm]]]]]}}" class="xq btn" bindtap="__e">详情</view></view></view></view></block><uni-load-more vue-id="bcc98de0-1" status="{{loadingType}}" bind:__l="__l"></uni-load-more></scroll-view></view>

unpackage/dist/build/mp-weixin/static/css/cmy.css

@@ -4,7 +4,7 @@
 	/* project id 1482221 */
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		/* url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'), */
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');

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

@@ -15,7 +15,7 @@
 	/* project id 1482221 */
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		/* url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'), */
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');

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

@@ -766,8 +766,8 @@ function populateParameters(result) {var _result$brand =
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.6.3",
-    uniRuntimeVersion: "3.6.3",
+    uniCompileVersion: "3.6.4",
+    uniRuntimeVersion: "3.6.4",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,

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

@@ -854,8 +854,10 @@ var info = '';info = wx.getMenuButtonBoundingClientRect();var _default = { data:
     // 	// obj[name + 'name'] = obj[name][e.detail.value].name
     // 	// obj[name + 'id'] = obj[name][e.detail.value].id
     // },
-    tot: function tot() {var obj = this;if (obj.chang == '') {return obj.$api.msg('请输入长度');}if (obj.kuan == '') {return obj.$api.msg('请输入宽度');}if (obj.gao == '') {return obj.$api.msg('请选择高度');}if (obj.isBaowen == '') {return obj.$api.msg('请选择是否保温');}if (obj.isBaowen == '是') {if (obj.baowenCl == '') {return obj.$api.msg('请选择保温材料');}}if (obj.isGangC == '') {return obj.$api.msg('请选择是否需要钢槽');}if (obj.isGangC == '是') {if (obj.gangcCl == '') {return obj.$api.msg('请选择钢槽材料');}}if (obj.isRent == '') {return obj.$api.msg('请选择是否需要人梯');}if (obj.gebanname == '') {return obj.$api.msg('请选择是否需要隔板');}(0, _index.getDefault)({ high: obj.gao }).then(function (res) {console.log(res, '999999', res.data); // 处理默认值
-        if (res.data.roof) {console.log('处理默认值');console.log(res.data.roof);obj.roof = res.data.roof.name;obj.roofId = res.data.roof.id;} else {console.log('清除默认');obj.roof = '';obj.roofId = '';}if (res.data.floor) {obj.floor = res.data.floor.name;obj.floorId = res.data.floor.id;} else {obj.floor = '';obj.floorId = '';}if (res.data.side_plate) {obj.sideplate = res.data.side_plate;} else {obj.sideplate = [];}if (res.data.column) {obj.column = res.data.column.name;obj.columnId = res.data.column.id;} else {obj.column = '';obj.columnId = '';}if (res.data.lacing) {obj.lacing = res.data.lacing;} else {obj.lacing = [];}if (res.data.fula) {obj.fula = res.data.fula;} else {obj.fula = [];}});obj.tabcurrent = 1;}, too: function too() {var obj = this;obj.tabcurrent = 0;}, toth: function toth() {var obj = this;if (obj.loading) {return;}var lacing = obj.lacing.map(function (item) {return item.id;});var fula = obj.fula.map(function (item) {return item.id;});var side_plate = obj.sideplate.map(function (item) {return item.id;});console.log(lacing, 'lacing++++');obj.loading = true;uni.showLoading({ title: '计算中...' });(0, _index.calculation)({ long: obj.chang, //长
+    tot: function tot() {var obj = this;if (obj.chang == '') {return obj.$api.msg('请输入长度');}if (obj.kuan == '') {return obj.$api.msg('请输入宽度');}if (obj.gao == '') {return obj.$api.msg('请选择高度');}if (obj.isBaowen == '') {return obj.$api.msg('请选择是否保温');}if (obj.isBaowen == '是') {if (obj.baowenCl == '') {return obj.$api.msg('请选择保温材料');}}if (obj.isGangC == '') {return obj.$api.msg('请选择是否需要钢槽');}if (obj.isGangC == '是') {if (obj.gangcCl == '') {return obj.$api.msg('请选择钢槽材料');}}if (obj.isRent == '') {return obj.$api.msg('请选择是否需要人梯');}if (obj.gebanname == '') {return obj.$api.msg('请选择是否需要隔板');}if (obj.type == 1) {obj.tabcurrent = 1;} else {(0, _index.getDefault)({ high: obj.gao }).then(function (res) {console.log(res, '999999', res.data); // 处理默认值
+          if (res.data.roof) {console.log('处理默认值');console.log(res.data.roof);obj.roof = res.data.roof.name;obj.roofId = res.data.roof.id;} else {console.log('清除默认');obj.roof = '';obj.roofId = '';}if (res.data.floor) {obj.floor = res.data.floor.name;obj.floorId = res.data.floor.id;} else {obj.floor = '';obj.floorId = '';}if (res.data.side_plate) {obj.sideplate = res.data.side_plate;} else {obj.sideplate = [];}if (res.data.column) {obj.column = res.data.column.name;obj.columnId = res.data.column.id;} else {obj.column = '';obj.columnId = '';}if (res.data.lacing) {obj.lacing = res.data.lacing;} else {obj.lacing = [];}if (res.data.fula) {obj.fula = res.data.fula;} else {obj.fula = [];}obj.tabcurrent = 1;});}}, too: function too() {var obj = this;obj.tabcurrent = 0;}, toth: function toth() {var obj = this;if (obj.loading) {return;}var lacing = obj.lacing.map(function (item) {return item.id;});var fula = obj.fula.map(function (item) {return item.id;});var side_plate = obj.sideplate.map(function (item) {return item.id;});if (obj.roof == '') {return obj.$api.msg('请选择顶板厚度');}if (obj.floor == '') {return obj.$api.msg('请选择底板厚度');} // 判断侧板是否完整
+      var cblen = Math.ceil(obj.gao);if (side_plate.length < cblen) {return obj.$api.msg('请选择侧板厚度');}if (obj.column == '') {return obj.$api.msg('请选择立柱厚度');} //判断辅拉，主拉是否完整
+      var lalen = Math.ceil(obj.gao) - 1;console.log(lalen, 'lalen');if (lacing.length < lalen) {return obj.$api.msg('请选择主拉厚度');}if (fula.length < lalen) {return obj.$api.msg('请选择辅拉厚度');}console.log(lacing, 'lacing++++');obj.loading = true;uni.showLoading({ title: '计算中...' });(0, _index.calculation)({ long: obj.chang, //长
         wide: obj.kuan, high: obj.gao, is_warm: obj.isBaowen == '是' ? 1 : 0, warm: obj.baowenClId, is_channel: obj.isGangC == '是' ? 1 : 0, channel: obj.gangcClId, is_human_ladder: obj.isRent == '是' ? 1 : 0, is_gc: obj.type, floor: obj.floorId, roof: obj.roofId, column: obj.columnId, lacing: lacing, fula: fula, side_plate: side_plate }).then(function (res) {console.log(res);uni.hideLoading();obj.jsjg = res.data;obj.tabcurrent = 2;}).catch(function (err) {uni.hideLoading();obj.loading = false;});}, endjs: function endjs() {uni.switchTab({ url: '/pages/index/index' });}, openKf: function openKf() {}, getZyList: function getZyList() {var obj = this;(0, _index.getZyList)({ is_gc: obj.type }).then(function (res) {console.log(res);obj.warmList = res.data.warm; //保温材料
         obj.channelList = res.data.channel; //钢槽材料
         obj.roofList = res.data.roof; //顶板厚度
@@ -863,12 +865,37 @@ var info = '';info = wx.getMenuButtonBoundingClientRect();var _default = { data:
         obj.sideplateList = res.data.side_plate; //侧板厚度
         obj.columnList = res.data.column; //立柱厚度
         obj.lacingList = res.data.lacing; //主拉厚度
-        obj.fulaList = res.data.fula;});} }, _defineProperty(_methods, "openKf", function openKf() {this.$refs.popupkf.open();}), _defineProperty(_methods, "cancel", function cancel() {this.$refs.popupkf.close();}), _defineProperty(_methods, "comfirm", function comfirm(text) {console.log(text);var result = this.uniCopy(text);if (result === false) {uni.showToast({ title: '不支持' });} else {uni.showToast({ title: '复制成功', icon: 'none' });}this.$refs.popupkf.close();}), _defineProperty(_methods, "uniCopy", function uniCopy(content) {/**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      * 小程序端 和 app端的复制逻辑
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      */uni.setClipboardData({ data: content, success: function success() {console.log('success');return true;} });
+        obj.fulaList = res.data.fula;});} }, _defineProperty(_methods, "openKf", function openKf() {this.$refs.popupkf.open();}), _defineProperty(_methods, "cancel", function cancel() {this.$refs.popupkf.close();}), _defineProperty(_methods, "comfirm", function comfirm(text) {console.log(text);
+    var result = this.uniCopy(text);
+    if (result === false) {
+      uni.showToast({
+        title: '不支持' });
+
+    } else {
+      uni.showToast({
+        title: '复制成功',
+        icon: 'none' });
+
+    }
+    this.$refs.popupkf.close();
+  }), _defineProperty(_methods, "uniCopy", function uniCopy(
+  content) {
+    /**
+             * 小程序端 和 app端的复制逻辑
+             */
+
+    uni.setClipboardData({
+      data: content,
+      success: function success() {
+        console.log('success');
+        return true;
+      } });
+
+
+
     /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     * H5端的复制逻辑
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     */
+             * H5端的复制逻辑
+             */
 
 
 

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

@@ -237,7 +237,7 @@
   padding: 0 10rpx;
 }
 .new-bg .bg-line {
-  height: 90rpx;
+  height: 100rpx;
   font-size: 26rpx;
   justify-content: flex-start;
   border-bottom: 1px solid #eeeeee;
@@ -247,7 +247,7 @@
 }
 .new-bg .bg-line view {
   text-align: center;
-  height: 90rpx;
+  height: 100rpx;
   display: flex;
   align-items: center;
   justify-content: center;

unpackage/dist/dev/mp-weixin/pages/user/jsxq.js

@@ -415,8 +415,8 @@ var _user = __webpack_require__(/*! @/api/user.js */ 28); //
 //
 //
 //
-var _default = { data: function data() {return { text: '', jsjg: [], id: '', price: '', weight: '', high: '', wide: '', long: '' };}, onLoad: function onLoad(opt) {console.log(opt);if (opt.id) {this.id = opt.id;this.getjsDetail();}if (opt.price) {this.price = opt.price;}if (opt.weight) {this.weight = opt.weight;} //weight=' + item.weight + '&long=' + item.long + '&wide=' + item.wide + '&high=' + item.high
-    if (opt.high) {this.high = opt.high * 1;console.log(this.high);}if (opt.wide) {this.wide = opt.wide * 1;console.log(this.wide);}if (opt.long) {this.long = opt.long * 1;console.log(this.long);}}, onShow: function onShow() {}, onReachBottom: function onReachBottom() {}, onReady: function onReady() {}, methods: { getjsDetail: function getjsDetail() {var obj = this;(0, _user.getjsDetail)({ id: obj.id }).then(function (res) {console.log(res);obj.jsjg = res.data;});}, // 打开客服
+var _default = { data: function data() {return { text: '', jsjg: [], id: '', price: '', weight: '', high: '', wide: '', long: '', iswarm: 0 };}, onLoad: function onLoad(opt) {console.log(opt);if (opt.id) {this.id = opt.id;this.getjsDetail();}if (opt.price) {this.price = opt.price;}if (opt.weight) {this.weight = opt.weight;} //weight=' + item.weight + '&long=' + item.long + '&wide=' + item.wide + '&high=' + item.high
+    if (opt.high) {this.high = opt.high * 1;console.log(this.high);}if (opt.wide) {this.wide = opt.wide * 1;console.log(this.wide);}if (opt.long) {this.long = opt.long * 1;console.log(this.long);}if (opt.iswarm) {this.iswarm = opt.iswarm;}}, onShow: function onShow() {}, onReachBottom: function onReachBottom() {}, onReady: function onReady() {}, methods: { getjsDetail: function getjsDetail() {var obj = this;(0, _user.getjsDetail)({ id: obj.id }).then(function (res) {console.log(res);obj.jsjg = res.data;});}, // 打开客服
     openKf: function openKf() {this.$refs.popupkf.open();}, // 关闭客服
     cancel: function cancel() {this.$refs.popupkf.close();}, // 复制客服微信
     comfirm: function comfirm(text) {console.log(text);var result = this.uniCopy(text);if (result === false) {uni.showToast({ title: '不支持' });} else {uni.showToast({ title: '复制成功', icon: 'none' });}this.$refs.popupkf.close();}, uniCopy: function uniCopy(content) {/**

unpackage/dist/dev/mp-weixin/pages/user/jsxq.wxss

@@ -172,7 +172,7 @@
   padding: 0 10rpx;
 }
 .new-bg .bg-line {
-  height: 90rpx;
+  height: 100rpx;
   font-size: 26rpx;
   justify-content: flex-start;
   border-bottom: 1px solid #eeeeee;
@@ -183,7 +183,7 @@
 .new-bg .bg-line view {
   border-top: 1px solid #eee;
   text-align: center;
-  height: 90rpx;
+  height: 100rpx;
   display: flex;
   align-items: center;
   justify-content: center;

unpackage/dist/dev/mp-weixin/pages/user/myjslis.wxml

@@ -1 +1 @@
-<view class="content"><block wx:if="{{list.length>0}}"><view class="list-top flex"><view class="list-left">规格</view><view class="list-mid">预估价格</view><view class="list-right">操作</view></view></block><view class="jg"></view><scroll-view class="scroll-wrap" style="{{'height:'+(height)+';'}}" scroll-y="true" data-event-opts="{{[['scrolltolower',[['getList',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__"><view class="list-box"><view class="list-item flex list-top"><view class="list-left clamp">长:<text>{{item.long*1}}</text>宽:<text>{{item.wide*1}}</text>高:<text>{{item.high*1}}</text></view><view class="list-mid"><text>{{"￥"+item.price*1}}</text></view><view class="list-right flex"><view data-event-opts="{{[['tap',[['navto',['/pages/user/jsxq?id='+item.id+'&price='+item.price+'&weight='+item.weight+'&long='+item.long+'&wide='+item.wide+'&high='+item.high]]]]]}}" class="xq btn" bindtap="__e">详情</view></view></view></view></block><uni-load-more vue-id="bcc98de0-1" status="{{loadingType}}" bind:__l="__l"></uni-load-more></scroll-view></view>
+<view class="content"><block wx:if="{{list.length>0}}"><view class="list-top flex"><view class="list-left">规格</view><view class="list-mid">预估价格</view><view class="list-right">操作</view></view></block><view class="jg"></view><scroll-view class="scroll-wrap" style="{{'height:'+(height)+';'}}" scroll-y="true" data-event-opts="{{[['scrolltolower',[['getList',['$event']]]]]}}" bindscrolltolower="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__"><view class="list-box"><view class="list-item flex list-top"><view class="list-left clamp">长:<text>{{item.long*1}}</text>宽:<text>{{item.wide*1}}</text>高:<text>{{item.high*1}}</text></view><view class="list-mid"><text>{{"￥"+item.price*1}}</text></view><view class="list-right flex"><view data-event-opts="{{[['tap',[['navto',['/pages/user/jsxq?id='+item.id+'&price='+item.price+'&weight='+item.weight+'&long='+item.long+'&wide='+item.wide+'&high='+item.high+'&iswarm='+item.is_warm]]]]]}}" class="xq btn" bindtap="__e">详情</view></view></view></view></block><uni-load-more vue-id="bcc98de0-1" status="{{loadingType}}" bind:__l="__l"></uni-load-more></scroll-view></view>

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

@@ -2,7 +2,8 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "基础项目",
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": true,
+        "urlCheck": false
     },
     "condition": {
         "miniprogram": {

unpackage/dist/dev/mp-weixin/static/css/cmy.css

@@ -4,7 +4,7 @@
 	/* project id 1482221 */
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
 	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		/* url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'), */
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
 		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');