Bladeren bron

update .gitignore

twt 3 jaren geleden
bovenliggende
commit
d263b0fde4
100 gewijzigde bestanden met toevoegingen van 5605 en 22879 verwijderingen
  1. 1 1
      .gitignore
  2. 17 17
      App.vue
  3. 153 153
      components/uni-plate-input/uni-plate-input.less
  4. 265 265
      components/uni-plate-input/uni-plate-input.vue
  5. 236 236
      pages.json
  6. 280 280
      pages/index/addCar.vue
  7. 366 366
      pages/index/index.vue
  8. 162 162
      pages/login/empower.vue
  9. 276 276
      pages/me/discountCard.vue
  10. 143 143
      pages/me/discountDetail.vue
  11. 249 249
      pages/me/feedBack.vue
  12. 48 48
      pages/me/intimity.vue
  13. 319 319
      pages/me/me.vue
  14. 300 300
      pages/me/myAppraise.vue
  15. 48 48
      pages/me/treaty.vue
  16. 424 424
      pages/order/evaluate.vue
  17. 303 303
      pages/order/myorder.vue
  18. 961 961
      pages/order/orderDetail.vue
  19. 791 791
      pages/shop/ckShop.vue
  20. 263 263
      pages/shop/shopAppraise.vue
  21. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  22. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  23. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  24. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/chose-city/chose-city.js.map
  25. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/nodata/nodata.js.map
  26. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-qrcode/tki-qrcode.js.map
  27. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-plate-input/uni-plate-input.js.map
  28. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/cailist.js.map
  29. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/carModel.js.map
  30. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/addphone.js.map
  31. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/phoneList.js.map
  32. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addCar.js.map
  33. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cailist.js.map
  34. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/carModel.js.map
  35. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  36. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/empower.js.map
  37. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/iphoneLogin.js.map
  38. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  39. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/intimity.js.map
  40. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map
  41. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/setup.js.map
  42. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/treaty.js.map
  43. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/evaluate.js.map
  44. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/myorder.js.map
  45. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map
  46. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shopList.js.map
  47. 0 72
      unpackage/dist/dev/mp-weixin/app.json
  48. 0 18
      unpackage/dist/dev/mp-weixin/common/main.wxss
  49. 0 273
      unpackage/dist/dev/mp-weixin/common/runtime.js
  50. 0 10503
      unpackage/dist/dev/mp-weixin/common/vendor.js
  51. 0 542
      unpackage/dist/dev/mp-weixin/components/chose-city/chose-city.js
  52. 0 185
      unpackage/dist/dev/mp-weixin/components/nodata/nodata.js
  53. 0 4
      unpackage/dist/dev/mp-weixin/components/nodata/nodata.json
  54. 0 1
      unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxml
  55. 0 15
      unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxss
  56. 0 357
      unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.js
  57. 0 4
      unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.json
  58. 0 1
      unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.wxml
  59. 0 11
      unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.wxss
  60. 0 420
      unpackage/dist/dev/mp-weixin/components/uni-plate-input/uni-plate-input.js
  61. 0 355
      unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.js
  62. 0 4
      unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.json
  63. 0 1
      unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.wxml
  64. 0 54
      unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.wxss
  65. 0 241
      unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.js
  66. 0 4
      unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.json
  67. 0 1
      unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.wxml
  68. 0 57
      unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.wxss
  69. 0 442
      unpackage/dist/dev/mp-weixin/pages/index/addCar.js
  70. 0 7
      unpackage/dist/dev/mp-weixin/pages/index/addCar.json
  71. 0 1
      unpackage/dist/dev/mp-weixin/pages/index/addCar.wxml
  72. 0 81
      unpackage/dist/dev/mp-weixin/pages/index/addCar.wxss
  73. 0 314
      unpackage/dist/dev/mp-weixin/pages/index/cailist.js
  74. 0 5
      unpackage/dist/dev/mp-weixin/pages/index/cailist.json
  75. 0 1
      unpackage/dist/dev/mp-weixin/pages/index/cailist.wxml
  76. 0 114
      unpackage/dist/dev/mp-weixin/pages/index/cailist.wxss
  77. 0 613
      unpackage/dist/dev/mp-weixin/pages/index/carModel.js
  78. 0 6
      unpackage/dist/dev/mp-weixin/pages/index/carModel.json
  79. 0 1
      unpackage/dist/dev/mp-weixin/pages/index/carModel.wxml
  80. 0 405
      unpackage/dist/dev/mp-weixin/pages/index/carModel.wxss
  81. 0 447
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  82. 0 6
      unpackage/dist/dev/mp-weixin/pages/index/index.json
  83. 0 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  84. 0 92
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  85. 0 204
      unpackage/dist/dev/mp-weixin/pages/me/intimity.js
  86. 0 5
      unpackage/dist/dev/mp-weixin/pages/me/intimity.json
  87. 0 1
      unpackage/dist/dev/mp-weixin/pages/me/intimity.wxml
  88. 0 7
      unpackage/dist/dev/mp-weixin/pages/me/intimity.wxss
  89. 0 381
      unpackage/dist/dev/mp-weixin/pages/me/me.js
  90. 0 1
      unpackage/dist/dev/mp-weixin/pages/me/me.wxml
  91. 0 282
      unpackage/dist/dev/mp-weixin/pages/me/setup.js
  92. 0 5
      unpackage/dist/dev/mp-weixin/pages/me/setup.json
  93. 0 1
      unpackage/dist/dev/mp-weixin/pages/me/setup.wxml
  94. 0 46
      unpackage/dist/dev/mp-weixin/pages/me/setup.wxss
  95. 0 204
      unpackage/dist/dev/mp-weixin/pages/me/treaty.js
  96. 0 5
      unpackage/dist/dev/mp-weixin/pages/me/treaty.json
  97. 0 1
      unpackage/dist/dev/mp-weixin/pages/me/treaty.wxml
  98. 0 6
      unpackage/dist/dev/mp-weixin/pages/me/treaty.wxss
  99. 0 440
      unpackage/dist/dev/mp-weixin/pages/order/evaluate.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/pages/order/evaluate.json

+ 1 - 1
.gitignore

@@ -1 +1 @@
-/unpackage/
+unpackage/

+ 17 - 17
App.vue

