Ver Fonte

项目初始化

zhanghui há 2 anos atrás
pai
commit
9b212401fa
100 ficheiros alterados com 454 adições e 702 exclusões
  1. 3 0
      App.vue
  2. 0 24
      common/css/common.css
  3. 23 3
      common/js/api.js
  4. 162 0
      components/tabBar/tabBar.vue
  5. 74 74
      manifest.json
  6. 0 71
      orderPages/goodsDetail/index.rpx.css
  7. 3 109
      orderPages/goodsDetail/index.vue
  8. 3 7
      orderPages/orderDetail/index.vue
  9. 49 42
      pages.json
  10. 5 59
      pages/index/index.rpx.css
  11. 12 151
      pages/index/index.vue
  12. 0 0
      pages/login/index.rpx.css
  13. 2 2
      pages/login/login.vue
  14. 7 0
      pages/my/index.rpx.css
  15. 10 1
      pages/my/index.vue
  16. 5 71
      pages/order/index.rpx.css
  17. 11 88
      pages/order/index.vue
  18. 7 0
      pages/orderMeal/index.rpx.css
  19. 36 0
      pages/orderMeal/index.vue
  20. 7 0
      pages/qrCode/index.rpx.css
  21. 35 0
      pages/qrCode/index.vue
  22. BIN
      static/0e733b67a401b9b5776b5196cd5b38e0.jpg
  23. BIN
      static/coupon/u210.png
  24. BIN
      static/coupon/u2102.png
  25. BIN
      static/coupon/u2103.png
  26. BIN
      static/coupon/u2107.png
  27. BIN
      static/coupon/u2108.png
  28. BIN
      static/coupon/u2109.png
  29. BIN
      static/coupon/u211.png
  30. BIN
      static/coupon/u2118.png
  31. BIN
      static/goods/add.png
  32. BIN
      static/goods/h-bg.png
  33. BIN
      static/goods/u291.png
  34. BIN
      static/goods/u292.png
  35. BIN
      static/imageIcon/1-001.png
  36. BIN
      static/imageIcon/1-002.png
  37. BIN
      static/imageIcon/2-001.png
  38. BIN
      static/imageIcon/2-002.png
  39. BIN
      static/imageIcon/3-001.png
  40. BIN
      static/imageIcon/3-002.png
  41. BIN
      static/imageIcon/4-001.png
  42. BIN
      static/imageIcon/4-002.png
  43. BIN
      static/imageIcon/aixin.png
  44. BIN
      static/imageIcon/aixin_1.png
  45. BIN
      static/index/qrcode.png
  46. BIN
      static/index/u01.png
  47. BIN
      static/index/u213.png
  48. BIN
      static/index/u215.png
  49. BIN
      static/index/u217.png
  50. BIN
      static/index/u247.png
  51. BIN
      static/index/u41.png
  52. BIN
      static/index/u55.png
  53. BIN
      static/index/u65.png
  54. BIN
      static/index/u67.png
  55. BIN
      static/index/u72.png
  56. BIN
      static/index/u86.png
  57. BIN
      static/index/u87.png
  58. BIN
      static/integral/u01.png
  59. BIN
      static/login/u01.png
  60. BIN
      static/logo.png
  61. BIN
      static/me/u01.png
  62. BIN
      static/me/u10.png
  63. BIN
      static/me/u101.png
  64. BIN
      static/me/u1796.png
  65. BIN
      static/me/u1803.png
  66. BIN
      static/me/u1812.png
  67. BIN
      static/me/u1829.png
  68. BIN
      static/me/u1833.png
  69. BIN
      static/me/u2299.png
  70. BIN
      static/me/u655.png
  71. BIN
      static/me/u680.png
  72. BIN
      static/me/u687.png
  73. BIN
      static/me/u694.png
  74. BIN
      static/me/u701.png
  75. BIN
      static/me/u826.png
  76. BIN
      static/order/ud1.png
  77. BIN
      static/order/ud11.png
  78. BIN
      static/order/ud12.png
  79. BIN
      static/order/ud13.png
  80. BIN
      static/order/ud2.png
  81. BIN
      static/order/ud3.png
  82. BIN
      static/order/ud4.png
  83. BIN
      static/order/ud5.png
  84. BIN
      static/order/ud6.png
  85. BIN
      static/order/ud7.png
  86. BIN
      static/order/ud8.png
  87. BIN
      static/order/ud9.png
  88. BIN
      static/recharge/dianka.png
  89. BIN
      static/tabBar/index.png
  90. BIN
      static/tabBar/index_cur.png
  91. BIN
      static/tabBar/me.png
  92. BIN
      static/tabBar/me_cur.png
  93. BIN
      static/tabBar/order.png
  94. BIN
      static/tabBar/order_cur.png
  95. BIN
      static/tabBar/qrcode.png
  96. BIN
      static/tabBar/shop.png
  97. BIN
      static/tabBar/shop_cur.png
  98. BIN
      static/transaction/u1.png
  99. BIN
      static/transaction/u2.png
  100. BIN
      static/transaction/u3.png

