Merge remote-tracking branch 'origin/master'

ghs/src/components/chat/index.vue

@@ -368,7 +368,7 @@ export default {
 
     .global_kd_button {
         position fixed;
-        bottom: 35px;
+        bottom: 86px;
         right: 70px;
         z-index:9999;
     }

ghs/src/main.js

@@ -51,7 +51,7 @@ const conf = {
 			// },
 			pagination: {
 				props: {
-					layout: 'prev, pager, next, jumper'
+          layout: 'total, prev, pager, next, jumper'
 				}
 			},
 			dict: {

ghsApp/src/admin/home/order.vue

@@ -198,7 +198,7 @@ export default {
         {
           name: "已完成",
           value: 0,
-          id: 6,
+          id: 4,
         },
       ],
       selectItemId: "",

ghsApp/src/admin/home/workbench.vue

@@ -19,13 +19,13 @@
 				<div class="info-list">
 					<div class="info-list-name">开单</div>
 					<div class="info-list-value">
-						{{ $util.numberFormat(data.todayData.visit) || 0 }}
+						{{ $util.numberFormat(data.todayData.order) || 0 }}
 					</div>
 				</div>
 				<div class="info-list">
 					<div class="info-list-name">新客</div>
 					<div class="info-list-value">
-						{{ $util.numberFormat(data.todayData.user) || 0 }}
+						{{ $util.numberFormat(data.todayData.custom) || 0 }}
 					</div>
 				</div>
 				<div class="info-list">
@@ -157,6 +157,15 @@ export default {
 			},
 			// 订单总览
 			orderData: [
+				{
+					name: "待付款",
+					url: "/admin/home/order",
+					type: 4,
+					query: {
+						tabIndex: 1
+					},
+					value: 0
+				},
 				{
 					name: "待配送",
 					value: 0,
@@ -174,15 +183,6 @@ export default {
 					query: {
 						tabIndex: 3
 					}
-				},
-				{
-					name: "已完成",
-					url: "/admin/home/order",
-					type: 4,
-					query: {
-						tabIndex: 0
-					},
-					value: 0
 				}
 			],
 			// tab按钮
@@ -264,15 +264,15 @@ export default {
 					value: 0
 				},
 				{
-					name: "总收入",
+					name: "总收入(元)",
 					value: 0.00
 				},
 				{
-					name: "总支出",
+					name: "总支出(元)",
 					value: 0.00
 				},
 				{
-					name: "总采购",
+					name: "总采购(元)",
 					value: 0.00
 				}
 			],
@@ -326,9 +326,9 @@ export default {
 				const { asset, todayData } = res.data;
 				if (!this.$util.isEmpty(asset)) {
 					// 订单总览
-					this.orderData[0].value = asset.unSendOrder;
-					this.orderData[1].value = asset.sendingOrder;
-					this.orderData[2].value = todayData.order;
+					this.orderData[0].value = asset.unPayOrder;
+					this.orderData[1].value = asset.unSendOrder;
+					this.orderData[2].value = asset.sendingOrder;
 					// 总览数据
 					this.totalData[0].value = asset.totalUser;
 					this.totalData[1].value = asset.totalView;

ghsApp/src/pagesClient/official/apply.vue

@@ -83,20 +83,6 @@
       </div>
       <!-- 店长昵称 -->
       <div class="module-com">
-        <tui-list-cell
-          class="line-cell"
-          :hover="false"
-        >
-          <div class="tui-title">店长姓名</div>
-          <input
-            v-model="form.adminName"
-            placeholder-class="phcolor"
-            placeholder-style="color:#CCCCCC"
-            class="tui-input"
-            name="name"
-            placeholder="请输入店长姓名"
-          />
-        </tui-list-cell>
         <AppBindInfo
           @bindInfo="bindInfo"
           nameTetx="我的昵称"
@@ -145,7 +131,7 @@
           class="line-cell"
           :hover="false"
         >
-          <div class="tui-title">营业执照片</div>
+          <div class="tui-title">营业执照</div>
           <app-uploader
             @resultData="resultData"
             ref="appUploader"
@@ -241,7 +227,6 @@ export default {
         city: "",
         dist: "",
         address: "",
-        adminName: '',
         nickName: '',
         main: 1,
         licenseNo: "",

ghsApp/src/pagesOrder/detail.vue

@@ -43,13 +43,9 @@
 					</view>
 				</view>
 				<view class="order-info_box">
-					<view>销售人员：</view>
-					<view>{{ detailInfo.adminName }}</view>
+					<view>开单：</view>
+					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
-				<!-- <view class="order-info_box">
-                  <view>销售部门：</view>
-                  <view>2020 11-22</view>
-              </view> -->
 				<view class="order-info_box">
 					<view>出货日期：</view>
 					<view>{{ detailInfo.outTime }}</view>
@@ -58,14 +54,15 @@
 					<view>欠款：</view>
 					<view>{{ detailInfo.debt==1?'是':'-' }}</view>
 				</view>
+				<view class="order-info_box">
+					<view>配送方式：</view>
+					<view>{{ detailInfo.sendType==1?'待确认':detailInfo.sendType==2?'自取':detailInfo.sendType==3?'本店送':detailInfo.sendType==4?'快递配送':'未知' }}</view>
+				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
-				<!-- <view class="order-info_box">
-                  <view>销售门店：</view>
-                  <view>2020 11-22</view>
-              </view> -->
+
 			</view>
 			<view class="content-box shipping-address" v-if="detailInfo.expressProgress!=''">
 				<view> 配送进展：<text>{{ detailInfo.expressProgress.progressName }}</text> </view>

ghsApp/src/pagesStatistics/business.vue

@@ -58,10 +58,7 @@
 				</view>
 				<view class="space-right">
 					<view class="show-item">
-						<view class="show-name"
-							>库存预警数
-							<text class="iconfont iconchangjianwentixiangguanwenti2"></text
-						></view>
+						<view class="show-name">库存预警数</view>
 						<view class="show-value red">{{baseInfo.stockWarning}}</view>
 					</view>
 				</view>

hdApp/src/admin/home/workbench.vue

@@ -267,15 +267,15 @@ export default {
           value: 0
         },
         {
-          name: "总收入",
+          name: "总收入(元)",
           value: 0
         },
         {
-          name: "总支出",
+          name: "总支出(元)",
           value: 0
         },
         {
-          name: "总采购",
+          name: "总采购(元)",
           value: 0
         }
       ],

hdApp/src/pagesClient/official/apply.vue

@@ -83,20 +83,6 @@
       </div>
       <!-- 店长昵称 -->
       <div class="module-com">
-        <tui-list-cell
-          class="line-cell"
-          :hover="false"
-        >
-          <div class="tui-title">店长姓名</div>
-          <input
-            v-model="form.adminName"
-            placeholder-class="phcolor"
-            placeholder-style="color:#CCCCCC"
-            class="tui-input"
-            name="name"
-            placeholder="请输入店长姓名"
-          />
-        </tui-list-cell>
         <AppBindInfo
           @bindInfo="bindInfo"
           nameTetx="我的昵称"
@@ -145,7 +131,7 @@
           class="line-cell"
           :hover="false"
         >
-          <div class="tui-title">营业执照片</div>
+          <div class="tui-title">营业执照</div>
           <app-uploader
             @resultData="resultData"
             ref="appUploader"
@@ -241,7 +227,6 @@ export default {
         city: "",
         dist: "",
         address: "",
-        adminName: '',
         nickName: '',
         main: 1,
         licenseNo: "",

hdApp/src/pagesStatistics/business.vue

@@ -58,10 +58,7 @@
 				</view>
 				<view class="space-right">
 					<view class="show-item">
-						<view class="show-name"
-							>库存预警数
-							<text class="iconfont iconchangjianwentixiangguanwenti2"></text
-						></view>
+						<view class="show-name">库存预警数</view>
 						<view class="show-value red">{{baseInfo.stockWarning}}</view>
 					</view>
 				</view>

mallApp/package-lock.json

@@ -9594,10 +9594,18 @@
         "mime-types": "~2.1.19",
         "oauth-sign": "~0.9.0",
         "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "http://mvn.cloudmigrate.cn:8081/repository/yunqian-npm-group/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+        }
       }
     },
     "request-promise-core": {

mallApp/src/api/px-class/index.js

@@ -1,7 +1,21 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 /** *
- * 门店列表 b
+ * 培训班列表 开单列表 b  px-apply/add
  */
 export const pxClassList = data => {
-	return https.get('/px-class/list', data)
+    return https.get('/px-class/list', data)
+}
+
+/** *
+ * 新增培训班报名(下单) b  px-apply/wx-pay
+ */
+export const pxApplyAdd = data => {
+    return https.get('/px-apply/add', data)
+}
+
+/** *
+ * 课程下单微信支付 b  
+ */
+export const pxApplyWxPay = data => {
+    return https.get('/px-apply/wx-pay', data)
 }

mallApp/src/components/app-tabbar.vue

@@ -65,8 +65,7 @@ export default {
   },
   methods: {
     switchTab (index, item) {
-      console.log(index)
-      // this.currentTabIndex = index
+      this.currentTabIndex = index
       uni.switchTab({
         url: item.pagePath
       })

mallApp/src/ext.json

@@ -6,6 +6,6 @@
     "account": 12358,
     "apiHost": "https://api.shop.theflorist.cn",
     "imgHost": "https://img.theflorist.cn",
-    "name":"中花卉 account请填写门店id"
+    "name":"中花卉"
   }
 }

mallApp/src/pages.json

@@ -1,233 +1,225 @@
 {
-	"pages": [
-		{
-			"path": "pages/home/recent",
-			"style": {
-				"navigationBarTitleText": "最近访问"
-			}
-		},
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/home/category",
-			"style": {
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/home/shop",
-			"style": {
-				"navigationBarTitleText": "门店"
-			}
-		},
-		{
-			"path": "pages/home/user",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-    {
-			"path": "pages/home/course",
-			"style": {
-				"navigationBarTitleText": "课程"
-			}
-		},
-		{
-			"path": "common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "common/webview",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		},
-    {
-			"path": "pages/class/index",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pages/user",
-			"pages": [
-				{
-					"path": "register",
-					"style": {
-						"navigationBarTitleText": "注册"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/goods",
-			"pages": [
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/pay",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/callback",
-			"pages": [
-				{
-					"path": "index"
-				},
-				{
-					"path": "success",
-					"style": {
-						"navigationBarTitleText": "支付成功"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/coupon",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/order",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},
-				{
-					"path": "buy",
-					"style": {
-						"navigationBarTitleText": "订单确认"
-					}
-				},
-				{
-					"path": "comment",
-					"style": {
-						"navigationBarTitleText": "评价"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/interest",
-			"pages": [
-				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请排行",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "level",
-					"style": {
-						"navigationBarTitleText": "会员等级"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/chat",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "客服",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		// #ifdef H5
-		"navigationStyle": "custom",
-		// #endif
-		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花卉宝",
-		"navigationBarTextStyle": "black"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [
-			{
-				"pagePath": "pages/home/index",
-				"iconPath": "static/images/common/home-no.png",
-				"selectedIconPath": "static/images/common/home-is.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/home/category",
-				"iconPath": "static/images/common/category-no.png",
-				"selectedIconPath": "static/images/common/category-is.png",
-				"text": "分类"
-			},
-      {
-        "pagePath": "pages/home/course",
-        "iconPath": "static/images/common/icon_class.png",
-        "selectedIconPath": "static/images/common/icon_class_active.png",
-        "text": "课程"
-      },
-			{
-				"pagePath": "pages/home/shop",
-				"iconPath": "static/images/common/shop-no.png",
-				"selectedIconPath": "static/images/common/shop-is.png",
-				"text": "门店"
-			},
-			{
-				"pagePath": "pages/home/user",
-				"iconPath": "static/images/common/user-no.png",
-				"selectedIconPath": "static/images/common/user-is.png",
-				"text": "我的"
-			}
-		]
-	}
+    "pages": [{
+            "path": "pages/home/recent",
+            "style": {
+                "navigationBarTitleText": "最近访问"
+            }
+        },
+        {
+            "path": "pages/home/index",
+            "style": {
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/home/category",
+            "style": {
+                "navigationBarTitleText": "分类"
+            }
+        },
+        {
+            "path": "pages/home/shop",
+            "style": {
+                "navigationBarTitleText": "门店"
+            }
+        },
+        {
+            "path": "pages/home/user",
+            "style": {
+                "navigationBarTitleText": "我的"
+            }
+        },
+        {
+            "path": "pages/home/course",
+            "style": {
+                "navigationBarTitleText": "课程"
+            }
+        },
+        {
+            "path": "common/redirect",
+            "style": {
+                "navigationBarTitleText": "加载中..."
+            }
+        },
+        {
+            "path": "common/webview",
+            "style": {
+                "navigationBarBackgroundColor": "#ffffff",
+                "navigationBarTextStyle": "black"
+            }
+        },
+        {
+            "path": "pages/class/index",
+            "style": {
+                "navigationBarBackgroundColor": "#ffffff",
+                "navigationBarTextStyle": "black"
+            }
+        },
+        {
+            "path": "pages/class/paySuccess",
+            "style": {
+                "navigationBarBackgroundColor": "#ffffff",
+                "navigationBarTextStyle": "black"
+            }
+        }
+    ],
+    "subPackages": [{
+            "root": "pages/user",
+            "pages": [{
+                    "path": "register",
+                    "style": {
+                        "navigationBarTitleText": "注册"
+                    }
+                },
+                {
+                    "path": "password",
+                    "style": {
+                        "navigationBarTitleText": "修改密码"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/goods",
+            "pages": [{
+                "path": "detail",
+                "style": {
+                    "navigationBarTitleText": "详情"
+                }
+            }]
+        },
+        {
+            "root": "pages/pay",
+            "pages": [{
+                "path": "index",
+                "style": {
+                    "navigationBarTitleText": ""
+                }
+            }]
+        },
+        {
+            "root": "pages/callback",
+            "pages": [{
+                    "path": "index"
+                },
+                {
+                    "path": "success",
+                    "style": {
+                        "navigationBarTitleText": "支付成功"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/coupon",
+            "pages": [{
+                "path": "list",
+                "style": {
+                    "navigationBarTitleText": "优惠券",
+                    "enablePullDownRefresh": true
+                }
+            }]
+        },
+        {
+            "root": "pages/order",
+            "pages": [{
+                    "path": "list",
+                    "style": {
+                        "navigationBarTitleText": "订单列表",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "detail",
+                    "style": {
+                        "navigationBarTitleText": "订单列表"
+                    }
+                },
+                {
+                    "path": "buy",
+                    "style": {
+                        "navigationBarTitleText": "订单确认"
+                    }
+                },
+                {
+                    "path": "comment",
+                    "style": {
+                        "navigationBarTitleText": "评价"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/interest",
+            "pages": [{
+                    "path": "invite",
+                    "style": {
+                        "navigationBarTitleText": "邀请排行",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "level",
+                    "style": {
+                        "navigationBarTitleText": "会员等级"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/chat",
+            "pages": [{
+                "path": "index",
+                "style": {
+                    "navigationBarTitleText": "客服",
+                    "enablePullDownRefresh": true
+                }
+            }]
+        }
+    ],
+    "globalStyle": {
+        // #ifdef H5
+        "navigationStyle": "custom",
+        // #endif
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "花卉宝",
+        "navigationBarTextStyle": "black"
+    },
+    "tabBar": {
+        "color": "#C0C4CC",
+        "selectedColor": "#fa436a",
+        "borderStyle": "black",
+        "backgroundColor": "#ffffff",
+        "list": [{
+                "pagePath": "pages/home/index",
+                "iconPath": "static/images/common/home-no.png",
+                "selectedIconPath": "static/images/common/home-is.png",
+                "text": "首页"
+            },
+            {
+                "pagePath": "pages/home/category",
+                "iconPath": "static/images/common/category-no.png",
+                "selectedIconPath": "static/images/common/category-is.png",
+                "text": "分类"
+            },
+            {
+                "pagePath": "pages/home/course",
+                "iconPath": "static/images/common/icon_class.png",
+                "selectedIconPath": "static/images/common/icon_class_active.png",
+                "text": "课程"
+            },
+            {
+                "pagePath": "pages/home/shop",
+                "iconPath": "static/images/common/shop-no.png",
+                "selectedIconPath": "static/images/common/shop-is.png",
+                "text": "门店"
+            },
+            {
+                "pagePath": "pages/home/user",
+                "iconPath": "static/images/common/user-no.png",
+                "selectedIconPath": "static/images/common/user-is.png",
+                "text": "我的"
+            }
+        ]
+    }
 }

mallApp/src/pages/class/index.vue

@@ -2,28 +2,28 @@
   <view class="app-content classPage">
     <view class="class_info">
       <view class="class_details">
-        <text class="flower_name">专业花店</text>
-        <text class="flower_price">¥6800.00</text>
+        <text class="flower_name">{{pageData.name}}</text>
+        <text class="flower_price">¥{{pageData.price}}</text>
       </view>
       <view class="class_intro">
-        <text class="_intro">针对有想法的人</text>
+        <text class="_intro">{{pageData.target}}</text>
         <text class="_intro">×1</text>
       </view>
     </view>
     <view class="class_fill">
       <view class="fill_name">
         <text class="nickname">昵称</text>
-        <input type="text" class="inputText" placeholder="请填写昵称" placeholder-style="font-size: 28upx; color: #999;">
-        <view class="generate_btn">点击生成</view>
+        <input type="text" class="inputText" v-model="dataList.form.nickname" placeholder="请填写昵称" placeholder-style="font-size: 28upx; color: #999;">
+        <button class="generate_btn" open-type="getUserInfo" @getuserinfo="getWxAvatar">点击生成</button>
       </view>
       <view class="fill_name">
         <text class="nickname">手机号</text>
-        <input type="text" class="inputText" placeholder="请填写手机号" placeholder-style="font-size: 28upx; color: #999;">
-        <view class="generate_btn">点击生成</view>
+        <input type="text" class="inputText" v-model="dataList.form.mobile"  placeholder="请填写手机号" placeholder-style="font-size: 28upx; color: #999;">
+        <button class="generate_btn" open-type="getPhoneNumber"  @getphonenumber="getWxMobile">点击生成</button>
       </view>
       <view class="fill_name">
         <text class="nickname">姓名</text>
-        <input type="text" class="inputLast" placeholder="请填写姓名" placeholder-style="font-size: 28upx; color: #999;">
+        <input type="text" class="inputLast" v-model="dataList.form.name" placeholder="请填写姓名" placeholder-style="font-size: 28upx; color: #999;">
       </view>
     </view>
     <view class="footer_bar">
@@ -33,28 +33,108 @@
           <text style="font-size: 40upx;padding-left: 10upx;">6800.00</text>
         </text>
       </text>
-      <view class="confirm_btn">确认</view>
+      <view class="confirm_btn" @click="confirm">确认</view>
     </view>
   </view>
 </template>
 
 <script>
+import { pxApplyAdd, pxApplyWxPay } from '@/api/px-class/index'
+import weixinPay from '@/utils/pay/wxPay'
+import { getWxPhone, getWxInfo } from "@/api/mini";
 export default{
   data() {
     return {
       dataList: {
         form: {
           classId: '',
-          customId: '',
           name: '',
           mobile: '',
-          payWay: ''
+          nickname: ''
         }
-      }
+      },
+      orderSn: '',
+      pageData: {}
     }
   },
   onLoad(option) {
-    this.dataList.form.classId = option.classId
+    this.dataList.form.classId = option.id
+    this.pageData = option
+  },
+  methods: {
+    confirm(){
+      if(this.dataList.form.nickname === ''){
+        this.$msg('请输入昵称')
+        return false
+      }
+      if(this.dataList.form.mobile === ''){
+        this.$msg('手机号不能为空')
+        return false
+      }
+       if (!/^1[34578]\d{9}$/.test(this.dataList.form.mobile)){
+           this.$msg('请输入正确的手机号')
+           return false
+       }
+         if(this.dataList.form.name === ''){
+        this.$msg('请输入姓名')
+        return false
+      }
+      pxApplyAdd(this.dataList.form).then(res=>{
+        pxApplyWxPay({orderSn: res.data.orderSn}).then(res =>{
+          console.log(res)
+          weixinPay(res.data, this.successFn(), this.errorFn())
+        }).catch(err => { console.log(err, 'err') })
+        console.log(this.dataList.form.classId, 'classId')
+        console.log(res, 'res', pxApplyWxPay)
+      }).catch(err => {})
+      
+    },
+    successFn() {
+      uni.navigateTo({
+        url: '/pages/class/paySuccess'
+      })
+    },
+    errorFn() {
+      this.$msg('支付失败')
+    },
+     // 获取微信手机号
+    getWxMobile(e) {
+      console.log(e);
+      if (e.detail.errMsg === "getPhoneNumber:ok") {
+        getWxPhone({
+          iv: e.detail.iv,
+          encryptedData: e.detail.encryptedData
+        }).then(res => {
+          console.log("用户信息", res);
+          uni.showToast({
+            icon: "success"
+          });
+          this.dataList.form.mobile = res.data.mobile;
+        });
+      } else {
+        this.$msg("获取信息失败！");
+      }
+    },
+    // 获取微信信息
+    getWxAvatar() {
+      uni.getUserInfo({
+        provider: "weixin",
+        success: res => {
+          getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(
+            subRes => {
+              // this.form.adminId = subRes.data.id;
+              this.dataList.form.nickname = subRes.data.nickName;
+              uni.showToast({
+                icon: "success"
+              });
+            }
+          );
+        },
+        fail: () => {
+          // this.loading = false
+        }
+      });
+    },
   }
 }
 </script>
@@ -109,19 +189,24 @@ export default{
       }
       &>.inputText{
         width: calc(100% - 300upx);
+        padding: 10upx;
       }
       &>.inputLast{
         width: calc(100% - 150upx);
+        padding: 10upx;
       }
       &>.generate_btn{
         width: 140px;
         height: 50px;
         line-height: 50upx;
+        font-size: 20upx;
         text-align: center;
         background: #3385FF;
         border: 1px solid #3385FF;
+        padding: 0;
         border-radius: 8px;
         color: #fff;
+        border: none;
       }
     }
   }

mallApp/src/pages/class/paySuccess.vue

@@ -0,0 +1,73 @@
+<template>
+  <view class="app-content">
+    <view class="billing_box_bg">
+      <view class="top-view"> </view>
+      <view class="result-view">
+        <view :class="['iconfont', 'iconchenggong']"></view>
+        <view class="result-title">支付成功</view>
+        <view
+          class="close_btn"
+          @click="goClose"
+        >关闭</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "AppResult",
+  methods: {
+    goClose () {
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+  position: relative;
+  padding: 60px 30px;
+  display: flex;
+  flex-direction: column;
+  background-color: #f5f5f5;
+  .top-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 299px;
+    background: #3385ff;
+    border-radius: 0px 0px 83px 83px;
+  }
+  .result-view {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 70px;
+    // width: 100%;
+    background: #ffffff;
+    border-radius: 20px;
+    z-index: 1;
+    .iconchenggong {
+      font-size: 170px;
+      color: $mainColor1;
+    }
+    .result-title {
+      margin: 50px 0 70px;
+      font-size: 32px;
+    }
+    .close_btn {
+      line-height: 88upx;
+      text-align: center;
+      width: 550upx;
+      height: 88upx;
+      border: 1px solid #dddddd;
+      border-radius: 8px;
+      font-size: 32upx;
+      color: #666;
+    }
+  }
+}
+</style>

mallApp/src/pages/home/course.vue

@@ -2,18 +2,28 @@
 <template>
   <view class="app_content">
     <scroll-view class="course_list" scroll-y>
-      <view class="list_item" v-for="(item, index) in 8" :key="index">
-        <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fi1.sinaimg.cn%2FIT%2F2010%2F0419%2F201041993511.jpg&refer=http%3A%2F%2Fi1.sinaimg.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1621152651&t=08594a9b7bc95600bd5134c8be7f1150"></image>
-        <view class="class_name">婚礼宴会设计班</view>
-        <view class="class_introduce">针对花店花艺师，有一定花艺基础的花艺从业者</view>
+      <block v-if="!$util.isEmpty(pageList)">
+        <view class="list_item" v-for="(item, index) in pageList" :key="index" >
+        <image :src="item.cover"></image>
+        <view class="class_name">{{item.name}}</view>
+        <view class="class_introduce">{{item.target}}</view>
         <view class="class_price">
-          <text>¥6800.00</text>
+          <text>¥{{item.tuition}}</text>
           <view class="class_apply">
-            <text>600人报名</text>
-            <view class="apply_btn" @click="signUp">报名</view>
+            <text>{{item.num}}人报名</text>
+            <view class="apply_btn" @click="signUp(item)">报名</view>
           </view>
         </view>
       </view>
+      </block>
+      <block v-else>
+        <view class="nodata">
+          <view>
+            <image src="http://img.huaml.com/common/nodata.png"></image>
+            <view>暂无课程~</view>
+          </view>
+        </view>
+      </block>
     </scroll-view>
     <tab-bar
       :current="2"
@@ -23,20 +33,35 @@
 </template>
 
 <script>
+import AppWrapperEmpty from '@/components/app-wrapper-empty'
+import { pxClassList } from '@/api/px-class/index'
 export default {
+  components: {
+		AppWrapperEmpty
+	},
   data() {
     return {
-      currentTabIndex: 2
+      currentTabIndex: 2,
+      pageList: []
     }
   },
+  mounted(){
+    this.pxClassList()
+  },
   methods: {
     tabClick (index) {
       this.currentTabIndex = index
     },
-    signUp() {
+    signUp(item) {
       uni.navigateTo({
-        url: '/pages/class/index'
+        url: '/pages/class/index?id=' + item.id + '&name=' + item.name + '&price=' + item.tuition + '&target=' + item.target
       })
+    },
+    pxClassList() {
+      pxClassList().then(res => {
+        console.log(res)
+        this.pageList = res.data.list
+      }).catch(err => {console.log(err)})
     }
   }
 }
@@ -114,4 +139,27 @@ export default {
     }
   }
 }
+.nodata{
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  &>view{
+    width: 318upx;
+    height: 326upx;
+    // background-color: pink;
+    &>image{
+      width: 318upx;
+      height: 256upx;
+      // background-color: green;
+    }
+    &>view{
+      font-size: 26px;
+      color: #999999;
+      text-align: center;
+      margin-top: 40upx;
+    }
+  }
+}
 </style>

mallApp/src/pages/home/recent.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="latest-content_box">
-    <view class="shop-list_box" v-if="!show">
+    <view class="shop-list_box" v-if="show">
       <template v-if="!$util.isEmpty(list)">
         <view
           :key="item.shopId"

pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.d4a01365.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.d4a01365.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.0a39ca07.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.0a39ca07.js"></script></body></html>

pt/src/constant/constant.js

@@ -91,7 +91,7 @@ const _CONST_MAP = {
 			value: 2
 		},
 		{
-			label: '审核未通过',
+			label: '未通过',
 			value: 3
 		},
 		{

pt/src/saas/shop/apply.vue

@@ -1,9 +1,6 @@
 <template>
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
-			<template #table-column-addTime="{scope}">
-				<span>{{ scope.row.addTime | formatTime }}</span>
-			</template>
 
 			<template #table-column-status="{scope}">
 				<span>{{ scope.row.status | constantfilter('SAAS_APPLY_STATUS') }}</span>
@@ -11,9 +8,15 @@
 
 			<!-- 审核 -->
 			<template #slot-apply="{scope}">
-				<template v-if="scope.row.status == 1 || scope.row.status == 3">
+
+				<template v-if="scope.row.status == 1">
 					<el-button type="text" @click="showModalFn(scope.row)">审核</el-button>
 				</template>
+
+				<template v-if="scope.row.status == 3">
+					<el-button type="text" @click="showModalFn(scope.row)">重审</el-button>
+				</template>
+
 			</template>
 		</x-crud>
 		<!-- 审核弹窗 -->
@@ -34,7 +37,7 @@
 					<el-form-item label="状态" prop="status">
 						<el-radio-group v-model="form.status">
 							<el-radio label="1">通过</el-radio>
-							<el-radio label="2">拒绝</el-radio>
+							<el-radio label="3">拒绝</el-radio>
 						</el-radio-group>
 					</el-form-item>
 					<el-form-item label="备注" prop="remark">