@@ -1,18 +1,18 @@
-<script>
-	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
-</script>
-
-<style>
-	/*每个页面公共css */
-	
+<script>
+	export default {
+		onLaunch: function() {
+			console.log('App Launch')
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style>
+	/*每个页面公共css */
+	
 </style>

+ 153 - 153
components/uni-plate-input/uni-plate-input.less

@@ -1,154 +1,154 @@
-.so-mask {
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	background: rgba(0, 0, 0, 0.5);
-	z-index: 998;
-}
-.so-plate {
-	box-sizing: border-box;
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-	left: 0;
-	background: #fff;
-	padding: 25upx 25upx 0 25upx;
-	&-head {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	&-type {			
-		flex:1;
-		display:block;
-		label {
-			display: inline-block;
-			min-height: 32upx;
-			font-size: 26upx;
-			margin-right: 10upx;
-		}
-	}
-	&-body {
-		box-sizing: border-box;
-		padding: 30upx 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	&-word {
-		border: 1upx solid #ccc;
-		border-radius: 10upx;
-		height: 0;
-		margin: 0 5upx;
-		box-sizing: border-box;
-		padding-bottom: calc((100% - 70upx) / 7);
-		width: calc((100% - 70upx) / 7);
-		position: relative;
-		&.active {
-			border-color: #007aff;
-			box-shadow: 0 0 15upx 0 #007aff;
-		}
-		text {
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translateX(-50%) translateY(-50%);
-			font-weight: 700;
-			font-size: 32upx;
-		}
-	}
-	&-dot {
-		width: 15upx;
-		height: 15upx;
-		background: #ccc;
-		border-radius: 50%;
-		margin: 0 5upx;
-	}
-	&-keyboard {
-		background: #eee;
-		margin-left: -25upx;
-		margin-right: -25upx;
-		padding: 20upx 25upx 10upx 25upx;
-		box-sizing: border-box;
-		transition: all .3s;
-		&>view{
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-		}
-	}
-	&-key {
-		display: block;
-		background: #fff;
-		border-radius: 10upx;
-		box-shadow: 0 0 8upx 0 #bbb;
-		width: 80upx;
-		height: 80upx;
-		margin: 5upx 0;
-		font-size: 32upx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		&.hover {
-			background: #efefef;
-		}
-		&.fill-block {
-			width: 80upx;
-			height: 80upx;
-			background: none;
-			box-shadow: none;
-		}
-	}
-	&-btn {
-		display: inline-block;
-		background: #fff;
-		border-radius: 10upx;
-		box-shadow: 0 0 10upx 0 #bbb;
-		font-size: 28upx;
-		text-align: center;
-		margin:0 0 0 10upx;
-		padding:0 25upx;
-		&-group{
-			display: flex;
-			justify-content: space-between;
-			background: #eee;
-			margin-left: -25upx;
-			margin-right: -25upx;
-			box-sizing: border-box;
-			padding: 0 25upx 10upx 25upx;
-		}
-		&--cancel{
-			margin:0;
-		}
-		&--submit{
-			background:#5773f9;
-			color:#fff;
-		}
-		&--delete{
-			color:#fd6b6d;
-		}
-	}
-}
-
-
-.animation-scale-up {
-	animation-duration: .2s;
-	animation-timing-function: ease-out;
-	animation-fill-mode: both;
-    animation-name: scale-up
-}
-@keyframes scale-up {
-    0% {
-        opacity: .8;
-        transform: scale(.8)
-    }
-
-    100% {
-        opacity: 1;
-        transform: scale(1)
-    }
+.so-mask {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 998;
+}
+.so-plate {
+	box-sizing: border-box;
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	left: 0;
+	background: #fff;
+	padding: 25upx 25upx 0 25upx;
+	&-head {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	&-type {			
+		flex:1;
+		display:block;
+		label {
+			display: inline-block;
+			min-height: 32upx;
+			font-size: 26upx;
+			margin-right: 10upx;
+		}
+	}
+	&-body {
+		box-sizing: border-box;
+		padding: 30upx 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	&-word {
+		border: 1upx solid #ccc;
+		border-radius: 10upx;
+		height: 0;
+		margin: 0 5upx;
+		box-sizing: border-box;
+		padding-bottom: calc((100% - 70upx) / 7);
+		width: calc((100% - 70upx) / 7);
+		position: relative;
+		&.active {
+			border-color: #007aff;
+			box-shadow: 0 0 15upx 0 #007aff;
+		}
+		text {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translateX(-50%) translateY(-50%);
+			font-weight: 700;
+			font-size: 32upx;
+		}
+	}
+	&-dot {
+		width: 15upx;
+		height: 15upx;
+		background: #ccc;
+		border-radius: 50%;
+		margin: 0 5upx;
+	}
+	&-keyboard {
+		background: #eee;
+		margin-left: -25upx;
+		margin-right: -25upx;
+		padding: 20upx 25upx 10upx 25upx;
+		box-sizing: border-box;
+		transition: all .3s;
+		&>view{
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+		}
+	}
+	&-key {
+		display: block;
+		background: #fff;
+		border-radius: 10upx;
+		box-shadow: 0 0 8upx 0 #bbb;
+		width: 80upx;
+		height: 80upx;
+		margin: 5upx 0;
+		font-size: 32upx;
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		&.hover {
+			background: #efefef;
+		}
+		&.fill-block {
+			width: 80upx;
+			height: 80upx;
+			background: none;
+			box-shadow: none;
+		}
+	}
+	&-btn {
+		display: inline-block;
+		background: #fff;
+		border-radius: 10upx;
+		box-shadow: 0 0 10upx 0 #bbb;
+		font-size: 28upx;
+		text-align: center;
+		margin:0 0 0 10upx;
+		padding:0 25upx;
+		&-group{
+			display: flex;
+			justify-content: space-between;
+			background: #eee;
+			margin-left: -25upx;
+			margin-right: -25upx;
+			box-sizing: border-box;
+			padding: 0 25upx 10upx 25upx;
+		}
+		&--cancel{
+			margin:0;
+		}
+		&--submit{
+			background:#5773f9;
+			color:#fff;
+		}
+		&--delete{
+			color:#fd6b6d;
+		}
+	}
+}
+
+
+.animation-scale-up {
+	animation-duration: .2s;
+	animation-timing-function: ease-out;
+	animation-fill-mode: both;
+    animation-name: scale-up
+}
+@keyframes scale-up {
+    0% {
+        opacity: .8;
+        transform: scale(.8)
+    }
+
+    100% {
+        opacity: 1;
+        transform: scale(1)
+    }
 }

+ 265 - 265
components/uni-plate-input/uni-plate-input.vue

@@ -1,265 +1,265 @@
-/**
-* @author minisola
-* @version 20190814
-*/
-<template>
-	<view class="so-mask">
-		<view class="so-plate animation-scale-up">
-			<view class="so-plate-head">
-				<view class="so-plate-type">
-					<radio-group @change="typeChange">
-						<label>
-							<radio value="1" :checked="type===1" />
-							普通车牌
-						</label>
-						<label>
-							<radio value="2" :checked="type===2" />
-							新能源车牌
-						</label>
-					</radio-group>
-				</view>
-			</view>
-			<view class="so-plate-body">
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 0 }" @tap="inputSwitch" data-index="0">
-					<text>{{ currentInputValue[0] }}</text>
-				</view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 1 }" @tap="inputSwitch" data-index="1">
-					<text>{{ currentInputValue[1] }}</text>
-				</view>
-				<view class="so-plate-dot"></view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 2 }" @tap="inputSwitch" data-index="2">
-					<text>{{ currentInputValue[2] }}</text>
-				</view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 3 }" @tap="inputSwitch" data-index="3">
-					<text>{{ currentInputValue[3] }}</text>
-				</view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 4 }" @tap="inputSwitch" data-index="4">
-					<text>{{ currentInputValue[4] }}</text>
-				</view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 5 }" @tap="inputSwitch" data-index="5">
-					<text>{{ currentInputValue[5] }}</text>
-				</view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 6 }" @tap="inputSwitch" data-index="6">
-					<text>{{ currentInputValue[6] }}</text>
-				</view>
-				<view class="so-plate-word" :class="{ active: currentInputIndex == 7 }" @tap="inputSwitch" v-if="type == 2" data-index="7">
-					<text>{{ currentInputValue[7] }}</text>
-				</view>
-			</view>
-			<view class="so-plate-foot">
-				<view class="so-plate-keyboard"  :style="{height:keyboardHeight}">
-					<view id="keyboard">
-						<block v-if="inputType == 1">
-							<view hover-class="hover" class="so-plate-key" v-for="el of provinceText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
-						</block>
-						<block v-if="inputType == 1">
-							<text class="so-plate-key fill-block"></text>
-							<text class="so-plate-key fill-block"></text>
-						</block>
-						<block v-if="inputType >= 3">
-							<view hover-class="hover" class="so-plate-key" v-for="el of numberText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
-						</block>
-						<block v-if="inputType >= 2">
-							<view hover-class="hover" class="so-plate-key" v-for="el of wordText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
-						</block>
-						<block v-if="inputType == 3">
-							<text v-for="el of fillBlock" :key="el.num" class="so-plate-key fill-block"></text>
-						</block>
-						<block v-if="inputType == 4">
-							<view hover-class="hover" class="so-plate-key" v-for="el of lastWordText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
-						</block>
-							<text v-if="inputType == 4" class="so-plate-key fill-block"></text>
-					</view>
-				</view>
-				<view class="so-plate-btn-group">
-					<view>
-						<button class="so-plate-btn so-plate-btn--cancel" @tap="$emit('close')">取消</button>
-					</view>
-					<view>
-						<button class="so-plate-btn so-plate-btn--delete" @tap="deleteKey">删除</button>
-						<button class="so-plate-btn so-plate-btn--submit" @tap="exportPlate">完成</button>
-						
-					</view>
-					
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-export default {
-	name: 'uni-plate-input',
-	data() {
-		return {
-			type: 1, //车牌类型
-			currentInputIndex: 0, //当前编辑的输入框
-			currentInputValue: ['', '', '', '', '', '', ''],
-			fillBlock:[{num:11},{num:12},{num:13},{num:14},{num:15},{num:16}],  //避免:key报错
-			keyboardHeightInit:false,
-			keyboardHeight:'auto',
-			provinceText: [
-				'粤',
-				'京',
-				'冀',
-				'沪',
-				'津',
-				'晋',
-				'蒙',
-				'辽',
-				'吉',
-				'黑',
-				'苏',
-				'浙',
-				'皖',
-				'闽',
-				'赣',
-				'鲁',
-				'豫',
-				'鄂',
-				'湘',
-				'桂',
-				'琼',
-				'渝',
-				'川',
-				'贵',
-				'云',
-				'藏',
-				'陕',
-				'甘',
-				'青',
-				'宁',
-				'新'
-			],
-			numberText: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
-			wordText: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'],
-			lastWordText: ['港', '澳', '学', '领', '警']
-		};
-	},
-	props: {
-		plate: {
-			type: String
-		}
-	},
-	computed: {
-		//输入框类型
-		inputType() {
-			switch (this.currentInputIndex) {
-				case 0:
-					return 1;
-					break;
-				case 1:
-					return 2;
-					break;
-				case 2:
-					return 3;
-					break;
-				case 3:
-					return 3;
-					break;
-				case 4:
-					return 3;
-					break;
-				case 5:
-					return 3;
-					break;
-				case 6:
-					return this.type==2 ? 3 :4 ;
-					break;
-				case 7:
-					return 4;
-					break;
-				default:
-					return 1;
-					break;
-			}
-		}
-	},
-	watch:{
-		currentInputIndex:function(n,o){
-			if(!this.keyboardHeightInit) return
-				this.$nextTick(()=>{
-					this.changeKeyboardHeight()
-				})
-		}
-	},
-	methods: {
-		//车牌类型切换
-		typeChange(e) {
-			const {value} = e.detail;
-			this.type = parseInt(value)
-			this.currentInputIndex = 0
-			if(value==1){
-				this.currentInputValue = ['','','','','','','']
-			}else{
-				this.currentInputValue = ['','','','','','','','']
-			}
-		},
-		inputSwitch(e) {
-			const { index } = e.currentTarget.dataset;
-			this.currentInputIndex = parseInt(index);
-		},
-		chooseKey(e) {
-			const { value } = e.currentTarget.dataset;
-			this.$set(this.currentInputValue, this.currentInputIndex, value);
-			if(this.type==1 && this.currentInputIndex<6){
-				this.currentInputIndex++
-			}
-			if(this.type==2 && this.currentInputIndex<7){
-				this.currentInputIndex++
-			}
-		},
-		deleteKey(){
-				this.$set(this.currentInputValue,this.currentInputIndex,'')
-				if(this.currentInputIndex!=0) this.currentInputIndex--
-		},
-		exportPlate(){
-			const plate = this.currentInputValue.join('')
-			let err = false
-			if(this.type===1&&plate.length!=7){
-				err = true
-			}else if(this.type===2&&plate.length!=8){
-				err = true
-			}
-			if(err) return uni.showToast({
-				title:'请输入完整的车牌号码',
-				icon:'none'
-			})
-			
-			this.$emit('export',plate)
-		},
-		changeKeyboardHeight(){
-			const that = this
-			const query = uni.createSelectorQuery().in(this);
-			query.select('#keyboard').boundingClientRect();
-			query.exec(function(res) {
-				if(res&&res[0]){
-					that.keyboardHeight = res[0].height + uni.upx2px(30) + 'px'
-					that.keyboardHeightInit = true
-				}
-			});
-		}
-	},
-	mounted() {
-		console.log(this.plate);
-		const plateKey = this.plate.split('')
-		if(plateKey.length===7){
-			this.type=1
-		}else if(plateKey.length===8){
-			this.type=2
-		}
-		if(plateKey.length===7 || plateKey.length===8){
-			this.currentInputValue = plateKey
-			this.currentInputIndex = plateKey.length-1
-		}
-
-		setTimeout(() => {  //在动画结束之后才开始获取
-			this.$nextTick(()=>{
-				this.changeKeyboardHeight()
-			})
-		}, 500);
-	}
-};
-</script>
-<style scoped lang="less">
-@import './uni-plate-input';
-</style>
+/**
+* @author minisola
+* @version 20190814
+*/
+<template>
+	<view class="so-mask">
+		<view class="so-plate animation-scale-up">
+			<view class="so-plate-head">
+				<view class="so-plate-type">
+					<radio-group @change="typeChange">
+						<label>
+							<radio value="1" :checked="type===1" />
+							普通车牌
+						</label>
+						<label>
+							<radio value="2" :checked="type===2" />
+							新能源车牌
+						</label>
+					</radio-group>
+				</view>
+			</view>
+			<view class="so-plate-body">
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 0 }" @tap="inputSwitch" data-index="0">
+					<text>{{ currentInputValue[0] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 1 }" @tap="inputSwitch" data-index="1">
+					<text>{{ currentInputValue[1] }}</text>
+				</view>
+				<view class="so-plate-dot"></view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 2 }" @tap="inputSwitch" data-index="2">
+					<text>{{ currentInputValue[2] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 3 }" @tap="inputSwitch" data-index="3">
+					<text>{{ currentInputValue[3] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 4 }" @tap="inputSwitch" data-index="4">
+					<text>{{ currentInputValue[4] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 5 }" @tap="inputSwitch" data-index="5">
+					<text>{{ currentInputValue[5] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 6 }" @tap="inputSwitch" data-index="6">
+					<text>{{ currentInputValue[6] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 7 }" @tap="inputSwitch" v-if="type == 2" data-index="7">
+					<text>{{ currentInputValue[7] }}</text>
+				</view>
+			</view>
+			<view class="so-plate-foot">
+				<view class="so-plate-keyboard"  :style="{height:keyboardHeight}">
+					<view id="keyboard">
+						<block v-if="inputType == 1">
+							<view hover-class="hover" class="so-plate-key" v-for="el of provinceText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+						<block v-if="inputType == 1">
+							<text class="so-plate-key fill-block"></text>
+							<text class="so-plate-key fill-block"></text>
+						</block>
+						<block v-if="inputType >= 3">
+							<view hover-class="hover" class="so-plate-key" v-for="el of numberText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+						<block v-if="inputType >= 2">
+							<view hover-class="hover" class="so-plate-key" v-for="el of wordText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+						<block v-if="inputType == 3">
+							<text v-for="el of fillBlock" :key="el.num" class="so-plate-key fill-block"></text>
+						</block>
+						<block v-if="inputType == 4">
+							<view hover-class="hover" class="so-plate-key" v-for="el of lastWordText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+							<text v-if="inputType == 4" class="so-plate-key fill-block"></text>
+					</view>
+				</view>
+				<view class="so-plate-btn-group">
+					<view>
+						<button class="so-plate-btn so-plate-btn--cancel" @tap="$emit('close')">取消</button>
+					</view>
+					<view>
+						<button class="so-plate-btn so-plate-btn--delete" @tap="deleteKey">删除</button>
+						<button class="so-plate-btn so-plate-btn--submit" @tap="exportPlate">完成</button>
+						
+					</view>
+					
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	name: 'uni-plate-input',
+	data() {
+		return {
+			type: 1, //车牌类型
+			currentInputIndex: 0, //当前编辑的输入框
+			currentInputValue: ['', '', '', '', '', '', ''],
+			fillBlock:[{num:11},{num:12},{num:13},{num:14},{num:15},{num:16}],  //避免:key报错
+			keyboardHeightInit:false,
+			keyboardHeight:'auto',
+			provinceText: [
+				'粤',
+				'京',
+				'冀',
+				'沪',
+				'津',
+				'晋',
+				'蒙',
+				'辽',
+				'吉',
+				'黑',
+				'苏',
+				'浙',
+				'皖',
+				'闽',
+				'赣',
+				'鲁',
+				'豫',
+				'鄂',
+				'湘',
+				'桂',
+				'琼',
+				'渝',
+				'川',
+				'贵',
+				'云',
+				'藏',
+				'陕',
+				'甘',
+				'青',
+				'宁',
+				'新'
+			],
+			numberText: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
+			wordText: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'],
+			lastWordText: ['港', '澳', '学', '领', '警']
+		};
+	},
+	props: {
+		plate: {
+			type: String
+		}
+	},
+	computed: {
+		//输入框类型
+		inputType() {
+			switch (this.currentInputIndex) {
+				case 0:
+					return 1;
+					break;
+				case 1:
+					return 2;
+					break;
+				case 2:
+					return 3;
+					break;
+				case 3:
+					return 3;
+					break;
+				case 4:
+					return 3;
+					break;
+				case 5:
+					return 3;
+					break;
+				case 6:
+					return this.type==2 ? 3 :4 ;
+					break;
+				case 7:
+					return 4;
+					break;
+				default:
+					return 1;
+					break;
+			}
+		}
+	},
+	watch:{
+		currentInputIndex:function(n,o){
+			if(!this.keyboardHeightInit) return
+				this.$nextTick(()=>{
+					this.changeKeyboardHeight()
+				})
+		}
+	},
+	methods: {
+		//车牌类型切换
+		typeChange(e) {
+			const {value} = e.detail;
+			this.type = parseInt(value)
+			this.currentInputIndex = 0
+			if(value==1){
+				this.currentInputValue = ['','','','','','','']
+			}else{
+				this.currentInputValue = ['','','','','','','','']
+			}
+		},
+		inputSwitch(e) {
+			const { index } = e.currentTarget.dataset;
+			this.currentInputIndex = parseInt(index);
+		},
+		chooseKey(e) {
+			const { value } = e.currentTarget.dataset;
+			this.$set(this.currentInputValue, this.currentInputIndex, value);
+			if(this.type==1 && this.currentInputIndex<6){
+				this.currentInputIndex++
+			}
+			if(this.type==2 && this.currentInputIndex<7){
+				this.currentInputIndex++
+			}
+		},
+		deleteKey(){
+				this.$set(this.currentInputValue,this.currentInputIndex,'')
+				if(this.currentInputIndex!=0) this.currentInputIndex--
+		},
+		exportPlate(){
+			const plate = this.currentInputValue.join('')
+			let err = false
+			if(this.type===1&&plate.length!=7){
+				err = true
+			}else if(this.type===2&&plate.length!=8){
+				err = true
+			}
+			if(err) return uni.showToast({
+				title:'请输入完整的车牌号码',
+				icon:'none'
+			})
+			
+			this.$emit('export',plate)
+		},
+		changeKeyboardHeight(){
+			const that = this
+			const query = uni.createSelectorQuery().in(this);
+			query.select('#keyboard').boundingClientRect();
+			query.exec(function(res) {
+				if(res&&res[0]){
+					that.keyboardHeight = res[0].height + uni.upx2px(30) + 'px'
+					that.keyboardHeightInit = true
+				}
+			});
+		}
+	},
+	mounted() {
+		console.log(this.plate);
+		const plateKey = this.plate.split('')
+		if(plateKey.length===7){
+			this.type=1
+		}else if(plateKey.length===8){
+			this.type=2
+		}
+		if(plateKey.length===7 || plateKey.length===8){
+			this.currentInputValue = plateKey
+			this.currentInputIndex = plateKey.length-1
+		}
+
+		setTimeout(() => {  //在动画结束之后才开始获取
+			this.$nextTick(()=>{
+				this.changeKeyboardHeight()
+			})
+		}, 500);
+	}
+};
+</script>
+<style scoped lang="less">
+@import './uni-plate-input';
+</style>

+ 236 - 236
pages.json

@@ -1,237 +1,237 @@
-{
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "填写爱车信息"
-			}
-		},
-		{
-			"path": "pages/shop/shopList",
-			"style": {
-				"navigationBarTitleText": "4S门店"
-			}
-		},
-		{
-			"path": "pages/me/me",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#FFEDEA"
-			}
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/login/empower",
-			"style": {
-				"navigationBarTitleText": "天下养车"
-			}
-		},
-		{
-			"path": "pages/login/iphoneLogin",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#FFFFFF"
-			}
-		},
-		{
-			"path": "pages/module/maintain",
-			"style": {
-				"navigationBarTitleText": "保养方案",
-				"navigationBarBackgroundColor":"#FF4F00",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/module/replaceGoods",
-			"style": {
-				"navigationBarTitleText": "可更换商品"
-				
-			}
-		},
-		{
-			"path": "pages/module/confirmOrder",
-			"style": {
-				"navigationBarTitleText": "订单确认"
-				
-			}
-		},
-		{
-			"path": "pages/module/orderShop",
-			"style": {
-				"navigationBarTitleText": "选择门店"
-				
-			}
-		}
-		, {
-			"path": "pages/index/addCar",
-			"style": {
-				"navigationBarTitleText": "添加爱车",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/index/cailist",
-			"style": {
-				"navigationBarTitleText": "我的车库",
-				"navigationBarBackgroundColor": "#FFFFFF"
-			}
-		},
-		{
-			"path": "pages/index/carModel",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/me/setup",
-			"style": {
-				"navigationBarTitleText": "账号设置",
-				"navigationBarBackgroundColor": "#FFFFFF"
-
-			}
-		},
-		{
-			"path": "pages/iPhone/phoneList",
-			"style": {
-				"navigationBarTitleText": "联系人管理"
-
-			}
-		},
-		{
-			"path": "pages/iPhone/addphone",
-			"style": {
-				"navigationBarTitleText": "新增联系人"
-
-			}
-		},
-		{
-			"path": "pages/me/treaty",
-			"style": {
-				"navigationBarTitleText": "服务协议",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/intimity",
-			"style": {
-				"navigationBarTitleText": "隐私政策",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/order/myorder",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		}, 
-		{
-			"path": "pages/order/evaluate",
-			"style": {
-				"navigationBarTitleText": "评价"
-			}
-		},
-		{
-			"path": "pages/me/discountCard",
-			"style": {
-				"navigationBarTitleText": "优惠券",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#FFFFFF"
-			}
-
-		}, {
-			"path": "pages/me/discountDetail",
-			"style": {
-				"navigationBarTitleText": "优惠券详情",
-				"navigationBarBackgroundColor": "#BE573F"
-			}
-
-		}, {
-			"path": "pages/me/myAppraise",
-			"style": {
-				"navigationBarTitleText": "我的评价",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": true
-			}
-
-		}, {
-			"path": "pages/me/myAppraiseDetail",
-			"style": {
-				"navigationBarTitleText": "查看评价",
-				"navigationBarBackgroundColor": "#FFFFFF"
-			}
-		}, {
-			"path": "pages/me/feedBack",
-			"style": {
-				"navigationBarTitleText": "意见反馈",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/shop/ckShop",
-			"style": {
-				"navigationBarTitleText": "选择门店",
-				"navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": true
-			}
-		},
-		 {
-			"path": "pages/shop/shopDetail",
-			"style": {
-				"navigationBarTitleText": "门店详情",
-				"navigationBarBackgroundColor": "#FFFFFF"
-			}
-		} 
-	],
-	"tabBar": {
-		"color": "#8a8a8a",
-		"selectedColor": "#FF4F00",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/img/tabme1.png",
-				"selectedIconPath": "static/img/tabme2.png",
-				"text": "4S保养"
-			},
-
-			{
-				"pagePath": "pages/shop/shopList",
-				"iconPath": "static/img/tabshop1.png",
-				"selectedIconPath": "static/img/tabshop2.png",
-				"text": "4S门店"
-			},
-			{
-				"pagePath": "pages/me/me",
-				"iconPath": "static/img/tabme1.png",
-				"selectedIconPath": "static/img/tabme2.png",
-				"text": "我的"
-			}
-
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	}
+{
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "填写爱车信息"
+			}
+		},
+		{
+			"path": "pages/shop/shopList",
+			"style": {
+				"navigationBarTitleText": "4S门店"
+			}
+		},
+		{
+			"path": "pages/me/me",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#FFEDEA"
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/empower",
+			"style": {
+				"navigationBarTitleText": "天下养车"
+			}
+		},
+		{
+			"path": "pages/login/iphoneLogin",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/module/maintain",
+			"style": {
+				"navigationBarTitleText": "保养方案",
+				"navigationBarBackgroundColor":"#FF4F00",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/module/replaceGoods",
+			"style": {
+				"navigationBarTitleText": "可更换商品"
+				
+			}
+		},
+		{
+			"path": "pages/module/confirmOrder",
+			"style": {
+				"navigationBarTitleText": "订单确认"
+				
+			}
+		},
+		{
+			"path": "pages/module/orderShop",
+			"style": {
+				"navigationBarTitleText": "选择门店"
+				
+			}
+		}
+		, {
+			"path": "pages/index/addCar",
+			"style": {
+				"navigationBarTitleText": "添加爱车",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/index/cailist",
+			"style": {
+				"navigationBarTitleText": "我的车库",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/index/carModel",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/me/setup",
+			"style": {
+				"navigationBarTitleText": "账号设置",
+				"navigationBarBackgroundColor": "#FFFFFF"
+
+			}
+		},
+		{
+			"path": "pages/iPhone/phoneList",
+			"style": {
+				"navigationBarTitleText": "联系人管理"
+
+			}
+		},
+		{
+			"path": "pages/iPhone/addphone",
+			"style": {
+				"navigationBarTitleText": "新增联系人"
+
+			}
+		},
+		{
+			"path": "pages/me/treaty",
+			"style": {
+				"navigationBarTitleText": "服务协议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/intimity",
+			"style": {
+				"navigationBarTitleText": "隐私政策",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/order/myorder",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order/orderDetail",
+			"style": {
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		}, 
+		{
+			"path": "pages/order/evaluate",
+			"style": {
+				"navigationBarTitleText": "评价"
+			}
+		},
+		{
+			"path": "pages/me/discountCard",
+			"style": {
+				"navigationBarTitleText": "优惠券",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+
+		}, {
+			"path": "pages/me/discountDetail",
+			"style": {
+				"navigationBarTitleText": "优惠券详情",
+				"navigationBarBackgroundColor": "#BE573F"
+			}
+
+		}, {
+			"path": "pages/me/myAppraise",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/me/myAppraiseDetail",
+			"style": {
+				"navigationBarTitleText": "查看评价",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/me/feedBack",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/shop/ckShop",
+			"style": {
+				"navigationBarTitleText": "选择门店",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+		},
+		 {
+			"path": "pages/shop/shopDetail",
+			"style": {
+				"navigationBarTitleText": "门店详情",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		} 
+	],
+	"tabBar": {
+		"color": "#8a8a8a",
+		"selectedColor": "#FF4F00",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/img/tabme1.png",
+				"selectedIconPath": "static/img/tabme2.png",
+				"text": "4S保养"
+			},
+
+			{
+				"pagePath": "pages/shop/shopList",
+				"iconPath": "static/img/tabshop1.png",
+				"selectedIconPath": "static/img/tabshop2.png",
+				"text": "4S门店"
+			},
+			{
+				"pagePath": "pages/me/me",
+				"iconPath": "static/img/tabme1.png",
+				"selectedIconPath": "static/img/tabme2.png",
+				"text": "我的"
+			}
+
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	}
 }

+ 280 - 280
pages/index/addCar.vue

@@ -1,181 +1,181 @@
-<template>
-	<view class="content">
-
-		<!-- 填写车辆信息 -->
-		<view class="carMessage">
-
-			<view class="mesView">
-				<view class="leftTitle">车牌号</view>
-				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
-					@tap="plateShow=true" v-model.trim="plateNo" />
-				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
-
-
-			</view>
-
-			<view class="mesView" @click="goCarModel()">
-				<view class="leftTitle">车型</view>
-				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
-				<view class="carModBtn selectColor" v-else>{{carModelInfo.value}}</view>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">购车时间</view>
-				<picker class="timeBtn" @change="bindChange" mode="date">
-					<view class="uni-input selectColor" v-if="time">{{time}}</view>
-					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
-				</picker>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">行驶里程</view>
-				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
-					placeholder-style="color:#999999" />
-				<view class="kmStr">km</view>
-			</view>
-
-
-		</view>
-
-
-		<view class="bottomView">
-			<view class="saveCar" @click="saveCar()">保存爱车</view>
-		</view>
-
-
-	</view>
-</template>
-
-<script>
-	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
-	export default {
-		components: {
-			plateInput
-		},
-
-		data() {
-			return {
-
-				plateNo: '',
-				plateShow: false,
-				carModelInfo: '',
-				time: '',
-				mileage: '',
-				carId: '',
-				isEditCar: false,
-
-			}
-		},
-		onLoad(opt) {
-			var carModelInfo = uni.getStorageSync("carModelInfo");
-			if (carModelInfo) {
-				this.carModelInfo = carModelInfo;
-			}
-			console.log(opt);
-			this.isEditCar = opt.isEditCar
-			this.carId = opt.id
-			if (this.isEditCar == 1) {
-				this.getEditData()
-			}
-		},
-		onShow() {
-			var carModelInfo = uni.getStorageSync("carModelInfo");
-			if (carModelInfo) {
-				this.carModelInfo = carModelInfo;
-			}
-		},
-		methods: {
-			getEditData() {
-				uni.showLoading({});
-				var carModelInfo = {
-					carModelInfo: {
-
-					}
-				}
-				this.$http('worldKeepCar/worldHome/queryMyTMemberCarDetail', {
-					id: this.carId
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					carModelInfo.carModelInfo.logo = res.data.brandLogo;
-					carModelInfo.carModelInfo.brand = res.data.brand;
-					carModelInfo.carModelInfo.carSeries = res.data.series;
-					carModelInfo.carModelInfo.displacement = res.data.displacement;
-					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
-					carModelInfo.carModelInfo.modelYear = res.data.annualmoney;
-					carModelInfo.carModelInfo.carModel = res.data.carModel;
+<template>
+	<view class="content">
+
+		<!-- 填写车辆信息 -->
+		<view class="carMessage">
+
+			<view class="mesView">
+				<view class="leftTitle">车牌号</view>
+				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
+					@tap="plateShow=true" v-model.trim="plateNo" />
+				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
+
+
+			</view>
+
+			<view class="mesView" @click="goCarModel()">
+				<view class="leftTitle">车型</view>
+				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
+				<view class="carModBtn selectColor" v-else>{{carModelInfo.value}}</view>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">购车时间</view>
+				<picker class="timeBtn" @change="bindChange" mode="date">
+					<view class="uni-input selectColor" v-if="time">{{time}}</view>
+					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
+				</picker>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">行驶里程</view>
+				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
+					placeholder-style="color:#999999" />
+				<view class="kmStr">km</view>
+			</view>
+
+
+		</view>
+
+
+		<view class="bottomView">
+			<view class="saveCar" @click="saveCar()">保存爱车</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
+	export default {
+		components: {
+			plateInput
+		},
+
+		data() {
+			return {
+
+				plateNo: '',
+				plateShow: false,
+				carModelInfo: '',
+				time: '',
+				mileage: '',
+				carId: '',
+				isEditCar: false,
+
+			}
+		},
+		onLoad(opt) {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+			console.log(opt);
+			this.isEditCar = opt.isEditCar
+			this.carId = opt.id
+			if (this.isEditCar == 1) {
+				this.getEditData()
+			}
+		},
+		onShow() {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+		},
+		methods: {
+			getEditData() {
+				uni.showLoading({});
+				var carModelInfo = {
+					carModelInfo: {
+
+					}
+				}
+				this.$http('worldKeepCar/worldHome/queryMyTMemberCarDetail', {
+					id: this.carId
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					carModelInfo.carModelInfo.logo = res.data.brandLogo;
+					carModelInfo.carModelInfo.brand = res.data.brand;
+					carModelInfo.carModelInfo.carSeries = res.data.series;
+					carModelInfo.carModelInfo.displacement = res.data.displacement;
+					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
+					carModelInfo.carModelInfo.modelYear = res.data.annualmoney;
+					carModelInfo.carModelInfo.carModel = res.data.carModel;
 					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
-					
-
 					
-					// 展示时
+
+					
+					// 展示时
 					this.plateNo = res.data.plateNumber;
 					carModelInfo.value = res.data.carModel;
-					this.time = res.data.createTime;
-					this.mileage = res.data.milage;
-
-					this.carModelInfo = carModelInfo;
-
-				})
-			},
-			goCarModel() {
-				uni.navigateTo({
-					url: 'carModel'
-				})
-			},
-			setPlate(plate) {
-				if (plate.length >= 7) this.plateNo = plate;
-				this.plateShow = false;
-			},
-
-
-			bindChange(e) {
-				console.log(e);
-				this.time = e.target.value
-			},
-
-			saveCar() {
-				uni.showLoading({});
-				if (this.plateNo == '') {
-					uni.showToast({
-						title: '请填写车牌号',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.carModelInfo == '') {
-					uni.showToast({
-						title: '请选择车型',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.time == '') {
-					uni.showToast({
-						title: '请选择购车时间',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.mileage == '') {
-					uni.showToast({
-						title: '请输入行驶里程',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
+					this.time = res.data.createTime;
+					this.mileage = res.data.milage;
+
+					this.carModelInfo = carModelInfo;
+
+				})
+			},
+			goCarModel() {
+				uni.navigateTo({
+					url: 'carModel'
+				})
+			},
+			setPlate(plate) {
+				if (plate.length >= 7) this.plateNo = plate;
+				this.plateShow = false;
+			},
+
+
+			bindChange(e) {
+				console.log(e);
+				this.time = e.target.value
+			},
+
+			saveCar() {
+				uni.showLoading({});
+				if (this.plateNo == '') {
+					uni.showToast({
+						title: '请填写车牌号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.carModelInfo == '') {
+					uni.showToast({
+						title: '请选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.time == '') {
+					uni.showToast({
+						title: '请选择购车时间',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.mileage == '') {
+					uni.showToast({
+						title: '请输入行驶里程',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
 				if (this.isEditCar == 1) {
 					this.updateTMemberCar()
 				}
 				else {
 					this.addTMemberCar()
-				}
-				
+				}
+				
 			},
 			
 			addTMemberCar(){
@@ -219,7 +219,7 @@
 					}
 				
 				})
-			},
+			},
 			updateTMemberCar(){
 				this.$http('worldKeepCar/worldHome/updateTMemberCar', {
 					plateNumber: this.plateNo,
@@ -263,114 +263,114 @@
 					}
 				
 				})
-			},
-		}
-	}
-</script>
-
-<style>
-	.content {
-		min-height: 100vh;
-		background-color: #F4F5F7;
-		padding-top: 20rpx;
-	}
-
-
-
-	.carMessage {
-		margin: 0rpx 24rpx 40rpx;
-		padding-top: 20rpx;
-		height: 500rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-
-
-	.mesView {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		background-color: #FFFFFF;
-	}
-
-	.leftTitle {
-		margin: 28rpx;
-		width: 120rpx;
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-
-	.noSelectColor {
-		color: #999999;
-
-	}
-
-	.selectColor {
-		color: #333333;
-
-	}
-
-	.rightArrow {
-		margin-right: 28rpx;
-		width: 14rpx;
-		height: 23rpx;
-
-	}
-
-	.cityBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.plateNumber {
-		width: 55%;
-		font-size: 28rpx;
-	}
-
-
-	.carModBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.timeBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.mileageInput {
-		width: 20%;
-		font-size: 28rpx;
-	}
-
-	.kmStr {
-		font-size: 28rpx;
-		color: #333333;
-
-	}
-
-	.bottomView {
-		background-color: #FFFFFF;
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0rpx;
-	}
-
-	.saveCar {
-
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-		margin: 23rpx 30rpx;
-		height: 74rpx;
-		line-height: 74rpx;
-		border-radius: 37rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		font-weight: bold;
-		text-align: center;
-
-	}
+			},
+		}
+	}
+</script>
+
+<style>
+	.content {
+		min-height: 100vh;
+		background-color: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+
+
+	.carMessage {
+		margin: 0rpx 24rpx 40rpx;
+		padding-top: 20rpx;
+		height: 500rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+
+
+	.mesView {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		background-color: #FFFFFF;
+	}
+
+	.leftTitle {
+		margin: 28rpx;
+		width: 120rpx;
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+
+	.noSelectColor {
+		color: #999999;
+
+	}
+
+	.selectColor {
+		color: #333333;
+
+	}
+
+	.rightArrow {
+		margin-right: 28rpx;
+		width: 14rpx;
+		height: 23rpx;
+
+	}
+
+	.cityBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.plateNumber {
+		width: 55%;
+		font-size: 28rpx;
+	}
+
+
+	.carModBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.timeBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.mileageInput {
+		width: 20%;
+		font-size: 28rpx;
+	}
+
+	.kmStr {
+		font-size: 28rpx;
+		color: #333333;
+
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+	}
+
+	.saveCar {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		line-height: 74rpx;
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+		text-align: center;
+
+	}
 </style>

+ 366 - 366
pages/index/index.vue

@@ -1,370 +1,370 @@
-<template>
-	<view class="content">
-		<!-- 轮播图 -->
-		<view class="bBannerList">
-			<swiper class="swiper" :autoplay="autoplay" :interval="interval" :duration="duration" :circular="true">
-				<swiper-item v-for="(item,index) in imgData" @click="carBswpClick(item)" v-if="!shopId">
-					<view class="swiper-item uni-bg-red">
-						<image :src="item.logo" mode="" class="swpImg"></image>
-					</view>
-				</swiper-item>
-				<swiper-item v-for="(item,index) in imgData" @click="carBswpClickshop(item)" v-if="shopId">
-					<view class="swiper-item uni-bg-red">
-						<image :src="item.logo" mode="" class="swpImg"></image>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<!-- 填写车辆信息 -->
-		<view class="carMessage">
-			<view class="mesView">
-				<view class="leftTitle">城市</view>
-				<view class="cityBtn noSelectColor" v-if="!cityname" @click="showCity=true">请选择</view>
-				<view class="cityBtn selectColor" v-else @click="showCity=true">{{cityname}}</view>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">车牌号</view>
-
-				<view class="rightView" v-if="!memberCar">
-					<view class="plateNumber noSelectColor">请添加您的爱车</view>
-
-					<view class="changeCarBg" @click="addCar()">
-						<image src="../../static/img/icon_change.png"
-							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
-						<view style="color: #FF2400; font-size: 28rpx;">添加</view>
-					</view>
-				</view>
-				<view class="rightView" v-else>
-					<view class="plateNumber selectColor">{{memberCar.plateNumber}}</view>
-
-					<view class="changeCarBg" @click="goCarList()">
-						<image src="../../static/img/icon_change.png"
-							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
-						<view style="color: #FF2400; font-size: 28rpx;">换车</view>
-					</view>
-				</view>
-
-
-			</view>
-			<view class="mesView">
-				<view class="leftTitle">车型</view>
-				<view class="carModBtn selectColor" v-if="memberCar">{{memberCar.carModel}}</view>
-
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">行驶里程</view>
-				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
-					placeholder-style="color:#999999" />
-				<view class="kmStr">km</view>
-			</view>
-
-
-		</view>
-
-
-		<view class="look4s" @click="gomodule">查看4S店保养价格</view>
-
-		<chose-city @selectCity="selectCity" v-if="showCity" @closeModal="closeModal"></chose-city>
-
-	</view>
-</template>
-
-<script>
-	import choseCity from "@/components/chose-city/chose-city"
-	export default {
-		components: {
-			choseCity
-		},
-
-		data() {
-			return {
-				imgData: [],
-				uid: '',
-				cityname: '',
-				showCity: false,
-				memberCar: '',
-				location: {
-					lng:'',
-					lat:'',
-					cityname:'',
-					cityCode:'',
-				},
-				cityCode: '',
-				time: '',
-				mileage: '',
-                autoplay:true,
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-
-			var that = this;
-			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-
-			this.uid = uni.getStorageSync("logodata").uid;
-
-			var location = uni.getStorageSync("location");
-
-
-			if (location) {
-				this.lng = location.lng;
-				this.lat = location.lat;
-				this.cityname = location.cityname;
-				this.cityCode = location.cityCode;
-                this.location=location
-				that.queryHomeDetail();
-			} else {
-				/* uni.showToast({
-					title: '请选择城市'
-				}) */
-				uni.getLocation({
-				    type: 'gcj02',
-				    success: function (res) {
-				       console.log(res)
-						that.lng=res.longitude
-						that.lat=res.latitude
-						that.getAdress();
-						
-				    },
-					 fail(err) {
-						
-					 }
-				}); 
-			}
-
-		},
-
-		methods: {
-
-			queryHomeDetail() {
-				uni.showLoading({
-					title: '加载中'
-				})
-
-				this.$http('worldKeepCar/worldHome/queryHomeDetail', {
-					cityCode: this.cityCode
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					this.imgData = res.data.banners
-					this.memberCar = res.data.memberCar
-					this.mileage = res.data.memberCar.milage
-
-					var cardata = uni.getStorageSync("maintainCarData")
+<template>
+	<view class="content">
+		<!-- 轮播图 -->
+		<view class="bBannerList">
+			<swiper class="swiper" :autoplay="autoplay" :interval="interval" :duration="duration" :circular="true">
+				<swiper-item v-for="(item,index) in imgData" @click="carBswpClick(item)" v-if="!shopId">
+					<view class="swiper-item uni-bg-red">
+						<image :src="item.logo" mode="" class="swpImg"></image>
+					</view>
+				</swiper-item>
+				<swiper-item v-for="(item,index) in imgData" @click="carBswpClickshop(item)" v-if="shopId">
+					<view class="swiper-item uni-bg-red">
+						<image :src="item.logo" mode="" class="swpImg"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- 填写车辆信息 -->
+		<view class="carMessage">
+			<view class="mesView">
+				<view class="leftTitle">城市</view>
+				<view class="cityBtn noSelectColor" v-if="!cityname" @click="showCity=true">请选择</view>
+				<view class="cityBtn selectColor" v-else @click="showCity=true">{{cityname}}</view>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">车牌号</view>
+
+				<view class="rightView" v-if="!memberCar">
+					<view class="plateNumber noSelectColor">请添加您的爱车</view>
+
+					<view class="changeCarBg" @click="addCar()">
+						<image src="../../static/img/icon_change.png"
+							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
+						<view style="color: #FF2400; font-size: 28rpx;">添加</view>
+					</view>
+				</view>
+				<view class="rightView" v-else>
+					<view class="plateNumber selectColor">{{memberCar.plateNumber}}</view>
+
+					<view class="changeCarBg" @click="goCarList()">
+						<image src="../../static/img/icon_change.png"
+							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
+						<view style="color: #FF2400; font-size: 28rpx;">换车</view>
+					</view>
+				</view>
+
+
+			</view>
+			<view class="mesView">
+				<view class="leftTitle">车型</view>
+				<view class="carModBtn selectColor" v-if="memberCar">{{memberCar.carModel}}</view>
+
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">行驶里程</view>
+				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
+					placeholder-style="color:#999999" />
+				<view class="kmStr">km</view>
+			</view>
+
+
+		</view>
+
+
+		<view class="look4s" @click="gomodule">查看4S店保养价格</view>
+
+		<chose-city @selectCity="selectCity" v-if="showCity" @closeModal="closeModal"></chose-city>
+
+	</view>
+</template>
+
+<script>
+	import choseCity from "@/components/chose-city/chose-city"
+	export default {
+		components: {
+			choseCity
+		},
+
+		data() {
+			return {
+				imgData: [],
+				uid: '',
+				cityname: '',
+				showCity: false,
+				memberCar: '',
+				location: {
+					lng:'',
+					lat:'',
+					cityname:'',
+					cityCode:'',
+				},
+				cityCode: '',
+				time: '',
+				mileage: '',
+                autoplay:true,
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+
+			var that = this;
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+
+			this.uid = uni.getStorageSync("logodata").uid;
+
+			var location = uni.getStorageSync("location");
+
+
+			if (location) {
+				this.lng = location.lng;
+				this.lat = location.lat;
+				this.cityname = location.cityname;
+				this.cityCode = location.cityCode;
+                this.location=location
+				that.queryHomeDetail();
+			} else {
+				/* uni.showToast({
+					title: '请选择城市'
+				}) */
+				uni.getLocation({
+				    type: 'gcj02',
+				    success: function (res) {
+				       console.log(res)
+						that.lng=res.longitude
+						that.lat=res.latitude
+						that.getAdress();
+						
+				    },
+					 fail(err) {
+						
+					 }
+				}); 
+			}
+
+		},
+
+		methods: {
+
+			queryHomeDetail() {
+				uni.showLoading({
+					title: '加载中'
+				})
+
+				this.$http('worldKeepCar/worldHome/queryHomeDetail', {
+					cityCode: this.cityCode
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.imgData = res.data.banners
+					this.memberCar = res.data.memberCar
+					this.mileage = res.data.memberCar.milage
+
+					var cardata = uni.getStorageSync("maintainCarData")
 					
 					if (cardata) {
 						this.memberCar = cardata
-					}else{
-						uni.setStorage({
-							key: 'maintainCarData',
-							data: this.memberCar,
-							success: function () {			
-						     }
-						}); 
-					}
-					
-				})
-			},
-			gomodule() {
-				uni.navigateTo({
-					url: '../module/maintain'
-				})
-			},
-
-			goCarList() {
-				if (this.uid) {
-					uni.navigateTo({
-						url: 'cailist?type=1'
-					})
-				}
-			},
-			addCar() {
-				uni.navigateTo({
-					url: 'addCar'
-
-				})
-			},
-			selectCity(item) {
-				console.log('-您选择的城市-', item)
-				console.log(this.location)
-				this.location.cityname = item.name;
-				this.location.cityCode = item.citycode;
-				this.cityname = item.name;
-				console.log(this.location)
-				uni.setStorage({
-					key: 'location',
-					data: this.location,
-					success: function() {}
-				});
-				this.showCity = false;
-
-			},
-			closeModal() {
-				this.showCity = false
-
-			},
-
-
-			bindChange(e) {
-				console.log(e);
-				this.time = e.target.value
-			},
-            getAdress(){
-            	var location=this.lng+','+this.lat
-            	uni.request({
-            	    url: 'https://restapi.amap.com/v3/place/around', //仅为示例,并非真实接口地址。
-            	    data: {
-            	        key: '064b6a4a8ade55656edcde2f528876de',
-            			location: location,
-            			types:"190000",
-            			extensions:"all",
-            			radius:100
-            	    },
-            	    dataType: "json",
-            	    success: (res) => {
-            	        console.log(res);
-            	        this.cityname=res.data.pois[0].cityname;
-            			var cityCode=res.data.pois[0].adcode
-            			cityCode=cityCode.slice(0, -2)
-            			cityCode=cityCode+'00'
-						this.cityCode=cityCode
-            			var obj={
-            				cityname:this.cityname,
-            				lng:this.lng,
-            				lat:this.lat,
-            				cityCode:cityCode
-            			}
-            			uni.setStorage({
-            				key: 'location',
-            				data: obj,
-            				success: function () {}
-            			}); 
-            			this.queryHomeDetail();
-            	    }
-            	});
-            },
-
-
-		}
-	}
-</script>
-
-<style>
-	.content {
-		min-height: 100vh;
-		background-color: #F4F5F7;
-	}
-
-	.bBannerList {
-		width: 100%;
-		height: 300rpx;
-		background-color: #F4F5F7;
-	}
-
-	.swpImg {
-		width: 100%;
-		height: 300rpx;
-	}
-
-	.carMessage {
-		margin: 24rpx 24rpx 40rpx;
-		padding-top: 10rpx;
-		height: 500rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.look4s {
-		margin: 40rpx 24rpx;
-		height: 88rpx;
-		line-height: 88rpx;
-		text-align: center;
-		background-color: #FD5300;
-		border-radius: 10rpx;
-		color: #FFFFFF;
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.mesView {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		background-color: #FFFFFF;
-	}
-
-	.leftTitle {
-		margin: 28rpx;
-		width: 120rpx;
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-
-	.noSelectColor {
-		color: #999999;
-
-	}
-
-	.selectColor {
-		color: #333333;
-
-	}
-
-	.rightArrow {
-		margin-right: 28rpx;
-		width: 14rpx;
-		height: 23rpx;
-
-	}
-
-	.cityBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.rightView {
-		display: flex;
-		justify-content: space-between;
-		width: 80%;
-	}
-
-	.plateNumber {
-		font-size: 28rpx;
-	}
-
-
-	.carModBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.timeBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.mileageInput {
-		width: 20%;
-		font-size: 28rpx;
-	}
-
-	.kmStr {
-		font-size: 28rpx;
-		color: #333333;
-
-	}
-
-	.changeCarBg {
-		display: flex;
-		/* justify-content: flex-start; */
-		align-items: center;
-		width: 120rpx;
-		margin-right: 28rpx;
-	}
+					}else{
+						uni.setStorage({
+							key: 'maintainCarData',
+							data: this.memberCar,
+							success: function () {			
+						     }
+						}); 
+					}
+					
+				})
+			},
+			gomodule() {
+				uni.navigateTo({
+					url: '../module/maintain'
+				})
+			},
+
+			goCarList() {
+				if (this.uid) {
+					uni.navigateTo({
+						url: 'cailist?type=1'
+					})
+				}
+			},
+			addCar() {
+				uni.navigateTo({
+					url: 'addCar'
+
+				})
+			},
+			selectCity(item) {
+				console.log('-您选择的城市-', item)
+				console.log(this.location)
+				this.location.cityname = item.name;
+				this.location.cityCode = item.citycode;
+				this.cityname = item.name;
+				console.log(this.location)
+				uni.setStorage({
+					key: 'location',
+					data: this.location,
+					success: function() {}
+				});
+				this.showCity = false;
+
+			},
+			closeModal() {
+				this.showCity = false
+
+			},
+
+
+			bindChange(e) {
+				console.log(e);
+				this.time = e.target.value
+			},
+            getAdress(){
+            	var location=this.lng+','+this.lat
+            	uni.request({
+            	    url: 'https://restapi.amap.com/v3/place/around', //仅为示例,并非真实接口地址。
+            	    data: {
+            	        key: '064b6a4a8ade55656edcde2f528876de',
+            			location: location,
+            			types:"190000",
+            			extensions:"all",
+            			radius:100
+            	    },
+            	    dataType: "json",
+            	    success: (res) => {
+            	        console.log(res);
+            	        this.cityname=res.data.pois[0].cityname;
+            			var cityCode=res.data.pois[0].adcode
+            			cityCode=cityCode.slice(0, -2)
+            			cityCode=cityCode+'00'
+						this.cityCode=cityCode
+            			var obj={
+            				cityname:this.cityname,
+            				lng:this.lng,
+            				lat:this.lat,
+            				cityCode:cityCode
+            			}
+            			uni.setStorage({
+            				key: 'location',
+            				data: obj,
+            				success: function () {}
+            			}); 
+            			this.queryHomeDetail();
+            	    }
+            	});
+            },
+
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		min-height: 100vh;
+		background-color: #F4F5F7;
+	}
+
+	.bBannerList {
+		width: 100%;
+		height: 300rpx;
+		background-color: #F4F5F7;
+	}
+
+	.swpImg {
+		width: 100%;
+		height: 300rpx;
+	}
+
+	.carMessage {
+		margin: 24rpx 24rpx 40rpx;
+		padding-top: 10rpx;
+		height: 500rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.look4s {
+		margin: 40rpx 24rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		background-color: #FD5300;
+		border-radius: 10rpx;
+		color: #FFFFFF;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+
+	.mesView {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		background-color: #FFFFFF;
+	}
+
+	.leftTitle {
+		margin: 28rpx;
+		width: 120rpx;
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+
+	.noSelectColor {
+		color: #999999;
+
+	}
+
+	.selectColor {
+		color: #333333;
+
+	}
+
+	.rightArrow {
+		margin-right: 28rpx;
+		width: 14rpx;
+		height: 23rpx;
+
+	}
+
+	.cityBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.rightView {
+		display: flex;
+		justify-content: space-between;
+		width: 80%;
+	}
+
+	.plateNumber {
+		font-size: 28rpx;
+	}
+
+
+	.carModBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.timeBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.mileageInput {
+		width: 20%;
+		font-size: 28rpx;
+	}
+
+	.kmStr {
+		font-size: 28rpx;
+		color: #333333;
+
+	}
+
+	.changeCarBg {
+		display: flex;
+		/* justify-content: flex-start; */
+		align-items: center;
+		width: 120rpx;
+		margin-right: 28rpx;
+	}
 </style>

+ 162 - 162
pages/login/empower.vue

@@ -1,144 +1,144 @@
-<template>
-	<view class="container">
-		<view v-if="!wxOpendata&&isload">
-			<view class="logoBox">
-				<image src="../../static/img/sign_bg.png" mode="" class="euroImg"></image>
-			</view>
+<template>
+	<view class="container">
+		<view v-if="!wxOpendata&&isload">
+			<view class="logoBox">
+				<image src="../../static/img/sign_bg.png" mode="" class="euroImg"></image>
+			</view>
 			
 			<view class="title1">欢迎使用天下养车小程序</view>
-			<view class="title2">天下养车为您的爱车提供全方面的功能支持 为保证您能正常使用,请以此授权微信和手机号</view>
-			<button class="wxlogin" @click="wxgologin">授权微信用户信息</button>
-			<view class="title3" @click="goIndex">取消授权</view>
-		</view>
-
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-				wxdata: '',
-				wxCode: '',
-				openID: '',
-				session_key: '',
-				wxPhoneData: '',
-				type: '',
-				wxOpendata: '',
-				isload: false,
-			}
-		},
-		onLoad(opt) {
-			this.type = opt.type;
-			this.wxOpendata = uni.getStorageSync("wxOpendata");
-
-			if (this.wxOpendata) {
-				uni.switchTab({
-					url: '../index/index'
-				})
-			} else {
-				this.isload = true;
-			}
-		},
-		methods: {
-			goIndex() {
-				uni.switchTab({
-					url: '../index/index'
-				})
-			},
-
-			//api uni.getUserProfile
-			wxgologin() {
-				var that = this;
-				uni.getUserProfile({
-					lang: 'zh_CN',
-					desc: '登录',
-					success: (res) => {
-						console.log(res);
-						that.wxdata = res;
-						uni.setStorage({
-							key: 'wxdata',
-							data: res,
-							success: function() {
-								that.ipLogin()
-
-							}
-						});
-					},
-					fail: (res) => {
-						console.log(res)
-					}
-				});
-			},
-			//api uni.login
-			ipLogin() {
-				var that = this;
-				uni.showLoading({});
-				uni.login({
-					provider: 'weixin',
-					success: function(loginRes) {
-						// console.log(loginRes)
-						that.wxCode = loginRes.code
-						that.getWxOpenID()
-
-					}
-				});
-
-			},
-
-			getWxOpenID() {
-				var that = this;
-				this.$http('worldKeepCar/sys/getWxOpenID', {
-					code: this.wxCode,
-				}, 'GET').then(res => {
-					// console.log(res)
-					this.openID = res.data.openid;
-					this.session_key = res.data.session_key;
-					// console.log(this.openID)
-					uni.setStorage({
-						key: 'wxOpendata',
-						data: res.data,
-						success: function() {
-							// that.ipLogin()
-							uni.hideLoading();
-							if (!that.type) {
-								uni.switchTab({
-									url: '../index/index'
-								})
-							} else {
-								uni.redirectTo({
-									url: 'login'
-								})
-							}
-						}
-					});
-
-				})
-			},
-
-		}
-	}
-</script>
-
-<style scoped>
-	.euroImg {
-		width: 440rpx;
-		height: 360rpx;
-	}
-
-	.logoBox {
-		text-align: center;
-		padding-top: 160rpx;
-	}
-
-	.title1 {
-		font-size: 30rpx;
+			<view class="title2">天下养车为您的爱车提供全方面的功能支持 为保证您能正常使用,请以此授权微信和手机号</view>
+			<button class="wxlogin" @click="wxgologin">授权微信用户信息</button>
+			<view class="title3" @click="goIndex">取消授权</view>
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+				wxdata: '',
+				wxCode: '',
+				openID: '',
+				session_key: '',
+				wxPhoneData: '',
+				type: '',
+				wxOpendata: '',
+				isload: false,
+			}
+		},
+		onLoad(opt) {
+			this.type = opt.type;
+			this.wxOpendata = uni.getStorageSync("wxOpendata");
+
+			if (this.wxOpendata) {
+				uni.switchTab({
+					url: '../index/index'
+				})
+			} else {
+				this.isload = true;
+			}
+		},
+		methods: {
+			goIndex() {
+				uni.switchTab({
+					url: '../index/index'
+				})
+			},
+
+			//api uni.getUserProfile
+			wxgologin() {
+				var that = this;
+				uni.getUserProfile({
+					lang: 'zh_CN',
+					desc: '登录',
+					success: (res) => {
+						console.log(res);
+						that.wxdata = res;
+						uni.setStorage({
+							key: 'wxdata',
+							data: res,
+							success: function() {
+								that.ipLogin()
+
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res)
+					}
+				});
+			},
+			//api uni.login
+			ipLogin() {
+				var that = this;
+				uni.showLoading({});
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						// console.log(loginRes)
+						that.wxCode = loginRes.code
+						that.getWxOpenID()
+
+					}
+				});
+
+			},
+
+			getWxOpenID() {
+				var that = this;
+				this.$http('worldKeepCar/sys/getWxOpenID', {
+					code: this.wxCode,
+				}, 'GET').then(res => {
+					// console.log(res)
+					this.openID = res.data.openid;
+					this.session_key = res.data.session_key;
+					// console.log(this.openID)
+					uni.setStorage({
+						key: 'wxOpendata',
+						data: res.data,
+						success: function() {
+							// that.ipLogin()
+							uni.hideLoading();
+							if (!that.type) {
+								uni.switchTab({
+									url: '../index/index'
+								})
+							} else {
+								uni.redirectTo({
+									url: 'login'
+								})
+							}
+						}
+					});
+
+				})
+			},
+
+		}
+	}
+</script>
+
+<style scoped>
+	.euroImg {
+		width: 440rpx;
+		height: 360rpx;
+	}
+
+	.logoBox {
+		text-align: center;
+		padding-top: 160rpx;
+	}
+
+	.title1 {
+		font-size: 30rpx;
 		text-align: center;
-		font-weight: bold;
-		color: #3C3C3C;
-		margin-top: 113rpx;
+		font-weight: bold;
+		color: #3C3C3C;
+		margin-top: 113rpx;
 	}
 	.title2 {
 		font-size: 26rpx;
@@ -146,28 +146,28 @@
 		color: #999999;
 		margin: 20rpx 98rpx 80rpx;
 		text-indent: 1em;
-	}
-
-	.wxlogin {
-		width: 658rpx;
-		height: 88rpx;
-
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%) #FF2400;
-		border-radius: 10rpx;
-		line-height: 88rpx;
-		text-align: center;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 20rpx;
-	}
-
-	.title3 {
-		width: 100vw;
-		position: fixed;
-		left: 0;
-		bottom: 50rpx;
-		font-size: 26rpx;
-		text-align: center;
-		color: #999999;
-	}
+	}
+
+	.wxlogin {
+		width: 658rpx;
+		height: 88rpx;
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%) #FF2400;
+		border-radius: 10rpx;
+		line-height: 88rpx;
+		text-align: center;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 20rpx;
+	}
+
+	.title3 {
+		width: 100vw;
+		position: fixed;
+		left: 0;
+		bottom: 50rpx;
+		font-size: 26rpx;
+		text-align: center;
+		color: #999999;
+	}
 </style>

+ 276 - 276
pages/me/discountCard.vue

@@ -1,282 +1,282 @@
-<template>
-	<view class="content">
-
-		<view class="teamTop">
-			<view class="sumCount">可使用优惠券</view>
-		</view>
-
-		<!-- 列表 -->
-		<view class="itemContent">
-			<view v-for="(item,index) in itemData" :key="index">
-				<view class="item">
-
-					<!-- 第一块 -->
-					<view class="topView" @click="ckCoupon(item)">
-						<view class="leftView">
-							<view class="moneyView">
-								<view>¥</view>
-								<view class="money">{{item.ActMoney}}</view>
-							</view>
-							<view class="condition" v-if="item.WhereMoney != 0">满{{item.WhereMoney}}元可用</view>
+<template>
+	<view class="content">
+
+		<view class="teamTop">
+			<view class="sumCount">可使用优惠券</view>
+		</view>
+
+		<!-- 列表 -->
+		<view class="itemContent">
+			<view v-for="(item,index) in itemData" :key="index">
+				<view class="item">
+
+					<!-- 第一块 -->
+					<view class="topView" @click="ckCoupon(item)">
+						<view class="leftView">
+							<view class="moneyView">
+								<view>¥</view>
+								<view class="money">{{item.ActMoney}}</view>
+							</view>
+							<view class="condition" v-if="item.WhereMoney != 0">满{{item.WhereMoney}}元可用</view>
 							<view class="condition" v-else>满任意金额可用</view>
-						</view>
-
-						<view class="rightView">
+						</view>
+
+						<view class="rightView">
 							<view class="cardName">{{item.ActName}}</view>
-							<!-- 时间截取 -->
-							<view class="valid">有效期:{{item.StartTime.slice(0,item.StartTime.length-8)}}至 {{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
-						</view>
-					</view>
-
-					<!-- 第二快 -->
-					<view class="bottomView">
-						<view>发放门店:{{item.ShopName}}</view>
-						<view @click="goDiscountDetail(item)">查看详情</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 上拉 加载更多 -->
-		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
-		<!-- 无数据空白页 -->
-		<nodata v-if="itemData.length==0"></nodata>
-
-	</view>
-</template>
-
-<script>
-	import nodata from '../../components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata,
-		},
-		data() {
-			return {
-				itemData: [],
-				page: 1,
-				noMoreShow: false,
-				payMoney:'',
-			}
-		},
-		onLoad(opt) {
-			this.page = 1
-			if(opt.payMoney){
-				this.payMoney=opt.payMoney;
-				this.myOrderCoupon()
-			}else{
-				this.getItemData()
-			}
-			
-		},
-		methods: {
-			ckCoupon(item){
-				console.log(item);
-				uni.setStorage({
-					key: 'couponData',
-					data: item,
-					success: function () {
-						uni.navigateBack({
-							delta:1
-						})
-					}
-				}); 
-			},
-			myOrderCoupon(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				this.$http('miniApp/maintainOrder/myOrderCoupon', {
-				  money:this.payMoney,
-				  page:this.page,
-				  limit:10,
-				 },'GET').then(res => {
-					uni.hideLoading();
-					var list = res.data.Items
-					
-					// 处理 undefined和null转为空白字符串
-					list.forEach((item, index) => {
-						for (const key in item) {
-							item[key] = this.$praseStrEmpty(item[key])
-						}
-					})
-					
-					if (this.page == 1) {
-						this.itemData = list
-					} else {
-						this.itemData = this.itemData.concat(list)
-					}
-					
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
-					}
-				})
-			},
-			goDiscountDetail(item) {
-
-				uni.navigateTo({
-					url: 'discountDetail?couponId=' + item.CouponID,
-				})
-			},
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'miniAppMyBMemberCar/listMiniAppCouponPage',
-					params = {
-						page: this.page,
-						limit: 20,
-
-					}
+							<!-- 时间截取 -->
+							<view class="valid">有效期:{{item.StartTime.slice(0,item.StartTime.length-8)}}至 {{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
+						</view>
+					</view>
+
+					<!-- 第二快 -->
+					<view class="bottomView">
+						<view>发放门店:{{item.ShopName}}</view>
+						<view @click="goDiscountDetail(item)">查看详情</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+		<!-- 无数据空白页 -->
+		<nodata v-if="itemData.length==0"></nodata>
+
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		data() {
+			return {
+				itemData: [],
+				page: 1,
+				noMoreShow: false,
+				payMoney:'',
+			}
+		},
+		onLoad(opt) {
+			this.page = 1
+			if(opt.payMoney){
+				this.payMoney=opt.payMoney;
+				this.myOrderCoupon()
+			}else{
+				this.getItemData()
+			}
+			
+		},
+		methods: {
+			ckCoupon(item){
+				console.log(item);
+				uni.setStorage({
+					key: 'couponData',
+					data: item,
+					success: function () {
+						uni.navigateBack({
+							delta:1
+						})
+					}
+				}); 
+			},
+			myOrderCoupon(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('miniApp/maintainOrder/myOrderCoupon', {
+				  money:this.payMoney,
+				  page:this.page,
+				  limit:10,
+				 },'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+					
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+					
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+					
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+				})
+			},
+			goDiscountDetail(item) {
+
+				uni.navigateTo({
+					url: 'discountDetail?couponId=' + item.CouponID,
+				})
+			},
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'miniAppMyBMemberCar/listMiniAppCouponPage',
+					params = {
+						page: this.page,
+						limit: 20,
+
+					}
 				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-					var list = res.data.Items
-
-					// 处理 undefined和null转为空白字符串
-					list.forEach((item, index) => {
-						for (const key in item) {
-							item[key] = this.$praseStrEmpty(item[key])
-						}
-					})
-
-
-					if (this.page == 1) {
-						this.itemData = list
-					} else {
-						this.itemData = this.itemData.concat(list)
-					}
-
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
-					}
+					uni.hideLoading();
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+					
 					
-					
-				})
-			},
-
-		},
-
-		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
-			this.page = 1
-			if(opt.payMoney){
-				
-				this.myOrderCoupon()
-			}else{
-				this.getItemData()
-			}
-			//this.getItemData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.page++;
-			if(opt.payMoney){
-				
-				this.myOrderCoupon()
-			}else{
-				this.getItemData()
-			}
-		},
-
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
-
-	.teamTop {
-		position: fixed;
-		top: 0rpx;
-		left: 0rpx;
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 77rpx;
-	}
-
-	.sumCount {
-		padding: 20rpx 24rpx;
-		color: #999999;
-		font-size: 26rpx;
-	}
-
-	.itemContent {
-		padding: 55rpx 20rpx 24rpx;
-	}
-
-	.item {
-		margin: 20rpx 0rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-
-	}
-
-	.topView {
-		display: flex;
-		justify-content: flex-start;
-		padding: 22rpx 0rpx;
-		margin-left: 22rpx;
-		margin-right: 22rpx;
-		border-bottom: 1rpx #CCCCCC dashed;
-		align-items: center;
-	}
-
-	.leftView,
-	.rightView {
+				})
+			},
+
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+			if(opt.payMoney){
+				
+				this.myOrderCoupon()
+			}else{
+				this.getItemData()
+			}
+			//this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+			if(opt.payMoney){
+				
+				this.myOrderCoupon()
+			}else{
+				this.getItemData()
+			}
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	.teamTop {
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		background-color: #F4F5F7;
+		width: 100%;
+		height: 77rpx;
+	}
+
+	.sumCount {
+		padding: 20rpx 24rpx;
+		color: #999999;
+		font-size: 26rpx;
+	}
+
+	.itemContent {
+		padding: 55rpx 20rpx 24rpx;
+	}
+
+	.item {
+		margin: 20rpx 0rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+
+	}
+
+	.topView {
+		display: flex;
+		justify-content: flex-start;
+		padding: 22rpx 0rpx;
+		margin-left: 22rpx;
+		margin-right: 22rpx;
+		border-bottom: 1rpx #CCCCCC dashed;
+		align-items: center;
+	}
+
+	.leftView,
+	.rightView {
 		margin-right: 40rpx;
-		
-	}
-
-	.moneyView {
-		display: flex;
-		justify-content: flex-start;
-		color: #FF4F00;
-		align-items: baseline;
-	}
-
-	.money {
-		font-size: 56rpx;
-	}
-
-	.condition {
-		font-size: 22rpx;
-		color: #999999;
-	}
-
-	.cardName {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #333333;
-		margin-top: 10rpx;
-		margin-bottom: 15rpx;
-	}
-
-	.valid {
-		font-size: 26rpx;
-		color: #999999;
-	}
-
-	.bottomView {
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx 24rpx;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.noMore {
-		text-align: center;
-		line-height: 50rpx;
-		color: #999999;
-		font-size: 28rpx;
-	}
+		
+	}
+
+	.moneyView {
+		display: flex;
+		justify-content: flex-start;
+		color: #FF4F00;
+		align-items: baseline;
+	}
+
+	.money {
+		font-size: 56rpx;
+	}
+
+	.condition {
+		font-size: 22rpx;
+		color: #999999;
+	}
+
+	.cardName {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 10rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.valid {
+		font-size: 26rpx;
+		color: #999999;
+	}
+
+	.bottomView {
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

+ 143 - 143
pages/me/discountDetail.vue

@@ -1,43 +1,43 @@
-<template>
-	<view class="content">
-		<view style="background: #BE573F; height: 56rpx; width: 100%;"></view>
-
-		<view class="whiteBg">
-
-			<!-- firstView -->
-			<view class="firstView">
+<template>
+	<view class="content">
+		<view style="background: #BE573F; height: 56rpx; width: 100%;"></view>
+
+		<view class="whiteBg">
+
+			<!-- firstView -->
+			<view class="firstView">
 				<view class="money">{{detailData.actName}}</view>
 				<view class="condition" v-if="detailData.whereMoney != 0">满{{detailData.whereMoney}}元可用</view>
-				<view class="condition" v-else>满任意金额可用</view>
-			</view>
-			<view class="point leftP"></view>
-			<view class="point rightP"></view>
-
-			<!-- secondView -->
-			<view class="secondView">
-				
-				<view  v-if="detailData.endOffsetDays===null||detailData.endOffsetDays==='null'||detailData.endOffsetDays===''">
-					
-					<view class="valid same" >有效期:{{detailData.startTime.slice(0,detailData.startTime.length-8)}}至 {{detailData.endTime.slice(0,detailData.endTime.length-8)}}</view>
-				</view>
-				<view v-else>
-				
-					<view class="valid same" v-if="detailData.endOffsetDays>-1">有效期:自领取后,{{detailData.endOffsetDays}}天有效</view>
-				     <view class="valid same" v-if="detailData.endOffsetDays==-1||detailData.endOffsetDays==null||detailData.endOffsetDays=='null'">有效期:{{detailData.startTime.slice(0,detailData.startTime.length-8)}}至 {{detailData.endTime.slice(0,detailData.endTime.length-8)}}</view>
+				<view class="condition" v-else>满任意金额可用</view>
+			</view>
+			<view class="point leftP"></view>
+			<view class="point rightP"></view>
+
+			<!-- secondView -->
+			<view class="secondView">
+				
+				<view  v-if="detailData.endOffsetDays===null||detailData.endOffsetDays==='null'||detailData.endOffsetDays===''">
+					
+					<view class="valid same" >有效期:{{detailData.startTime.slice(0,detailData.startTime.length-8)}}至 {{detailData.endTime.slice(0,detailData.endTime.length-8)}}</view>
+				</view>
+				<view v-else>
+				
+					<view class="valid same" v-if="detailData.endOffsetDays>-1">有效期:自领取后,{{detailData.endOffsetDays}}天有效</view>
+				     <view class="valid same" v-if="detailData.endOffsetDays==-1||detailData.endOffsetDays==null||detailData.endOffsetDays=='null'">有效期:{{detailData.startTime.slice(0,detailData.startTime.length-8)}}至 {{detailData.endTime.slice(0,detailData.endTime.length-8)}}</view>
+				</view>
+				
+				
+				<view class="same">可用次数:{{detailData.avaQty}}</view>
+			</view>
+
+			<!-- thirdView -->
+			<view class="thirdView">
+				<view class="thirdTitle">使用说明</view>
+				<view class="store">
+					<view class="grayPoint"></view>
+					<view class="same">适用门店:{{detailData.shopNames}}</view>
 				</view>
-				
-				
-				<view class="same">可用次数:{{detailData.avaQty}}</view>
-			</view>
-
-			<!-- thirdView -->
-			<view class="thirdView">
-				<view class="thirdTitle">使用说明</view>
-				<view class="store">
-					<view class="grayPoint"></view>
-					<view class="same">适用门店:{{detailData.shopNames}}</view>
-				</view>
-			</view>
+			</view>
 			
 			<!-- 列表 -->
 			<view class="itemContent">
@@ -49,27 +49,27 @@
 						<view class="same">{{item}}</view>
 					</view>
 				</view> -->
-			</view>
-
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				detailData:{},
 				couponId:'',
-				couContent:'',
-			}
+				couContent:'',
+			}
 		},
 		onLoad(opt) {
 			this.couponId = opt.couponId,
 			this.page = 1
 			this.getDetailData()
-		},
-		methods: {
+		},
+		methods: {
 			getDetailData() {
 				uni.showLoading({
 					title: '加载中'
@@ -97,100 +97,100 @@
 					
 					
 				})
-			},
-		}
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #BE573F;
-		min-height: 100vh;
-	}
-
-	.whiteBg {
-		margin: 0rpx 24rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-		min-height: 60vh;
-	}
-
-	.firstView {
-		border-bottom: 1rpx #EEEEEE dashed;
-		text-align: center;
-		padding: 50rpx 20rpx;
-		padding-bottom: 30rpx;
-	}
-
-	.money {
-		font-size: 44rpx;
-		color: #333333;
-		font-weight: bold;
-		margin-bottom: 10rpx;
-	}
-
-	.condition {
-		font-size: 28rpx;
-		color: #999999;
-	}
-
-	.point {
-		width: 30rpx;
-		height: 30rpx;
-		background-color: #BE573F;
-		border-radius: 15rpx;
-	}
-
-	.leftP {
-		float: left;
-		margin-left: -15rpx;
-		margin-top: -15rpx;
-	}
-
-	.rightP {
-		float: right;
-		margin-right: -15rpx;
-		margin-top: -15rpx;
-	}
-
-	.secondView {
-		padding: 30rpx 40rpx;
-	}
-
-	.valid {
-		margin-bottom: 20rpx;
-	}
-
-	.same {
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-	.thirdView {
-		padding: 30rpx 40rpx;
-		border: 1rpx #EEEEEE solid;
-	}
-
-	.thirdTitle {
-		font-size: 32rpx;
-		color: #333333;
-		margin-bottom: 20rpx;
-	}
-
-	.store {
-		display: flex;
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #BE573F;
+		min-height: 100vh;
+	}
+
+	.whiteBg {
+		margin: 0rpx 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		min-height: 60vh;
+	}
+
+	.firstView {
+		border-bottom: 1rpx #EEEEEE dashed;
+		text-align: center;
+		padding: 50rpx 20rpx;
+		padding-bottom: 30rpx;
+	}
+
+	.money {
+		font-size: 44rpx;
+		color: #333333;
+		font-weight: bold;
+		margin-bottom: 10rpx;
+	}
+
+	.condition {
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.point {
+		width: 30rpx;
+		height: 30rpx;
+		background-color: #BE573F;
+		border-radius: 15rpx;
+	}
+
+	.leftP {
+		float: left;
+		margin-left: -15rpx;
+		margin-top: -15rpx;
+	}
+
+	.rightP {
+		float: right;
+		margin-right: -15rpx;
+		margin-top: -15rpx;
+	}
+
+	.secondView {
+		padding: 30rpx 40rpx;
+	}
+
+	.valid {
+		margin-bottom: 20rpx;
+	}
+
+	.same {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.thirdView {
+		padding: 30rpx 40rpx;
+		border: 1rpx #EEEEEE solid;
+	}
+
+	.thirdTitle {
+		font-size: 32rpx;
+		color: #333333;
+		margin-bottom: 20rpx;
+	}
+
+	.store {
+		display: flex;
 		align-items: center;
-		margin-bottom: 20rpx;
-	}
-
-	.grayPoint {
-		width: 12rpx;
-		height: 12rpx;
-		border-radius: 6rpx;
-		background-color: #DDDDDD;
-		margin-right: 15rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.grayPoint {
+		width: 12rpx;
+		height: 12rpx;
+		border-radius: 6rpx;
+		background-color: #DDDDDD;
+		margin-right: 15rpx;
 	}
 	.itemContent{
 		padding: 30rpx 40rpx;
-	}
+	}
 </style>

+ 249 - 249
pages/me/feedBack.vue

@@ -1,116 +1,116 @@
-<template>
-	<view class="content">
-		<view class="main">
-			<!-- 建议 -->
-			<view class="firstView">
-				<view class="title">您的问题或建议</view>
-				<view>
-					<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
-						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
-				</view>
-			</view>
-
-			<!-- 图片 -->
-			<view class="secondView">
-				<view class="title">上传图片</view>
-				<view class="imgBox">
-					<view class="imgLine" v-for="(img,imgindex) in imgArr">
-						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
-						<image src="../../static/img/icon_delpic@2x.png" mode="" class="delImg"
-							@click="delimg(imgindex)"></image>
-					</view>
-					<view class="imgLine" @click="uploadImg">
-						<image src="../../static/img/icon_addpic@2x.png" mode="" class="itemImg"></image>
-					</view>
-				</view>
-			</view>
-
-
-		</view>
-
-		<view class="bottom">
-			<view class="shoreDz" @click="submit">提交</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import nodata from '@/components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata
-		},
-		data() {
-			return {
-				imgArr: [],
-				exeContent: '',
-				
-			}
-		},
-		
-		methods: {
-			feedDone(e) {
-				this.exeContent = e.target.value
-				
-			},
-			uploadImg() {
-
-				var that = this;
-				var length=this.imgArr.length;
-				var num=9;
-				if(length>8){
-					uni.showToast({
-						title: '最多上传9张',
-						icon: 'none',
-						duration: 2000,
-					});
-					return false;
-				}
-				uni.chooseImage({
-					sourceType: ['album','camera'],
-					count:num-length, 
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						/* uni.uploadFile({
-				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例,非真实的接口地址
-				            filePath: tempFilePaths[0],
-				            name: 'file',
-				            formData: {
-				                'user': 'test'
-				            },
-				            success: (uploadFileRes) => {
-				                console.log(JSON.parse(uploadFileRes.data).data );
-								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
-								
-				            }
-				        }); */
-						tempFilePaths.forEach(v => {
-							console.log(that.$request.baseUrl + 'tuhuUploadFile');
-							uni.uploadFile({
-								url: that.$request.baseUrl + 'tuhuUploadFile',
-								filePath: v,
-								name: 'file',
-								formData: {
-									'user': 'test'
+<template>
+	<view class="content">
+		<view class="main">
+			<!-- 建议 -->
+			<view class="firstView">
+				<view class="title">您的问题或建议</view>
+				<view>
+					<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
+						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				</view>
+			</view>
+
+			<!-- 图片 -->
+			<view class="secondView">
+				<view class="title">上传图片</view>
+				<view class="imgBox">
+					<view class="imgLine" v-for="(img,imgindex) in imgArr">
+						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+						<image src="../../static/img/icon_delpic@2x.png" mode="" class="delImg"
+							@click="delimg(imgindex)"></image>
+					</view>
+					<view class="imgLine" @click="uploadImg">
+						<image src="../../static/img/icon_addpic@2x.png" mode="" class="itemImg"></image>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
+		<view class="bottom">
+			<view class="shoreDz" @click="submit">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata
+		},
+		data() {
+			return {
+				imgArr: [],
+				exeContent: '',
+				
+			}
+		},
+		
+		methods: {
+			feedDone(e) {
+				this.exeContent = e.target.value
+				
+			},
+			uploadImg() {
+
+				var that = this;
+				var length=this.imgArr.length;
+				var num=9;
+				if(length>8){
+					uni.showToast({
+						title: '最多上传9张',
+						icon: 'none',
+						duration: 2000,
+					});
+					return false;
+				}
+				uni.chooseImage({
+					sourceType: ['album','camera'],
+					count:num-length, 
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						/* uni.uploadFile({
+				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例,非真实的接口地址
+				            filePath: tempFilePaths[0],
+				            name: 'file',
+				            formData: {
+				                'user': 'test'
+				            },
+				            success: (uploadFileRes) => {
+				                console.log(JSON.parse(uploadFileRes.data).data );
+								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+								
+				            }
+				        }); */
+						tempFilePaths.forEach(v => {
+							console.log(that.$request.baseUrl + 'tuhuUploadFile');
+							uni.uploadFile({
+								url: that.$request.baseUrl + 'tuhuUploadFile',
+								filePath: v,
+								name: 'file',
+								formData: {
+									'user': 'test'
 								},
-								
-								success: (uploadFileRes) => {
-
-									console.log(JSON.parse(uploadFileRes.data).data);
-									that.imgArr = that.imgArr.concat(JSON.parse(
-										uploadFileRes.data).data);
-								}
-							});
-						})
-						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
-							
-						}) */
-					}
-				});
-			},
-			delimg(index) {
-				this.imgArr.splice(index, 1)
-			},
+								
+								success: (uploadFileRes) => {
+
+									console.log(JSON.parse(uploadFileRes.data).data);
+									that.imgArr = that.imgArr.concat(JSON.parse(
+										uploadFileRes.data).data);
+								}
+							});
+						})
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+					}
+				});
+			},
+			delimg(index) {
+				this.imgArr.splice(index, 1)
+			},
 			submit() {
 				if (!this.exeContent) {
 					uni.showToast({
@@ -119,145 +119,145 @@
 						duration: 2000,
 					});
 					return ;
-				}
-				// if (this.imgArr.length == 0) {
-				// 	uni.showToast({
-				// 		title: '请上传图片',
-				// 		icon: 'none',
-				// 		duration: 2000,
-				// 	});
-				// 	return ;
-				// }
-				uni.showLoading({});
-				var exeImg = this.imgArr.join(',')
-				this.$http('miniAppMyBMemberCar/addBMemberSuggest', {
-					
-					contents: this.exeContent,
-					img: exeImg
-				}, 'POST').then(res => {
-					//this.submitSuperCheckSheet()
-					if(res.code==0){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
-						});
-						setTimeout(function() {
-							uni.navigateBack({
-								
-							})
-						}, 2000); 	
-					}else{
-						uni.showToast({
-							title: '提交失败',
-							icon: 'none',
-							duration: 2000,
-						});
-					}
-					
-					
-
-				})
-			}
-
-		}
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
-
-	/* #ifdef H5 */
-	.content {
-		background: #F4F5F7;
-		min-height: calc(100vh - 44px);
-
-	}
-
-	/* #endif */
-	.main {
-		background: #F4F5F7;
-		padding: 20rpx 24rpx;
-	}
-
-	.firstView,
-	.secondView {
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.firstView {
-		margin-bottom: 20rpx;
-	}
-
-	.title {
-		font-size: 30rpx;
-		color: #3C3C3C;
-		padding: 20rpx;
-	}
-
-	.textareaCont {
-		padding: 20rpx;
-		min-height: 150rpx;
-		width: 95%;
-	}
-
-
-	.imgBox {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-
-	}
+				}
+				// if (this.imgArr.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请上传图片',
+				// 		icon: 'none',
+				// 		duration: 2000,
+				// 	});
+				// 	return ;
+				// }
+				uni.showLoading({});
+				var exeImg = this.imgArr.join(',')
+				this.$http('miniAppMyBMemberCar/addBMemberSuggest', {
+					
+					contents: this.exeContent,
+					img: exeImg
+				}, 'POST').then(res => {
+					//this.submitSuperCheckSheet()
+					if(res.code==0){
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000,
+						});
+						setTimeout(function() {
+							uni.navigateBack({
+								
+							})
+						}, 2000); 	
+					}else{
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 2000,
+						});
+					}
+					
+					
+
+				})
+			}
+
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background: #F4F5F7;
+		min-height: calc(100vh - 44px);
+
+	}
+
+	/* #endif */
+	.main {
+		background: #F4F5F7;
+		padding: 20rpx 24rpx;
+	}
+
+	.firstView,
+	.secondView {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.firstView {
+		margin-bottom: 20rpx;
+	}
+
+	.title {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		padding: 20rpx;
+	}
+
+	.textareaCont {
+		padding: 20rpx;
+		min-height: 150rpx;
+		width: 95%;
+	}
+
+
+	.imgBox {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20rpx;
+
+	}
 	.imgLine{
 		position: relative;
 		margin-right: 10rpx;
-	}
-	.itemImg {
-		width: 150rpx;
-		height: 150rpx;
-		margin-right: 5rpx;
-	}
-
-	/* .img4 {
+	}
+	.itemImg {
+		width: 150rpx;
+		height: 150rpx;
+		margin-right: 5rpx;
+	}
+
+	/* .img4 {
 		margin-right: 20rpx;
-		
-	} */
-
-	.delImg {
-		width: 32rpx;
-		height: 32rpx;
-		position: absolute;
-		right: 0rpx;
-		top: 0rpx;
-	}
-
-
-	.bottom {
-		width: 750rpx;
-		height: 120rpx;
-		background: #FFFFFF;
-		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.shoreDz {
-		width: 702rpx;
-		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-		border-radius: 37rpx;
-		text-align: center;
-		line-height: 74rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 24rpx;
-	}
+		
+	} */
+
+	.delImg {
+		width: 32rpx;
+		height: 32rpx;
+		position: absolute;
+		right: 0rpx;
+		top: 0rpx;
+	}
+
+
+	.bottom {
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.shoreDz {
+		width: 702rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+	}
 </style>

+ 48 - 48
pages/me/intimity.vue

@@ -1,50 +1,50 @@
-<template>
-	<view class="content">
-		<rich-text :nodes="couContent" ></rich-text>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				couContent: '',
-			}
-		},
-		onLoad() {
-			this.getDetailData()
-		},
-		methods: {
-
-			getDetailData() {
-				console.log('谢雨');
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'miniAppMyBMemberCar/Privacy',
-					params = {}
-				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-
-
-					if (res.data.contents) {
-						this.couContent = res.data.contents.replace(/\<p/gi, '<p style="display: inline-block"');
-					}
-
-
-
-				})
-			},
-		}
-
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
+<template>
+	<view class="content">
+		<rich-text :nodes="couContent" ></rich-text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				couContent: '',
+			}
+		},
+		onLoad() {
+			this.getDetailData()
+		},
+		methods: {
+
+			getDetailData() {
+				console.log('谢雨');
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'miniAppMyBMemberCar/Privacy',
+					params = {}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+
+
+					if (res.data.contents) {
+						this.couContent = res.data.contents.replace(/\<p/gi, '<p style="display: inline-block"');
+					}
+
+
+
+				})
+			},
+		}
+
 	}
-	
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+	
 </style>

+ 319 - 319
pages/me/me.vue

@@ -1,79 +1,79 @@
-<template>
-	<view class="box">
-
-		<view class="headerBox">
-			<view class="headerLeft">
-				<image :src="ueserInfo.memberInfo.headUrl" mode="" class="headerImg"
-					v-if="ueserInfo.memberInfo.headUrl"></image>
-				<image src="../../static/img/pic_def_ava.png" mode="" class="headerImg" v-else></image>
-
-				<view class="nickName">{{ueserInfo.memberInfo.nickName}}</view>
-			</view>
-			<view>
-				<image src="../../static/img/icon_set.png" mode="" class="setImg" @click="gonavigateTo('setup')">
-				</image>
-			</view>
-		</view>
-
-
-		<!-- 我的订单 -->
-		<view class="orderBox">
-			<view class="orderTitleBg">
-				<view class="orderTitle">我的订单</view>
-				<view class="orderAll" @click="goorder(6)">
-					<view style="color: #999999; font-size: 24rpx; margin-right: 5rpx;">全部订单</view>
-					<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-
-				</view>
-			</view>
-			<view class="orderLIneBox">
-				<view class="orderLine" @click="goorder(1)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.sheetOne>0">{{numList.sheetOne}}</view>
-						<image src="../../static/img/icon_daifukuan.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待付款</view>
-				</view>
-				<view class="orderLine" @click="goorder(2)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.sheetTwo>0">{{numList.sheetTwo}}</view>
-						<image src="../../static/img/icon_daiqueren.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待确认</view>
-				</view>
-				<view class="orderLine" @click="goorder(3)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.sheetThree>0">{{numList.sheetThree}}</view>
-						<image src="../../static/img/icon_daiyuyue.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待收货</view>
-				</view>
-
-				<view class="orderLine" @click="goorder(4)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.sheetFour>0">{{numList.sheetFour}}</view>
-						<image src="../../static/img/icon_daifuwu.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待服务</view>
-				</view>
-				<view class="orderLine" @click="goorder(5)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.sheetFive>0">{{numList.sheetFive}}</view>
-						<image src="../../static/img/icon_daipingjia.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待评价</view>
-				</view>
-
-			</view>
-		</view>
-		<!-- 售后订单 -->
-		<view class="rowBoxBg">
-			<view class="rowBox">
-				<view class="leftView">
-					<image src="../../static/img/icon_tuikuan.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">退款申请记录</view>
-				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+<template>
+	<view class="box">
+
+		<view class="headerBox">
+			<view class="headerLeft">
+				<image :src="ueserInfo.memberInfo.headUrl" mode="" class="headerImg"
+					v-if="ueserInfo.memberInfo.headUrl"></image>
+				<image src="../../static/img/pic_def_ava.png" mode="" class="headerImg" v-else></image>
+
+				<view class="nickName">{{ueserInfo.memberInfo.nickName}}</view>
+			</view>
+			<view>
+				<image src="../../static/img/icon_set.png" mode="" class="setImg" @click="gonavigateTo('setup')">
+				</image>
+			</view>
+		</view>
+
+
+		<!-- 我的订单 -->
+		<view class="orderBox">
+			<view class="orderTitleBg">
+				<view class="orderTitle">我的订单</view>
+				<view class="orderAll" @click="goorder(6)">
+					<view style="color: #999999; font-size: 24rpx; margin-right: 5rpx;">全部订单</view>
+					<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+
+				</view>
+			</view>
+			<view class="orderLIneBox">
+				<view class="orderLine" @click="goorder(1)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.sheetOne>0">{{numList.sheetOne}}</view>
+						<image src="../../static/img/icon_daifukuan.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待付款</view>
+				</view>
+				<view class="orderLine" @click="goorder(2)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.sheetTwo>0">{{numList.sheetTwo}}</view>
+						<image src="../../static/img/icon_daiqueren.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待确认</view>
+				</view>
+				<view class="orderLine" @click="goorder(3)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.sheetThree>0">{{numList.sheetThree}}</view>
+						<image src="../../static/img/icon_daiyuyue.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待收货</view>
+				</view>
+
+				<view class="orderLine" @click="goorder(4)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.sheetFour>0">{{numList.sheetFour}}</view>
+						<image src="../../static/img/icon_daifuwu.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待服务</view>
+				</view>
+				<view class="orderLine" @click="goorder(5)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.sheetFive>0">{{numList.sheetFive}}</view>
+						<image src="../../static/img/icon_daipingjia.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待评价</view>
+				</view>
+
+			</view>
+		</view>
+		<!-- 售后订单 -->
+		<view class="rowBoxBg">
+			<view class="rowBox">
+				<view class="leftView">
+					<image src="../../static/img/icon_tuikuan.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">退款申请记录</view>
+				</view>
+				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
 			
 			<view class="rowBox">
@@ -82,46 +82,46 @@
 					<view class="rowTitle">更换门店申请记录</view>
 				</view>
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-			</view>
-		</view>
-
-		<!-- 我的 相关 -->
-		<view class="rowBoxBg">
-			<view class="rowBox" @click="gonavigateTo('../index/cailist')">
-				<view class="leftView">
-					<image src="../../static/img/icon_car.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">我的车库</view>
-				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-			</view>
+			</view>
+		</view>
+
+		<!-- 我的 相关 -->
+		<view class="rowBoxBg">
+			<view class="rowBox" @click="gonavigateTo('../index/cailist')">
+				<view class="leftView">
+					<image src="../../static/img/icon_car.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">我的车库</view>
+				</view>
+				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+			</view>
+			<view class="grayline"></view>
+				
+			<view class="rowBox" @click="gonavigateTo('discountCard')">
+				<view class="leftView">
+					<image src="../../static/img/icon_youhuiquan.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">我的优惠券</view>
+				</view>
+				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+			</view>
 			<view class="grayline"></view>
-				
-			<view class="rowBox" @click="gonavigateTo('discountCard')">
-				<view class="leftView">
-					<image src="../../static/img/icon_youhuiquan.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">我的优惠券</view>
-				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-			</view>
+			
+			<view class="rowBox" @click="gonavigateTo('myAppraise')">
+				<view class="leftView">
+					<image src="../../static/img/icon_pingjia.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">我的评价</view>
+				</view>
+				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+			</view>
 			<view class="grayline"></view>
-			
-			<view class="rowBox" @click="gonavigateTo('myAppraise')">
-				<view class="leftView">
-					<image src="../../static/img/icon_pingjia.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">我的评价</view>
-				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
+
+			<view class="rowBox">
+				<view class="leftView">
+					<image src="../../static/img/icon_yaoqing.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">邀请有礼</view>
+				</view>
+				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
-			<view class="grayline"></view>
-
-			<view class="rowBox">
-				<view class="leftView">
-					<image src="../../static/img/icon_yaoqing.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">邀请有礼</view>
-				</view>
-				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-			</view>
-
+
 		</view>
 		
 		<!-- 关于 我们 -->
@@ -158,222 +158,222 @@
 		
 		</view>
 		
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				ueserInfo: '',
-				shopData: '',
-				numList: '',
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-			this.$common.isUserId()
-			this.ueserInfo = uni.getStorageSync("logodata");
-			this.shopData = uni.getStorageSync("shopData");
-			this.queryMyDetail();
-		},
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				ueserInfo: '',
+				shopData: '',
+				numList: '',
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.$common.isUserId()
+			this.ueserInfo = uni.getStorageSync("logodata");
+			this.shopData = uni.getStorageSync("shopData");
+			this.queryMyDetail();
+		},
 		methods: {
-			
+			
 			call(e) {
-				// console.log(e);
-				uni.makePhoneCall({
-					phoneNumber: e
-				});
-			},
-			goorder(num) {
-				uni.navigateTo({
-					url: '../order/myorder?num=' + num
-				})
-			},
-			login() {
-				uni.navigateTo({
-					url: '../login/login'
-				})
-			},
-			queryMyDetail() {
-				uni.showLoading({});
-				this.$http('miniAppMyBMemberCar/queryMyDetail', {
-
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					this.numList = res.data
-				})
-			},
-			gonavigateTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.box {
-		min-height: 100vh;
-
-		background: linear-gradient(180deg, #FFEDEA 0%, #F4F5F7 100%);
-		padding: 0 24rpx 60rpx;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.headerBox {
-		padding-top: 14rpx;
-	}
-
-	.headerImg {
-		width: 90rpx;
-		height: 90rpx;
-		border-radius: 50%;
-	}
-
-	.setImg {
-		width: 38rpx;
-		height: 38rpx;
-		margin-top: 25rpx;
-	}
-
-	.headerBox {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.headerLeft {
-		display: flex;
-	}
-
-	.nickName {
-		padding-left: 20rpx;
-		line-height: 90rpx;
-		color: #3C3C3C;
-		font-size: 32rpx;
-	}
-
-
-	.orderBox {
-		margin-top: 30rpx;
-		background: #FFFFFF;
-		padding: 30rpx 0rpx;
-		border-radius: 10rpx;
-	}
-
-	.orderTitleBg {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.orderTitle {
-		font-size: 30rpx;
-		color: #333333;
-		font-weight: bold;
-		padding-left: 20rpx;
-	}
-
-	.orderAll {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.orderLine {
-		width: 25%;
-		text-align: center;
-	}
-
-	.orderLineImg {
-		width: 44rpx;
-		height: 44rpx;
-	}
-
-	.orderLineTxt {
-		font-size: 24rpx;
-		color: #333333;
-	}
-
-	.orderImgBox {
-		text-align: center;
-		position: relative;
-	}
-
-	.orderLIneBox {
-		display: flex;
-		justify-content: space-between;
-		padding-top: 30rpx;
-	}
-
-	.orderNum {
-		line-height: 26rpx;
-		background: #FF4F00;
-		padding: 0 8rpx;
-		border-radius: 13rpx;
-		color: #FFFFFF;
-		font-size: 20rpx;
-		position: absolute;
-		top: -5rpx;
-		right: 38rpx;
-		z-index: 11;
-	}
-
-	.rightArrow {
-		margin-right: 20rpx;
-		width: 12rpx;
-		height: 20rpx;
-
-	}
-
-	.rowBoxBg {
-		margin-top: 30rpx;
-		background: #FFFFFF;
-		/* padding: 30rpx 0rpx; */
-		border-radius: 10rpx;
-	}
-
-	.rowBox {
-		display: flex;
-		justify-content: space-between;
-		background: #FFFFFF;
-		padding: 30rpx 0rpx;
-		border-radius: 10rpx;
-		align-items: center;
-
-	}
-
-	.leftView {
-		display: flex;
-		align-items: center;
-
-	}
+				// console.log(e);
+				uni.makePhoneCall({
+					phoneNumber: e
+				});
+			},
+			goorder(num) {
+				uni.navigateTo({
+					url: '../order/myorder?num=' + num
+				})
+			},
+			login() {
+				uni.navigateTo({
+					url: '../login/login'
+				})
+			},
+			queryMyDetail() {
+				uni.showLoading({});
+				this.$http('miniAppMyBMemberCar/queryMyDetail', {
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.numList = res.data
+				})
+			},
+			gonavigateTo(url) {
+				uni.navigateTo({
+					url: url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+
+		background: linear-gradient(180deg, #FFEDEA 0%, #F4F5F7 100%);
+		padding: 0 24rpx 60rpx;
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.headerBox {
+		padding-top: 14rpx;
+	}
+
+	.headerImg {
+		width: 90rpx;
+		height: 90rpx;
+		border-radius: 50%;
+	}
+
+	.setImg {
+		width: 38rpx;
+		height: 38rpx;
+		margin-top: 25rpx;
+	}
+
+	.headerBox {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.headerLeft {
+		display: flex;
+	}
+
+	.nickName {
+		padding-left: 20rpx;
+		line-height: 90rpx;
+		color: #3C3C3C;
+		font-size: 32rpx;
+	}
+
+
+	.orderBox {
+		margin-top: 30rpx;
+		background: #FFFFFF;
+		padding: 30rpx 0rpx;
+		border-radius: 10rpx;
+	}
+
+	.orderTitleBg {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.orderTitle {
+		font-size: 30rpx;
+		color: #333333;
+		font-weight: bold;
+		padding-left: 20rpx;
+	}
+
+	.orderAll {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.orderLine {
+		width: 25%;
+		text-align: center;
+	}
+
+	.orderLineImg {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
+	.orderLineTxt {
+		font-size: 24rpx;
+		color: #333333;
+	}
+
+	.orderImgBox {
+		text-align: center;
+		position: relative;
+	}
+
+	.orderLIneBox {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 30rpx;
+	}
+
+	.orderNum {
+		line-height: 26rpx;
+		background: #FF4F00;
+		padding: 0 8rpx;
+		border-radius: 13rpx;
+		color: #FFFFFF;
+		font-size: 20rpx;
+		position: absolute;
+		top: -5rpx;
+		right: 38rpx;
+		z-index: 11;
+	}
+
+	.rightArrow {
+		margin-right: 20rpx;
+		width: 12rpx;
+		height: 20rpx;
+
+	}
+
+	.rowBoxBg {
+		margin-top: 30rpx;
+		background: #FFFFFF;
+		/* padding: 30rpx 0rpx; */
+		border-radius: 10rpx;
+	}
+
+	.rowBox {
+		display: flex;
+		justify-content: space-between;
+		background: #FFFFFF;
+		padding: 30rpx 0rpx;
+		border-radius: 10rpx;
+		align-items: center;
+
+	}
+
+	.leftView {
+		display: flex;
+		align-items: center;
+
+	}
 	.rightView{
 		display: flex;
 		align-items: center;
 		
-	}
-	.liftIcon {
-		width: 38rpx;
-		height: 38rpx;
-		margin: 0rpx 20rpx;
-	}
-
-	.rowTitle {
-		color: #3C3C3C;
-		font-size: 28rpx;
+	}
+	.liftIcon {
+		width: 38rpx;
+		height: 38rpx;
+		margin: 0rpx 20rpx;
+	}
+
+	.rowTitle {
+		color: #3C3C3C;
+		font-size: 28rpx;
 	}
 	.grayline{
 		margin-left: 77rpx;
 		margin-right: 20rpx;
 		background-color: #F4F5F7;
 		height: 2rpx;
-	}
+	}
 </style>

+ 300 - 300
pages/me/myAppraise.vue

@@ -1,305 +1,305 @@
-<template>
-	<view class="content">
-
-		<!-- 列表 -->
-		<view class="itemContent">
-			<view v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">
-				<view class="item">
-
-					<view class="leftView">
-						<image :src='item.PhotoPath' v-if="item.PhotoPath" class="storeImg"></image>
-						<image src="../../static/img/pic_def_ava.png"  mode="" class="storeImg" v-else></image>
-					</view>
-
-					<view class="rightView">
-						<!-- 第一行 -->
-						<view class="firstView">
-							<view class="shopName">{{item.ShopName}}</view>
-							<!-- 时间截取 -->
-							<!-- <view class="time">2021-9-05</view> -->
-							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
-						</view>
-
-						<!-- 第2行 -->
-						<view class="secondView">
-							<!-- 星星 -->
-							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
-								:size="16" :margin="4" :readonly="true" />
-							<image src="../../static/img/review_icon_del@2x.png" class="deleteBtn"
-								@click.stop="deleteItem(item, index)"></image>
-						</view>
-
-						<view class="contentMes">{{item.EContent}}</view>
-
-						<!-- 照片 -->
-						<view class="imgBg">
-							<view v-for="(itemImg,indexImg) in item.imgs" :key="indexImg">
-
-								<image :src="itemImg.imageUrl" class="img"
-									@click.stop="previewImage(itemImg.imageUrl,item.imgs)"></image>
-							</view>
-						</view>
-
-						<!-- 商家回复 -->
-
-						<view class="writeBack" v-if="item.ReplyContent">商家回复:{{item.ReplyContent}}</view>
-					</view>
-
-
-
-				</view>
-			</view>
-		</view>
-
-		<!-- 上拉 加载更多 -->
-		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
-		<!-- 无数据空白页 -->
-		<nodata v-if="itemData.length==0"></nodata>
-
-	</view>
-</template>
-
-<script>
-	import nodata from '../../components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata,
-		},
-		data() {
-			return {
-				itemData: [],
-				page: 1,
-				noMoreShow: false,
-				imgArr: [],
-			}
-		},
-		onLoad(opt) {
-			
-		},
-		onShow() {
-			this.itemData=[]
-			this.page = 1
-			this.getItemData()
-		},
-		methods: {
-			goDetail(item){
-				uni.navigateTo({
-					url:'myAppraiseDetail?id='+item.SheetID
-				})
-			},
-			previewImage(img, arrDic) {
-				var arr = [];
-
-				arrDic.forEach(item => {
-					arr.push(item.imageUrl)
-				})
-
-				// 预览图片
-				uni.previewImage({
-					urls: arr,
-					current: img,
-					longPressActions: {
-						itemList: ['发送给朋友', '保存图片', '收藏'],
-						success: function(data) {
-							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-						},
-						fail: function(err) {
-							console.log(err.errMsg);
-						}
-					}
-				});
-			},
+<template>
+	<view class="content">
+
+		<!-- 列表 -->
+		<view class="itemContent">
+			<view v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">
+				<view class="item">
+
+					<view class="leftView">
+						<image :src='item.PhotoPath' v-if="item.PhotoPath" class="storeImg"></image>
+						<image src="../../static/img/pic_def_ava.png"  mode="" class="storeImg" v-else></image>
+					</view>
+
+					<view class="rightView">
+						<!-- 第一行 -->
+						<view class="firstView">
+							<view class="shopName">{{item.ShopName}}</view>
+							<!-- 时间截取 -->
+							<!-- <view class="time">2021-9-05</view> -->
+							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+						</view>
+
+						<!-- 第2行 -->
+						<view class="secondView">
+							<!-- 星星 -->
+							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
+								:size="16" :margin="4" :readonly="true" />
+							<image src="../../static/img/review_icon_del@2x.png" class="deleteBtn"
+								@click.stop="deleteItem(item, index)"></image>
+						</view>
+
+						<view class="contentMes">{{item.EContent}}</view>
+
+						<!-- 照片 -->
+						<view class="imgBg">
+							<view v-for="(itemImg,indexImg) in item.imgs" :key="indexImg">
+
+								<image :src="itemImg.imageUrl" class="img"
+									@click.stop="previewImage(itemImg.imageUrl,item.imgs)"></image>
+							</view>
+						</view>
+
+						<!-- 商家回复 -->
+
+						<view class="writeBack" v-if="item.ReplyContent">商家回复:{{item.ReplyContent}}</view>
+					</view>
+
+
+
+				</view>
+			</view>
+		</view>
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+		<!-- 无数据空白页 -->
+		<nodata v-if="itemData.length==0"></nodata>
+
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		data() {
+			return {
+				itemData: [],
+				page: 1,
+				noMoreShow: false,
+				imgArr: [],
+			}
+		},
+		onLoad(opt) {
+			
+		},
+		onShow() {
+			this.itemData=[]
+			this.page = 1
+			this.getItemData()
+		},
+		methods: {
+			goDetail(item){
+				uni.navigateTo({
+					url:'myAppraiseDetail?id='+item.SheetID
+				})
+			},
+			previewImage(img, arrDic) {
+				var arr = [];
+
+				arrDic.forEach(item => {
+					arr.push(item.imageUrl)
+				})
+
+				// 预览图片
+				uni.previewImage({
+					urls: arr,
+					current: img,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			deleteItem(item, index) {
-				var that=this;
-				uni.showModal({
-				    title: '提示',
-				    content: '确定删除该条评价吗?',
-				    success: function (res) {
-						 if (res.confirm) {
-							 that.itemData.splice(index, 1);
-							 uni.showLoading({
-							 	title: '删除中'
-							 })
-							 
-							 let url = 'miniAppMyBMemberCar/deleteMyBMEvaluate',
-							 	params = {
-							 		id: item.ID,
-							 
-							 	}
-							 that.$http(url, params, 'POST').then(res => {
-							 	uni.hideLoading();
-							 
-							 	that.page = 1
-							 	that.getItemData()
-							 
-							 })
-						 }
-				       
-				    }
+				var that=this;
+				uni.showModal({
+				    title: '提示',
+				    content: '确定删除该条评价吗?',
+				    success: function (res) {
+						 if (res.confirm) {
+							 that.itemData.splice(index, 1);
+							 uni.showLoading({
+							 	title: '删除中'
+							 })
+							 
+							 let url = 'miniAppMyBMemberCar/deleteMyBMEvaluate',
+							 	params = {
+							 		id: item.ID,
+							 
+							 	}
+							 that.$http(url, params, 'POST').then(res => {
+							 	uni.hideLoading();
+							 
+							 	that.page = 1
+							 	that.getItemData()
+							 
+							 })
+						 }
+				       
+				    }
 				});
-				
-			},
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'miniAppMyBMemberCar/listBMEvaluatePage',
-					params = {
-						page: this.page,
-						limit: 20,
-
-					}
-				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-					var list = res.data.Items
-
-					// 处理 undefined和null转为空白字符串
-					list.forEach((item, index) => {
-						for (const key in item) {
-							item[key] = this.$praseStrEmpty(item[key])
-						}
-					})
-
-
-					if (this.page == 1) {
-						this.itemData = list
-					} else {
-						this.itemData = this.itemData.concat(list)
-					}
-
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
-					}
-
-
-				})
-			},
-
-		},
-
-		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
-			this.page = 1
-			this.getItemData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.page++;
-			this.getItemData()
-		},
-
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #FFFFFF;
-		min-height: 100vh;
-
-	}
-
-
-
-	.item {
-		display: flex;
-		justify-content: flex-start;
-		padding: 0 24rpx;
-		background-color: #FFFFFF;
-
-	}
-
-	.leftView {
-		width: 117rpx;
-		padding-right: 20rpx;
-	}
-
-	.storeImg {
-		width: 72rpx;
-		height: 72rpx;
-		border-radius: 8rpx;
-		margin-top: 30rpx;
-	}
-
-	.rightView {
-		border-bottom: 1rpx #EEEEEE solid;
-		width: 100vw;
-	}
-
-	.firstView,
-	.secondView {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-	}
-
-	.firstView {
-		padding-top: 30rpx;
-	}
-
-	.secondView {
-		padding-top: 12rpx;
-		padding-bottom: 20rpx;
-	}
-
-	.shopName {
-		/* padding-top: 30rpx;
-		padding-bottom: 10rpx; */
-		font-size: 26rpx;
-		font-weight: bold;
-		color: #333333;
-	}
-
-	.time {
-		font-size: 26rpx;
-		color: #999999;
-	}
-
-	.deleteBtn {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-	.contentMes {
-		font-size: 26rpx;
-		color: #666666;
-		line-height: 37rpx;
-		/* padding-top: 20rpx; */
-
-	}
-
-	.imgBg {
-		display: flex;
-		justify-content: flex-start;
-		padding: 30rpx 0rpx;
-		flex-wrap: wrap;
-	}
-
-	.img {
-		width: 140rpx;
-		height: 140rpx;
-		margin-right: 5rpx;
-		border-radius: 8rpx;
-	}
-
-	.writeBack {
-		font-size: 26rpx;
-		color: #666666;
-		line-height: 37rpx;
-		padding: 20rpx;
+				
+			},
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'miniAppMyBMemberCar/listBMEvaluatePage',
+					params = {
+						page: this.page,
+						limit: 20,
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+
+
+				})
+			},
+
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+			this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+			this.getItemData()
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #FFFFFF;
+		min-height: 100vh;
+
+	}
+
+
+
+	.item {
+		display: flex;
+		justify-content: flex-start;
+		padding: 0 24rpx;
+		background-color: #FFFFFF;
+
+	}
+
+	.leftView {
+		width: 117rpx;
+		padding-right: 20rpx;
+	}
+
+	.storeImg {
+		width: 72rpx;
+		height: 72rpx;
+		border-radius: 8rpx;
+		margin-top: 30rpx;
+	}
+
+	.rightView {
+		border-bottom: 1rpx #EEEEEE solid;
+		width: 100vw;
+	}
+
+	.firstView,
+	.secondView {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+	}
+
+	.firstView {
+		padding-top: 30rpx;
+	}
+
+	.secondView {
+		padding-top: 12rpx;
+		padding-bottom: 20rpx;
+	}
+
+	.shopName {
+		/* padding-top: 30rpx;
+		padding-bottom: 10rpx; */
+		font-size: 26rpx;
+		font-weight: bold;
+		color: #333333;
+	}
+
+	.time {
+		font-size: 26rpx;
+		color: #999999;
+	}
+
+	.deleteBtn {
+		width: 36rpx;
+		height: 36rpx;
+	}
+
+	.contentMes {
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 37rpx;
+		/* padding-top: 20rpx; */
+
+	}
+
+	.imgBg {
+		display: flex;
+		justify-content: flex-start;
+		padding: 30rpx 0rpx;
+		flex-wrap: wrap;
+	}
+
+	.img {
+		width: 140rpx;
+		height: 140rpx;
+		margin-right: 5rpx;
+		border-radius: 8rpx;
+	}
+
+	.writeBack {
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 37rpx;
+		padding: 20rpx;
 		background-color: #F4F5F7;
 		
-		padding-bottom: 20rpx;
-	}
-
-	.noMore {
-		text-align: center;
-		line-height: 50rpx;
-		color: #999999;
-		font-size: 28rpx;
-	}
+		padding-bottom: 20rpx;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

+ 48 - 48
pages/me/treaty.vue

@@ -1,49 +1,49 @@
-<template>
-	<view class="content">
-		<rich-text :nodes="couContent" ></rich-text>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				couContent: '',
-			}
-		},
-		onLoad() {
-			this.getDetailData()
-		},
-		methods: {
-
-			getDetailData() {
-				console.log('谢雨');
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'miniAppMyBMemberCar/userAgreement',
-					params = {}
-				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-
-
-					if (res.data.contents) {
-						this.couContent = res.data.contents.replace(/\<p/gi, '<p style="display: inline-block"');
-					}
-
-
-
-				})
-			},
-		}
-
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
+<template>
+	<view class="content">
+		<rich-text :nodes="couContent" ></rich-text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				couContent: '',
+			}
+		},
+		onLoad() {
+			this.getDetailData()
+		},
+		methods: {
+
+			getDetailData() {
+				console.log('谢雨');
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'miniAppMyBMemberCar/userAgreement',
+					params = {}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+
+
+					if (res.data.contents) {
+						this.couContent = res.data.contents.replace(/\<p/gi, '<p style="display: inline-block"');
+					}
+
+
+
+				})
+			},
+		}
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
 </style>

+ 424 - 424
pages/order/evaluate.vue

@@ -1,434 +1,434 @@
-<template>
-	<view class="box">
-		<view class="main">
-			<!-- 总体评价-->
-			<view class="population populationCont2">
-				<view class="title">总体评价</view>
-				<view class=" " style="padding-left: 30rpx;">
-					<view class="xxBox">
-						<uni-rate v-model="grade" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
-							@change="zhiliang" />
-						<view class="td orangeColor" v-if="grade==5">非常好</view>
-						<view class="td orangeColor" v-if="grade==4">很好</view>
-						<view class="td orangeColor" v-if="grade==3">好</view>
-						<view class="td orangeColor" v-if="grade==2">一般</view>
-						<view class="td orangeColor" v-if="grade==1">差</view>
-					</view>
-				<!-- 	<view class="populationLine" v-if="grade==1" @click="changeGrade(1)">
-						<image src="../../static/img/good.png" mode="" class="populationImg"></image>
-						<view class="populationTxt orangeColor">好评</view>
-					</view>
-					<view class="populationLine" v-else @click="changeGrade(1)">
-						<image src="../../static/img/icon_normal_def.png" mode="" class="populationImg"></image>
-						<view class="populationTxt">好评</view>
-					</view>
-
-					<view class="populationLine" v-if="grade==2" @click="changeGrade(2)">
-						<image src="../../static/img/good.png" mode="" class="populationImg"></image>
-						<view class="populationTxt orangeColor">中评</view>
-					</view>
-					<view class="populationLine" v-else @click="changeGrade(2)">
-						<image src="../../static/img/icon_normal_def.png" mode="" class="populationImg"></image>
-						<view class="populationTxt">中评</view>
-					</view>
-
-					<view class="populationLine" v-if="grade==3" @click="changeGrade(3)">
-						<image src="../../static/img/good.png" mode="" class="populationImg"></image>
-						<view class="populationTxt orangeColor">差评</view>
-					</view>
-					<view class="populationLine" v-else @click="changeGrade(3)">
-						<image src="../../static/img/icon_normal_def.png" mode="" class="populationImg"></image>
-						<view class="populationTxt">差评</view>
-					</view> -->
-				</view>
-			</view>
-
-			<!-- 商家服务评价-->
-			<view class="population">
-				<view class="title">商家服务评价</view>
-				<view class="rowView">
-					<view class="littleTitle">服务态度</view>
-					<view class="xxBox">
-						<uni-rate v-model="xx" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
-							@change="taidu" />
-						<view class="td orangeColor" v-if="taiduStar==5">非常好</view>
-						<view class="td orangeColor" v-if="taiduStar==4">很好</view>
-						<view class="td orangeColor" v-if="taiduStar==3">好</view>
-						<view class="td orangeColor" v-if="taiduStar==2">一般</view>
-						<view class="td orangeColor" v-if="taiduStar==1">差</view>
-					</view>
-				</view>
-
-				<view class="rowView">
-					<view class="littleTitle">施工质量</view>
-					<view class="xxBox">
-						<uni-rate v-model="yy" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
-							@change="zhiliang" />
-						<view class="td orangeColor" v-if="zhiliangStar==5">非常好</view>
-						<view class="td orangeColor" v-if="zhiliangStar==4">很好</view>
-						<view class="td orangeColor" v-if="zhiliangStar==3">好</view>
-						<view class="td orangeColor" v-if="zhiliangStar==2">一般</view>
-						<view class="td orangeColor" v-if="zhiliangStar==1">差</view>
-					</view>
-				</view>
-
-				<view class="rowView">
-					<view class="littleTitle">店面环境</view>
-					<view class="xxBox">
-						<uni-rate v-model="zz" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
-							@change="huanjing" />
-						<view class="td orangeColor" v-if="huanjingStar==5">非常好</view>
-						<view class="td orangeColor" v-if="huanjingStar==4">很好</view>
-						<view class="td orangeColor" v-if="huanjingStar==3">好</view>
-						<view class="td orangeColor" v-if="huanjingStar==2">一般</view>
-						<view class="td orangeColor" v-if="huanjingStar==1">差</view>
-					</view>
-
-				</view>
-
-			</view>
-
-			<!-- 评价内容 和图片 -->
-			<view class="population">
-				<!-- 建议 -->
-				<view class="firstView">
-
-					<view>
-						<textarea placeholder-style="color:#999999" placeholder="说说哪里满意,帮大家选择~" v-model="exeContent"
-							class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
-					</view>
-				</view>
-
-				<!-- 图片 -->
-				<view class="secondView">
-
-					<view class="imgBox">
-						<view class="imgLine" v-for="(img,imgindex) in imgArr">
-							<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
-							<image src="../../static/img/icon_delpic@2x.png" mode="" class="delImg"
-								@click="delimg(imgindex)"></image>
-						</view>
-						<view class="imgLine" @click="uploadImg">
-							<image src="../../static/img/icon_addpic@2x.png" mode="" class="itemImg"></image>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<view class="bottom">
-				<view class="shoreDz" @click="submit">提交</view>
-			</view>
-		</view>
-
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				grade: '5',
-				xx: 5,
-				yy: 5,
-				zz: 5,
-				taiduStar: 5,
-				zhiliangStar: 5,
-				huanjingStar: 5,
-				imgArr: [],
+<template>
+	<view class="box">
+		<view class="main">
+			<!-- 总体评价-->
+			<view class="population populationCont2">
+				<view class="title">总体评价</view>
+				<view class=" " style="padding-left: 30rpx;">
+					<view class="xxBox">
+						<uni-rate v-model="grade" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
+							@change="zhiliang" />
+						<view class="td orangeColor" v-if="grade==5">非常好</view>
+						<view class="td orangeColor" v-if="grade==4">很好</view>
+						<view class="td orangeColor" v-if="grade==3">好</view>
+						<view class="td orangeColor" v-if="grade==2">一般</view>
+						<view class="td orangeColor" v-if="grade==1">差</view>
+					</view>
+				<!-- 	<view class="populationLine" v-if="grade==1" @click="changeGrade(1)">
+						<image src="../../static/img/good.png" mode="" class="populationImg"></image>
+						<view class="populationTxt orangeColor">好评</view>
+					</view>
+					<view class="populationLine" v-else @click="changeGrade(1)">
+						<image src="../../static/img/icon_normal_def.png" mode="" class="populationImg"></image>
+						<view class="populationTxt">好评</view>
+					</view>
+
+					<view class="populationLine" v-if="grade==2" @click="changeGrade(2)">
+						<image src="../../static/img/good.png" mode="" class="populationImg"></image>
+						<view class="populationTxt orangeColor">中评</view>
+					</view>
+					<view class="populationLine" v-else @click="changeGrade(2)">
+						<image src="../../static/img/icon_normal_def.png" mode="" class="populationImg"></image>
+						<view class="populationTxt">中评</view>
+					</view>
+
+					<view class="populationLine" v-if="grade==3" @click="changeGrade(3)">
+						<image src="../../static/img/good.png" mode="" class="populationImg"></image>
+						<view class="populationTxt orangeColor">差评</view>
+					</view>
+					<view class="populationLine" v-else @click="changeGrade(3)">
+						<image src="../../static/img/icon_normal_def.png" mode="" class="populationImg"></image>
+						<view class="populationTxt">差评</view>
+					</view> -->
+				</view>
+			</view>
+
+			<!-- 商家服务评价-->
+			<view class="population">
+				<view class="title">商家服务评价</view>
+				<view class="rowView">
+					<view class="littleTitle">服务态度</view>
+					<view class="xxBox">
+						<uni-rate v-model="xx" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
+							@change="taidu" />
+						<view class="td orangeColor" v-if="taiduStar==5">非常好</view>
+						<view class="td orangeColor" v-if="taiduStar==4">很好</view>
+						<view class="td orangeColor" v-if="taiduStar==3">好</view>
+						<view class="td orangeColor" v-if="taiduStar==2">一般</view>
+						<view class="td orangeColor" v-if="taiduStar==1">差</view>
+					</view>
+				</view>
+
+				<view class="rowView">
+					<view class="littleTitle">施工质量</view>
+					<view class="xxBox">
+						<uni-rate v-model="yy" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
+							@change="zhiliang" />
+						<view class="td orangeColor" v-if="zhiliangStar==5">非常好</view>
+						<view class="td orangeColor" v-if="zhiliangStar==4">很好</view>
+						<view class="td orangeColor" v-if="zhiliangStar==3">好</view>
+						<view class="td orangeColor" v-if="zhiliangStar==2">一般</view>
+						<view class="td orangeColor" v-if="zhiliangStar==1">差</view>
+					</view>
+				</view>
+
+				<view class="rowView">
+					<view class="littleTitle">店面环境</view>
+					<view class="xxBox">
+						<uni-rate v-model="zz" :max="5" color="#EEEEEE" active-color="#FF4F00" :size="16" :margin="5"
+							@change="huanjing" />
+						<view class="td orangeColor" v-if="huanjingStar==5">非常好</view>
+						<view class="td orangeColor" v-if="huanjingStar==4">很好</view>
+						<view class="td orangeColor" v-if="huanjingStar==3">好</view>
+						<view class="td orangeColor" v-if="huanjingStar==2">一般</view>
+						<view class="td orangeColor" v-if="huanjingStar==1">差</view>
+					</view>
+
+				</view>
+
+			</view>
+
+			<!-- 评价内容 和图片 -->
+			<view class="population">
+				<!-- 建议 -->
+				<view class="firstView">
+
+					<view>
+						<textarea placeholder-style="color:#999999" placeholder="说说哪里满意,帮大家选择~" v-model="exeContent"
+							class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
+					</view>
+				</view>
+
+				<!-- 图片 -->
+				<view class="secondView">
+
+					<view class="imgBox">
+						<view class="imgLine" v-for="(img,imgindex) in imgArr">
+							<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+							<image src="../../static/img/icon_delpic@2x.png" mode="" class="delImg"
+								@click="delimg(imgindex)"></image>
+						</view>
+						<view class="imgLine" @click="uploadImg">
+							<image src="../../static/img/icon_addpic@2x.png" mode="" class="itemImg"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="bottom">
+				<view class="shoreDz" @click="submit">提交</view>
+			</view>
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				grade: '5',
+				xx: 5,
+				yy: 5,
+				zz: 5,
+				taiduStar: 5,
+				zhiliangStar: 5,
+				huanjingStar: 5,
+				imgArr: [],
 				exeContent: '',
 				shopID:'',
-				sheetID:'',
-			}
-		},
-		onLoad(opt) {
+				sheetID:'',
+			}
+		},
+		onLoad(opt) {
 			this.shopID = opt.shopID
-			this.sheetID = opt.sheetID
-			uni.setStorage({
-				key: 'evaluate',
-				data: 1,
-				success: function () {
-				 
-				}
-			}); 
-			
-			
-		},
-		onShow() {
-
-		},
-		methods: {
-			changeGrade(v) {
-				console.log(v);
-				this.grade = v
-			},
-			taidu(e) {
-				console.log(e)
-				this.taiduStar = e.value
-			},
-			zhiliang(e) {
-				console.log(e)
-				this.zhiliangStar = e.value
-			},
-			huanjing(e) {
-				console.log(e)
-				this.huanjingStar = e.value
-			},
-
-
-			feedDone(e) {
-				this.exeContent = e.target.value
-
-			},
-			uploadImg() {
-
-				var that = this;
-				var num=9;
-				var length=this.imgArr.length;
-				if(length==9){
-					uni.showToast({
-						title: '最多上传9张图片',
-						icon: 'none',
-						duration: 2000,
-					});
-					return false;
-				}
-				uni.chooseImage({
-					sourceType: ['album','camera'],
-					count:num-length, 
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						/* uni.uploadFile({
-					            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例,非真实的接口地址
-					            filePath: tempFilePaths[0],
-					            name: 'file',
-					            formData: {
-					                'user': 'test'
-					            },
-					            success: (uploadFileRes) => {
-					                console.log(JSON.parse(uploadFileRes.data).data );
-									that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
-									
-					            }
-					        }); */
-						tempFilePaths.forEach(v => {
-							console.log(that.$request.baseUrl + 'tuhuUploadFile');
-							uni.uploadFile({
-								url: that.$request.baseUrl + 'tuhuUploadFile',
-								filePath: v,
-								name: 'file',
-								formData: {
-									'user': 'test'
-								},
-
-								success: (uploadFileRes) => {
-
-									console.log(JSON.parse(uploadFileRes.data).data);
-									that.imgArr = that.imgArr.concat(JSON.parse(
-										uploadFileRes.data).data);
-								}
-							});
-						})
-						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
-							
-						}) */
-					}
-				});
-			},
-			delimg(index) {
-				this.imgArr.splice(index, 1)
-			},
-			submit() {
-				
-				uni.showLoading({});
-				var exeImg = this.imgArr.join(',')
-				this.$http('miniAppMyBMemberCar/addBMEvaluate', {
+			this.sheetID = opt.sheetID
+			uni.setStorage({
+				key: 'evaluate',
+				data: 1,
+				success: function () {
+				 
+				}
+			}); 
+			
+			
+		},
+		onShow() {
+
+		},
+		methods: {
+			changeGrade(v) {
+				console.log(v);
+				this.grade = v
+			},
+			taidu(e) {
+				console.log(e)
+				this.taiduStar = e.value
+			},
+			zhiliang(e) {
+				console.log(e)
+				this.zhiliangStar = e.value
+			},
+			huanjing(e) {
+				console.log(e)
+				this.huanjingStar = e.value
+			},
+
+
+			feedDone(e) {
+				this.exeContent = e.target.value
+
+			},
+			uploadImg() {
+
+				var that = this;
+				var num=9;
+				var length=this.imgArr.length;
+				if(length==9){
+					uni.showToast({
+						title: '最多上传9张图片',
+						icon: 'none',
+						duration: 2000,
+					});
+					return false;
+				}
+				uni.chooseImage({
+					sourceType: ['album','camera'],
+					count:num-length, 
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						/* uni.uploadFile({
+					            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例,非真实的接口地址
+					            filePath: tempFilePaths[0],
+					            name: 'file',
+					            formData: {
+					                'user': 'test'
+					            },
+					            success: (uploadFileRes) => {
+					                console.log(JSON.parse(uploadFileRes.data).data );
+									that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+									
+					            }
+					        }); */
+						tempFilePaths.forEach(v => {
+							console.log(that.$request.baseUrl + 'tuhuUploadFile');
+							uni.uploadFile({
+								url: that.$request.baseUrl + 'tuhuUploadFile',
+								filePath: v,
+								name: 'file',
+								formData: {
+									'user': 'test'
+								},
+
+								success: (uploadFileRes) => {
+
+									console.log(JSON.parse(uploadFileRes.data).data);
+									that.imgArr = that.imgArr.concat(JSON.parse(
+										uploadFileRes.data).data);
+								}
+							});
+						})
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+					}
+				});
+			},
+			delimg(index) {
+				this.imgArr.splice(index, 1)
+			},
+			submit() {
+				
+				uni.showLoading({});
+				var exeImg = this.imgArr.join(',')
+				this.$http('miniAppMyBMemberCar/addBMEvaluate', {
 					shopID:this.shopID,
 					sheetID:this.sheetID,
 					overallevaluation:this.grade,
 					serviceevaluation:this.taiduStar,
 					constructionevaluation:this.zhiliangStar,
-					storeevaluation:this.huanjingStar,
-					eContent: this.exeContent,
-					imgs: exeImg
-				}, 'POST').then(res => {
-					//this.submitSuperCheckSheet()
-					uni.showToast({
-						title: '提交成功',
-						icon: 'none',
-						duration: 2000,
-					});
-					let pages = getCurrentPages(); // 当前页面
-					let beforePage = pages[pages.length - 2]; // 上一页
-					setTimeout(function() {
-						uni.navigateBack({
-						    /* success: function() {
-						        beforePage.onLoad(); // 执行上一页的onLoad方法
-						    } */
-						});
-					}, 2000);
-
-
-				})
-			}
-
-
-
-		}
-	}
-</script>
-
-<style scoped>
-	.box {
-		min-height: 100vh;
-		background: #F4F5F7;
-	}
-
-	.main {
-		padding: 20rpx 24rpx;
-		margin-bottom: 120rpx;
-	}
-
-	.population {
-		margin-top: 20rpx;
-		background: #FFFFFF;
-		padding: 30rpx 20rpx;
-		border-radius: 10rpx;
-	}
-
-	.title {
-		font-size: 30rpx;
-		font-weight: 600;
-		color: #333333;
-	}
-
-	.populationImg {
-		width: 32rpx;
-		height: 32rpx;
-	}
-
-	.populationCont {
-		display: flex;
-		padding-top: 30rpx;
-	}
-
-	.populationLine {
-		display: flex;
-		line-height: 32rpx;
-		font-size: 28rpx;
-		color: #999999;
-		width: 200rpx;
-	}
-
-	.populationTxt {
-		padding-left: 12rpx;
-	}
-
-	.orangeColor {
-		color: #FF4F00;
-	}
-
-	.rowView {
-		padding: 30rpx 0rpx 0rpx;
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.littleTitle {
-		font-size: 28rpx;
-		color: #666666;
-		line-height: 32rpx;
-	}
-
-	.xxBox {
-		display: flex;
-		justify-content: flex-start;
-
-	}
-
-	.td {
-		width: 80rpx;
-		font-size: 24rpx;
-		margin-left: 10rpx;
-	}
-
-	.firstView,
-	.secondView {
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.firstView {
-		margin-bottom: 20rpx;
-	}
-
-
-
-	.textareaCont {
-		padding: 20rpx 0rpx;
-		min-height: 150rpx;
+					storeevaluation:this.huanjingStar,
+					eContent: this.exeContent,
+					imgs: exeImg
+				}, 'POST').then(res => {
+					//this.submitSuperCheckSheet()
+					uni.showToast({
+						title: '提交成功',
+						icon: 'none',
+						duration: 2000,
+					});
+					let pages = getCurrentPages(); // 当前页面
+					let beforePage = pages[pages.length - 2]; // 上一页
+					setTimeout(function() {
+						uni.navigateBack({
+						    /* success: function() {
+						        beforePage.onLoad(); // 执行上一页的onLoad方法
+						    } */
+						});
+					}, 2000);
+
+
+				})
+			}
+
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+
+	.main {
+		padding: 20rpx 24rpx;
+		margin-bottom: 120rpx;
+	}
+
+	.population {
+		margin-top: 20rpx;
+		background: #FFFFFF;
+		padding: 30rpx 20rpx;
+		border-radius: 10rpx;
+	}
+
+	.title {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #333333;
+	}
+
+	.populationImg {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.populationCont {
+		display: flex;
+		padding-top: 30rpx;
+	}
+
+	.populationLine {
+		display: flex;
+		line-height: 32rpx;
+		font-size: 28rpx;
+		color: #999999;
+		width: 200rpx;
+	}
+
+	.populationTxt {
+		padding-left: 12rpx;
+	}
+
+	.orangeColor {
+		color: #FF4F00;
+	}
+
+	.rowView {
+		padding: 30rpx 0rpx 0rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.littleTitle {
+		font-size: 28rpx;
+		color: #666666;
+		line-height: 32rpx;
+	}
+
+	.xxBox {
+		display: flex;
+		justify-content: flex-start;
+
+	}
+
+	.td {
+		width: 80rpx;
+		font-size: 24rpx;
+		margin-left: 10rpx;
+	}
+
+	.firstView,
+	.secondView {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.firstView {
+		margin-bottom: 20rpx;
+	}
+
+
+
+	.textareaCont {
+		padding: 20rpx 0rpx;
+		min-height: 150rpx;
 		width: 95%;
-		font-size: 28rpx;
-	}
-
-
-	.imgBox {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx 0rpx;
-
-	}
-
-	.imgLine {
-		position: relative;
-		margin-right: 10rpx;
-	}
-
-	.itemImg {
-		width: 150rpx;
-		height: 150rpx;
-		margin-right: 5rpx;
-	}
-
-	/* .img4 {
-		margin-right: 20rpx;
-		
-	} */
-
-	.delImg {
-		width: 32rpx;
-		height: 32rpx;
-		position: absolute;
-		right: 0rpx;
-		top: 0rpx;
-	}
-
-
-	.bottom {
-		width: 750rpx;
-		height: 120rpx;
-		background: #FFFFFF;
-		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.shoreDz {
-		width: 702rpx;
-		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-		border-radius: 37rpx;
-		text-align: center;
-		line-height: 74rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 24rpx;
-	}
-	.populationCont2{
-		display: flex;
-		justify-content: space-between;
-	}
+		font-size: 28rpx;
+	}
+
+
+	.imgBox {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20rpx 0rpx;
+
+	}
+
+	.imgLine {
+		position: relative;
+		margin-right: 10rpx;
+	}
+
+	.itemImg {
+		width: 150rpx;
+		height: 150rpx;
+		margin-right: 5rpx;
+	}
+
+	/* .img4 {
+		margin-right: 20rpx;
+		
+	} */
+
+	.delImg {
+		width: 32rpx;
+		height: 32rpx;
+		position: absolute;
+		right: 0rpx;
+		top: 0rpx;
+	}
+
+
+	.bottom {
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.shoreDz {
+		width: 702rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+	}
+	.populationCont2{
+		display: flex;
+		justify-content: space-between;
+	}
 </style>

+ 303 - 303
pages/order/myorder.vue

@@ -1,310 +1,310 @@
-<template>
-	<view class="box">
-		<view class="tab">
-			<view class="tabLine" :class="{tabActive:tabIndex==6}" @click="tabClick(6)">全部</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">待付款</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">待确认</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==3}" @click="tabClick(3)">待收货</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==4}" @click="tabClick(4)">待服务</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==5}" @click="tabClick(5)">待评价</view>
-		</view>
-		<view class="main">
-			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
-				<view class="itemTop">
-					<view style="color: #999999; font-size: 24rpx;">保养订单</view>
-					<view class="itemSheetState" v-if="item.SheetState==1">待付款</view>
-					<view class="itemSheetState" v-if="item.SheetState==2">待确定</view>
-					<view class="itemSheetState" v-if="item.SheetState==3">待收货</view>
-					<view class="itemSheetState" v-if="item.SheetState==4">待服务</view>
-					<view class="itemSheetState" v-if="item.SheetState==5">已完成</view>
-					<view class="itemSheetState" v-if="item.SheetState==0">已取消</view>
-				</view>
-				<view class="itemShopBg">
-					<view class="shopName">{{item.ShopName}}</view>
-					<view class="price">¥{{item.raleMoney}}</view>
-				</view>
-				<view class="itemName">{{item.itemNameList}}</view>
-				<view class="itemName">{{item.goodNameList}}</view>
-				<view class="plateNumber">{{item.PlateNumber}}</view>
-
-				<view class="itemLineBottom">
-					<view class="itemBtn2" v-if="item.SheetState==1" @click.stop="orderPay(item)">立即支付</view>
+<template>
+	<view class="box">
+		<view class="tab">
+			<view class="tabLine" :class="{tabActive:tabIndex==6}" @click="tabClick(6)">全部</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">待付款</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">待确认</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==3}" @click="tabClick(3)">待收货</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==4}" @click="tabClick(4)">待服务</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==5}" @click="tabClick(5)">待评价</view>
+		</view>
+		<view class="main">
+			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
+				<view class="itemTop">
+					<view style="color: #999999; font-size: 24rpx;">保养订单</view>
+					<view class="itemSheetState" v-if="item.SheetState==1">待付款</view>
+					<view class="itemSheetState" v-if="item.SheetState==2">待确定</view>
+					<view class="itemSheetState" v-if="item.SheetState==3">待收货</view>
+					<view class="itemSheetState" v-if="item.SheetState==4">待服务</view>
+					<view class="itemSheetState" v-if="item.SheetState==5">已完成</view>
+					<view class="itemSheetState" v-if="item.SheetState==0">已取消</view>
+				</view>
+				<view class="itemShopBg">
+					<view class="shopName">{{item.ShopName}}</view>
+					<view class="price">¥{{item.raleMoney}}</view>
+				</view>
+				<view class="itemName">{{item.itemNameList}}</view>
+				<view class="itemName">{{item.goodNameList}}</view>
+				<view class="plateNumber">{{item.PlateNumber}}</view>
+
+				<view class="itemLineBottom">
+					<view class="itemBtn2" v-if="item.SheetState==1" @click.stop="orderPay(item)">立即支付</view>
 					
 					<!-- ChangeState  更换门店:1待处理2更换成功3更换关闭    3的不展示 -->
 					<view class="orderState" v-if="item.ChangeState==1">更换门店中</view>
 					<view class="orderState" v-if="item.ChangeState==2">更换成功</view>
 					
