Merge branch 'master' of gitee.com:sh_13808852820/program

src/components/index/regist.vue

@@ -61,13 +61,20 @@
     </div>
 
     <div class="text-center padding-lr padding-top">
-      <button
+      <!-- <button
         class="cu-btn lg cu-btn-primary text-white text-center"
         open-type="getUserInfo"
         @getuserinfo="get_Userinfo"
         :disabled="btn_disabled"
       >
         {{ title }}
+      </button> -->
+      <button
+        class="cu-btn lg cu-btn-primary text-white text-center"
+        @click='get_user_info'
+        :disabled="btn_disabled"
+      >
+        {{ title }}
       </button>
     </div>
     <view class="text-center text-xs protocol_text">
@@ -422,14 +429,30 @@ export default {
       $this.time_start = $this.time_show = false;
     },
     //  获取用户信息
-    get_Userinfo(e) {
-      console.log(e);
-      if (e.mp.detail.errMsg == "getUserInfo:fail auth deny") {
-        Toast.fail("请进行授权登录");
-      } else {
-        $this._userinfo = e.mp.detail.userInfo;
-        $this.wechat_login();
-      }
+    // get_Userinfo(e) {
+    //   console.log("获取到的用户信息为:", e);
+    //   if (e.mp.detail.errMsg == "getUserInfo:fail auth deny") {
+    //     Toast.fail("请进行授权登录");
+    //   } else {
+    //     $this._userinfo = e.mp.detail.userInfo;
+    //     $this.wechat_login();
+    //   }
+    // },
+    get_user_info() {
+      wx.getUserProfile({
+        desc: "获取你的昵称、头像、地区及性别",
+        success: (res) => {
+          let wxUserInfo = res.userInfo;
+          $this._userinfo = wxUserInfo;
+          $this.wechat_login();
+          console.log("我能获取到用户的信息吗？？", $this._userinfo);
+        },
+        fail: (res) => {
+          //拒绝授权
+          Toast.fail("请进行授权登录");
+          return;
+        },
+      });
     },
   },
   mounted() {

src/pages/index/index.vue

@@ -192,7 +192,7 @@ export default {
   onLoad($option) {
     if (process.env.NODE_ENV == "development") {
       // wx.setStorageSync("token", "7MZYqpAWOdw8WDxsgUV5QkQnKfrU5L_7");
-      wx.setStorageSync("token", "PADD7JOgYHsv_cU_mJvv2pdAoxrGVIFu");
+      wx.setStorageSync("token", "hbVDHNVpJqZsWn_MpFlQYIJI5QcoCk4v");
     }
 
     console.log(
@@ -227,9 +227,9 @@ export default {
       user_store.setters.set_token($token);
       user_store.setters.set_login(true);
       this.is_login = user_store.getters.get_login_status();
-      wx.navigateTo({
-        url: "/pages/payment/main",
-      });
+      // wx.navigateTo({
+      //   url: "/pages/payment/main",
+      // });
     }
   },
   created() {

src/pages/report/index.vue.bakk

@@ -65,66 +65,50 @@
 
     <!--    专注力维持区间、受干扰次数，专注力最大爆发值、专注力启动时长-->
     <view class="margin-tb">
-      <van-row>
-        <van-col span="16">
-          <van-row>
-            <van-col span="12">
-              <view class="detail">
-                <view>
-                  <view>{{ record.scope_diff }}</view>
-                  <view>专注力维持区间</view>
-                </view>
-              </view>
-            </van-col>
-            <van-col span="12">
-              <view class="detail">
-                <view>
-                  <view>{{ record.interfere }}</view>
-                  <view>受干扰次数</view>
-                </view>
-              </view>
-
-            </van-col>
-          </van-row>
-
-          <van-row>
-            <van-col span="12">
-              <view class="detail">
-                <view>
-                  <view>{{ record.burst }}</view>
-                  <view>专注力最大爆发值</view>
-                </view>
-              </view>
-
-            </van-col>
-            <van-col span="12">
-              <view class="detail">
-                <view>
-                  <view>{{ record.start }}</view>
-                  <view>专注力启动时长</view>
-                </view>
-              </view>
-            </van-col>
-          </van-row>
-        </van-col>
-        <van-col span="5">
-          <view class="text-center">
-            <view class="hight_pie_chart">
-              <mpvue-echarts
-                :echarts="echarts"
-                :onInit="hight_att_charts"
-                canvasId="demo-canvas1"
-              />
-            </view>
-            <view class="detail">
-              <view>
-                <view>{{ record.height_absorbed }}%</view>
-                <view>高专注力占比</view>
-              </view>
-            </view>
-          </view>
-        </van-col>
-      </van-row>
+
+      <view class="detail">
+        <view>
+          <view>{{ record.scope_diff }}</view>
+          <view>专注力维持区间</view>
+        </view>
+      </view>
+
+      <view class="detail">
+        <view>
+          <view>{{ record.interfere }}</view>
+          <view>受干扰次数</view>
+        </view>
+      </view>
+
+      <view class="hight_pie_chart">
+        <mpvue-echarts
+          :echarts="echarts"
+          :onInit="hight_att_charts"
+          canvasId="demo-canvas1"
+        />
+      </view>
+
+      <view class="detail">
+        <view>
+          <view>{{ record.burst }}</view>
+          <view>专注力最大爆发值</view>
+        </view>
+      </view>
+
+      <view class="detail">
+        <view>
+          <view>{{ record.start }}</view>
+          <view>专注力启动时长</view>
+        </view>
+      </view>
+
+      <view class="detail">
+        <view>
+          <view>{{ record.height_absorbed }}%</view>
+          <view>高专注力占比</view>
+        </view>
+      </view>
+
     </view>
 
     <view class="bar">
@@ -561,8 +545,14 @@ image.boy {
 }
 
 /* 详细数据 */
+.margin-tb {
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+}
+
 .detail {
-  width: 100%;
+  width: 30%;
   height: 102px;
   /*display: flex;*/
   /*align-items: center;*/
@@ -654,10 +644,11 @@ image.boy {
 }
 
 .hight_pie_chart {
-  margin: 0 auto;
-  width: 100px;
-  height: 100px;
+  /* margin: 0 auto; */
+  width: 30%;
+  height: 102px;
   background: #f3f3f3;
+  margin-top: 5px;
   /*border-radius: 10px;*/
   /*box-shadow: 0px 6px 11px #dadada;*/
 }

src/pages/start/index.vue

@@ -282,7 +282,7 @@ export default {
       //删除隐藏时间
       game_store.remover.rmHideTime();
       //游戏结束重置游戏模式
-      game_store.setters.setMode(0);
+      // game_store.setters.setMode(0);
       //删除游戏得id
       game_store.setters.removeToyHex();
 
@@ -447,6 +447,7 @@ export default {
         $this.beta_list = [];
         //游戏结束重置游戏时间
         wx.removeStorageSync("over_play_time");
+        game_store.setters.setMode(0);
       });
     },
     //  处理游戏中数据的方法