样式处理

main.js

@@ -8,7 +8,7 @@ import commonjs from 'common/common.js'
 
 Vue.prototype.$commonjs = commonjs
 Vue.prototype.$request = request
-Vue.prototype.$wxurl = 'https://wx.pangdly.com/#/'
+Vue.prototype.$wxurl = 'https://lx.pangdly.com/#/'
 Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png'
 Vue.use(uView)
 uni.$u.config.unit = 'rpx'

pages.json

@@ -331,15 +331,15 @@
 						"navigationBarTextStyle": "black"
 					}
 				},
-				// {
-				// 	"path": "vlogface/vlogface",
-				// 	"style": {
-				// 		"navigationBarTitleText": "扫脸获取视频",
-				// 		"enablePullDownRefresh": false,
-				// 		"navigationBarBackgroundColor": "#ffffff",
-				// 		"navigationBarTextStyle": "black"
-				// 	}
-				// },
+				{
+					"path": "vlogface/vlogface",
+					"style": {
+						"navigationBarTitleText": "扫脸获取视频",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black"
+					}
+				},
 				{
 					"path": "scenicList/scenicList",
 					"style": {
@@ -461,14 +461,14 @@
 						"navigationStyle": "custom"
 					}
 				},
-				// {
-				// 	"path": "getPortrait",
-				// 	"style": {
-				// 		"navigationBarTitleText": "获取人像",
-				// 		"enablePullDownRefresh": false,
-				// 		"navigationStyle": "custom"
-				// 	}
-				// }, 
+				{
+					"path": "getPortrait",
+					"style": {
+						"navigationBarTitleText": "获取人像",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}, 
 				{
 					"path": "myPhotoAlbum/myPhotoAlbum",
 					"style": {

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -585,7 +585,7 @@ export default {
         } else {
           //普通票
           uni.navigateTo({
-            url: '/pages/scenic/scenicOrder/scenicOrder'+ query
+            url: '/pages/scenic/scenicSingleOrder/scenicSingleOrder'+ query
           })
         }
       } else {
@@ -684,6 +684,9 @@ export default {
 	margin-top: 24rpx;
 	padding: 24rpx;
 }
+.merchant label{
+	width: 100%;
+}
 .merchant label.off .product {
 	background: #f3f3f3;
 	color: #999999;

pages/scenic/combinationProduct/combinationProduct.vue

@@ -585,7 +585,7 @@ export default {
         } else {
           //普通票
           uni.navigateTo({
-            url: '/pages/scenic/scenicOrder/scenicOrder'+ query
+            url: '/pages/scenic/scenicSingleOrder/scenicSingleOrder'+ query
           })
         }
       } else {
@@ -684,6 +684,9 @@ export default {
 	margin-top: 24rpx;
 	padding: 24rpx;
 }
+.merchant label{
+	width: 100%;
+}
 .merchant label.off .product {
 	background: #f3f3f3;
 	color: #999999;

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -389,6 +389,7 @@ export default {
       sortInforPop: false, //一个站点时获取排队信息弹窗
       showChooseArea: false, //控制选择站点弹窗显示隐藏
       defaultAreaCode:'',//默认站点
+      numberSync:true,//数量和联系人同步
     }
   },
   onLoad(option) {

pages/scenic/scenicComponents/editContacts.vue

@@ -27,13 +27,13 @@
 						<text>
 							身份证：
 						</text>
-						<input v-model.trim="credentialNumber" maxlength="18" placeholder="请输入身份证号码,必填" />
+						<input type="idcard" v-model.trim="credentialNumber" maxlength="18" placeholder="请输入身份证号码,必填" />
 					</view>
 					<view>
 						<text>
 							联系电话：
 						</text>
-						<input v-model.trim="phone" maxlength="11" placeholder="用于接收行程信息" />
+						<input type="number" v-model.trim="phone" maxlength="11" placeholder="用于接收行程信息" />
 					</view>
 					<view>
 						<a class="complete" @click="keepSave()">完成</a>

pages/scenic/scenicOrder/scenicOrder.vue

 <template>
+	<!-- 临时用，后面需要把代码放入老页面 -->
 	<view class="orderBox">
 		<view class="head"> </view>
 		<view class="middle">