Browse Source

遮罩层组件完成

liangtengxiong 4 years ago
parent
commit
968d82164f

+ 58 - 35
src/pages/components/mask.vue

@@ -1,16 +1,20 @@
 <!-- 遮罩层 -->
 <template name="mask">
-  <view class="mask">
+  <view class="mask" @touchmove.stop.prevent="moveHandle">
     <view class="maskbgc"></view>
     <view class="content">
       <view class="header">
         <view class="title">订单兑换</view>
-        <image src="" class="iconclose" />
+        <!-- <image src="" class="iconclose" /> -->
       </view>
       <view class="content-warp">
-        <view class="txt">{{ txt }}</view>
+        <view class="message">
+          <image src="../../static/images/sureicon.png" class="iocn"></image>
+          <view class="txt">{{ txt }}</view>
+        </view>
+        
         <view class="sure">
-          <view class="btn">确认</view>
+          <view class="btn" @tap="sureconver">确认</view>
         </view>
       </view>
     </view>
@@ -34,7 +38,16 @@ export default {
   //监控data中的数据变化
   watch: {},
   //方法集合
-  methods: {},
+  methods: {
+    // 确认后
+    sureconver () {
+      this.$emit('isSureConver', true)
+    },
+
+    // 禁止页面滚动
+    moveHandle() {}
+
+  },
   onLoad() {},
 };
 </script>
