弹框样式修改

pagesHome/order/components/dialog_1.vue

@@ -1,30 +1,22 @@
 <template>
-	<view class="dialog">
-		<view v-if="dialog.show==true" @tap="dialogClose">
-			<view class="dialog_1" v-if="dialog.type=='1'">
-				<swiper class="swiper" circular @change="diaSpecs" :current="is_specs">
-					<swiper-item class="list" v-for="(item,index) in specsList" :key="index">
-						<view class="list_1">
-							<image class="image"
-								:src="item.file&&item.file.length>0?item.file[0].url:info.goods.file[0].url"
-								mode="aspectFit"></image>
-						</view>
-						<view class="name">
-							<text>{{item.name}}</text>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-		</view>
+	<view class="dialogs">
+		<swiper class="swiper" circular @change="diaSpecs" :current="is_specs">
+			<swiper-item class="list" v-for="(item,index) in specsList" :key="index">
+				<view class="list_1">
+					<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:info.goods.file[0].url" mode="aspectFit"></image>
+				</view>
+				<view class="name">
+					<text>{{item.name}}</text>
+				</view>
+			</swiper-item>
+		</swiper>
+	</view>
 	</view>
 </template>
 
 <script>
 	export default {
 		props: {
-			dialog: {
-				type: Object,
-			},
 			info: {
 				type: Object
 			},
@@ -38,13 +30,9 @@
 			};
 		},
 		methods: {
-			dialogClose() {
+			diaSpecs(e) {
 				const that = this;
-				that.$emit('dialogClose')
-			},
-			diaSpecs() {
-				const that = this;
-				that.$emit('diaSpecs')
+				that.$emit('diaSpecs', e)
 			},
 		},
 		watch: {
@@ -60,8 +48,7 @@
 </script>
 
 <style lang="scss">
-	.dialog {
-
+	.dialogs {
 		swiper {
 			height: 60vh;
 		}

pagesHome/order/detail.vue

@@ -9,18 +9,14 @@
 							</banner_1>
 						</view>
 						<view class="one_2">
-							<text class="money_1"
-								v-if="infospecs.leader_price"><text>团长价¥</text>{{infospecs.leader_price||0}}</text>
+							<text class="money_1" v-if="infospecs.leader_price"><text>团长价¥</text>{{infospecs.leader_price||0}}</text>
 							<text class="money" v-if="infospecs.price"><text>特价¥</text>{{infospecs.price||0}}</text>
-							<text class="money"
-								v-if="!infospecs.price&&!infospecs.leader_price"><text>¥</text>{{infospecs.sell_money||0}}</text>
+							<text class="money" v-if="!infospecs.price&&!infospecs.leader_price"><text>¥</text>{{infospecs.sell_money||0}}</text>
 							<text class="money"><text>¥</text>{{infospecs.flow_money||0}}</text>
 						</view>
 						<view class="one_3" v-if="discount">
-							<text v-if="discount.full_decrement&&discount.full_decrement.length>0" class="act"
-								v-for="(item,index) in discount.full_decrement" :key="index">{{item}}</text>
-							<text v-if="discount.full_fold&&discount.full_decrement.length>0" class="act"
-								v-for="(item,index) in discount.full_fold" :key="index">{{item}}</text>
+							<text v-if="discount.full_decrement&&discount.full_decrement.length>0" class="act" v-for="(item,index) in discount.full_decrement" :key="index">{{item}}</text>
+							<text v-if="discount.full_fold&&discount.full_decrement.length>0" class="act" v-for="(item,index) in discount.full_fold" :key="index">{{item}}</text>
 						</view>
 						<view class="one_4">
 							<text class="num">已售{{info.goods&&info.goods.sell_num||0}}件</text>
@@ -67,8 +63,7 @@
 							</view>
 							<view class="one_7_2">
 								<view class="image" v-for="(set,index) in info.sets[0].set" :key="index">
-									<image class="image" :src="set.file&&set.file.length>0?set.file[0].url:''"
-										mode="aspectFit">
+									<image class="image" :src="set.file&&set.file.length>0?set.file[0].url:''" mode="aspectFit">
 									</image>
 								</view>
 								<view class="money">
@@ -80,9 +75,7 @@
 						<view class="one_8">
 							<view class="one_8_1">
 								<view class="shop_1">
-									<image class="image"
-										:src="info.shop&&info.shop.logo&&info.shop.logo.length>0?info.shop.logo[0].url:''"
-										mode="aspectFit"></image>
+									<image class="image" :src="info.shop&&info.shop.logo&&info.shop.logo.length>0?info.shop.logo[0].url:''" mode="aspectFit"></image>
 								</view>
 								<view class="shop_2">
 									<view class="name">{{info.shop&&info.shop.name}}</view>
@@ -121,8 +114,7 @@
 				</scroll-view>
 			</view>
 			<view class="two">
-				<uni-goods-nav :options="options" :button-group="buttonGroup" @click="toNavleft"
-					@buttonClick="toNavright" />
+				<uni-goods-nav :options="options" :button-group="buttonGroup" @click="toNavleft" @buttonClick="toNavright" />
 			</view>
 		</view>
 		<!-- 跳转菜单 -->
@@ -130,8 +122,7 @@
 			<text @tap="toMenubar" class="iconfont icon-gengduo"></text>
 		</view>
 		<view class="bar_2" v-if="is_menu">
-			<view class="list" v-for="(item,index) in barList" :key="index" v-if="item.is_use=='0'"
-				@click="toPath(item)">
+			<view class="list" v-for="(item,index) in barList" :key="index" v-if="item.is_use=='0'" @click="toPath(item)">
 				<image class="image" :src="item.normal&&item.normal.length>0?item.normal[0].url:''"></image>
 				<text class="name"> {{item.name}}</text>
 			</view>
@@ -142,18 +133,15 @@
 				<view class="close">
 					<text @click="toClose" class="iconfont icon-shanchu"></text>
 				</view>
-				<specs_1 :info="info" :specsInfo="specsInfo" :btn_type="btn_type" :is_zero="is_zero" :buy_num="buy_num"
-					:popupShow="popupShow" :is_specs="is_specs" @diaView="diaView" @toSpecs="toSpecs" @toCount="toCount"
-					@toMarket="toMarket" @toBuy="toBuy" @toGroup="toGroup" @diaSpecs="diaSpecs"
-					@toSetMarket="toSetMarket" @toAct="toAct" @toDeatil="toDeatil">
+				<specs_1 :info="info" :specsInfo="specsInfo" :btn_type="btn_type" :is_zero="is_zero" :buy_num="buy_num" :popupShow="popupShow" :is_specs="is_specs" @diaView="diaView" @toSpecs="toSpecs" @toCount="toCount" @toMarket="toMarket" @toBuy="toBuy" @toGroup="toGroup" @diaSpecs="diaSpecs" @toSetMarket="toSetMarket" @toAct="toAct" @toDeatil="toDeatil">
 				</specs_1>
 			</view>
 		</uni-popup>
 		<!-- 弹框 -->
-		<view class="dislog">
-			<dialog_1 :info="info" :dialog="dialog" @dialogClose="dialogClose" :is_specs="is_specs"
-				@diaSpecs="diaSpecs">
-			</dialog_1>
+		<view class="dialog" v-if="dialog.show==true" @tap="dialogClose">
+			<view class="dialog_1" v-if="dialog.type=='1'">
+				<dialog_1 :info="info" :is_specs="is_specs" @diaSpecs="diaSpecs"></dialog_1>
+			</view>
 		</view>
 	</mobile-frame>
 </template>
@@ -236,7 +224,7 @@
 				buy_num: 1,
 				// 规格弹出框
 				dialog: {
-					show: true,
+					show: false,
 					type: '1'
 				},
 			};