合并开屏页与登陆成功页

app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
+    "pages/success/success",
     "pages/login/login",
-    "pages/login-success/login-success",
     "pages/index/index",
     "pages/person/person",
     "pages/detail/detail",
@@ -15,7 +15,6 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "开心灵工",
     "navigationBarTextStyle": "black"
   },
   "sitemapLocation": "sitemap.json"

pages/detail/detail.js

@@ -32,7 +32,7 @@ Page({
       },
       success: res => {
         wx.showToast({
-          title: '报名成功', //没用的  fail里面的有用
+          title: '报名成功',
         })
       },
       fail: res => {
@@ -47,6 +47,7 @@ Page({
       }
     })
   },
+  // 亮点输入
   input(e) {
     this.setData({
       bright_points: e.detail.value
@@ -55,7 +56,7 @@ Page({
   // 打开地图
   openMap(e) {
     const name = e.currentTarget.dataset.name;
-    const address = e.currentTarget.dataset.address
+    const address = e.currentTarget.dataset.address;
     // wx.openLocation({
     //   latitude: 31.544325,
     //   longitude: 120.356595,

pages/login/login.js

@@ -133,7 +133,7 @@ Page({
                       })
                     } else {
                       wx.redirectTo({
-                        url: '/pages/login-success/login-success',
+                        url: '/pages/success/success?type=login_success',
                       })
                     }
                   }

pages/login-success/login-success.js

@@ -5,7 +5,14 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    login_success: false,
+    version: false,
+    status: {
+      login_success: true
+    },
+    message: {
+      login_success: '登陆成功'
+    }
   },
   // 拨打电话
   callPhone() {
@@ -17,7 +24,27 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    if (options.type) {
+      this.data.message[options.type] && wx.setNavigationBarTitle({
+        title: this.data.message[options.type],
+      })
+      this.setData({
+        [options.type]: this.data.status[options.type]
+      })
+    } else {
+      wx.setNavigationBarTitle({
+        title: '欢迎进入开心灵工',
+      })
+      this.setData({
+        version: true
+      }, _ => {
+        setTimeout(_ => {
+          wx.redirectTo({
+            url: '/pages/login/login',
+          })
+        }, 1200)
+      })
+    }
   },
 
   /**

pages/login-success/login-success.wxml

@@ -1,14 +1,15 @@
 <!--pages/login-success/login-success.wxml-->
 <view class="container">
   <image src="/images/login.png" mode="widthFix" class="hint-pic"></image>
-  <view class="message">
+  <view class="message" wx:if='{{login_success}}'>
     <text> 欢迎进入开心灵工平台，</text>
     <text> 如果您有承揽需求，欢迎联系我们：</text>
     <view class="action" bindtap="callPhone">
       <image src="/images/icon/phone.png"></image>
       <text>400-692-0099</text>
     </view>
-
   </view>
-
+  <view class="version" wx:if='{{version}}'>
+    v1.0.0
+  </view>
 </view>

pages/login-success/login-success.wxss

@@ -38,3 +38,10 @@ page {
   width: 28rpx;
   margin-right: 15rpx;
 }
+
+.version {
+  color: #888a8e;
+  font-size: 28rpx;
+  position: absolute;
+  bottom: 65rpx;
+}

project.config.json

@@ -24,7 +24,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx5ae6908ae55edcb7",
+	"appid": "wx997164f2857c1a1d",
 	"projectname": "Mina_B",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -50,7 +50,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,
@@ -60,9 +60,9 @@
 					"scene": null
 				},
 				{
-					"id": -1,
-					"name": "登录成功（非后台导入用户）",
-					"pathName": "pages/login-success/login-success",
+					"id": 1,
+					"name": "pages/success/success",
+					"pathName": "pages/success/success",
 					"query": "",
 					"scene": null
 				},

utils/util.js

@@ -91,7 +91,7 @@ class Utils {
   /* 
     请求方法
     @options 请求参数
-    @status 是否携带openID
+    @status 是否携带userID
   */
   request(options, status = true) {
 
@@ -154,9 +154,9 @@ class Utils {
         dataType: opt.dataType || 'json',
         responseType: opt.responseType || 'text',
         success: function(res) {
-          console.log('请求参数=>', opt)
-          console.log('服务器响应结果=>',res)
-          console.log('当前页面=>', getCurrentPages().map(val => val.route).pop())
+          console.log('请求参数=>', opt);
+          console.log('服务器响应结果=>',res);
+          console.log('当前页面=>', getCurrentPages().map(val => val.route).pop());
           // 判断是否含有成功方法并执行
           if (opt.success && typeof opt.success === 'function') {
             if (res.statusCode === 200) {