@@ -59,7 +72,7 @@ export default {
     box-sizing: border-box;
     overflow: hidden;
     .header {
-      position: relative;
+      // position: relative;
       width: 100%;
       height: 102upx;
       border-top-left-radius: 20upx;
@@ -73,47 +86,57 @@ export default {
         font-size: 36upx;
         letter-spacing: 2upx;
       }
-      .iconclose {
-        position: absolute;
-        right: 24upx;
-        top: 50%;
-        margin-top: -25upx;
-        height: 50upx;
-        width: 50upx;
-        background-color: #fff;
-      }
+      // .iconclose {
+      //   position: absolute;
+      //   right: 24upx;
+      //   top: 50%;
+      //   margin-top: -25upx;
+      //   height: 50upx;
+      //   width: 50upx;
+      //   background-color: #fff;
+      // }
     }
 
     .content-warp {
       background-color: #fff;
       border-bottom-left-radius: 20upx;
       border-bottom-right-radius: 20upx;
-      .txt {
-        height: 340upx;
-        line-height: 340upx;
-        text-align: center;
-        color: #18211e;
-        font-size: 36upx;
-        letter-spacing: 2upx;
-      }
-      .sure {
-        padding-bottom: 40upx;
-        box-sizing: border-box;
+      .message{
         display: flex;
         justify-content: center;
         align-items: center;
-        .btn {
-          width: 280upx;
-          height: 80upx;
-          background-color: #a95cff;
-          color: #fff;
-          font-size: 32upx;
-          letter-spacing: 2upx;
+        flex-direction: column;
+        height: 340upx;
+        .txt {
           text-align: center;
-          line-height: 80upx;
-          border-radius: 10upx;
+          color: #18211e;
+          font-size: 36upx;
+          letter-spacing: 2upx;
+        }
+        .iocn {
+          width: 70upx;
+          height: 70upx;
+          margin-bottom: 25upx;
         }
       }
+        .sure {
+          padding-bottom: 40upx;
+          box-sizing: border-box;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .btn {
+            width: 280upx;
+            height: 80upx;
+            background-color: #a95cff;
+            color: #fff;
+            font-size: 32upx;
+            letter-spacing: 2upx;
+            text-align: center;
+            line-height: 80upx;
+            border-radius: 10upx;
+          }
+        }
     }
   }
 }

+ 160 - 127
src/pages/index/conversion.vue

@@ -1,4 +1,4 @@
-<!-- 订单详情 -->
+<!-- 订单兑换 -->
 <template>
 	<view class="conversion">
 		<Header :title="title"></Header>
@@ -6,181 +6,214 @@
 		<view class="order-detail-content">
 			<view class="order-message">
 				<view class="title">订单信息</view>
-				<view class="ordername titlebar">产品名称:<text class="txt">观光车</text></view>
-				<view class="shopname titlebar">店铺名称:<text class="txt">观光车</text></view>
-				<view class="waternum titlebar">流水号:<text class="txt">观光车</text></view>
-				<view class="ordernum titlebar">订单号:<text class="txt">观光车</text></view>
-				<view class="phonenum titlebar">手机号:<text class="txt">观光车</text></view>
-				<view class="goindate titlebar">入园日期:<text class="txt">观光车</text></view>
-				<view class="price titlebar">产品价格:<text class="txt">观光车</text></view>
-				<view class="buynum titlebar">购买数量:<text class="txt">观光车</text></view>
-				<view class="palytime titlebar">游玩时间:<text class="txt">观光车</text></view>
-				<view class="orderstatus titlebar">订单状态:<text class="txt">退款中</text> </view>
+				<view class="ordername titlebar"
+					>产品名称:<text class="txt">观光车</text></view
+				>
+				<view class="shopname titlebar"
+					>店铺名称:<text class="txt">观光车</text></view
+				>
+				<view class="waternum titlebar"
+					>流水号:<text class="txt">观光车</text></view
+				>
+				<view class="ordernum titlebar"
+					>订单号:<text class="txt">观光车</text></view
+				>
+				<view class="phonenum titlebar"
+					>手机号:<text class="txt">观光车</text></view
+				>
+				<view class="goindate titlebar"
+					>入园日期:<text class="txt">观光车</text></view
+				>
+				<view class="price titlebar"
+					>产品价格:<text class="txt">观光车</text></view
+				>
+				<view class="buynum titlebar"
+					>购买数量:<text class="txt">观光车</text></view
+				>
+				<view class="palytime titlebar"
+					>游玩时间:<text class="txt">观光车</text></view
+				>
+				<view class="orderstatus titlebar"
+					>订单状态:<text class="txt">退款中</text>
+				</view>
 				<view class="tourist">
 					<view class="title">游客信息</view>
-					<view class="name touristbar">姓名:<text class="txt">猪猪虾</text></view>
-					<view class="idcard touristbar">身份证:<text class="txt">500233199308278293</text></view>
+					<view class="name touristbar"
+						>姓名:<text class="txt">猪猪虾</text></view
+					>
+					<view class="idcard touristbar"
+						>身份证:<text class="txt">500233199308278293</text></view
+					>
 				</view>
 			</view>
 			<view class="paymessage">
 				<view class="title">支付信息</view>
 				<view class="shoppric">产品价格:<text class="money">¥280</text></view>
-				<view class="realitypirc">实付金额:<text class="money">¥280</text></view>
+				<view class="realitypirc"
+					>实付金额:<text class="money">¥280</text></view
+				>
 			</view>
 			<view class="btns">
 				<view class="btn cancel">取消兑换</view>
-				<view class="btn convert"  @tap="sureconvert">确认兑换</view>
+				<view class="btn convert" @tap="sureconvert">确认兑换</view>
 			</view>
 		</view>
 
-		<mask :txt="txt"></mask>
+		<mask :txt="masktxt" v-if="isShowMask" @isSureConver="isSureConver"></mask>
 
 		<rf-loading v-if="loading"></rf-loading>
-
 	</view>
 </template>
 
 <script>
-	import Header from '../components/header.vue';
-	import mask from '../components/mask'
-	export default {
-		components: {
-			Header,
-			mask
-		},
-		data() {
-			return {
-				title: '订单兑换',
-				loading: false,
-				txt:'是的'
-			}
+import Header from '../components/header.vue';
+import mask from '../components/mask';
+export default {
+	components: {
+		Header,
+		mask
+	},
+	data() {
+		return {
+			isShowMask: false,
+			title: '订单兑换',
+			loading: false,
+			masktxt: '是的'
+		};
+	},
+	onLoad() {},
+	methods: {
+		//  确认兑换
+		sureconvert() {
+			this.masktxt = '兑换成功!';
+			this.isShowMask = true;
 		},
-		onLoad() {
 
-		},
-		methods: {
-			//  确认兑换
-			sureconvert () {
-				console.log(1);
+		// 监听遮罩层行为
+		isSureConver(e) {
+			if (e) {
+				console.log(e);
 			}
-			
+			this.isShowMask = false;
+			this.$mRouter.back()
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.conversion {
-		.order-detail-content {
-			padding: 24upx 32upx 44upx;
-
-			.order-message {
-				background-color: #FFFFFF;
-				padding: 31upx 33upx 35upx;
-				border-radius: 17upx;
+.conversion {
+	.order-detail-content {
+		padding: 24upx 32upx 44upx;
+
+		.order-message {
+			background-color: #ffffff;
+			padding: 31upx 33upx 35upx;
+			border-radius: 17upx;
+
+			.title {
+				font-size: 34upx;
+				color: #111111;
+			}
 
-				.title {
-					font-size: 34upx;
-					color: #111111;
-				}
+			.titlebar {
+				font-size: 28upx;
+				color: #666666;
+				letter-spacing: 2upx;
+				margin-top: 12upx;
 
-				.titlebar {
+				.txt {
+					margin-left: 10upx;
 					font-size: 28upx;
-					color: #666666;
-					letter-spacing: 2upx;
-					margin-top: 12upx;
-
-					.txt {
-						margin-left: 10upx;
-						font-size: 28upx;
-					}
-				}
-
-				.ordername {
-					margin-top: 15upx;
-				}
-
-				.orderstatus {
-					height: 98upx;
-					line-height: 98upx;
-					border-top: 1px solid #e1e1e1;
-					border-bottom: 1px solid #e1e1e1;
 				}
+			}
 
-				.tourist {
-					.title {
-						padding: 15upx 0;
-						font-size: 34upx;
-						color: #111111;
-					}
-
-					.touristbar {
-						color: #666666;
-					}
-
-					.txt {
-						margin-left: 10upx;
-						font-size: 28upx;
-					}
-				}
+			.ordername {
+				margin-top: 15upx;
 			}
 
-			.paymessage {
-				background-color: #FFFFFF;
-				padding: 31upx 33upx 35upx;
-				border-radius: 17upx;
-				margin-top: 24upx;
+			.orderstatus {
+				height: 98upx;
+				line-height: 98upx;
+				border-top: 1px solid #e1e1e1;
+				border-bottom: 1px solid #e1e1e1;
+			}
 
+			.tourist {
 				.title {
+					padding: 15upx 0;
 					font-size: 34upx;
 					color: #111111;
 				}
-				.shoppric {
+
+				.touristbar {
 					color: #666666;
-					margin-top: 20upx;
-					.money {
-						margin-left: 10upx;
-					}
 				}
 
-				.realitypirc {
-					color: #666666;
+				.txt {
+					margin-left: 10upx;
 					font-size: 28upx;
-					margin-top: 20upx;
-					border-top: 1upx solid #e1e1e1;
-					padding-top: 20upx;
-					.money {
-						margin-left: 10upx;
-						color: #fa4141;
-					}
 				}
 			}
+		}
+
+		.paymessage {
+			background-color: #ffffff;
+			padding: 31upx 33upx 35upx;
+			border-radius: 17upx;
+			margin-top: 24upx;
 
-			.btns {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin-top: 40upx;
-				.btn {
-					width: 321upx;
-					height: 92upx;
-					box-sizing: border-box;
-					text-align: center;
-					line-height: 92upx;
-					font-size: 38upx;
-					letter-spacing: 2upx;
-					color: #7a7c7c;
-					margin-right: 31upx;
-					background-color: #fff;
-					border: 1px solid #e2e2e2;
-					border-radius: 10upx;
+			.title {
+				font-size: 34upx;
+				color: #111111;
+			}
+			.shoppric {
+				color: #666666;
+				margin-top: 20upx;
+				.money {
+					margin-left: 10upx;
 				}
-				.convert {
-					margin-right: 0;
-					background-color: #a95cff;
-					color: #FFFFFF;
-					border: none;
+			}
+
+			.realitypirc {
+				color: #666666;
+				font-size: 28upx;
+				margin-top: 20upx;
+				border-top: 1upx solid #e1e1e1;
+				padding-top: 20upx;
+				.money {
+					margin-left: 10upx;
+					color: #fa4141;
 				}
 			}
 		}
+
+		.btns {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-top: 40upx;
+			.btn {
+				width: 321upx;
+				height: 92upx;
+				box-sizing: border-box;
+				text-align: center;
+				line-height: 92upx;
+				font-size: 38upx;
+				letter-spacing: 2upx;
+				color: #7a7c7c;
+				margin-right: 31upx;
+				background-color: #fff;
+				border: 1px solid #e2e2e2;
+				border-radius: 10upx;
+			}
+			.convert {
+				margin-right: 0;
+				background-color: #a95cff;
+				color: #ffffff;
+				border: none;
+			}
+		}
 	}
+}
 </style>

+ 5 - 1
src/pages/index/index.vue

@@ -271,7 +271,11 @@ export default {
     },
     // 搜索订单
     searchOrder () {
-      console.log();
+
+      // 判断该订单是否兑换,存在等状态,若存在且未使用(两个状态),则跳转订单兑换页面
+
+      this.$mRouter.push({route: "/pages/index/conversion"})
+
     },
 
     // 数据处理

+ 16 - 10
src/pages/index/setting/setting.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 			<view class="item-warp">
-				<view class="item" @tap="topage">
+				<view class="item" @tap="logout()">
 					<text class="name">退出登陆</text>
 					<image src="../../../static/images/moreicon.png" class="more"></image>
 				</view>
@@ -42,16 +42,22 @@ export default {
 		return {
 			title: '设置'
 		};
-  },
-  onLoad () {
-
-  },
-  methods: {
-    topage (url) {
+	},
+	onLoad() {},
+	methods: {
+		topage(url) {
 			console.log(url);
-			this.$mRouter.push({ route: url});
-    }
-  }
+			this.$mRouter.push({ route: url });
+		},
+
+		// 退出登陆
+		logout() {
+			this.$http.get('logout', {}).then(res => {
+				console.log('退出登陆');
+				console.log(res);
+			});
+		}
+	}
 };
 </script>
 

+ 258 - 262
src/pages/order/order.vue

@@ -1,271 +1,267 @@
 <!-- order -->
 <template>
-	<view class="order">
-		<view class="header-warp">
-			<view class="header-search">
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerChange" :value="index" :range="array">
-							<view class="uni-input">{{ array[index] }}</view>
-						</picker>
-						<image src="../../static/images/garydownicon.png" mode="" class="icon"></image>
-					</view>
-				</view>
-				<view class="search">
-					<input type="text" placeholder-style="color:#a3a8a8;font-size:10px;" placeholder="请输入订单号或手机号、身份证号" class="cellphone" />
-					<text class="txt">搜索</text>
-				</view>
-				<view class="btn-time">
-					<image src="../../static/images/timeIcon.png" class="timeicon"></image>
-					<text class="screen">按时间</text>
-				</view>
-			</view>
-			<view class="header-bar">
-				<view class="item" @tap="changeTab(1)" :class="{ active: isactive === 1 }">
-					<view class="ordertype">已付款</view>
-					<view class="heng"></view>
-				</view>
-				<view class="item" @tap="changeTab(2)" :class="{ active: isactive === 2 }">
-					<view class="ordertype">已完成</view>
-					<view class="heng"></view>
-				</view>
-				<view class="item" @tap="changeTab(3)" :class="{ active: isactive === 3 }">
-					<view class="ordertype">退款</view>
-					<view class="heng"></view>
-				</view>
-				<view class="line"></view>
-			</view>
-		</view>
-		<view style="height: 192upx;"></view>
-		<view class="order-content" v-if="isactive === 1">
-			<view class="order-list" @tap='todetail'>
-				<view class="order-title">
-					<text class="ordernum">订单号:<text class="num">15648464184616</text></text>
-					<text class="ordertime">09:26</text>
-				</view>
-				<view class="order-detail">
-					<view class="name">仙女山成人票</view>
-					<view class="door">门店:<text class="message">1</text></view>
-					<view class="num">门店:<text class="message">2</text></view>
-					<view class="status">门店:<text class="message">3</text></view>
-					<view class="playtime">门店:<text class="message">4</text></view>
-				</view>
-			</view>
-			1
-		</view>
-	</view>
+  <view class="order">
+    <view class="header-warp">
+      <view class="header-search">
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-db">
+            <picker @change="bindPickerChange" :value="index" :range="array">
+              <view class="uni-input">{{ array[index] }}</view>
+            </picker>
+            <image
+              src="../../static/images/garydownicon.png"
+              mode=""
+               class="icon"
+            ></image>
+          </view>
+        </view>
+        <view class="search">
+          <input
+            type="text"
+            placeholder-style="color:#a3a8a8;font-size:10px;"
+            placeholder="请输入订单号或手机号、身份证号"
+            class="cellphone"
+          />
+          <text class="txt">搜索</text>
+        </view>
+        <view class="btn-time">
+          <image
+            src="../../static/images/timeIcon.png"
+            class="timeicon"
+          ></image>
+          <text class="screen">按时间</text>
+        </view>
+      </view>
+      <view class="header-bar">
+        <view
+          class="item"
+          @tap="changeTab(1)"
+          :class="{ active: isactive === 1 }"
+        >
+          <view class="ordertype">已付款</view>
+          <view class="heng"></view>
+        </view>
+        <view
+          class="item"
+          @tap="changeTab(2)"
+          :class="{ active: isactive === 2 }"
+        >
+          <view class="ordertype">已完成</view>
+          <view class="heng"></view>
+        </view>
+        <view
+          class="item"
+          @tap="changeTab(3)"
+          :class="{ active: isactive === 3 }"
+        >
+          <view class="ordertype">退款</view>
+          <view class="heng"></view>
+        </view>
+        <view class="line"></view>
+      </view>
+    </view>
+    <view style="height: 192upx;"></view>
+    <view class="order-content" v-if="isactive === 1">
+      <view class="order-list" @tap='todetail'>
+        <view class="order-title">
+          <text class="ordernum"
+            >订单号:<text class="num">15648464184616</text></text
+          >
+          <text class="ordertime">09:26</text>
+        </view>
+        <view class="order-detail">
+          <view class="name">仙女山成人票</view>
+          <view class="door">门店:<text class="message">1</text></view>
+          <view class="num">门店:<text class="message">2</text></view>
+          <view class="status">门店:<text class="message">3</text></view>
+          <view class="playtime">门店:<text class="message">4</text></view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		name: 'order',
-		components: {},
-		data() {
-			//这里存放数据
-			return {
-				array: ['中国', '美国', '巴西', '日本'],
-				index: 0,
-				isactive: 1,
-			};
-		},
-		//方法集合
-		methods: {
-			bindPickerChange: function(e) {
-				console.log('picker发送选择改变,携带值为', e.target.value);
-				this.index = e.target.value;
-			},
-			// tab
-			changeTab(type) {
-				this.isactive = type;
-			},
+export default {
+  name: 'order',
+  components: {},
+  data() {
+    //这里存放数据
+    return {
+      array: ['中国', '美国', '巴西', '日本'],
+      index: 0,
+      isactive: 1,
+    };
+  },
+  //方法集合
+  methods: {
+    bindPickerChange: function (e) {
+      console.log('picker发送选择改变,携带值为', e.target.value);
+      this.index = e.target.value;
+    },
+    // tab
+    changeTab(type) {
+      this.isactive = type;
+    },
 
-			// 跳转详情
-			todetail() {
-				console.log(1);
-				this.$mRouter.push({
-					route: '/pages/order/orderdetail'
-				})
-			}
-		},
-	};
+    // 跳转详情
+    todetail() {
+      console.log(1);
+      this.$mRouter.push({route: ""})
+    }
+  },
+};
 </script>
 <style lang="scss" scoped>
-	.order {
-		background-color: #f4f4f4;
+.order {
+  background-color: #f4f4f4;
+  .header-warp {
+    width: 100%;
+    background-color: #fff;
+    padding: 15upx 33upx 0;
+    position: fixed;
+    .header-search {
+      display: flex;
+      align-items: center;
+      .uni-list-cell {
+        width: 92upx;
+        .uni-list-cell-db {
+          height: 80upx;
+          font-size: 28upx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          background-color: #fff;
+          color: #8f8f8f;
+          .icon {
+            width: 17upx;
+            height: 12upx;
+            margin-left: 10upx;
+          }
+        }
+      }
+      .search {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        height: 80upx;
+        margin-left: 20upx;
+        background-color: #f7f7f7;
+        border-radius: 10upx;
+        .cellphone {
+          flex: 1;
+          height: 100%;
+          color: $titleColor;
+          padding-left: 20upx;
+        }
+        .search-holder {
+          color: #f00;
+        }
+        .txt {
+          height: 72upx;
+          width: 90upx;
+          text-align: center;
+          line-height: 72upx;
+          color: #a95cff;
+          font-size: 28upx;
+        }
+      }
+      .btn-time {
+        width: 130upx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .timeicon {
+          width: 25upx;
+          height: 28upx;
+        }
+        .screen {
+          margin-left: 5upx;
+          font-size: 24upx;
+          color: #8f8f8f;
+        }
+      }
+    }
+    .header-bar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+      .item {
+        position: relative;
+        width: 33.33%;
+        height: 99upx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        .ordertype {
+          position: relative;
+          font-size: 30upx;
+          letter-spacing: 3upx;
+          color: #7a7c7c;
+        }
+        .heng {
+          position: absolute;
+          display: none;
+          bottom: 0;
+          width: 40upx;
+          height: 6upx;
+          border-radius: 4upx;
+          background-color: #a95cff;
+        }
+      }
 
-		.header-warp {
-			width: 100%;
-			background-color: #fff;
-			padding: 15upx 33upx 0;
-			position: fixed;
-
-			.header-search {
-				display: flex;
-				align-items: center;
-
-				.uni-list-cell {
-					width: 92upx;
-
-					.uni-list-cell-db {
-						height: 80upx;
-						font-size: 28upx;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						background-color: #fff;
-						color: #8f8f8f;
-
-						.icon {
-							width: 17upx;
-							height: 12upx;
-							margin-left: 10upx;
-						}
-					}
-				}
-
-				.search {
-					flex: 1;
-					display: flex;
-					align-items: center;
-					height: 80upx;
-					margin-left: 20upx;
-					background-color: #f7f7f7;
-					border-radius: 10upx;
-
-					.cellphone {
-						flex: 1;
-						height: 100%;
-						color: $titleColor;
-						padding-left: 20upx;
-					}
-
-					.search-holder {
-						color: #f00;
-					}
-
-					.txt {
-						height: 72upx;
-						width: 90upx;
-						text-align: center;
-						line-height: 72upx;
-						color: #a95cff;
-						font-size: 28upx;
-					}
-				}
-
-				.btn-time {
-					width: 130upx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-
-					.timeicon {
-						width: 25upx;
-						height: 28upx;
-					}
-
-					.screen {
-						margin-left: 5upx;
-						font-size: 24upx;
-						color: #8f8f8f;
-					}
-				}
-			}
-
-			.header-bar {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				position: relative;
-
-				.item {
-					position: relative;
-					width: 33.33%;
-					height: 99upx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-direction: column;
-
-					.ordertype {
-						position: relative;
-						font-size: 30upx;
-						letter-spacing: 3upx;
-						color: #7a7c7c;
-					}
-
-					.heng {
-						position: absolute;
-						display: none;
-						bottom: 0;
-						width: 40upx;
-						height: 6upx;
-						border-radius: 4upx;
-						background-color: #a95cff;
-					}
-				}
-
-				.active .ordertype {
-					color: #a95cff;
-				}
-
-				.active .heng {
-					display: block;
-				}
-			}
-		}
-
-		.order-content {
-			padding: 24upx 32upx 0;
-
-			.order-list {
-				background-color: #fff;
-				border-radius: 10upx;
-				padding: 30upx 24upx 33upx;
-				margin-bottom: 24upx;
-
-				.order-title {
-					border-bottom: 1px solid $bordrColor;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					padding-bottom: 22upx;
-
-					.ordernum {
-						font-size: 30upx;
-						color: #232828;
-
-						.num {
-							margin-left: 10upx;
-						}
-					}
-
-					.ordertime {
-						color: #a3a8a8;
-					}
-				}
-
-				.order-detail {
-					margin-top: 24upx;
-
-					.name {
-						font-size: 34upx;
-					}
-
-					.door,
-					.num,
-					.status,
-					.playtime {
-						font-size: 26upx;
-						color: #7a7c7c;
-						margin-top: 14upx;
-					}
-
-					.message {
-						margin-left: 10upx;
-					}
-				}
-			}
-		}
-	}
-</style>
+      .active .ordertype {
+        color: #a95cff;
+      }
+      .active .heng {
+        display: block;
+      }
+    }
+  }
+  .order-content {
+    padding: 24upx 32upx 0;
+    .order-list {
+      background-color: #fff;
+      border-radius: 10upx;
+      padding: 30upx 24upx 33upx;
+      margin-bottom: 24upx;
+      .order-title {
+        border-bottom: 1px solid $bordrColor;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding-bottom: 22upx;
+        .ordernum {
+          font-size: 30upx;
+          color: #232828;
+          .num {
+            margin-left: 10upx;
+          }
+        }
+        .ordertime {
+          color: #a3a8a8;
+        }
+      }
+      .order-detail {
+        margin-top: 24upx;
+        .name {
+          font-size: 34upx;
+        }
+        .door,
+        .num,
+        .status,
+        .playtime {
+          font-size: 26upx;
+          color: #7a7c7c;
+          margin-top: 14upx;
+        }
+        .message {
+          margin-left: 10upx;
+        }
+      }
+    }
+  }
+}
+</style>

+ 90 - 1
src/pages/shop/shop.vue

@@ -58,7 +58,88 @@
 
 				</view>
 				<view class="operate">
-					<view class="btn stick">置顶</view>
+					<view class="btn stick" id="one" @tap="sticktop($event)">置顶</view>
+					<view class="btn sold">下架</view>
+					<view class="btn compile" @tap="topage">编辑</view>
+					<view class="btn delete">删除</view>
+				</view>
+			</view>
+			<view class="order-list">
+				<view class="order-title">
+					<text class="ordernum">仙女山成人票</text>
+				</view>
+				<view class="order-detail">
+
+					<view class="left">
+						<image src="" mode="" class="img"></image>
+					</view>
+
+					<view class="center">
+						<view class="shop-detail door">所属店铺:仙女山</view>
+						<view class="shop-detail type">类型:门票</view>
+						<view class="shop-detail putaway">上下架状态:已下架状态</view>
+						<view class="shop-detail status">状态:审核通过</view>
+					</view>
+
+					<view class="right">¥<text class="price">180</text></view>
+
+				</view>
+				<view class="operate">
+					<view class="btn stick" @tap="sticktop($event)">置顶</view>
+					<view class="btn sold">下架</view>
+					<view class="btn compile" @tap="topage">编辑</view>
+					<view class="btn delete">删除</view>
+				</view>
+			</view>
+			<view class="order-list">
+				<view class="order-title">
+					<text class="ordernum">仙女山成人票</text>
+				</view>
+				<view class="order-detail">
+
+					<view class="left">
+						<image src="" mode="" class="img"></image>
+					</view>
+
+					<view class="center">
+						<view class="shop-detail door">所属店铺:仙女山</view>
+						<view class="shop-detail type">类型:门票</view>
+						<view class="shop-detail putaway">上下架状态:已下架状态</view>
+						<view class="shop-detail status">状态:审核通过</view>
+					</view>
+
+					<view class="right">¥<text class="price">180</text></view>
+
+				</view>
+				<view class="operate">
+					<view class="btn stick" @tap="sticktop($event)">置顶</view>
+					<view class="btn sold">下架</view>
+					<view class="btn compile" @tap="topage">编辑</view>
+					<view class="btn delete">删除</view>
+				</view>
+			</view>
+			<view class="order-list">
+				<view class="order-title">
+					<text class="ordernum">仙女山成人票</text>
+				</view>
+				<view class="order-detail">
+
+					<view class="left">
+						<image src="" mode="" class="img"></image>
+					</view>
+
+					<view class="center">
+						<view class="shop-detail door">所属店铺:仙女山</view>
+						<view class="shop-detail type">类型:门票</view>
+						<view class="shop-detail putaway">上下架状态:已下架状态</view>
+						<view class="shop-detail status">状态:审核通过</view>
+					</view>
+
+					<view class="right">¥<text class="price">180</text></view>
+
+				</view>
+				<view class="operate">
+					<view class="btn stick" @tap="sticktop($event)">置顶</view>
 					<view class="btn sold">下架</view>
 					<view class="btn compile" @tap="topage">编辑</view>
 					<view class="btn delete">删除</view>
@@ -86,11 +167,18 @@
 				console.log('picker发送选择改变,携带值为', e.target.value);
 				this.index = e.target.value;
 			},
+
 			// tab
 			changeTab(type) {
 				this.isactive = type;
 			},
 
+			// 置顶
+			sticktop(e) {
+				console.log(e.target);
+
+			},
+
 			// 跳转详情
 			topage() {
 				console.log(1);
@@ -110,6 +198,7 @@
 			background-color: #fff;
 			padding: 15upx 33upx 0;
 			position: fixed;
+			z-index: 99;
 
 			.header-search {
 				display: flex;

BIN
src/static/images/sureicon.png