+ 3 - 0
App.vue

@@ -5,6 +5,9 @@
 <script>
 <script>
 	export default {
 	export default {
 		onLaunch: function() {
 		onLaunch: function() {
+		    uni.hideTabBar({
+                animation:false
+            })
 			console.log('App Launch')
 			console.log('App Launch')
 		},
 		},
 		onShow: function() {
 		onShow: function() {

+ 0 - 24
common/css/common.css

@@ -1,27 +1,3 @@
-body *,
-page view {
-	box-sizing: border-box;
-	flex-shrink: 0;
-}
-
-body {
-	font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma,
-		Arial, PingFang SC-Light, Microsoft YaHei;
-	margin: 0;
-}
-
-button {
-	margin: 0;
-	padding: 0;
-	border: 1px solid transparent;
-	outline: none;
-	background-color: transparent;
-}
-
-button:active {
-	opacity: 0.6;
-}
-
 .flex-col {
 .flex-col {
 	display: flex;
 	display: flex;
 	flex-direction: column;
 	flex-direction: column;

+ 23 - 3
common/js/api.js

@@ -22,11 +22,31 @@ export default {
             method: 'POST',
             method: 'POST',
             data: data
             data: data
         })
         })
-    }
-
-
+    },
 
 
+    /**
+     *  get请求 通过电话及名称获取老系统会员信息
+      */
+    getOldMember (data){
+        return request({
+            url:'/member/wechat/getOldMember',
+            method:'GET',
+            params:data
+        })
+    } ,
 
 
+    /**
+     * get请求 通过会员编号获取老系统充值记录
+     * @param data
+     * @returns {Promise<unknown>}
+     */
+    getOrderRechargeOldList(data){
+        return request({
+            url:'/member/wechat/getOrderRechargeOldList',
+            method:'GET',
+            params:data
+        })
+    },
 
 
 
 
 }
 }

+ 162 - 0
components/tabBar/tabBar.vue

@@ -0,0 +1,162 @@
+<template>
+	<view>
+		<view class="box  flex-col justify-end">
+			<view class="tabbar  flex-row justify-around">
+				<view class="item flex-col justify-center" @click="goPages(0)">
+					<view class="imageView flex-row justify-center">
+						<image class="image" :src="tabIndex===0? '/static/tabBar/index_cur.png':'/static/tabBar/index.png'"></image>
+					</view>
+					<view class=" flex-row justify-center" :class="tabIndex ===0?'title':'title1'">
+						<text>首页</text>
+					</view>
+				</view>
+
+				<view class="item  flex-col justify-center" @click="goPages(1)">
+					<view class="imageView flex-row justify-center">
+						<image class="image" :src="tabIndex===1? '/static/tabBar/shop_cur.png':'/static/tabBar/shop.png'"></image>
+					</view>
+					<view class=" flex-row justify-center" :class="tabIndex ===1?'title':'title1'">
+						<text>点单</text>
+					</view>
+				</view>
+
+				<view class="item  flex-col justify-center" @click="goPages(2)">
+					<view class="qrcodeView flex-row justify-center">
+						<image class="qrcode" src="/static/tabBar/qrcode.png"></image>
+					</view>
+
+				</view>
+
+
+				<view class="item  flex-col justify-center" @click="goPages(3)">
+					<view class="imageView flex-row justify-center">
+						<image class="image" :src="tabIndex===3? '/static/tabBar/order_cur.png':'/static/tabBar/order.png'"></image>
+					</view>
+					<view class=" flex-row justify-center" :class="tabIndex ===3?'title':'title1'">
+						<text>订单</text>
+					</view>
+				</view>
+
+				<view class="item  flex-col justify-center" @click="goPages(4)">
+					<view class="imageView flex-row justify-center">
+						<image class="image" :src="tabIndex===4? '/static/tabBar/me_cur.png':'/static/tabBar/me.png'"></image>
+					</view>
+					<view class=" flex-row justify-center" :class="tabIndex ===4?'title':'title1'">
+						<text>我的</text>
+					</view>
+				</view>
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tabBar",
+		props: {
+			tabIndex: {
+				type: Number,
+				default () {
+					return 0
+				}
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods:{
+			goPages(num){
+
+				console.log(num)
+
+				if (num === 0){
+					uni.switchTab({
+						url:'/pages/index/index'
+					})
+				}
+
+				if (num === 1){
+					uni.switchTab({
+						url:'/pages/orderMeal/index'
+					})
+				}
+
+				if (num === 2){
+					uni.switchTab({
+						url:'/pages/qrCode/index'
+					})
+				}
+
+				if (num === 3){
+					uni.switchTab({
+						url:'/pages/order/index'
+					})
+				}
+
+				if (num===4){
+					uni.switchTab({
+						url:'/pages/my/index'
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style>
+	@import '/common/css/common.css';
+
+	.box {
+		width: 750rpx;
+		height: 138rpx;
+		background: #F7F7F7;
+	}
+
+	.tabbar {
+		width: 750rpx;
+		height: 108rpx;
+		background: #FFFFFF;
+	}
+	.imageView{
+		width: 100%;
+	}
+
+	.image {
+		width: 40rpx;
+		height: 40rpx;
+	}
+	.title{
+		width: 44rpx;
+		height: 32rpx;
+		font-size: 22rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		line-height: 32rpx;
+	}
+	.title1{
+		width: 44rpx;
+		height: 32rpx;
+		font-size: 22rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #999999;
+		line-height: 32rpx;
+	}
+	.qrcodeView{
+		width: 120rpx;
+		height: 120rpx;
+		position: relative;
+	}
+	.qrcode{
+		width: 120rpx;
+		height: 120rpx;
+		position: absolute;
+		bottom: 20rpx;
+	}
+
+</style>

+ 74 - 74
manifest.json

@@ -1,75 +1,75 @@
 {
 {
-    "name" : "shoppingTemplate",
-    "appid" : "__UNI__EEB3904",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "optimization": {
-            "subPackages": true
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
-}
+	"name": "shoppingTemplate",
+	"appid": "__UNI__EEB3904",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx3f3b07566561dc70",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true,
+		"optimization": {
+			"subPackages": true
+		}
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2"
+}

+ 0 - 71
orderPages/goodsDetail/index.rpx.css

@@ -1,71 +0,0 @@
-.swiper{
-    height: 390rpx;
-}
-.swiperImgView{
-    width: 750rpx;
-    height: 390rpx;
-}
-.swiperImg{
-    width: 750rpx;
-    height: 390rpx;
-
-}
-
-.banner{
-    margin-top: 10rpx;
-}
-.goods{
-    padding: 10rpx 20rpx;
-}
-.goodsName{
-    width: 710rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-top: 10rpx;
-    font-size: 30rpx;
-}
-.goodsImgTitle{
-    width: 710rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-top: 10rpx;
-    font-size: 26rpx;
-    color: #999999;
-}
-.goodsPrice{
-    margin-top: 10rpx;
-    font-size: 40rpx;
-    color: red;
-}
-
-.aixinView{
-    width: 40rpx;
-    height: 40rpx;
-}
-.aixinImg{
-    width: 40rpx;
-    height: 40rpx;
-}
-.goodsDetail{
-    height: 70rpx;
-    line-height: 70rpx;
-    font-size: 35rpx;
-}
-.goodsDetailImgView{
-}
-.goodsDetailImg{
-    width: 750rpx;
-}
-.goods-carts {
-    flex-direction: column;
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-}

+ 3 - 109
orderPages/goodsDetail/index.vue

@@ -1,54 +1,6 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
-		<!--轮播图-->
-		<view class="banner">
-			<swiper :autoplay="true" :circular="true" :interval="3000" class="swiper" :indicator-dots="true">
-				<swiper-item class="swiperItem" v-for="(item,index) in slideshowLinks" :key="index">
-					<view class="swiperImgView ">
-						<image class="swiperImg" :src="item"></image>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<!--商品文字信息-->
-		<view class="goods flex-col ">
-			<view class=" flex-row justify-between">
-				<view class="goodsPrice">
-				<text>¥700</text>
-				</view>
-				<view class="aixinView ">
-					<image class=" aixinImg" src="/static/imageIcon/aixin.png"></image>
-				</view>
-			</view>
-
-			<view  class="goodsName">
-				<text>商品名字商品名字商品名字商商品名字商品名字商品字商品名字商</text>
-			</view>
-
-			<view  class="goodsImgTitle">
-				<text>商品说明商品名字商品名字字商品名字商品名字商</text>
-			</view>
-
-		</view>
-
-		<!--商品详情-->
-		<view class="flex-col">
-			<view class="goodsDetail flex-row justify-center">
-				<text>商品详情</text>
-			</view>
-			<view class="goodsDetailImgView flex-col" v-for="i in 10" :key="i">
-				<image class="goodsDetailImg" mode="widthFix" src="/static/0e733b67a401b9b5776b5196cd5b38e0.jpg"></image>
-			</view>
-		</view>
-
-		<view :style="{'height':'50px'}"></view>
-
-		<!--底部导航-->
-		<view class="goods-carts">
-			<uni-goods-nav :options="options" :fill="true" :button-group="buttonGroup" @click="onClick"
-						   @buttonClick="buttonClick" />
-		</view>
-
+		商品详情
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -56,72 +8,14 @@
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
-
-				options: [{
-					icon: 'chat',
-					text: '客服'
-				}, {
-					icon: 'shop',
-					text: '店铺',
-					info: 2,
-					infoBackgroundColor: '#007aff',
-					infoColor: "#f5f5f5"
-				}, {
-					icon: 'cart',
-					text: '购物车',
-					info: 2
-				}],
-				buttonGroup: [{
-					text: '加入购物车',
-					backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
-					color: '#fff'
-				},
-					{
-						text: '立即购买',
-						backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
-						color: '#fff'
-					}
-				],
-				customButtonGroup: [{
-					text: '加入购物车',
-					backgroundColor: 'linear-gradient(90deg, #1E83FF, #0053B8)',
-					color: '#fff'
-				},
-					{
-						text: '立即购买',
-						backgroundColor: 'linear-gradient(90deg, #60F3FF, #088FEB)',
-						color: '#fff'
-					}
-				],
-
-				slideshowLinks: [
-					'http://rredu.obs.cn-southwest-2.myhuaweicloud.com/upload/20230709/b1a1d6fcfb8b30f13b20607739e1b344.png',
-					'http://rredu.obs.cn-southwest-2.myhuaweicloud.com/upload/20230709/c3d1ebde245651d602211ba7af4d1a92.png',
-					'http://rredu.obs.cn-southwest-2.myhuaweicloud.com/upload/20230709/ee83d2c5934cea4d66a43a3a34d2cf86.png'
-				],
+				title: 'Hello'
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
-			this.getmessage()
+
 		},
 		},
 		methods: {
 		methods: {
 
 
-			onClick(e) {
-				uni.showToast({
-					title: `点击${e.content.text}`,
-					icon: 'none'
-				})
-			},
-			buttonClick(e) {
-				console.log(e)
-				this.options[2].info++
-			},
-
-			getmessage(){
-				this.$api.payTheBill({}).then(res =>{
-					console.log(res)
-				})
-			}
 		}
 		}
 	}
 	}
 </script>
 </script>

+ 3 - 7
orderPages/orderDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
-	首页
+		订单详情
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -12,14 +12,10 @@
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
-			this.getmessage()
+
 		},
 		},
 		methods: {
 		methods: {
-			getmessage(){
-				this.$api.payTheBill({}).then(res =>{
-					console.log(res)
-				})
-			}
+
 		}
 		}
 	}
 	}
 </script>
 </script>

+ 49 - 42
pages.json

@@ -3,6 +3,15 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	},
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+
 		{
 		{
 			"path": "pages/index/index",
 			"path": "pages/index/index",
 			"style": {
 			"style": {
@@ -10,45 +19,49 @@
 			}
 			}
 		},
 		},
 		{
 		{
-			"path": "pages/video/index",
+			"path": "pages/orderMeal/index",
+			"style": {
+				"navigationBarTitleText": "点单"
+			}
+		},
+		{
+			"path": "pages/qrCode/index",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "视屏"
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 			}
+
 		},
 		},
 		{
 		{
 			"path": "pages/order/index",
 			"path": "pages/order/index",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "我的订单"
+				"navigationBarTitleText": "订单"
 			}
 			}
 		},
 		},
 		{
 		{
 			"path": "pages/my/index",
 			"path": "pages/my/index",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "个人中心"
+				"navigationBarTitleText": "我的"
 			}
 			}
 		}
 		}
 	],
 	],
 
 
-	"subPackages": [
-		{
-			"root": "orderPages",
-			"pages": [
-				{
-					"path": "orderDetail/index",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh": false
-					}
-				},	{
-					"path": "goodsDetail/index",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"enablePullDownRefresh": false
-					}
-				}
-			]
-		}
-	],
+	"subPackages": [{
+		"root": "orderPages",
+		"pages": [{
+			"path": "orderDetail/index",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "goodsDetail/index",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"enablePullDownRefresh": false
+			}
+		}]
+	}],
 
 
 	"tabBar": {
 	"tabBar": {
 		"color": "#282828",
 		"color": "#282828",
@@ -56,29 +69,23 @@
 		"borderStyle": "white",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"backgroundColor": "#ffffff",
 		"list": [{
 		"list": [{
-			"pagePath": "pages/index/index",
-			"iconPath": "static/imageIcon/1-001.png",
-			"selectedIconPath": "static/imageIcon/1-002.png",
-			"text": "首页"
-		},
+				"pagePath": "pages/index/index"
+			},
 			{
 			{
-				"pagePath": "pages/order/index",
-				"iconPath": "static/imageIcon/2-001.png",
-				"selectedIconPath": "static/imageIcon/2-002.png",
-				"text": "订单"
+				"pagePath": "pages/orderMeal/index"
+
 			},
 			},
 			{
 			{
-				"pagePath": "pages/video/index",
-				"iconPath": "static/imageIcon/3-001.png",
-				"selectedIconPath": "static/imageIcon/3-002.png",
-				"text": "视屏",
-				"enablePullDownRefresh": false
+				"pagePath": "pages/qrCode/index"
+
 			},
 			},
 			{
 			{
-				"pagePath": "pages/my/index",
-				"iconPath": "static/imageIcon/4-001.png",
-				"selectedIconPath": "static/imageIcon/4-002.png",
-				"text": "我的"
+				"pagePath": "pages/order/index"
+
+			},
+			{
+				"pagePath": "pages/my/index"
+
 			}
 			}
 		]
 		]
 	},
 	},

