Merge remote-tracking branch 'origin/master'

miniapp/app/app.json

@@ -1,12 +1,41 @@
 {
     "pages": [
         "pages/launch/index",
-        "pages/home/index"
+        "pages/home/index",
+        "pages/classify/index",
+        "pages/order/index",
+        "pages/user/index"
     ],
     "window": {
         "backgroundTextStyle": "light",
         "navigationBarBackgroundColor": "#00a0e9",
         "navigationBarTitleText": "玥子轩",
         "navigationBarTextStyle": "white"
+    },
+    "tabBar": {
+        "color": "#fff",
+        "selectedColor": "#fff",
+        "backgroundColor": "#00a0e9",
+        "list": [{
+            "pagePath": "pages/home/index",
+            "text": "首页",
+            "iconPath": "/img/icon-home.png",
+            "selectedIconPath": "/img/icon-home-active.png"
+        }, {
+            "pagePath": "pages/classify/index",
+            "text": "分类",
+            "iconPath": "/img/icon-classify.png",
+            "selectedIconPath": "/img/icon-classify-active.png"
+        }, {
+            "pagePath": "pages/order/index",
+            "text": "订单",
+            "iconPath": "/img/icon-order.png",
+            "selectedIconPath": "/img/icon-order-active.png"
+        }, {
+            "pagePath": "pages/user/index",
+            "text": "我的",
+            "iconPath": "/img/icon-user.png",
+            "selectedIconPath": "/img/icon-user-active.png"
+        }]
     }
 }

miniapp/app/pages/classify/index.js

@@ -0,0 +1,7 @@
+const $ = global;
+
+new $.Page({
+    data: {
+
+    }
+});

miniapp/app/pages/classify/index.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "支付结果"
+}

miniapp/app/pages/classify/index.wxml

@@ -0,0 +1,9 @@
+<view class="page">
+    <view class="page-bd">
+        <view class="card">
+            <image class="icon-status" src="/img/pay-success.png"></image>
+            <view class="status-text">支付成功</view>
+            <view class="btn-green">查看订单</view>
+        </view>
+    </view>
+</view>

miniapp/app/pages/classify/index.wxss

@@ -0,0 +1,40 @@
+page{
+    background-color: #ebebeb;
+}
+.page{
+    overflow: hidden;
+}
+.card{
+    background-color: #fff;
+    margin: 74rpx auto 0;
+    border-radius: 40rpx;
+    width: 600rpx;
+    height: 800rpx;
+    overflow: hidden;
+}
+
+.icon-status{
+    display: block;
+    margin: 100rpx auto 0;
+    width: 141rpx;
+    height: 141rpx;
+}
+
+.status-text{
+    text-align: center;
+    font-size: 46rpx;
+    color: #494949;
+    margin-top: 80rpx;
+}
+
+.btn-green{
+    width: 300rpx;
+    height: 80rpx;
+    text-align: center;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    color: #fff;
+    font-size: 30rpx;
+    background-color: #1aad19;
+    margin: 210rpx auto 0;
+}

miniapp/app/pages/order/index.js

@@ -0,0 +1,7 @@
+const $ = global;
+
+new $.Page({
+    data: {
+
+    }
+});

miniapp/app/pages/order/index.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "支付结果"
+}

miniapp/app/pages/order/index.wxml

@@ -0,0 +1,9 @@
+<view class="page">
+    <view class="page-bd">
+        <view class="card">
+            <image class="icon-status" src="/img/pay-success.png"></image>
+            <view class="status-text">支付成功</view>
+            <view class="btn-green">查看订单</view>
+        </view>
+    </view>
+</view>

miniapp/app/pages/order/index.wxss

@@ -0,0 +1,40 @@
+page{
+    background-color: #ebebeb;
+}
+.page{
+    overflow: hidden;
+}
+.card{
+    background-color: #fff;
+    margin: 74rpx auto 0;
+    border-radius: 40rpx;
+    width: 600rpx;
+    height: 800rpx;
+    overflow: hidden;
+}
+
+.icon-status{
+    display: block;
+    margin: 100rpx auto 0;
+    width: 141rpx;
+    height: 141rpx;
+}
+
+.status-text{
+    text-align: center;
+    font-size: 46rpx;
+    color: #494949;
+    margin-top: 80rpx;
+}
+
+.btn-green{
+    width: 300rpx;
+    height: 80rpx;
+    text-align: center;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    color: #fff;
+    font-size: 30rpx;
+    background-color: #1aad19;
+    margin: 210rpx auto 0;
+}

miniapp/app/pages/user/index.js

@@ -0,0 +1,7 @@
+const $ = global;
+
+new $.Page({
+    data: {
+
+    }
+});

miniapp/app/pages/user/index.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "支付结果"
+}

miniapp/app/pages/user/index.wxml

@@ -0,0 +1,9 @@
+<view class="page">
+    <view class="page-bd">
+        <view class="card">
+            <image class="icon-status" src="/img/pay-success.png"></image>
+            <view class="status-text">支付成功</view>
+            <view class="btn-green">查看订单</view>
+        </view>
+    </view>
+</view>

miniapp/app/pages/user/index.wxss

@@ -0,0 +1,40 @@
+page{
+    background-color: #ebebeb;
+}
+.page{
+    overflow: hidden;
+}
+.card{
+    background-color: #fff;
+    margin: 74rpx auto 0;
+    border-radius: 40rpx;
+    width: 600rpx;
+    height: 800rpx;
+    overflow: hidden;
+}
+
+.icon-status{
+    display: block;
+    margin: 100rpx auto 0;
+    width: 141rpx;
+    height: 141rpx;
+}
+
+.status-text{
+    text-align: center;
+    font-size: 46rpx;
+    color: #494949;
+    margin-top: 80rpx;
+}
+
+.btn-green{
+    width: 300rpx;
+    height: 80rpx;
+    text-align: center;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    color: #fff;
+    font-size: 30rpx;
+    background-color: #1aad19;
+    margin: 210rpx auto 0;
+}

miniapp/app/project.config.json

@@ -13,7 +13,7 @@
 	"compileType": "miniprogram",
 	"libVersion": "2.2.2",
 	"appid": "wxa24a07ee1b94389b",
-	"projectname": "%E5%AE%B6%E6%94%BF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
+	"projectname": "%E5%AE%B6%E6%94%BF%E5%B0%8F%E7%A8%8B%E5%BA%8Fnew",
 	"isGameTourist": false,
 	"condition": {
 		"search": {