Quellcode durchsuchen

Merge branch 'master' of http://124.70.211.186:3000/zxh/YXGJ

codeMan vor 1 Jahr
Ursprung
Commit
8a8ad8508b
5 geänderte Dateien mit 143 neuen und 23 gelöschten Zeilen
  1. 5 0
      .idea/.gitignore
  2. 12 0
      .idea/YXGJ.iml
  3. 8 0
      .idea/modules.xml
  4. 6 0
      .idea/vcs.xml
  5. 112 23
      pages/index/index/userCenter.vue

+ 5 - 0
.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

+ 12 - 0
.idea/YXGJ.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/YXGJ.iml" filepath="$PROJECT_DIR$/.idea/YXGJ.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 112 - 23
pages/index/index/userCenter.vue

@@ -1,23 +1,112 @@
-<template>
-    <view>
-        用户中心
-    </view>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            updatePage: true,
-        }
-    },
-    methods: {
-        init(callBack) {
-            callBack()
-            this.updatePage = false;
-        },
-    },
-}
-</script>
-
-<style lang="scss"></style>
+<template>
+    <view>
+        <view class="border-list-box">
+			<navigator class="" url="/packageA/shop/history?title=我访问的店铺" hover-class="navigator-hover">
+				<view class="border-list-top">
+					<view class="text-style">
+						我的访问店铺
+					</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style-long"></view>
+				</view>          
+			</navigator>
+			<navigator class="" url="" hover-class="navigator-hover">
+				<view class="border-list-content">
+					<view class="text-style">
+						我的预约
+					</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style"></view>
+				</view>
+			</navigator>
+			<!-- <navigator class="" url="" hover-class="navigator-hover">
+				<view class="border-list-content">
+					<view class="text-style">优惠券</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style"></view>
+				</view>  
			</navigator> -->
+			<navigator class="" url="" hover-class="navigator-hover">
+				<view class="border-list-content">
+					<view class="text-style">收货地址</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style"></view>
+				</view>
			</navigator>
+			<navigator class="" url="" hover-class="navigator-hover">
+				<view class="border-list-content">
+					<view class="text-style">中奖信息</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style"></view>
+				</view>    
			</navigator>
+			<navigator class="" url="" hover-class="navigator-hover">
+				<view class="border-list-content">
+					<view class="text-style">我的收藏</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style"></view>
+				</view>    
			</navigator>
+			<navigator class="" url="" hover-class="navigator-hover">
+				<view class="border-list-bottom">
+					<view class="text-style">活动订单</view>
+					<view class="iconfont icon-a-wodetiaozhuan icon-style"></view>
+				</view>
			</navigator>
+		</view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            updatePage: true,
+        }
+    },
+    methods: {
+        init(callBack) {
+            callBack()
+            this.updatePage = false;
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+	.border-list-box{
+		height: 20px;
+		width: 355px;
+		border-radius: 8px;
+		background: #FFFFFF;
+		margin: 84px 10px 0px 10px;
+	}
+	.border-list-top{
+		border-radius: 8px 8px 0px 0px;
+		background: #FFFFFF;
+		border-bottom: 1px solid #F7F7F7;
+		display: flex;
+	}
+	.border-list-content{
+		background: #FFFFFF;
+		border-bottom: 1px solid #F7F7F7;
+		display: flex;
+	}
+	.border-list-bottom{
+		border-radius: 0px 0px 8px 8px;
+		background: #FFFFFF;
+		display: flex;
+	}
+	.text-style{
+		font-family: Source Han Sans SC, Source Han Sans SC;
+		font-weight: 400px;
+		font-size: 14px;
+		color: #333333;
+		height: 20px;
+		line-height: 20px;
+		text-align: left;
+		vertical-align: auto;
+		font-style: normal;
+		text-transform: none;
+		padding: 15px 15px 15px 10px;
+	}
+	.icon-style-long{
+		color: #999999;
+		margin-left: 200px;
+		padding: 15px 15px 15px 10px;
+	}
+	.icon-style{
+		color: #999999;
+		margin-left: 227px;
+		padding: 15px 15px 15px 10px;
+	}
+</style>