-					<!-- ServiceState  退款申请:1待处理2退款成功3退款关闭    3的不展示 -->
+					<!-- ServiceState  退款申请:1待处理2退款成功3退款关闭    3的不展示 -->
 					<view class="orderState" v-if="item.ServiceState==1">更换门店中</view>
-					<view class="orderState" v-if="item.ServiceState==2">更换成功</view>
-					
-
-					<view class="itemBtn2" v-if="item.SheetState==5&&item.EvaluateState==0"
-						@click.stop="goEvaluate(item)">
-						立即评价</view>
-					<view class="itemBtn1" v-if="item.SheetState==5&&item.EvaluateState==1"
-						@click.stop="gopingjia(item)">
-						查看评价</view>
-
-				</view>
-
-
-			</view>
-
-			<nodata v-show="items==''&&isload"></nodata>
-		</view>
-	</view>
-</template>
-
-<script>
-	import nodata from '@/components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata
-		},
-		data() {
-			return {
-				page: 1,
-				tabIndex: '',
-				items: [],
-				isload: false,
-			}
-		},
-		onLoad(opt) {
-
-			this.tabIndex = opt.num;
-
-			this.getData()
-		},
-		onShow() {
-			console.log(this.tabIndex)
-
-			this.getData()
-
-		},
-		methods: {
-			goEvaluate(item) {
-				uni.navigateTo({
-					url: 'evaluate?shopID=' + item.ShopID + '&sheetID=' + item.ID
-				})
-			},
-			gopingjia(item) {
-				uni.navigateTo({
-					url: '../me/myAppraiseDetail?id=' + item.ID
-				})
-			},
-
-
-			tabClick(num) {
-				this.tabIndex = num;
-
-
-				this.page = 1;
-				this.getData()
-			},
-			goDetail(id) {
-				uni.navigateTo({
-					url: 'orderDetail?id=' + id
-				})
-			},
-			getData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.isload = false;
-				if (this.tabIndex == 6) {
-					var padata = {
-						page: this.page,
-						limit: 10,
-					}
-				} else {
-					if (this.tabIndex == 5) {
-						var padata = {
-							page: this.page,
-							limit: 10,
-							evaluateState: '待评价'
-						}
-					} else {
-						var padata = {
-							page: this.page,
-							limit: 10,
-							state: this.tabIndex
-						}
-					}
-				}
-
-				this.$http('worldKeepCar/keepCarMy/listMiNiTMSheetPage', padata, 'GET').then(res => {
-					uni.hideLoading();
-					this.isload = true;
-
-					var list = res.data.Items;
-
-					if (this.page == 1) {
-						this.items = list
-					} else {
-						this.items = this.items.concat(list)
-					}
-
-				})
-			},
-			orderPay(item) {
-				uni.showLoading({});
-				this.$http('miniApp/maintainOrder/orderPay', {
-					sheetID: item.ID
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					var payInfo = JSON.parse(res.data.payInfo)
-					uni.requestPayment({
-						provider: 'wxpay',
-						// timeStamp: String(Date.now()),
-						timeStamp: payInfo.timeStamp,
-						nonceStr: payInfo.nonceStr,
-						package: payInfo.package,
-						signType: payInfo.signType,
-						paySign: payInfo.paySign,
-						success: function(res) {
-							console.log('success:' + JSON.stringify(res));
-							uni.showToast({
-								title: '支付成功',
-								icon: 'none',
-								duration: 2000
-							});
-							uni.switchTab({
-								url: '../index/index'
-							})
-						},
-						fail: function(err) {
-							console.log('fail:' + JSON.stringify(err));
-
-						}
-					});
-				})
-			},
-		},
-		onReachBottom() {
-			this.page++;
-
-			this.getData()
-		},
-		onPullDownRefresh() {
-			this.page = 1;
-			this.getData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		}
-	}
-</script>
-
-<style scoped>
-	.box {
-		min-height: 100vh;
-		background: #F4F5F7;
-	}
-
-	.tab {
-		background: #FFFFFF;
-		display: flex;
-		justify-content: space-between;
-		line-height: 92rpx;
-		position: fixed;
-		width: 100%;
-		height: 92rpx;
-		z-index: 11;
-	}
-
-	.tabLine {
-		width: 180rpx;
-		text-align: center;
-	}
-
-	.tabActive {
-		color: #FF4F00;
-		border-bottom: 4rpx solid #FF4F00;
-	}
-
-	.main {
-		padding-top: 92rpx;
-		padding-bottom: 20rpx;
-		background-color: #F4F5F7;
-	}
-
-	.itemBg {
-		margin: 20rpx 24rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-		padding: 20rpx;
-	}
-
-	.itemTop {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.itemSheetState {
-		font-size: 24rpx;
-		color: #FF2400
-	}
-
-	.itemShopBg {
-		display: flex;
-		justify-content: space-between;
-		margin: 20rpx 0;
-	}
-
-	.shopName {
-		color: #333333;
-		font-size: 30rpx;
-	}
-
-	.price {
-		color: #333333;
-		font-size: 32rpx;
-	}
-
-	.itemName {
-		color: #666666;
-		font-size: 24rpx;
-
-		height: 30rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.plateNumber {
-		color: #666666;
-		font-size: 24rpx;
-		margin: 15rpx 0 20rpx;
-	}
-
-	.itemLineBottom {
-		display: flex;
-		justify-content: flex-end;
-
-	}
-
-	.itemBtn1 {
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		text-align: center;
-		line-height: 56rpx;
-		font-size: 28rpx;
-		color: #3C3C3C;
-		margin-left: 40rpx;
-	}
-
-	.itemBtn2 {
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #FF4F00;
-		text-align: center;
-		line-height: 56rpx;
-		font-size: 28rpx;
-		color: #FF4F00;
-		margin-left: 40rpx;
-	}
+					<view class="orderState" v-if="item.ServiceState==2">更换成功</view>
+					
+
+					<view class="itemBtn2" v-if="item.SheetState==5&&item.EvaluateState==0"
+						@click.stop="goEvaluate(item)">
+						立即评价</view>
+					<view class="itemBtn1" v-if="item.SheetState==5&&item.EvaluateState==1"
+						@click.stop="gopingjia(item)">
+						查看评价</view>
+
+				</view>
+
+
+			</view>
+
+			<nodata v-show="items==''&&isload"></nodata>
+		</view>
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata
+		},
+		data() {
+			return {
+				page: 1,
+				tabIndex: '',
+				items: [],
+				isload: false,
+			}
+		},
+		onLoad(opt) {
+
+			this.tabIndex = opt.num;
+
+			this.getData()
+		},
+		onShow() {
+			console.log(this.tabIndex)
+
+			this.getData()
+
+		},
+		methods: {
+			goEvaluate(item) {
+				uni.navigateTo({
+					url: 'evaluate?shopID=' + item.ShopID + '&sheetID=' + item.ID
+				})
+			},
+			gopingjia(item) {
+				uni.navigateTo({
+					url: '../me/myAppraiseDetail?id=' + item.ID
+				})
+			},
+
+
+			tabClick(num) {
+				this.tabIndex = num;
+
+
+				this.page = 1;
+				this.getData()
+			},
+			goDetail(id) {
+				uni.navigateTo({
+					url: 'orderDetail?id=' + id
+				})
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.isload = false;
+				if (this.tabIndex == 6) {
+					var padata = {
+						page: this.page,
+						limit: 10,
+					}
+				} else {
+					if (this.tabIndex == 5) {
+						var padata = {
+							page: this.page,
+							limit: 10,
+							evaluateState: '待评价'
+						}
+					} else {
+						var padata = {
+							page: this.page,
+							limit: 10,
+							state: this.tabIndex
+						}
+					}
+				}
+
+				this.$http('worldKeepCar/keepCarMy/listMiNiTMSheetPage', padata, 'GET').then(res => {
+					uni.hideLoading();
+					this.isload = true;
+
+					var list = res.data.Items;
+
+					if (this.page == 1) {
+						this.items = list
+					} else {
+						this.items = this.items.concat(list)
+					}
+
+				})
+			},
+			orderPay(item) {
+				uni.showLoading({});
+				this.$http('miniApp/maintainOrder/orderPay', {
+					sheetID: item.ID
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					var payInfo = JSON.parse(res.data.payInfo)
+					uni.requestPayment({
+						provider: 'wxpay',
+						// timeStamp: String(Date.now()),
+						timeStamp: payInfo.timeStamp,
+						nonceStr: payInfo.nonceStr,
+						package: payInfo.package,
+						signType: payInfo.signType,
+						paySign: payInfo.paySign,
+						success: function(res) {
+							console.log('success:' + JSON.stringify(res));
+							uni.showToast({
+								title: '支付成功',
+								icon: 'none',
+								duration: 2000
+							});
+							uni.switchTab({
+								url: '../index/index'
+							})
+						},
+						fail: function(err) {
+							console.log('fail:' + JSON.stringify(err));
+
+						}
+					});
+				})
+			},
+		},
+		onReachBottom() {
+			this.page++;
+
+			this.getData()
+		},
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+
+	.tab {
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-between;
+		line-height: 92rpx;
+		position: fixed;
+		width: 100%;
+		height: 92rpx;
+		z-index: 11;
+	}
+
+	.tabLine {
+		width: 180rpx;
+		text-align: center;
+	}
+
+	.tabActive {
+		color: #FF4F00;
+		border-bottom: 4rpx solid #FF4F00;
+	}
+
+	.main {
+		padding-top: 92rpx;
+		padding-bottom: 20rpx;
+		background-color: #F4F5F7;
+	}
+
+	.itemBg {
+		margin: 20rpx 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		padding: 20rpx;
+	}
+
+	.itemTop {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.itemSheetState {
+		font-size: 24rpx;
+		color: #FF2400
+	}
+
+	.itemShopBg {
+		display: flex;
+		justify-content: space-between;
+		margin: 20rpx 0;
+	}
+
+	.shopName {
+		color: #333333;
+		font-size: 30rpx;
+	}
+
+	.price {
+		color: #333333;
+		font-size: 32rpx;
+	}
+
+	.itemName {
+		color: #666666;
+		font-size: 24rpx;
+
+		height: 30rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.plateNumber {
+		color: #666666;
+		font-size: 24rpx;
+		margin: 15rpx 0 20rpx;
+	}
+
+	.itemLineBottom {
+		display: flex;
+		justify-content: flex-end;
+
+	}
+
+	.itemBtn1 {
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		text-align: center;
+		line-height: 56rpx;
+		font-size: 28rpx;
+		color: #3C3C3C;
+		margin-left: 40rpx;
+	}
+
+	.itemBtn2 {
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #FF4F00;
+		text-align: center;
+		line-height: 56rpx;
+		font-size: 28rpx;
+		color: #FF4F00;
+		margin-left: 40rpx;
+	}
 </style>

File diff suppressed because it is too large
+ 961 - 961
pages/order/orderDetail.vue


File diff suppressed because it is too large
+ 791 - 791
pages/shop/ckShop.vue


+ 263 - 263
pages/shop/shopAppraise.vue

@@ -1,268 +1,268 @@
-<template>
-	<view class="content">
-
-		<!-- 列表 -->
-		<view class="itemContent">
-			<view v-for="(item,index) in itemData" :key="index">
-				<view class="item">
-
-					<view class="leftView">
-						<image :src='item.HeadUrl' v-if="item.HeadUrl" class="storeImg"></image>
-						<image src="../../static/img/pic_def_ava.png" mode="" class="storeImg" v-else></image>
-					</view>
-
-					<view class="rightView">
-						<!-- 第一行 -->
-						<view class="firstView">
-							<view class="shopName">{{item.Evaluator}}</view>
-							<!-- 时间截取 -->
-							<!-- <view class="time">2021-9-05</view> -->
-							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
-						</view>
-
-						<!-- 第2行 -->
-						<view class="secondView">
-							<!-- 星星 -->
-							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
-								:size="16" :margin="4" :readonly="true" />
-							
-						</view>
-
-						<view class="contentMes">{{item.EContent}}</view>
-
-						<!-- 照片 -->
-						<view class="imgBg">
-							<view v-for="(itemImg,indexImg) in item.imgs" :key="indexImg">
-
-								<image :src="itemImg.imageUrl" class="img"
-									@click="previewImage(itemImg.imageUrl,item.imgs)"></image>
-							</view>
-						</view>
-
-						<!-- 商家回复 -->
-
-						<view class="writeBack" v-if="item.ReplyContent">商家回复:{{item.ReplyContent}}</view>
-					</view>
-
-
-
-				</view>
-			</view>
-		</view>
-
-		<!-- 上拉 加载更多 -->
-		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
-		<!-- 无数据空白页 -->
-		<nodata v-if="itemData.length==0"></nodata>
-
-	</view>
-</template>
-
-<script>
-	import nodata from '../../components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata,
-		},
-		data() {
-			return {
-				itemData: [],
-				page: 1,
-				noMoreShow: false,
+<template>
+	<view class="content">
+
+		<!-- 列表 -->
+		<view class="itemContent">
+			<view v-for="(item,index) in itemData" :key="index">
+				<view class="item">
+
+					<view class="leftView">
+						<image :src='item.HeadUrl' v-if="item.HeadUrl" class="storeImg"></image>
+						<image src="../../static/img/pic_def_ava.png" mode="" class="storeImg" v-else></image>
+					</view>
+
+					<view class="rightView">
+						<!-- 第一行 -->
+						<view class="firstView">
+							<view class="shopName">{{item.Evaluator}}</view>
+							<!-- 时间截取 -->
+							<!-- <view class="time">2021-9-05</view> -->
+							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+						</view>
+
+						<!-- 第2行 -->
+						<view class="secondView">
+							<!-- 星星 -->
+							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
+								:size="16" :margin="4" :readonly="true" />
+							
+						</view>
+
+						<view class="contentMes">{{item.EContent}}</view>
+
+						<!-- 照片 -->
+						<view class="imgBg">
+							<view v-for="(itemImg,indexImg) in item.imgs" :key="indexImg">
+
+								<image :src="itemImg.imageUrl" class="img"
+									@click="previewImage(itemImg.imageUrl,item.imgs)"></image>
+							</view>
+						</view>
+
+						<!-- 商家回复 -->
+
+						<view class="writeBack" v-if="item.ReplyContent">商家回复:{{item.ReplyContent}}</view>
+					</view>
+
+
+
+				</view>
+			</view>
+		</view>
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+		<!-- 无数据空白页 -->
+		<nodata v-if="itemData.length==0"></nodata>
+
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		data() {
+			return {
+				itemData: [],
+				page: 1,
+				noMoreShow: false,
 				imgArr: [],
-				shopId:'',
-			}
-		},
-		onLoad(opt) {
+				shopId:'',
+			}
+		},
+		onLoad(opt) {
 			this.page = 1
-			this.shopId = opt.shopId
-			this.getItemData()
-		},
-		methods: {
-			previewImage(img, arrDic) {
-				var arr = [];
-
-				arrDic.forEach(item => {
-					arr.push(item.imageUrl)
-				})
-
-				// 预览图片
-				uni.previewImage({
-					urls: arr,
-					current: img,
-					longPressActions: {
-						itemList: ['发送给朋友', '保存图片', '收藏'],
-						success: function(data) {
-							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-						},
-						fail: function(err) {
-							console.log(err.errMsg);
-						}
-					}
-				});
-			},
-			
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'miniAppShopInfoController/listShopBMEvaluatePage',
-					params = {
-						page: this.page,
-						limit: 20,
-						shopId:this.shopId,
-					}
-				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-					var list = res.data.Items
-
-					// 处理 undefined和null转为空白字符串
-					list.forEach((item, index) => {
-						for (const key in item) {
-							item[key] = this.$praseStrEmpty(item[key])
-						}
-					})
-
-
-					if (this.page == 1) {
-						this.itemData = list
-					} else {
-						this.itemData = this.itemData.concat(list)
-					}
-
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
-					}
-
-
-				})
-			},
-
-		},
-
-		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
-			this.page = 1
-			this.getItemData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.page++;
-			this.getItemData()
-		},
-
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #FFFFFF;
-		min-height: 100vh;
-
-	}
-
-
-
-	.item {
-		display: flex;
-		justify-content: flex-start;
-		padding: 0 24rpx;
-		background-color: #FFFFFF;
-
-	}
-
-	.leftView {
-		width: 117rpx;
-		padding-right: 20rpx;
-	}
-
-	.storeImg {
-		width: 72rpx;
-		height: 72rpx;
-		border-radius: 8rpx;
-		margin-top: 30rpx;
-	}
-
-	.rightView {
-		border-bottom: 1rpx #EEEEEE solid;
-		width: 100vw;
-	}
-
-	.firstView,
-	.secondView {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-	}
-
-	.firstView {
-		padding-top: 30rpx;
-	}
-
-	.secondView {
-		padding-top: 12rpx;
-		padding-bottom: 20rpx;
-	}
-
-	.shopName {
-		/* padding-top: 30rpx;
-		padding-bottom: 10rpx; */
-		font-size: 26rpx;
-		font-weight: bold;
-		color: #333333;
-	}
-
-	.time {
-		font-size: 26rpx;
-		color: #999999;
-	}
-
-	.deleteBtn {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-	.contentMes {
-		font-size: 26rpx;
-		color: #666666;
-		line-height: 37rpx;
-		/* padding-top: 20rpx; */
-
-	}
-
-	.imgBg {
-		display: flex;
-		justify-content: flex-start;
-		padding: 30rpx 0rpx;
-		flex-wrap: wrap;
-	}
-
-	.img {
-		width: 140rpx;
-		height: 140rpx;
-		margin-right: 5rpx;
-		border-radius: 8rpx;
-	}
-
-	.writeBack {
-		font-size: 26rpx;
-		color: #666666;
-		line-height: 37rpx;
-		padding: 20rpx;
+			this.shopId = opt.shopId
+			this.getItemData()
+		},
+		methods: {
+			previewImage(img, arrDic) {
+				var arr = [];
+
+				arrDic.forEach(item => {
+					arr.push(item.imageUrl)
+				})
+
+				// 预览图片
+				uni.previewImage({
+					urls: arr,
+					current: img,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
+			
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'miniAppShopInfoController/listShopBMEvaluatePage',
+					params = {
+						page: this.page,
+						limit: 20,
+						shopId:this.shopId,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+
+
+				})
+			},
+
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+			this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+			this.getItemData()
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #FFFFFF;
+		min-height: 100vh;
+
+	}
+
+
+
+	.item {
+		display: flex;
+		justify-content: flex-start;
+		padding: 0 24rpx;
+		background-color: #FFFFFF;
+
+	}
+
+	.leftView {
+		width: 117rpx;
+		padding-right: 20rpx;
+	}
+
+	.storeImg {
+		width: 72rpx;
+		height: 72rpx;
+		border-radius: 8rpx;
+		margin-top: 30rpx;
+	}
+
+	.rightView {
+		border-bottom: 1rpx #EEEEEE solid;
+		width: 100vw;
+	}
+
+	.firstView,
+	.secondView {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+	}
+
+	.firstView {
+		padding-top: 30rpx;
+	}
+
+	.secondView {
+		padding-top: 12rpx;
+		padding-bottom: 20rpx;
+	}
+
+	.shopName {
+		/* padding-top: 30rpx;
+		padding-bottom: 10rpx; */
+		font-size: 26rpx;
+		font-weight: bold;
+		color: #333333;
+	}
+
+	.time {
+		font-size: 26rpx;
+		color: #999999;
+	}
+
+	.deleteBtn {
+		width: 36rpx;
+		height: 36rpx;
+	}
+
+	.contentMes {
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 37rpx;
+		/* padding-top: 20rpx; */
+
+	}
+
+	.imgBg {
+		display: flex;
+		justify-content: flex-start;
+		padding: 30rpx 0rpx;
+		flex-wrap: wrap;
+	}
+
+	.img {
+		width: 140rpx;
+		height: 140rpx;
+		margin-right: 5rpx;
+		border-radius: 8rpx;
+	}
+
+	.writeBack {
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 37rpx;
+		padding: 20rpx;
 		background-color: #F4F5F7;
 		
-		padding-bottom: 20rpx;
-	}
-
-	.noMore {
-		text-align: center;
-		line-height: 50rpx;
-		color: #999999;
-		font-size: 28rpx;
-	}
+		padding-bottom: 20rpx;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/chose-city/chose-city.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/nodata/nodata.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-qrcode/tki-qrcode.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-plate-input/uni-plate-input.js.map


+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/cailist.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;AACA;AACA,8M,6FAFmBA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC;AAGnBC,UAAU,CAACC,gBAAD,CAAV,C","file":"pages/car/cailist.js","sourcesContent":["import 'uni-pages';wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/car/cailist.vue'\ncreatePage(Page)"],"sourceRoot":""}

+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/carModel.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;AACA;AACA,gN,6FAFmBA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC;AAGnBC,UAAU,CAACC,iBAAD,CAAV,C","file":"pages/car/carModel.js","sourcesContent":["import 'uni-pages';wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/car/carModel.vue'\ncreatePage(Page)"],"sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/addphone.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/phoneList.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addCar.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cailist.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/carModel.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/empower.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/iphoneLogin.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/intimity.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/setup.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/treaty.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/evaluate.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/myorder.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shopList.js.map


+ 0 - 72
unpackage/dist/dev/mp-weixin/app.json

@@ -1,72 +0,0 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/shop/shopList",
-    "pages/me/me",
-    "pages/login/login",
-    "pages/login/empower",
-    "pages/login/iphoneLogin",
-    "pages/module/maintain",
-    "pages/module/replaceGoods",
-    "pages/module/confirmOrder",
-    "pages/module/orderShop",
-    "pages/index/addCar",
-    "pages/index/cailist",
-    "pages/index/carModel",
-    "pages/me/setup",
-    "pages/iPhone/phoneList",
-    "pages/iPhone/addphone",
-    "pages/me/treaty",
-    "pages/me/intimity",
-    "pages/order/myorder",
-    "pages/order/orderDetail",
-    "pages/order/evaluate",
-    "pages/me/discountCard",
-    "pages/me/discountDetail",
-    "pages/me/myAppraise",
-    "pages/me/myAppraiseDetail",
-    "pages/me/feedBack",
-    "pages/shop/ckShop",
-    "pages/shop/shopDetail"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#8a8a8a",
-    "selectedColor": "#FF4F00",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/img/tabme1.png",
-        "selectedIconPath": "static/img/tabme2.png",
-        "text": "4S保养"
-      },
-      {
-        "pagePath": "pages/shop/shopList",
-        "iconPath": "static/img/tabshop1.png",
-        "selectedIconPath": "static/img/tabshop2.png",
-        "text": "4S门店"
-      },
-      {
-        "pagePath": "pages/me/me",
-        "iconPath": "static/img/tabme1.png",
-        "selectedIconPath": "static/img/tabme2.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "permission": {
-    "scope.userLocation": {
-      "desc": "获取定位"
-    }
-  },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
-}