+ 5 - 59
pages/index/index.rpx.css

@@ -1,61 +1,7 @@
-.swiper{
-    height: 390rpx;
+.tabBarLineHeight{
+    height: 138rpx;
 }
 }
-.swiperImgView{
-    width: 750rpx;
-    height: 390rpx;
-}
-.swiperImg{
-    width: 750rpx;
-    height: 390rpx;
-}
-.search{
-    width: 500rpx;
-    padding: 0 20rpx;
-}
-.banner{
-    margin-top: 10rpx;
-}
-
-.goodsList{
-    height:900rpx;
-}
-.goods{
-    width: 375rpx;
-    padding: 0 15rpx 20rpx 15rpx;
-
-}
-.goodsImgView{
-    width: 350rpx;
-    height: 350rpx;
-    border-radius: 10rpx;
-    overflow: hidden;
-}
-.goodsImg{
-    width: 350rpx;
-    height: 350rpx;
-}
-.goodsName{
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-top: 10rpx;
-    font-size: 30rpx;
-}
-.goodsImgTitle{
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-top: 10rpx;
-    font-size: 26rpx;
-    color: #999999;
-}
-.goodsPrice{
-    margin-top: 10rpx;
-    font-size: 40rpx;
-    color: red;
+.tabBarView{
+    position: fixed;
+    bottom: 0;
 }
 }

+ 12 - 151
pages/index/index.vue

@@ -1,175 +1,36 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
-		<!--搜索栏-->
-		<view>
-			<u-search :shape="square" @search="doSearch" :showAction="false" :height="searchHeight" placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
-		</view>
-		<!--轮播图-->
-		<view class="banner">
-			<swiper :autoplay="true" :circular="true" :interval="3000" class="swiper" :indicator-dots="true">
-				<swiper-item class="swiperItem" v-for="(item,index) in slideshowLinks" :key="index">
-					<view class="swiperImgView ">
-						<image class="swiperImg" :src="item"></image>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-
-		<!-- 标题栏 -->
-			<u-sticky>
-				<View>
-					<u-tabs :list="tabList" :current="tabIndex" @click="clickTab"></u-tabs>
-				</View>
-			</u-sticky>
-
-
-		<!-- 商品列表 -->
-		<view :style="{'height':windowHeight}">
-			<swiper :style="{'height':windowHeight}" :current="tabIndex" @change="swiperChange">
-				<swiper-item class="swiperItem" v-for="(item,index) in tabList" :key="index" >
-					<scroll-view  :style="{'height':windowHeight}" :scroll-y="true" @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
-						<uni-grid :column="2" :square="false" :showBorder="false">
-							<uni-grid-item v-for="i in 10" :key="i">
-
-								<view class="goods flex-col" @click="goGoodsDetail">
-									<view class="goodsImgView">
-										<image  class="goodsImg" src="/static/0e733b67a401b9b5776b5196cd5b38e0.jpg"></image>
-									</view>
-									<view  class="goodsName">
-										<text>美女</text>
-									</view>
-									<view  class="goodsImgTitle">
-										<text>商品说明</text>
-									</view>
-									<view class="goodsPrice">
-										<text>¥700</text>
-									</view>
-								</view>
-
-							</uni-grid-item>
-
-						</uni-grid>
+		首页
 
 
-					</scroll-view>
-				</swiper-item>
-			</swiper>
+		<view class="tabBarLineHeight"></view>
+		<view class="tabBarView">
+			<tab-bar :tabIndex="tabIndex"></tab-bar>
 		</view>
 		</view>
-
-
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	import tabBar from "../../components/tabBar/tabBar";
 	export default {
 	export default {
+		components:{
+			tabBar
+		},
 		data() {
 		data() {
 			return {
 			return {
-
-				swiperList: ['integral', 'kefu-ermai', 'coupon', 'gift', 'scan', 'pause-circle', 'wifi', 'email', 'list'],
-				slideshowLinks: [
-					'http://rredu.obs.cn-southwest-2.myhuaweicloud.com/upload/20230709/b1a1d6fcfb8b30f13b20607739e1b344.png',
-					'http://rredu.obs.cn-southwest-2.myhuaweicloud.com/upload/20230709/c3d1ebde245651d602211ba7af4d1a92.png',
-					'http://rredu.obs.cn-southwest-2.myhuaweicloud.com/upload/20230709/ee83d2c5934cea4d66a43a3a34d2cf86.png'
-				],
-				tabList: [{
-					name: '关注',
-				}, {
-					name: '推荐',
-				}, {
-					name: '电影'
-				}, {
-					name: '科技'
-				}, {
-					name: '音乐'
-				}, {
-					name: '美食'
-				}, {
-					name: '文化'
-				}, {
-					name: '财经'
-				}, {
-					name: '手工'
-				}],
-				menuButtonTop:'',//胶囊按钮距离屏幕上边的距离
-				menuButtonLeft:'',//胶囊按钮距离屏幕左边的距离
-				searchHeight:'',//搜索框的高度
-				windowHeight:'',//屏幕的可用高度
-				tabIndex:0,
-				keyword:'',
+				title: 'Hello',
+				tabIndex:0
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
-			this.getmessage()
-			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-			console.log('+++++menuButtonInfo+++++++',menuButtonInfo)
-			this.menuButtonTop =menuButtonInfo.top+'px';  //胶囊按钮距离屏幕上边的距离
-			this.menuButtonLeft =menuButtonInfo.left +'px'; //胶囊按钮距离屏幕左边的距离
-			this.searchHeight=menuButtonInfo.bottom-menuButtonInfo.top +'px' //搜索框的高度
-			let sysInfo = uni.getSystemInfoSync()
-			this.windowHeight =sysInfo.windowHeight-44+'px'//除标题栏栏外的屏幕可用高度
+
 		},
 		},
 		methods: {
 		methods: {
-			/*下拉刷新的回调 */
-			downCallback() {
-				// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
-				// loadSwiper();
-				// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
-				this.mescroll.resetUpScroll()
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				//联网加载数据
-				// getSchoolPage(page.num, 10).then(res => {
-				// 	console.log(res)
-				// 	this.mescroll.endSuccess(res.data.data.records.length,res.data.data.records.length === 10);
-				// 	if (page.num === 1) this.schoolMsgs = []; //如果是第一页需手动制空列表
-				// 	if (res.data.data.records.length > 0){
-				// 		this.schoolMsgs = this.schoolMsgs.concat(res.data.data.records); //追加新数据
-				// 	}
-				// }).catch((err) => {
-				// 	//联网失败, 结束加载
-				// 	this.mescroll.endErr();
-				// })
-			},
-			//点击空布局按钮的回调
-			emptyClick() {
-				uni.showToast({
-					title: '点击了按钮,具体逻辑自行实现'
-				})
-			},
-			// 搜索
-			doSearch() {
-				console.log('sousuo')
-				this.list = []; // 先清空列表,显示加载进度
-				this.mescroll.resetUpScroll();
-			},
-			goGoodsDetail() {
-				uni.navigateTo({
-					url: '/orderPages/goodsDetail/index'
-				})
-			},
-			getmessage() {
-				this.$api.payTheBill({}).then(res => {
-					console.log(res)
-				})
-			},
-			clickTab(e){
-				this.tabIndex = e.index
-			},
-			swiperChange(e){
-				this.tabIndex = e.detail.current
-			},
-			scrolltoupper(){
-
-			},
-			scrolltolower(){
-
-			}
 
 
 		}
 		}
 	}
 	}
 </script>
 </script>
 
 
-<style lang="scss">
+<style>
 	@import '/common/css/common.css';
 	@import '/common/css/common.css';
 	@import './index.rpx.css';
 	@import './index.rpx.css';
 </style>
 </style>

+ 0 - 0
pages/video/index.rpx.css → pages/login/index.rpx.css


+ 2 - 2
pages/video/index.vue → pages/login/login.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
-	视频
+		登录
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -23,4 +23,4 @@
 <style>
 <style>
 	@import '/common/css/common.css';
 	@import '/common/css/common.css';
 	@import './index.rpx.css';
 	@import './index.rpx.css';
-</style>
+</style>

+ 7 - 0
pages/my/index.rpx.css

@@ -0,0 +1,7 @@
+.tabBarLineHeight{
+    height: 138rpx;
+}
+.tabBarView{
+    position: fixed;
+    bottom: 0;
+}

+ 10 - 1
pages/my/index.vue

@@ -1,14 +1,23 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
 	我的
 	我的
+		<view class="tabBarLineHeight"></view>
+		<view class="tabBarView">
+			<tab-bar :tabIndex="tabIndex"></tab-bar>
+		</view>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	import tabBar from "../../components/tabBar/tabBar";
 	export default {
 	export default {
+		components:{
+			tabBar
+		},
 		data() {
 		data() {
 			return {
 			return {
-				title: 'Hello'
+				title: 'Hello',
+				tabIndex:4
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {

+ 5 - 71
pages/order/index.rpx.css

@@ -1,73 +1,7 @@
-.orderView{
-    padding: 10rpx 10rpx;
+.tabBarLineHeight{
+    height: 138rpx;
 }
 }
-.orderImgView{
-    width: 180rpx;
-    height: 180rpx;
-    border-radius: 5rpx;
-    overflow: hidden;
-}
-.orderImg{
-    width: 180rpx;
-    height: 180rpx;
-}
-.orderTitle{
-    width: 400rpx;
-    padding-left: 10rpx;
-}
-.goodsName{
-    height: 28rpx;
-    line-height: 28rpx;
-    font-size: 28rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-}
-.specification{
-    margin-top: 10rpx;
-    height: 105rpx;
-    line-height: 35rpx;
-    font-size: 26rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.label{
-    margin-top: 10rpx;
-    height: 35rpx;
-    line-height: 35rpx;
-    font-size: 20rpx;
-    border: 1rpx solid orangered;
-    padding: 5rpx 10rpx;
-    border-radius: 20rpx;
-}
-.priceAndNumber{
-    width: 150rpx;
-}
-.price{
-    font-size: 28rpx;
-    text-align: right;
-}
-.number{
-    font-size: 23rpx;
-    text-align: right;
-}
-
-.buttonView{
-
-    padding: 20rpx 0;
-}
-.button{
-    height: 60rpx;
-    font-size: 28rpx;
-    line-height: 60rpx;
-    padding: 0 20rpx;
-    border-radius: 30rpx;
-    margin-left: 10rpx;
-    border: 1px solid #999999;
+.tabBarView{
+    position: fixed;
+    bottom: 0;
 }
 }

+ 11 - 88
pages/order/index.vue

@@ -1,108 +1,31 @@
 <template>
 <template>
-	<view>
-		<u-sticky>
-			<View>
-				<u-tabs :list="tabList" :current="tabIndex" @click="clickTab"></u-tabs>
-			</View>
-		</u-sticky>
+	<view class="content">
+		订单
 
 
-		<!-- 订单列表 -->
-		<view :style="{'height':windowHeight}" >
-			<swiper :style="{'height':windowHeight}" :current="tabIndex" @change="swiperChange">
-				<swiper-item class="swiperItem" v-for="(item,index) in tabList" :key="index" >
-					<scroll-view :style="{'height':windowHeight}" :scroll-y="true"  @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
-
-							<view class="orderView flex-col" v-for="i in 20" :key="i">
-								<view class="flex-row justify-between">
-									<view class="orderImgView">
-										<image class="orderImg" src="/static/0e733b67a401b9b5776b5196cd5b38e0.jpg"></image>
-									</view>
-									<view class="orderTitle flex-col">
-										<view class="goodsName flex-col">
-											<text>商品名称商品名称商品名称商品名称商品名称商品名称商品名称</text>
-										</view>
-										<view class="specification flex-col">
-											<text>商品规格商品规格商品规格商品规格商品规格商品规格商品规格商品规格商品规格</text>
-										</view>
-										<view>
-											<text class="label">7天无理由退货</text>
-										</view>
-									</view>
-
-									<view class="priceAndNumber flex-col">
-										<view class="price flex-col">
-											<text>¥81.44</text>
-										</view>
-										<view class="number flex-col">
-											<text>x1</text>
-										</view>
-									</view>
-								</view>
-								<view class=" buttonView flex-row justify-end">
-									<button class="button">申请售后</button>
-									<button class="button">申请售后</button>
-									<button class="button">申请售后</button>
-									<button class="button">申请售后</button>
-								</view>
-							</view>
-
-
-
-					</scroll-view>
-				</swiper-item>
-			</swiper>
+		<view class="tabBarLineHeight"></view>
+		<view class="tabBarView">
+			<tab-bar :tabIndex="tabIndex"></tab-bar>
 		</view>
 		</view>
-
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	import tabBar from "../../components/tabBar/tabBar";
 	export default {
 	export default {
-		components: {
-
+		components:{
+			tabBar
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-
-				windowHeight:'',//屏幕的可用高度
-				tabIndex:0,
-				tabList: [{
-					name: '全部',
-				}, {
-					name: '待付款',
-				}, {
-					name: '待发货'
-				}, {
-					name: '待收货'
-				}, {
-					name: '待评价'
-				}, {
-					name: '退款/售后'
-				}],
+				title: 'Hello',
+				tabIndex:3
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
-			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-			console.log('+++++menuButtonInfo+++++++',menuButtonInfo)
-			this.menuButtonTop =menuButtonInfo.top+'px';  //胶囊按钮距离屏幕上边的距离
-			this.menuButtonLeft =menuButtonInfo.left +'px'; //胶囊按钮距离屏幕左边的距离
-			this.searchHeight=menuButtonInfo.bottom-menuButtonInfo.top +'px' //搜索框的高度
-			let sysInfo = uni.getSystemInfoSync()
-			this.windowHeight =sysInfo.windowHeight-44+'px'//除标题栏栏外的屏幕可用高度
+
 		},
 		},
 		methods: {
 		methods: {
-			clickTab(e){
-				this.tabIndex = e.index
-			},
-			swiperChange(e){
-				this.tabIndex = e.detail.current
-			},
-			scrolltoupper(){
 
 
-			},
-			scrolltolower(){
-
-			}
 		}
 		}
 	}
 	}
 </script>
 </script>

+ 7 - 0
pages/orderMeal/index.rpx.css

@@ -0,0 +1,7 @@
+.tabBarLineHeight{
+    height: 138rpx;
+}
+.tabBarView{
+    position: fixed;
+    bottom: 0;
+}

+ 36 - 0
pages/orderMeal/index.vue

@@ -0,0 +1,36 @@
+<template>
+	<view class="content">
+		点单
+		<view class="tabBarLineHeight"></view>
+		<view class="tabBarView">
+			<tab-bar :tabIndex="tabIndex"></tab-bar>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import tabBar from "../../components/tabBar/tabBar";
+	export default {
+		components:{
+			tabBar
+		},
+		data() {
+			return {
+				title: 'Hello',
+				tabIndex:1
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	@import '/common/css/common.css';
+	@import './index.rpx.css';
+</style>

+ 7 - 0
pages/qrCode/index.rpx.css

@@ -0,0 +1,7 @@
+.tabBarLineHeight{
+    height: 138rpx;
+}
+.tabBarView{
+    position: fixed;
+    bottom: 0;
+}

+ 35 - 0
pages/qrCode/index.vue

@@ -0,0 +1,35 @@
+<template>
+	<view class="content">
+		二维码
+		<view class="tabBarLineHeight"></view>
+		<view class="tabBarView">
+			<tab-bar :tabIndex="tabIndex"></tab-bar>
+		</view>
+	</view>
+</template>
+
+<script>
+	import tabBar from "../../components/tabBar/tabBar";
+	export default {
+		components:{
+			tabBar
+		},
+		data() {
+			return {
+				title: 'Hello',
+				tabIndex:2
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	@import '/common/css/common.css';
+	@import './index.rpx.css';
+</style>

BIN
static/0e733b67a401b9b5776b5196cd5b38e0.jpg


BIN
static/coupon/u210.png


BIN
static/coupon/u2102.png


BIN
static/coupon/u2103.png


BIN
static/coupon/u2107.png


BIN
static/coupon/u2108.png


BIN
static/coupon/u2109.png


BIN
static/coupon/u211.png


BIN
static/coupon/u2118.png


BIN
static/goods/add.png


BIN
static/goods/h-bg.png


BIN
static/goods/u291.png


BIN
static/goods/u292.png


BIN
static/imageIcon/1-001.png


BIN
static/imageIcon/1-002.png


BIN
static/imageIcon/2-001.png


BIN
static/imageIcon/2-002.png


BIN
static/imageIcon/3-001.png


BIN
static/imageIcon/3-002.png


BIN
static/imageIcon/4-001.png


BIN
static/imageIcon/4-002.png


BIN
static/imageIcon/aixin.png


BIN
static/imageIcon/aixin_1.png


BIN
static/index/qrcode.png


BIN
static/index/u01.png


BIN
static/index/u213.png


BIN
static/index/u215.png


BIN
static/index/u217.png


BIN
static/index/u247.png


BIN
static/index/u41.png


BIN
static/index/u55.png


BIN
static/index/u65.png


BIN
static/index/u67.png


BIN
static/index/u72.png


BIN
static/index/u86.png


BIN
static/index/u87.png


BIN
static/integral/u01.png


BIN
static/login/u01.png


BIN
static/logo.png


BIN
static/me/u01.png


BIN
static/me/u10.png


BIN
static/me/u101.png


BIN
static/me/u1796.png


BIN
static/me/u1803.png


BIN
static/me/u1812.png


BIN
static/me/u1829.png


BIN
static/me/u1833.png


BIN
static/me/u2299.png


BIN
static/me/u655.png


BIN
static/me/u680.png


BIN
static/me/u687.png


BIN
static/me/u694.png


BIN
static/me/u701.png


BIN
static/me/u826.png


BIN
static/order/ud1.png


BIN
static/order/ud11.png


BIN
static/order/ud12.png


BIN
static/order/ud13.png


BIN
static/order/ud2.png


BIN
static/order/ud3.png


BIN
static/order/ud4.png


BIN
static/order/ud5.png


BIN
static/order/ud6.png


BIN
static/order/ud7.png


BIN
static/order/ud8.png


BIN
static/order/ud9.png


BIN
static/recharge/dianka.png


BIN
static/tabBar/index.png


BIN
static/tabBar/index_cur.png


BIN
static/tabBar/me.png


BIN
static/tabBar/me_cur.png


BIN
static/tabBar/order.png


BIN
static/tabBar/order_cur.png


BIN
static/tabBar/qrcode.png


BIN
static/tabBar/shop.png


BIN
static/tabBar/shop_cur.png


BIN
static/transaction/u1.png


BIN
static/transaction/u2.png


BIN
static/transaction/u3.png


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff