Przeglądaj źródła

feat:新模板

xyh8905170 2 lat temu
rodzic
commit
f3e7ed06b0
62 zmienionych plików z 1362 dodań i 452 usunięć
  1. BIN
      node_modules.7z
  2. 7 2
      pages/my/index.rpx.css
  3. 279 20
      pages/my/index.vue
  4. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabBar/tabBar.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/orderPages/goodsDetail/index.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/orderPages/orderDetail/index.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderMeal/index.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/qrCode/index.js.map
  20. 21 22
      unpackage/dist/dev/mp-weixin/common/main.js
  21. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  22. 231 231
      unpackage/dist/dev/mp-weixin/common/vendor.js
  23. 8 10
      unpackage/dist/dev/mp-weixin/components/tabBar/tabBar.js
  24. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
  25. 4 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.json
  26. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxml
  27. 89 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxss
  28. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
  29. 4 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json
  30. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxml
  31. 193 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxss
  32. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  33. 4 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.json
  34. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxml
  35. 62 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxss
  36. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js
  37. 7 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.json
  38. 0 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.wxml
  39. 81 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.wxss
  40. 11 13
      unpackage/dist/dev/mp-weixin/orderPages/goodsDetail/index.js
  41. 11 13
      unpackage/dist/dev/mp-weixin/orderPages/orderDetail/index.js
  42. 11 13
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  43. 11 13
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  44. 11 13
      unpackage/dist/dev/mp-weixin/pages/my/index.js
  45. 2 0
      unpackage/dist/dev/mp-weixin/pages/my/index.json
  46. 0 1
      unpackage/dist/dev/mp-weixin/pages/my/index.wxml
  47. 5 2
      unpackage/dist/dev/mp-weixin/pages/my/index.wxss
  48. 11 13
      unpackage/dist/dev/mp-weixin/pages/order/index.js
  49. 11 13
      unpackage/dist/dev/mp-weixin/pages/orderMeal/index.js
  50. 11 13
      unpackage/dist/dev/mp-weixin/pages/qrCode/index.js
  51. 41 42
      unpackage/dist/dev/mp-weixin/project.config.json
  52. 23 16
      unpackage/dist/dev/mp-weixin/project.private.config.json
  53. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/1-001.png
  54. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/1-002.png
  55. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/2-001.png
  56. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/2-002.png
  57. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/3-001.png
  58. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/3-002.png
  59. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/4-001.png
  60. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/4-002.png
  61. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/aixin.png
  62. BIN
      unpackage/dist/dev/mp-weixin/static/imageIcon/aixin_1.png

BIN
node_modules.7z


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

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

+ 279 - 20
pages/my/index.vue

@@ -1,7 +1,263 @@
 <template>
 	<view class="content">
-	我的
-		<view class="tabBarLineHeight"></view>
+		<view class="tabBarLineHeight">
+			<view class="head-wrap">
+				<view class="content-info">
+					<!-- 轮播图 -->
+					<view class="head-bg">
+						<u-swiper :list="bannerList"></u-swiper>
+					</view>
+					<view class="content">
+						<!-- 用户信息 -->
+						<view @click="perfectUserInfo()" class="user-info">
+							<view class="user-head">
+								<image v-if="userInfo.selfPhotoUrl" :src="userInfo.selfPhotoUrl" mode=""></image>
+								<image v-else src="../../static/logo.png" mode=""></image>
+							</view>
+							<view class="h-content">
+								<view class="user-name">
+									<text>HI,亲爱的{{ userInfo.ncikName }}</text>
+								</view>
+								<view class="user-desc">
+									<view class="h-text">
+										<text>你当前的个人资料尚不完善</text>
+										<text>去完善</text>
+									</view>
+									<view class="h-arrow">
+										<u-icon name="arrow-right" color="#333333" size="16"></u-icon>
+									</view>
+								</view>
+							</view>
+						</view>
+
+
+						<view class="balance-info">
+							<view class="balance-name">
+								<text>我的资产</text>
+							</view>
+							<view class="h-content">
+								<view class="button-wrap">
+									<view @click="gotoRechargeService()" class="btn">
+										<view class="icon">
+											<u-icon name="/static/me/u701.png" color="red" size="30"></u-icon>
+										</view>
+										<view class="h-name">
+											<view class="name">
+												余额
+											</view>
+											<view class="num">
+												¥{{ userInfo.balance }}
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="button-wrap">
+									<view @click="gotoIntgral" class="btn">
+										<view class="icon">
+											<u-icon name="/static/me/u680.png" color="red" size="30"></u-icon>
+										</view>
+										<view class="h-name">
+											<view class="name">
+												积分
+											</view>
+											<view class="num">
+												{{ userInfo.integral }}
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="button-wrap">
+									<view @click="gotoCoupon" class="btn">
+										<view class="icon">
+											<u-icon name="/static/me/u687.png" color="red" size="30"></u-icon>
+										</view>
+										<view class="h-name">
+											<view class="name">
+												优惠券
+											</view>
+											<view class="num">
+												{{ userInfo.coupon }}
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="button-wrap">
+									<view class="btn">
+										<view class="icon">
+											<u-icon name="/static/me/u694.png" color="red" size="30"></u-icon>
+										</view>
+										<view class="h-name">
+											<view class="name">
+												电子币
+											</view>
+											<view class="num">
+												{{ userInfo.electronicCurrency }}
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="nav-bar">
+							<view class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u1796.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">贡献奖励记录</view>
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+							<view class="custom-line"></view>
+							<view @click="gotoRealNameAuth()" class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u1803.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">实名认证</view>
+										</view>
+										<view class="change-store">
+											<text v-if="userInfo.isAttestation">已认证</text>
+											<text v-else>未实名认证,去认证</text>
+										</view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+							<view class="custom-line"></view>
+							<view @click="gotoServiceObjectMgt()" class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u1812.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">服务对象管理</view>
+
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+							<view class="custom-line"></view>
+							<view class="nav-content">
+								<view @click="gotoSystemSwitch()" class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u1833.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">新老系统切换</view>
+
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+							<view class="custom-line"></view>
+							<view @click="gotoRechargeService()" class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u826.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">储值服务</view>
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="nav-bar">
+							<view @click="aboutOur()" class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u1829.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">关于我们</view>
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+							<view class="custom-line"></view>
+							<view @click="perfectUserInfo()" class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u10.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">个人信息</view>
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+							<view class="custom-line"></view>
+							<view @click="gotoSetting()" class="nav-content">
+								<view class="nav-info">
+									<view class="logo">
+										<image src="../../static/me/u101.png" mode=""></image>
+									</view>
+									<view class="nav-desc">
+										<view class="nav-name">
+											<view class="">设置</view>
+										</view>
+										<view class="change-store"></view>
+									</view>
+									<view class="arrow-right">
+										<u-icon name="arrow-right" color="#666" size="18"></u-icon>
+										<!-- <image src="../../static/index/u10.png" mode=""></image> -->
+									</view>
+								</view>
+							</view>
+
+						</view>
+					</view>
+
+
+				</view>
+			</view>
+		</view>
 		<view class="tabBarView">
 			<tab-bar :tabIndex="tabIndex"></tab-bar>
 		</view>
@@ -9,27 +265,30 @@
 </template>
 
 <script>
-	import tabBar from "../../components/tabBar/tabBar";
-	export default {
-		components:{
-			tabBar
-		},
-		data() {
-			return {
-				title: 'Hello',
-				tabIndex:4
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
+import tabBar from "../../components/tabBar/tabBar";
+export default {
+	components: {
+		tabBar
+	},
+	data() {
+		return {
+			title: 'Hello',
+			tabIndex: 4,
+			bannerList: [
+				'/static/me/u655.png',
+			],
 		}
+	},
+	onLoad() {
+
+	},
+	methods: {
+
 	}
+}
 </script>
 
 <style>
-	@import '/common/css/common.css';
-	@import './index.rpx.css';
+@import '/common/css/common.css';
+@import './index.rpx.css';
 </style>

Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabBar/tabBar.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/orderPages/goodsDetail/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/orderPages/orderDetail/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderMeal/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/qrCode/index.js.map


Plik diff jest za duży
+ 21 - 22
unpackage/dist/dev/mp-weixin/common/main.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/tabBar/tabBar":1};
+/******/ 		var cssChunks = {"components/tabBar/tabBar":1,"node-modules/uview-ui/components/u-icon/u-icon":1,"node-modules/uview-ui/components/u-swiper/u-swiper":1,"node-modules/uview-ui/components/u-loading-icon/u-loading-icon":1,"node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/tabBar/tabBar":"components/tabBar/tabBar"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/tabBar/tabBar":"components/tabBar/tabBar","node-modules/uview-ui/components/u-icon/u-icon":"node-modules/uview-ui/components/u-icon/u-icon","node-modules/uview-ui/components/u-swiper/u-swiper":"node-modules/uview-ui/components/u-swiper/u-swiper","node-modules/uview-ui/components/u-loading-icon/u-loading-icon":"node-modules/uview-ui/components/u-loading-icon/u-loading-icon","node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":"node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

Plik diff jest za duży
+ 231 - 231
unpackage/dist/dev/mp-weixin/common/vendor.js


Plik diff jest za duży
+ 8 - 10
unpackage/dist/dev/mp-weixin/components/tabBar/tabBar.js


Plik diff jest za duży
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['clickHandler',['$event']]]]]}}" class="{{['u-icon','data-v-172979f2','u-icon--'+labelPos]}}" bindtap="__e"><block wx:if="{{isImg}}"><image class="u-icon__img data-v-172979f2" style="{{$root.s0}}" src="{{name}}" mode="{{imgMode}}"></image></block><block wx:else><text class="{{['u-icon__icon','data-v-172979f2',uClasses]}}" style="{{$root.s1}}" hover-class="{{hoverClass}}">{{icon}}</text></block><block wx:if="{{label!==''}}"><text class="u-icon__label data-v-172979f2" style="{{'color:'+(labelColor)+';'+('font-size:'+($root.g0)+';')+('margin-left:'+(labelPos=='right'?$root.g1:0)+';')+('margin-top:'+(labelPos=='bottom'?$root.g2:0)+';')+('margin-right:'+(labelPos=='left'?$root.g3:0)+';')+('margin-bottom:'+(labelPos=='top'?$root.g4:0)+';')}}">{{label}}</text></block></view>

+ 89 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxss

@@ -0,0 +1,89 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-172979f2, scroll-view.data-v-172979f2, swiper-item.data-v-172979f2 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+@font-face {
+  font-family: 'uicon-iconfont';
+  src: url("https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf") format("truetype");
+}
+.u-icon.data-v-172979f2 {
+  display: flex;
+  align-items: center;
+}
+.u-icon--left.data-v-172979f2 {
+  flex-direction: row-reverse;
+  align-items: center;
+}
+.u-icon--right.data-v-172979f2 {
+  flex-direction: row;
+  align-items: center;
+}
+.u-icon--top.data-v-172979f2 {
+  flex-direction: column-reverse;
+  justify-content: center;
+}
+.u-icon--bottom.data-v-172979f2 {
+  flex-direction: column;
+  justify-content: center;
+}
+.u-icon__icon.data-v-172979f2 {
+  font-family: uicon-iconfont;
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.u-icon__icon--primary.data-v-172979f2 {
+  color: #3c9cff;
+}
+.u-icon__icon--success.data-v-172979f2 {
+  color: #5ac725;
+}
+.u-icon__icon--error.data-v-172979f2 {
+  color: #f56c6c;
+}
+.u-icon__icon--warning.data-v-172979f2 {
+  color: #f9ae3d;
+}
+.u-icon__icon--info.data-v-172979f2 {
+  color: #909399;
+}
+.u-icon__img.data-v-172979f2 {
+  height: auto;
+  will-change: transform;
+}
+.u-icon__label.data-v-172979f2 {
+  line-height: 1;
+}
+

Plik diff jest za duży
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="{{['u-loading-icon','data-v-8ae91632',vertical&&'u-loading-icon--vertical']}}" style="{{$root.s0}}"><block wx:if="{{!webviewHide}}"><view data-ref="ani" class="{{['u-loading-icon__spinner','data-v-8ae91632','vue-ref','u-loading-icon__spinner--'+mode]}}" style="{{'color:'+(color)+';'+('width:'+($root.g0)+';')+('height:'+($root.g1)+';')+('border-top-color:'+(color)+';')+('border-bottom-color:'+(otherBorderColor)+';')+('border-left-color:'+(otherBorderColor)+';')+('border-right-color:'+(otherBorderColor)+';')+('animation-duration:'+(duration+'ms')+';')+('animation-timing-function:'+(mode==='semicircle'||mode==='circle'?timingFunction:'')+';')}}"><block wx:if="{{mode==='spinner'}}"><block class="data-v-8ae91632"><block wx:for="{{array12}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="u-loading-icon__dot data-v-8ae91632"></view></block></block></block></view></block><block wx:if="{{text}}"><text class="u-loading-icon__text data-v-8ae91632" style="{{'font-size:'+($root.g2)+';'+('color:'+(textColor)+';')}}">{{text}}</text></block></view></block>

+ 193 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxss

@@ -0,0 +1,193 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-8ae91632, scroll-view.data-v-8ae91632, swiper-item.data-v-8ae91632 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-loading-icon.data-v-8ae91632 {
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  color: #c8c9cc;
+}
+.u-loading-icon__text.data-v-8ae91632 {
+  margin-left: 4px;
+  color: #606266;
+  font-size: 14px;
+  line-height: 20px;
+}
+.u-loading-icon__spinner.data-v-8ae91632 {
+  width: 30px;
+  height: 30px;
+  position: relative;
+  box-sizing: border-box;
+  max-width: 100%;
+  max-height: 100%;
+  -webkit-animation: u-rotate-data-v-8ae91632 1s linear infinite;
+          animation: u-rotate-data-v-8ae91632 1s linear infinite;
+}
+.u-loading-icon__spinner--semicircle.data-v-8ae91632 {
+  border-width: 2px;
+  border-color: transparent;
+  border-top-right-radius: 100px;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+  border-style: solid;
+}
+.u-loading-icon__spinner--circle.data-v-8ae91632 {
+  border-top-right-radius: 100px;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+  border-width: 2px;
+  border-top-color: #e5e5e5;
+  border-right-color: #e5e5e5;
+  border-bottom-color: #e5e5e5;
+  border-left-color: #e5e5e5;
+  border-style: solid;
+}
+.u-loading-icon--vertical.data-v-8ae91632 {
+  flex-direction: column;
+}
+.data-v-8ae91632:host {
+  font-size: 0px;
+  line-height: 1;
+}
+.u-loading-icon__spinner--spinner.data-v-8ae91632 {
+  -webkit-animation-timing-function: steps(12);
+          animation-timing-function: steps(12);
+}
+.u-loading-icon__text.data-v-8ae91632:empty {
+  display: none;
+}
+.u-loading-icon--vertical .u-loading-icon__text.data-v-8ae91632 {
+  margin: 6px 0 0;
+  color: #606266;
+}
+.u-loading-icon__dot.data-v-8ae91632 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.u-loading-icon__dot.data-v-8ae91632:before {
+  display: block;
+  width: 2px;
+  height: 25%;
+  margin: 0 auto;
+  background-color: currentColor;
+  border-radius: 40%;
+  content: " ";
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(1) {
+  -webkit-transform: rotate(30deg);
+          transform: rotate(30deg);
+  opacity: 1;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(2) {
+  -webkit-transform: rotate(60deg);
+          transform: rotate(60deg);
+  opacity: 0.9375;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(3) {
+  -webkit-transform: rotate(90deg);
+          transform: rotate(90deg);
+  opacity: 0.875;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(4) {
+  -webkit-transform: rotate(120deg);
+          transform: rotate(120deg);
+  opacity: 0.8125;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(5) {
+  -webkit-transform: rotate(150deg);
+          transform: rotate(150deg);
+  opacity: 0.75;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(6) {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+  opacity: 0.6875;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(7) {
+  -webkit-transform: rotate(210deg);
+          transform: rotate(210deg);
+  opacity: 0.625;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(8) {
+  -webkit-transform: rotate(240deg);
+          transform: rotate(240deg);
+  opacity: 0.5625;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(9) {
+  -webkit-transform: rotate(270deg);
+          transform: rotate(270deg);
+  opacity: 0.5;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(10) {
+  -webkit-transform: rotate(300deg);
+          transform: rotate(300deg);
+  opacity: 0.4375;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(11) {
+  -webkit-transform: rotate(330deg);
+          transform: rotate(330deg);
+  opacity: 0.375;
+}
+.u-loading-icon__dot.data-v-8ae91632:nth-of-type(12) {
+  -webkit-transform: rotate(360deg);
+          transform: rotate(360deg);
+  opacity: 0.3125;
+}
+@-webkit-keyframes u-rotate-data-v-8ae91632 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(1turn);
+            transform: rotate(1turn);
+}
+}
+@keyframes u-rotate-data-v-8ae91632 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(1turn);
+            transform: rotate(1turn);
+}
+}
+

Plik diff jest za duży
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxml

@@ -0,0 +1 @@
+<view class="u-swiper-indicator data-v-647f6c67"><block wx:if="{{indicatorMode==='line'}}"><view class="{{['u-swiper-indicator__wrapper','data-v-647f6c67','u-swiper-indicator__wrapper--'+indicatorMode]}}" style="{{'width:'+($root.g0)+';'+('background-color:'+(indicatorInactiveColor)+';')}}"><view class="u-swiper-indicator__wrapper--line__bar data-v-647f6c67" style="{{$root.s0}}"></view></view></block><block wx:if="{{indicatorMode==='dot'}}"><view class="u-swiper-indicator__wrapper data-v-647f6c67"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="{{['u-swiper-indicator__wrapper__dot','data-v-647f6c67',index===current&&'u-swiper-indicator__wrapper__dot--active']}}" style="{{item.s1}}"></view></block></view></block></view>

+ 62 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.wxss

@@ -0,0 +1,62 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-647f6c67, scroll-view.data-v-647f6c67, swiper-item.data-v-647f6c67 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-swiper-indicator__wrapper.data-v-647f6c67 {
+  display: flex;
+  flex-direction: row;
+}
+.u-swiper-indicator__wrapper--line.data-v-647f6c67 {
+  border-radius: 100px;
+  height: 4px;
+}
+.u-swiper-indicator__wrapper--line__bar.data-v-647f6c67 {
+  width: 22px;
+  height: 4px;
+  border-radius: 100px;
+  background-color: #FFFFFF;
+  transition: -webkit-transform 0.3s;
+  transition: transform 0.3s;
+  transition: transform 0.3s, -webkit-transform 0.3s;
+}
+.u-swiper-indicator__wrapper__dot.data-v-647f6c67 {
+  width: 5px;
+  height: 5px;
+  border-radius: 100px;
+  margin: 0 4px;
+}
+.u-swiper-indicator__wrapper__dot--active.data-v-647f6c67 {
+  width: 12px;
+}
+

Plik diff jest za duży
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
+    "u-swiper-indicator": "/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator"
+  },
+  "component": true
+}

Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.wxml


+ 81 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.wxss

@@ -0,0 +1,81 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-7b038a67, scroll-view.data-v-7b038a67, swiper-item.data-v-7b038a67 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-swiper.data-v-7b038a67 {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  overflow: hidden;
+}
+.u-swiper__wrapper.data-v-7b038a67 {
+  flex: 1;
+}
+.u-swiper__wrapper__item.data-v-7b038a67 {
+  flex: 1;
+}
+.u-swiper__wrapper__item__wrapper.data-v-7b038a67 {
+  display: flex;
+  flex-direction: row;
+  position: relative;
+  overflow: hidden;
+  transition: -webkit-transform 0.3s;
+  transition: transform 0.3s;
+  transition: transform 0.3s, -webkit-transform 0.3s;
+  flex: 1;
+}
+.u-swiper__wrapper__item__wrapper__image.data-v-7b038a67 {
+  flex: 1;
+}
+.u-swiper__wrapper__item__wrapper__video.data-v-7b038a67 {
+  flex: 1;
+}
+.u-swiper__wrapper__item__wrapper__title.data-v-7b038a67 {
+  position: absolute;
+  background-color: rgba(0, 0, 0, 0.3);
+  bottom: 0;
+  left: 0;
+  right: 0;
+  font-size: 28rpx;
+  padding: 12rpx 24rpx;
+  color: #FFFFFF;
+  flex: 1;
+}
+.u-swiper__indicator.data-v-7b038a67 {
+  position: absolute;
+  bottom: 10px;
+}
+

Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/orderPages/goodsDetail/index.js


Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/orderPages/orderDetail/index.js


Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/pages/index/index.js


Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/pages/login/login.js


Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/pages/my/index.js


+ 2 - 0
unpackage/dist/dev/mp-weixin/pages/my/index.json

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "我的",
   "usingComponents": {
+    "u-swiper": "/node-modules/uview-ui/components/u-swiper/u-swiper",
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
     "tab-bar": "/components/tabBar/tabBar"
   }
 }

Plik diff jest za duży
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/my/index.wxml


+ 5 - 2
unpackage/dist/dev/mp-weixin/pages/my/index.wxss

@@ -61,11 +61,14 @@
 .bord{
 	border:  1px  solid  red;
 }
-.tabBarLineHeight{
+.tabBarLineHeight {
     height: 138rpx;
 }
-.tabBarView{
+.tabBarView {
     position: fixed;
     bottom: 0;
 }
+.page {
+    height: 1360rpx;
+}
 

Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/pages/order/index.js


Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/pages/orderMeal/index.js


Plik diff jest za duży
+ 11 - 13
unpackage/dist/dev/mp-weixin/pages/qrCode/index.js


+ 41 - 42
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,48 +1,47 @@
 {
-    "description": "项目配置文件。",
-    "packOptions": {
-        "ignore": [],
-        "include": []
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": false,
+    "postcss": false,
+    "minified": false,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "setting": {
-        "urlCheck": false,
-        "es6": false,
-        "postcss": false,
-        "minified": false,
-        "newFeature": true,
-        "bigPackageSizeSupport": true,
-        "condition": false,
-        "ignoreUploadUnusedFiles": true,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        }
+    "condition": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "3.1.1",
+  "appid": "wx3f3b07566561dc70",
+  "projectname": "shoppingTemplate",
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
     },
-    "compileType": "miniprogram",
-    "libVersion": "2.32.3",
-    "appid": "wx3f3b07566561dc70",
-    "projectname": "shoppingTemplate",
-    "condition": {
-        "search": {
-            "current": -1,
-            "list": []
-        },
-        "conversation": {
-            "current": -1,
-            "list": []
-        },
-        "game": {
-            "current": -1,
-            "list": []
-        },
-        "miniprogram": {
-            "current": -1,
-            "list": []
-        }
+    "conversation": {
+      "current": -1,
+      "list": []
     },
-    "editorSetting": {
-        "tabIndent": "insertSpaces",
-        "tabSize": 4
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }

+ 23 - 16
unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -1,20 +1,27 @@
 {
-    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "shoppingTemplate",
-    "setting": {
-        "compileHotReLoad": false
-    },
-    "condition": {
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "",
-                    "pathName": "pages/index/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                }
-            ]
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "shoppingTemplate",
+  "setting": {
+    "compileHotReLoad": false
+  },
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "",
+          "pathName": "pages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/my/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
+      ]
     }
+  }
 }

BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/1-001.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/1-002.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/2-001.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/2-002.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/3-001.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/3-002.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/4-001.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/4-002.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/aixin.png


BIN
unpackage/dist/dev/mp-weixin/static/imageIcon/aixin_1.png


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików