模态框优化

components/merchantDetail.vue

@@ -30,24 +30,24 @@
 					<!-- 开放时间 -->
 					<view class="opentime">
 						<view class="middle-title">开放时间</view>
-						<table border-color="#04a7f4" >
-							<tr v-if="!times">
-								<td>每天</td>
-							</tr>
-							<tr v-if="!times">
-								<td>
+						<uni-table border>
+							<uni-tr v-if="!times">
+								<uni-td>每天</uni-td>
+							</uni-tr>
+							<uni-tr v-if="!times">
+								<uni-td>
 									{{detailData.businessStart?detailData.businessStart.substr(0,5):""}}
 									~{{detailData.businessEnd?detailData.businessEnd.substr(0,5):""}}
-								</td>
-							</tr>
-							<tr v-if="times">
-								<td colspan="2">开放时间</td>
-							</tr>
-							<tr v-for="(item,index) of times" :key="index" v-if="times">
-								<td v-for="(items,b) of item" :key="b" v-if="items!=''">
+								</uni-td>
+							</uni-tr>
+							<uni-tr v-if="times">
+								<uni-td colspan="2">开放时间</uni-td>
+							</uni-tr>
+							<uni-tr v-for="(item,index) of times" :key="index" v-if="times">
+								<uni-td v-for="(items,b) of item" :key="b" v-if="items!=''">
 									{{items}}
-								</td>
-							</tr>
+								</uni-td>
+							</uni-tr>
 						</table>
 					</view>
 					<!-- 优待政策 -->

manifest.json

@@ -5,9 +5,9 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
-		"networkTimeout":{
-			"request":30000//请求超时30秒
-		},
+    "networkTimeout" : {
+        "request" : 30000 //请求超时30秒
+    },
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

pages/scenic/combinationProduct/combinationProduct.vue

@@ -172,7 +172,7 @@
 			<!-- 商户详情 -->
 			<merchantDetail :detailData='detailData' ref='merchantDetail'></merchantDetail>
 			<!-- 模态框 -->
-			<u-modal v-model="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true">
+			<u-modal :show="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true">
 			</u-modal>
 		</scroll-view>
 	</view>