+ 0 - 18
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*每个页面公共css */
-
-

File diff suppressed because it is too large
+ 0 - 273
unpackage/dist/dev/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 0 - 10503
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 0 - 542
unpackage/dist/dev/mp-weixin/components/chose-city/chose-city.js


File diff suppressed because it is too large
+ 0 - 185
unpackage/dist/dev/mp-weixin/components/nodata/nodata.js


+ 0 - 4
unpackage/dist/dev/mp-weixin/components/nodata/nodata.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxml

@@ -1 +0,0 @@
-<view style="padding-bottom:20rpx;" class="data-v-4bb7b1e4"><view class="nodataBox data-v-4bb7b1e4"><image class="nodataImg data-v-4bb7b1e4" src="../../static/img/nodata.png" mode="widthFix"></image><view class="noTxt data-v-4bb7b1e4">暂无数据</view></view></view>

+ 0 - 15
unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxss

@@ -1,15 +0,0 @@
-
-.nodataImg.data-v-4bb7b1e4{
-  width: 400rpx;
-  padding-top: 100rpx;
-}
-.noTxt.data-v-4bb7b1e4{
-	font-size: 36rpx;
-	color: #999999;
-	padding-top: 50rpx;
-}
-.nodataBox.data-v-4bb7b1e4{
-	text-align: center;
-}
-
-

File diff suppressed because it is too large
+ 0 - 357
unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.js


+ 0 - 4
unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.wxml

@@ -1 +0,0 @@
-<view class="tki-qrcode data-v-143ec824"><canvas class="tki-qrcode-canvas data-v-143ec824" style="{{'width:'+(cpSize+'px')+';'+('height:'+(cpSize+'px')+';')}}" canvas-id="{{cid}}"></canvas><image hidden="{{!(show)}}" style="{{'width:'+(cpSize+'px')+';'+('height:'+(cpSize+'px')+';')}}" src="{{result}}" class="data-v-143ec824"></image></view>

+ 0 - 11
unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.wxss

@@ -1,11 +0,0 @@
-
-.tki-qrcode.data-v-143ec824 {
-  position: relative;
-}
-.tki-qrcode-canvas.data-v-143ec824 {
-  position: fixed;
-  top: -99999rpx;
-  left: -99999rpx;
-  z-index: -99999;
-}
-

File diff suppressed because it is too large
+ 0 - 420
unpackage/dist/dev/mp-weixin/components/uni-plate-input/uni-plate-input.js


File diff suppressed because it is too large
+ 0 - 355
unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.js


+ 0 - 4
unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "新增联系人",
-  "usingComponents": {}
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.wxml


+ 0 - 54
unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.wxss

@@ -1,54 +0,0 @@
-
-.box.data-v-3d239264{
-		min-height: 100vh;
-		background:#F4F5F7 ;
-}
-.main.data-v-3d239264{
-		padding: 24rpx;
-}
-.phoneListBox.data-v-3d239264{
-		background: #FFFFFF;
-		border-radius: 10rpx;
-		padding: 0 24rpx;
-}
-.phoneLine.data-v-3d239264{
-		display: flex;
-		
-		padding: 30rpx;
-		border-bottom: 1px solid #DDDDDD;
-}
-.phoneLeft.data-v-3d239264{
-		width: 150rpx;font-size: 28rpx;
-color: #3C3C3C;
-}
-.phoneLine2.data-v-3d239264{
-		padding:20rpx 30rpx;border-bottom: 1px solid #DDDDDD;
-}
-.lineInput.data-v-3d239264{
-	   color: #999999;
-		   font-size: 28rpx;
-}
-.DefaultTxt.data-v-3d239264{
-		font-size: 28rpx;
-		color: #3C3C3C;
-		display: flex;
-		align-items: center;
-}
-.submit.data-v-3d239264{
-		width: 690rpx;
-		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-		border-radius: 37rpx;
-		line-height: 74rpx;
-		text-align: center;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 80rpx;
-		margin-left: 6rpx;
-}
-.phoneLine3.data-v-3d239264{
-		color: #FF3B30;
-		font-size: 26rpx;
-		padding: 30rpx;
-}
-

File diff suppressed because it is too large
+ 0 - 241
unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.js


+ 0 - 4
unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "联系人管理",
-  "usingComponents": {}
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.wxml


+ 0 - 57
unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.wxss

@@ -1,57 +0,0 @@
-
-.box.data-v-04955f9b{
-	min-height: 100vh;
-	background:#F4F5F7 ;
-}
-.main.data-v-04955f9b{
-	padding: 24rpx;
-}
-.phoneListBox.data-v-04955f9b{
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	padding: 0 24rpx;
-}
-.phoneLine.data-v-04955f9b{
-	display: flex;
-	justify-content: space-between;
-	padding: 30rpx;
-	border-bottom: 1px solid #DDDDDD;
-}
-.phoneEdit.data-v-04955f9b{
-	width: 40rpx;
-	height: 40rpx;
-}
-.name.data-v-04955f9b{
-	font-size: 28rpx;
-	font-family: PingFangSC-Medium, PingFang SC;
-	font-weight: 500;
-	color: #3C3C3C;
-	width: 200rpx;
-}
-.phoneNUm.data-v-04955f9b{
-	font-size: 28rpx;
-	font-family: PingFangSC-Regular, PingFang SC;
-	font-weight: 400;
-	color: #3C3C3C;
-}
-.phoneLeft.data-v-04955f9b{
-	display: flex;
-}
-.default.data-v-04955f9b{
-	width: 64rpx;
-	height: 30rpx;
-	background: rgba(255, 79, 0, 0.06);
-	border-radius: 4rpx;
-	text-align: center;line-height: 30rpx;
-	color: #FF4F00;font-size: 22rpx;
-	margin-left: 30rpx;margin-top: 4rpx;
-}
-.addTxt.data-v-04955f9b{
-	color: #FF4F00;
-	font-size: 30rpx;
-}
-.addjt.data-v-04955f9b{
-	color: #CCCCCC;
-	font-size: 30rpx;
-}
-

File diff suppressed because it is too large
+ 0 - 442
unpackage/dist/dev/mp-weixin/pages/index/addCar.js


+ 0 - 7
unpackage/dist/dev/mp-weixin/pages/index/addCar.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "添加爱车",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "plate-input": "/components/uni-plate-input/uni-plate-input"
-  }
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/index/addCar.wxml


+ 0 - 81
unpackage/dist/dev/mp-weixin/pages/index/addCar.wxss

@@ -1,81 +0,0 @@
-
-.content {
-	min-height: 100vh;
-	background-color: #F4F5F7;
-	padding-top: 20rpx;
-}
-.carMessage {
-	margin: 0rpx 24rpx 40rpx;
-	padding-top: 20rpx;
-	height: 500rpx;
-	background-color: #FFFFFF;
-	border-radius: 10rpx;
-}
-.mesView {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	height: 120rpx;
-	background-color: #FFFFFF;
-}
-.leftTitle {
-	margin: 28rpx;
-	width: 120rpx;
-	font-size: 28rpx;
-	color: #666666;
-}
-.noSelectColor {
-	color: #999999;
-}
-.selectColor {
-	color: #333333;
-}
-.rightArrow {
-	margin-right: 28rpx;
-	width: 14rpx;
-	height: 23rpx;
-}
-.cityBtn {
-	width: 65%;
-	font-size: 28rpx;
-}
-.plateNumber {
-	width: 55%;
-	font-size: 28rpx;
-}
-.carModBtn {
-	width: 65%;
-	font-size: 28rpx;
-}
-.timeBtn {
-	width: 65%;
-	font-size: 28rpx;
-}
-.mileageInput {
-	width: 20%;
-	font-size: 28rpx;
-}
-.kmStr {
-	font-size: 28rpx;
-	color: #333333;
-}
-.bottomView {
-	background-color: #FFFFFF;
-	width: 100%;
-	height: 120rpx;
-	position: fixed;
-	bottom: 0rpx;
-}
-.saveCar {
-
-	background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-	margin: 23rpx 30rpx;
-	height: 74rpx;
-	line-height: 74rpx;
-	border-radius: 37rpx;
-	color: #FFFFFF;
-	font-size: 30rpx;
-	font-weight: bold;
-	text-align: center;
-}
-

File diff suppressed because it is too large
+ 0 - 314
unpackage/dist/dev/mp-weixin/pages/index/cailist.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/index/cailist.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "我的车库",
-  "navigationBarBackgroundColor": "#FFFFFF",
-  "usingComponents": {}
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/index/cailist.wxml


+ 0 - 114
unpackage/dist/dev/mp-weixin/pages/index/cailist.wxss

@@ -1,114 +0,0 @@
-
-.box.data-v-c657a5fa{
-	min-height: 100vh;
-	background:#F4F5F7 ;
-}
-.nodataImg.data-v-c657a5fa{
-  width: 400rpx;
-  padding-top: 100rpx;
-}
-.noTxt.data-v-c657a5fa{
-	font-size: 36rpx;
-	color: #999999;
-	padding-top: 50rpx;
-}
-.nodataBox.data-v-c657a5fa{
-	text-align: center;
-}
-.addBtn.data-v-c657a5fa{
-	width: 690rpx;
-	height: 74rpx;
-	background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-	border-radius: 37rpx;
-	line-height: 74rpx;
-	text-align: center;
-	color: #FFFFFF;
-	font-size: 30rpx;
-	position: fixed;
-	bottom: 23rpx;
-	left: 30rpx;
-}
-.carlistBox.data-v-c657a5fa{
-	padding-bottom: 120rpx;
-}
-.carlistBox.data-v-c657a5fa{
-	padding: 24rpx;
-	padding-bottom: 120rpx;
-}
-.brandLogo.data-v-c657a5fa{
-	width: 63rpx;
-}
-.line.data-v-c657a5fa{
-	background: #FFFFFF;
-	padding: 27rpx 20rpx;
-	border-radius: 10rpx;
-	margin-bottom: 20rpx;
-    position: relative;
-}
-.lineCont.data-v-c657a5fa{
-		display: flex;
-}
-.carName.data-v-c657a5fa{
-	color: #3C3C3C;font-size: 30rpx;display: flex;
-}
-.plateNumber.data-v-c657a5fa{
-	border-radius: 4px;
-	border: 1px solid #F19D01;
-	height: 32rpx;
-	line-height: 32rpx;
-	padding: 0 10rpx;color: #F19D01;
-	font-size: 22rpx;
-	margin-left: 20rpx;
-	margin-top: 5rpx;
-}
-.carMS.data-v-c657a5fa{
-	color: #666666;
-	font-size: 26rpx;
-	padding-top: 5px;
-}
-.lineBottom.data-v-c657a5fa{
-	display: flex;
-	justify-content: flex-end;
-	padding-top: 20rpx;
-}
-.lineDel.data-v-c657a5fa{
-	width: 94rpx;
-	height: 50rpx;
-	border-radius: 25rpx;
-	border: 1px solid #DDDDDD;
-	text-align: center;line-height: 50rpx;
-	font-size: 26rpx;color: #3C3C3C;
-	margin-right: 29rpx;
-}
-.Default.data-v-c657a5fa{
-	width: 148rpx;
-	height: 50rpx;
-	border-radius: 25rpx;
-	border: 1px solid #FF4F00;
-	line-height: 50rpx;
-	text-align: center;
-	color: #FF4F00;font-size: 26rpx;
-}
-.DefaultYES.data-v-c657a5fa{
-	width: 148rpx;
-	height: 50rpx;
-	border-radius: 25rpx;
-	border: 1px solid #DDDDDD;
-	line-height: 50rpx;
-	text-align: center;
-	color: #999999;font-size: 26rpx;
-}
-.DefaultIcon.data-v-c657a5fa{
-	position: absolute;
-	top: 0;
-	right: 0;
-	width: 109rpx;
-	height: 40rpx;
-	background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%);
-	border-radius: 0px 10rpx 0px 10rpx;
-	text-align: center;
-	line-height: 40rpx;
-	color: #FFFFFF;
-	font-size: 22rpx;
-}
-

File diff suppressed because it is too large
+ 0 - 613
unpackage/dist/dev/mp-weixin/pages/index/carModel.js


+ 0 - 6
unpackage/dist/dev/mp-weixin/pages/index/carModel.json

@@ -1,6 +0,0 @@
-{
-  "navigationStyle": "custom",
-  "usingComponents": {
-    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
-  }
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/index/carModel.wxml


+ 0 - 405
unpackage/dist/dev/mp-weixin/pages/index/carModel.wxss

@@ -1,405 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.box.data-v-411247ea {
-  min-height: 100vh;
-  background: #F4F5F7;
-}
-.vinboxTwoTopFh.data-v-411247ea {
-  font-size: 26rpx;
-  padding: 30rpx 24rpx;
-  color: #3F90F7;
-}
-.vinboxTwoBottom.data-v-411247ea {
-  width: 750rpx;
-  height: 120rpx;
-  background: #FFFFFF;
-  box-shadow: 0px -2px 20px 0px rgba(153, 153, 153, 0.2);
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  display: flex;
-  justify-content: space-around;
-}
-.shoudonng.data-v-411247ea {
-  width: 336rpx;
-  height: 74rpx;
-  border-radius: 37rpx;
-  border: 1px solid #FF4F00;
-  line-height: 74rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #FF4F00;
-  margin-top: 23rpx;
-}
-.qrcx.data-v-411247ea {
-  width: 336rpx;
-  height: 74rpx;
-  background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-  border-radius: 37rpx;
-  line-height: 74rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #FFFFFF;
-  margin-top: 23rpx;
-}
-.vinXzBox.data-v-411247ea {
-  padding-bottom: 120rpx;
-}
-.loginLogo.data-v-411247ea {
-  width: 28rpx;
-  height: 28rpx;
-}
-.vinXzLineyk.data-v-411247ea {
-  width: 24rpx;
-  height: 24rpx;
-  border: 2rpx solid #999999;
-  border-radius: 50%;
-}
-.vinXzLine.data-v-411247ea {
-  padding: 30rpx 24rpx;
-  display: flex;
-  justify-content: space-between;
-  color: #3C3C3C;
-  font-size: 28rpx;
-  line-height: 28rpx;
-  border-bottom: 1px solid #DDDDDD;
-}
-.vinboxTwoTopVIn.data-v-411247ea {
-  font-size: 28rpx;
-  color: #666666;
-  padding-left: 24rpx;
-  padding-bottom: 30rpx;
-}
-.zdyNav.data-v-411247ea {
-  width: 100vw;
-  background: #FFFFFF;
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1111111;
-}
-.zdyNavCont.data-v-411247ea {
-  height: 44px;
-  font-size: 28rpx;
-  display: flex;
-  justify-content: space-between;
-  line-height: 44px;
-}
-.vinCxNum.data-v-411247ea {
-  background: #F4F5F7;
-  font-size: 26rpx;
-  padding: 18rpx 24rpx;
-  color: #999999;
-}
-.baiheibackImg.data-v-411247ea {
-  width: 70px;
-  height: 44px;
-}
-.gaunbiIMg.data-v-411247ea {
-  width: 20px;
-  height: 20px;
-  padding: 12px;
-}
-.zdyNavContRight.data-v-411247ea {
-  width: 114px;
-}
-.smvin.data-v-411247ea {
-  color: #3C3C3C;
-  font-size: 30rpx;
-}
-.smvin2.data-v-411247ea {
-  color: #999999;
-  font-size: 26rpx;
-}
-.tab2.data-v-411247ea {
-  padding: 30rpx 24rpx;
-  min-height: calc(100vh - 150rpx - 44px);
-  background: #FFFFFF;
-  position: relative;
-}
-.vinboxTwo.data-v-411247ea {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 750rpx;
-  min-height: calc(100vh - 150rpx - 44px);
-  background: #FFFFFF;
-}
-.sltpImg.data-v-411247ea {
-  width: 704rpx;
-  height: 353rpx;
-}
-.vinImg.data-v-411247ea {
-  width: 704rpx;
-}
-.sltp.data-v-411247ea {
-  padding-top: 20rpx;
-}
-.vinSc.data-v-411247ea {
-  width: 690rpx;
-  height: 74rpx;
-  background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-  border-radius: 37rpx;
-  text-align: center;
-  line-height: 74rpx;
-  color: #FFFFFF;
-  font-size: 30rpx;
-  margin-top: 70rpx;
-}
-.nodataImg.data-v-411247ea {
-  width: 400rpx;
-  padding-top: 100rpx;
-}
-.noTxt.data-v-411247ea {
-  font-size: 36rpx;
-  color: #999999;
-  padding-top: 50rpx;
-}
-.nodataBox.data-v-411247ea {
-  text-align: center;
-}
-.addBtn.data-v-411247ea {
-  width: 690rpx;
-  height: 74rpx;
-  background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-  border-radius: 37rpx;
-  line-height: 74rpx;
-  text-align: center;
-  color: #FFFFFF;
-  font-size: 30rpx;
-  position: fixed;
-  bottom: 23rpx;
-  left: 30rpx;
-}
-.carlistBox.data-v-411247ea {
-  padding-bottom: 120rpx;
-}
-.tab.data-v-411247ea {
-  background: #FFFFFF;
-  display: flex;
-  justify-content: space-around;
-  line-height: 93rpx;
-  color: #3C3C3C;
-  font-size: 30rpx;
-  border-bottom: 1px solid #F4F5F7;
-}
-.activeTab.data-v-411247ea {
-  color: #FF4F00;
-  text-decoration: underline;
-}
-/* .brand-select-title{
-	height: 80px;
-	background:rgba(247,247,247,1);
-	position: relative;
-} */
-.brand-select .brand-select-title.data-v-411247ea {
-  height: 80rpx;
-  background: #f7f7f7;
-  position: relative;
-}
-.brand-select .brand-select-title ._h5.data-v-411247ea {
-  position: absolute;
-  height: 40rpx;
-  font-size: 28rpx;
-  font-weight: 500;
-  color: #666666;
-  line-height: 40rpx;
-  top: 20rpx;
-  left: 30rpx;
-}
-.brand-select .brand-select-wrapper.data-v-411247ea {
-  display: flex;
-  flex-wrap: wrap;
-  background: white;
-  width: 100vw;
-}
-.brand-select .brand-select-wrapper .brand-select-item.data-v-411247ea {
-  display: block;
-  width: 80rpx;
-  height: 100rpx;
-  padding: 30rpx;
-}
-.brand-select .brand-select-wrapper .brand-select-item ._img.data-v-411247ea {
-  display: inline-block;
-  margin-left: 10rpx;
-  width: 60rpx;
-  height: 60rpx;
-}
-.brand-select .brand-select-wrapper .brand-select-item ._span.data-v-411247ea {
-  display: inline-block;
-  text-align: center;
-  height: 33rpx;
-  width: 90rpx;
-  font-size: 24rpx;
-  font-weight: 400;
-  color: #333333;
-  line-height: 33rpx;
-}
-.fast-navigation.data-v-411247ea {
-  position: fixed;
-  text-align: center;
-  right: 16rpx;
-  top: 360rpx;
-  width: 23rpx;
-  font-size: 30rpx;
-  font-weight: 500;
-  line-height: 35rpx;
-  color: #999999;
-}
-.fast-navigation ._a.data-v-411247ea {
-  display: block;
-}
-.fast-navigation .select.data-v-411247ea {
-  color: #FF4F00;
-}
-.scroll-view.data-v-411247ea {
-  height: calc(100vh - 93rpx);
-}
-.popup-height.data-v-411247ea {
-  width: 200px;
-}
-.popup-content.data-v-411247ea {
-  width: 590rpx;
-  background: #FFFFFF;
-  height: 100vh;
-}
-.carModel-nav-title.data-v-411247ea {
-  height: 100rpx;
-  background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
-  line-height: 100rpx;
-  display: flex;
-  z-index: 500;
-}
-.carModel-nav-title.cell-logo.data-v-411247ea {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 0;
-  background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
-}
-.carModel-nav-title .carModel-nav-title-box.data-v-411247ea {
-  width: 100%;
-  display: flex;
-}
-.carModel-nav-title .carModel-nav-title-img.data-v-411247ea {
-  margin: 20rpx;
-  width: 60rpx;
-  height: 60rpx;
-}
-.carModel-nav-title .carModel-nav-title-msg.data-v-411247ea {
-  font-size: 30rpx;
-  font-weight: 400;
-  color: white;
-  display: block;
-  padding-right: 20rpx;
-}
-.cell-item-title.data-v-411247ea {
-  height: 60rpx;
-  background: #fafafa;
-  font-size: 28rpx;
-  font-weight: 400;
-  color: #666666;
-  line-height: 60rpx;
-  padding-left: 26rpx;
-}
-.span-cell.data-v-411247ea {
-  position: relative;
-  display: flex;
-  box-sizing: border-box;
-  width: 100%;
-  padding: 6rpx 30rpx;
-  overflow: hidden;
-  color: #323233;
-  font-size: 3.73333vw;
-  line-height: 82rpx;
-  height: 82rpx;
-  background-color: #fff;
-  border-bottom: 1px solid #ebedf0;
-}
-.carModel-nav-title.data-v-411247ea {
-  height: 100rpx;
-  background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
-  line-height: 100rpx;
-  display: flex;
-  z-index: 500;
-}
-.carModel-nav-title.cell-logo.data-v-411247ea {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 0;
-  background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
-}
-.carModel-nav-title .carModel-nav-title-box.data-v-411247ea {
-  width: 100%;
-  display: flex;
-}
-.carModel-nav-title .carModel-nav-title-img.data-v-411247ea {
-  margin: 20rpx;
-  width: 60rpx;
-  height: 60rpx;
-}
-.carModel-nav-title .carModel-nav-title-msg.data-v-411247ea {
-  font-size: 30rpx;
-  font-weight: 400;
-  color: white;
-  display: block;
-  padding-right: 20px;
-}
-.displacementListLine.data-v-411247ea {
-  min-height: 50rpx;
-  padding: 20rpx 20rpx 20rpx 30rpx;
-  font-size: 28rpx;
-  font-weight: 600;
-  color: #333333;
-  line-height: 50rpx;
-  border-top: 2rpx solid #eeeeee;
-  background-color: white;
-}
-.displacementListBox.data-v-411247ea {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-  background: #F4F5F7;
-  z-index: 11111;
-}
-.carGroupListBox.data-v-411247ea {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-  background: #F4F5F7;
-  z-index: 11111;
-}
-.brandList.data-v-411247ea {
-  height: calc(100vh - 100rpx);
-}
-.brand-select-titleselect.data-v-411247ea {
-  color: #FF4F00 !important;
-}
-

File diff suppressed because it is too large
+ 0 - 447
unpackage/dist/dev/mp-weixin/pages/index/index.js


+ 0 - 6
unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "填写爱车信息",
-  "usingComponents": {
-    "chose-city": "/components/chose-city/chose-city"
-  }
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 0 - 92
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1,92 +0,0 @@
-
-.content {
-	min-height: 100vh;
-	background-color: #F4F5F7;
-}
-.bBannerList {
-	width: 100%;
-	height: 300rpx;
-	background-color: #F4F5F7;
-}
-.swpImg {
-	width: 100%;
-	height: 300rpx;
-}
-.carMessage {
-	margin: 24rpx 24rpx 40rpx;
-	padding-top: 10rpx;
-	height: 500rpx;
-	background-color: #FFFFFF;
-	border-radius: 10rpx;
-}
-.look4s {
-	margin: 40rpx 24rpx;
-	height: 88rpx;
-	line-height: 88rpx;
-	text-align: center;
-	background-color: #FD5300;
-	border-radius: 10rpx;
-	color: #FFFFFF;
-	font-weight: bold;
-	font-size: 30rpx;
-}
-.mesView {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	height: 120rpx;
-	background-color: #FFFFFF;
-}
-.leftTitle {
-	margin: 28rpx;
-	width: 120rpx;
-	font-size: 28rpx;
-	color: #666666;
-}
-.noSelectColor {
-	color: #999999;
-}
-.selectColor {
-	color: #333333;
-}
-.rightArrow {
-	margin-right: 28rpx;
-	width: 14rpx;
-	height: 23rpx;
-}
-.cityBtn {
-	width: 65%;
-	font-size: 28rpx;
-}
-.rightView {
-	display: flex;
-	justify-content: space-between;
-	width: 80%;
-}
-.plateNumber {
-	font-size: 28rpx;
-}
-.carModBtn {
-	width: 65%;
-	font-size: 28rpx;
-}
-.timeBtn {
-	width: 65%;
-	font-size: 28rpx;
-}
-.mileageInput {
-	width: 20%;
-	font-size: 28rpx;
-}
-.kmStr {
-	font-size: 28rpx;
-	color: #333333;
-}
-.changeCarBg {
-	display: flex;
-	/* justify-content: flex-start; */
-	align-items: center;
-	width: 120rpx;
-	margin-right: 28rpx;
-}
-

File diff suppressed because it is too large
+ 0 - 204
unpackage/dist/dev/mp-weixin/pages/me/intimity.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/me/intimity.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "隐私政策",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/me/intimity.wxml

@@ -1 +0,0 @@
-<view class="content data-v-6c55d7ae"><rich-text nodes="{{couContent}}" class="data-v-6c55d7ae"></rich-text></view>

+ 0 - 7
unpackage/dist/dev/mp-weixin/pages/me/intimity.wxss

@@ -1,7 +0,0 @@
-
-.content.data-v-6c55d7ae {
-	background: #F4F5F7;
-	min-height: 100vh;
-}
-
-

File diff suppressed because it is too large
+ 0 - 381
unpackage/dist/dev/mp-weixin/pages/me/me.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/me/me.wxml


File diff suppressed because it is too large
+ 0 - 282
unpackage/dist/dev/mp-weixin/pages/me/setup.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/me/setup.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "账号设置",
-  "navigationBarBackgroundColor": "#FFFFFF",
-  "usingComponents": {}
-}

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/me/setup.wxml


+ 0 - 46
unpackage/dist/dev/mp-weixin/pages/me/setup.wxss

@@ -1,46 +0,0 @@
-
-.box.data-v-77845482{
-	min-height: 100vh;
-	background:#F4F5F7 ;
-}
-.main.data-v-77845482{
-	padding: 24rpx;
-}
-.mkBox.data-v-77845482{
-	background: #FEFFFE;
-	border-radius: 10rpx;
-	padding: 0 22rpx;
-	margin-bottom: 20rpx;
-}
-.line.data-v-77845482{
-	display: flex;
-	justify-content: space-between;
-	padding: 30rpx 0;
-	border-bottom: 1px solid #DDDDDD;
-	font-size: 28rpx;
-	color: #3C3C3C;
-}
-.lineinput.data-v-77845482{
-	text-align: right;
-	font-size: 28rpx;
-	color: #3C3C3C;
-}
-.lineJt.data-v-77845482{
-	width: 15rpx;
-	height: 26rpx;
-}
-.boderNo.data-v-77845482{
-	border: none;
-}
-.signOut.data-v-77845482{
-	width: 702rpx;
-	height: 98rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	font-size: 30rpx;
-	color: #FF3B30;
-	line-height: 98rpx;
-	text-align: center;
-	margin-top: 100rpx;
-}
-

File diff suppressed because it is too large
+ 0 - 204
unpackage/dist/dev/mp-weixin/pages/me/treaty.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/me/treaty.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "服务协议",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/me/treaty.wxml

@@ -1 +0,0 @@
-<view class="content data-v-11e544cd"><rich-text nodes="{{couContent}}" class="data-v-11e544cd"></rich-text></view>

+ 0 - 6
unpackage/dist/dev/mp-weixin/pages/me/treaty.wxss

@@ -1,6 +0,0 @@
-
-.content.data-v-11e544cd {
-	background: #F4F5F7;
-	min-height: 100vh;
-}
-

File diff suppressed because it is too large
+ 0 - 440
unpackage/dist/dev/mp-weixin/pages/order/evaluate.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/order/evaluate.json


Some files were not shown because too many files changed in this diff