Browse Source

开发优化我的页面

sun2511 2 years ago
parent
commit
52b66eb90c
12 changed files with 1682 additions and 1388 deletions
  1. 8 0
      api/user.js
  2. 52 48
      app.json
  3. 1250 1242
      pages/index/index.js
  4. 74 76
      pages/index/index.wxml
  5. 30 0
      pages/my/index.js
  6. 3 0
      pages/my/index.json
  7. 96 0
      pages/my/index.less
  8. 34 0
      pages/my/index.wxml
  9. 81 0
      pages/my/index.wxss
  10. 2 1
      project.private.config.json
  11. 5 21
      utils/httpUtilNoLogin.js
  12. 47 0
      utils/request.js

+ 8 - 0
api/user.js

@@ -0,0 +1,8 @@
+import {
+    request
+} from "../utils/request";
+
+module.exports = {
+    //获取用户信息
+    getUserInfo: data => request('/user/my', 'get', data),
+}

+ 52 - 48
app.json

@@ -1,51 +1,55 @@
 {
-  "pages": [
-    "pages/index/index",
-    "pages/login/login",
-    "pages/reading/reading",
-    "pages/social/works/works",
-    "pages/social/insideMessage/insideMessage",
-    "pages/social/replyDetail/replyDetail",
-    "pages/social/littleFlower/littleFlower",
-    "pages/social/prize/prize",
-    "pages/main/class/class",
-    "pages/main/books/books",
-    "pages/main/week/week",
-    "pages/main/searchResult/searchResult",
-    "pages/user/myEdit/myEdit",
-    "pages/myconcern/myconcern",
-    "pages/user/myWallet/myWallet",
-    "pages/user/mycourse/mycourse",
-    "pages/user/myread/myread",
-    "pages/mycollection/mycollection",
-    "pages/user/walletDetails/walletDetails",
-    "pages/myworks/myworks",
-    "pages/vipPage/vip/vip",
-    "pages/vipPage/vipCode/vipCode",
-    "pages/vipPage/wechat/wechat",
-    "pages/grade/grade",
-    "pages/activity/index/index",
-    "pages/activity/rule/rule",
-    "pages/activity/strategy/strategy",
-    "pages/activity/priceList/priceList",
-    "pages/vipActivity/vipActivity",
-    "pages/product/product",
-    "pages/activity/goodList/goodList"
-  ],
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#ededed",
-    "navigationBarTitleText": "小学语文朗读配音",
-    "navigationBarTextStyle": "black",
-    "onReachBottomDistance": 50,
-    "enablePullDownRefresh": true
-  },
-  "debug": false,
-  "sitemapLocation": "sitemap.json",
-  "plugins": {
-    "myPlugin": {
-      "version": "1.2.1",
-      "provider": "wx7279a29ef86a3002"
+    "pages": [
+        "pages/my/index",
+        "pages/index/index",
+        "pages/login/login",
+        "pages/reading/reading",
+        "pages/social/works/works",
+        "pages/social/insideMessage/insideMessage",
+        "pages/social/replyDetail/replyDetail",
+        "pages/social/littleFlower/littleFlower",
+        "pages/social/prize/prize",
+        "pages/main/class/class",
+        "pages/main/books/books",
+        "pages/main/week/week",
+        "pages/main/searchResult/searchResult",
+        "pages/user/myEdit/myEdit",
+        "pages/myconcern/myconcern",
+        "pages/user/myWallet/myWallet",
+        "pages/user/mycourse/mycourse",
+        "pages/user/myread/myread",
+        "pages/mycollection/mycollection",
+        "pages/user/walletDetails/walletDetails",
+        "pages/myworks/myworks",
+        "pages/vipPage/vip/vip",
+        "pages/vipPage/vipCode/vipCode",
+        "pages/vipPage/wechat/wechat",
+        "pages/grade/grade",
+        "pages/activity/index/index",
+        "pages/activity/rule/rule",
+        "pages/activity/strategy/strategy",
+        "pages/activity/priceList/priceList",
+        "pages/vipActivity/vipActivity",
+        "pages/product/product",
+        "pages/activity/goodList/goodList"
+    ],
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#ededed",
+        "navigationBarTitleText": "小学语文朗读配音",
+        "navigationBarTextStyle": "black",
+        "onReachBottomDistance": 50,
+        "enablePullDownRefresh": true
+    },
+    "debug": false,
+    "sitemapLocation": "sitemap.json",
+    "plugins": {
+        "myPlugin": {
+            "version": "1.2.1",
+            "provider": "wx7279a29ef86a3002"
+        }
+    },
+    "resolveAlias": {
+        "~/*": "/*"
     }
-  }
 }

File diff suppressed because it is too large
+ 1250 - 1242
pages/index/index.js


+ 74 - 76
pages/index/index.wxml

@@ -1,66 +1,64 @@
 <!-- index.wxml -->
 <!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
-<mp-navigation-bar  title="UI组件库"></mp-navigation-bar>
+<mp-navigation-bar title="UI组件库"></mp-navigation-bar>
 <view class="change_grade" wx:if="{{isGradeShow}}">
-  <view class="change_brage_wrapper">
-    <text class="title">分龄选择</text>
-    <view class="change_row">
-      <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_FIRST_GRADE">一年级</view>
-      <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_SECOND_GRADE">二年级</view>
+    <view class="change_brage_wrapper">
+        <text class="title">分龄选择</text>
+        <view class="change_row">
+            <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_FIRST_GRADE">一年级</view>
+            <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_SECOND_GRADE">二年级</view>
+        </view>
+        <view class="change_row">
+            <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_THREE_GRADE">三年级</view>
+            <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_SENIOR_GRADE">四年级</view>
+        </view>
+        <view class="change_row change_row_single">
+            <view class="change_item" bindtap="changeGrade" data-code="PRESCHOOL">学前班</view>
+            <view class="change_item change_item_blank" data-code="PRESCHOOL"></view>
+        </view>
     </view>
-    <view class="change_row">
-      <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_THREE_GRADE">三年级</view>
-      <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_SENIOR_GRADE">四年级</view>
-    </view>
-    <view class="change_row change_row_single">
-      <view class="change_item" bindtap="changeGrade" data-code="PRESCHOOL">学前班</view>
-      <view class="change_item change_item_blank" data-code="PRESCHOOL"></view>
-    </view>
-  </view>
 </view>
 <view class="container">
-  <!-- 引入组件 -->
-  <!-- <import src="/component/group/group.wxml" /> -->
-  <!-- <import src="/component/hot/hot.wxml" /> -->
-  <!-- <import src="/component/follow/follow.wxml" /> -->
-  <import src="/component/my/my.wxml" />
-  <import src="/templates/courses/courses.wxml" />
-  <!-- 顶部导航 -->
-  <view class="top-tab" wx:if="{{!isGradeShow}}">
-    <!-- <block wx:for="{{tab}}" wx:key="index">
-      <view class="tabbar {{index == myIndex ? 'select':' '}}" bindtap="switcher" data-index="{{index}}">
-        <text>{{item.name}}</text>
-      </view>
-    </block> -->
-    <view class="tabbar {{3 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="3">
-      <text>我的</text>
-    </view>
-    <view class="tabbar {{0 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="0">
-      <text>推荐</text>
+    <!-- 引入组件 -->
+    <!-- <import src="/component/group/group.wxml" /> -->
+    <!-- <import src="/component/hot/hot.wxml" /> -->
+    <!-- <import src="/component/follow/follow.wxml" /> -->
+    <import src="/component/my/my.wxml" />
+    <import src="/templates/courses/courses.wxml" />
+    <!-- 顶部导航 -->
+    <view class="top-tab" wx:if="{{!isGradeShow}}">
+        <!-- <view class="tabbar {{3 == myIndex ? 'select':' '}}" bindtap="jumpMy">
+            <text>我的</text>
+        </view> -->
+        <view class="tabbar {{3 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="3">
+            <text>我的</text>
+        </view>
+        <view class="tabbar {{0 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="0">
+            <text>推荐</text>
+        </view>
+        <view class="tabbar {{1 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="1">
+            <text>关注</text>
+        </view>
+        <view class="tabbar {{2 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="2">
+            <text>资源</text>
+        </view>
     </view>
-    <view class="tabbar {{1 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="1">
-      <text>关注</text>
+
+    <!-- <view hidden="{{gradeActivity === 'PRIMARY_SENIOR_GRADE' || gradeActivity === 'PRESCHOOL' || 0 != myIndex}}" class="activity-img" bindtap="goToActivity"> -->
+    <view hidden="{{0 != myIndex}}" class="activity-img" bindtap="goToActivity">
+        <image src="http://reader-wx.ai160.com/images/reader/activity/banner.jpg"></image>
     </view>
-    <view class="tabbar {{2 == myIndex ? 'select':' '}}" bindtap="switcher" data-index="2">
-      <text>资源</text>
-    </view>
-  </view>
-  
-  <!-- <view hidden="{{gradeActivity === 'PRIMARY_SENIOR_GRADE' || gradeActivity === 'PRESCHOOL' || 0 != myIndex}}" class="activity-img" bindtap="goToActivity"> -->
-  <view hidden="{{0 != myIndex}}" class="activity-img" bindtap="goToActivity">
-    <image src="http://reader-wx.ai160.com/images/reader/activity/banner.jpg"></image>
-  </view>
- 
-  <!-- <view hidden="{{(!isIos && isVip) || 0 != myIndex }}" class="activity-img" bindtap="bannerTap">
+
+    <!-- <view hidden="{{(!isIos && isVip) || 0 != myIndex }}" class="activity-img" bindtap="bannerTap">
     <image src="http://reader-wx.ai160.com/images/reader/pay/{{isIos ? 'ios_banner' : 'android_banner'}}.jpg"></image>
   </view>-->
-  <view wx:if="{{isIos ||  isVip}}" class="activity-buy" bindtap="myPlase">
-    <image src="http://reader-wx.ai160.com/images/reader/pay/vip_icon.png"></image>
-  </view> 
-  <!-- 调用组件 -->
-  <template is="{{templates}}" wx:if="{{myIndex === 3 || myIndex === 2}}" data="{{myData: myData,coursesData:coursesData,noMoreWork:noMoreWork}}"></template>
-  <VideoSwiper wx:if="{{videoList.length > 0}}" class="video-swiper" video-list="{{videoList}}" nextMargin="{{nextMargin}}" isSwiper="{{isSwiper}}" noMoreWork="{{noMoreWork}}" ifHeadTap="{{true}}" bindopenShare="openShare" bindopenComment="openComment" bindheadTap="headTapHandler" bindgoToReading="goToReading" bindcollectTap="collectTap" bindlikeTap="likeTap" binddelHideMyWork="delHideMyWork" bindaddShareAmount="addShareAmount" bindchange="videoChange">
-    <!-- bindplay="onPlay"
+    <view wx:if="{{isIos ||  isVip}}" class="activity-buy" bindtap="myPlase">
+        <image src="http://reader-wx.ai160.com/images/reader/pay/vip_icon.png"></image>
+    </view>
+    <!-- 调用组件 -->
+    <template is="{{templates}}" wx:if="{{myIndex === 3 || myIndex === 2}}" data="{{myData: myData,coursesData:coursesData,noMoreWork:noMoreWork}}"></template>
+    <VideoSwiper wx:if="{{videoList.length > 0}}" class="video-swiper" video-list="{{videoList}}" nextMargin="{{nextMargin}}" isSwiper="{{isSwiper}}" noMoreWork="{{noMoreWork}}" ifHeadTap="{{true}}" bindopenShare="openShare" bindopenComment="openComment" bindheadTap="headTapHandler" bindgoToReading="goToReading" bindcollectTap="collectTap" bindlikeTap="likeTap" binddelHideMyWork="delHideMyWork" bindaddShareAmount="addShareAmount" bindchange="videoChange">
+        <!-- bindplay="onPlay"
   bindpause="onPause"
   bindtimeupdate="onTimeUpdate"
   bindended="onEnded"
@@ -68,37 +66,37 @@
   bindwaiting="onWaiting"
   bindprogress="onProgress"
   bindloadedmetadata="onLoadedMetaData" -->
-  </VideoSwiper>
-  <view class="comment_section" catchtouchmove="touchMove" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
-    <Comment data-type="list" commentId="{{commentId}}" commentNum="{{commentNum}}" inputValue="{{inputValue}}" bindsendReply="sendReply" />
-  </view>
-  <view class="no_follow" wx:if="{{myIndex === 1 && videoList.length <= 0 && noFollow}}">
-    <image class="no_follow_icon" src="../../static/index/no_follow.png" />
-    <text>赶快去关注优秀作者吧,</text>
-    <text>这里将会发生欣喜的变化。</text>
-  </view>
+    </VideoSwiper>
+    <view class="comment_section" catchtouchmove="touchMove" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
+        <Comment data-type="list" commentId="{{commentId}}" commentNum="{{commentNum}}" inputValue="{{inputValue}}" bindsendReply="sendReply" />
+    </view>
+    <view class="no_follow" wx:if="{{myIndex === 1 && videoList.length <= 0 && noFollow}}">
+        <image class="no_follow_icon" src="../../static/index/no_follow.png" />
+        <text>赶快去关注优秀作者吧,</text>
+        <text>这里将会发生欣喜的变化。</text>
+    </view>
 </view>
 <!--弹窗-->
 <view class="help-pay" hidden="{{helpPayHide}}">
-  <view class="help-pay-main" style="{{tipsType === 'tips' && 'top: 35%'}}">
-    <view wx:if="{{ tipsType === 'helpPay'}}" bindtap="payAndHelp">
-        <view class="pay-price" wx:if="{{payPrice}}">{{payPrice}}<text>元</text></view>
-        <image  class="help-pay-icon" src="{{helpPayImg}}"></image>
+    <view class="help-pay-main" style="{{tipsType === 'tips' && 'top: 35%'}}">
+        <view wx:if="{{ tipsType === 'helpPay'}}" bindtap="payAndHelp">
+            <view class="pay-price" wx:if="{{payPrice}}">{{payPrice}}<text>元</text></view>
+            <image class="help-pay-icon" src="{{helpPayImg}}"></image>
+        </view>
+        <image wx:else class="tips-icon" src="{{tipsImg}}" bindtap="tips"></image>
+        <image class="help-close" bindtap="helpPayHideEvent" src="../../static/image/close.png"></image>
     </view>
-    <image wx:else class="tips-icon" src="{{tipsImg}}" bindtap="tips"></image>
-    <image class="help-close" bindtap="helpPayHideEvent" src="../../static/image/close.png"></image>
-  </view>
 </view>
 <!-- <MyToast /> -->
 <view hidden="{{hide}}">
-  <Dialog bindmyevent="jurisdiction" />
+    <Dialog bindmyevent="jurisdiction" />
 </view>
 <!-- <view class="upgrade" hidden="{{gradeActivity === 'PRIMARY_SENIOR_GRADE' || gradeActivity === 'PRESCHOOL' || upgradeHide}}"> -->
-<view class="upgrade" hidden="{{upgradeHide}}"  bindtap="hideUpgrade">
-  <view class="upgrade-main">
-    <image class="upgrade-icon" src="http://reader-wx.ai160.com/images/reader/activity/activity_dialog.png" catchtap="goToActivity"></image>
-    <image class="close" catchtap="hideUpgrade" src="../../static/image/close.png"></image>
-  </view>
+<view class="upgrade" hidden="{{upgradeHide}}" bindtap="hideUpgrade">
+    <view class="upgrade-main">
+        <image class="upgrade-icon" src="http://reader-wx.ai160.com/images/reader/activity/activity_dialog.png" catchtap="goToActivity"></image>
+        <image class="close" catchtap="hideUpgrade" src="../../static/image/close.png"></image>
+    </view>
 </view>
 <shareDialog id="share-dialog" shareType='works' bindaddShareAmount="addShareAmount" bindShareDialogClose="shareDialogClose" shareId="{{id}}" />
 <canvas canvas-id="myCanvas" style="width:300px; height: 525px; position: absolute; left: -999rpx; top: -9999rpx;"></canvas>
@@ -114,4 +112,4 @@
     <view class="index-dialog-text">还有<text class="red-text">{{unfinishedCount}}</text>个小红花任务哦</view>
     <view class="index-dialog-btn" >查看任务</view>
   </view>
-</view> -->
+</view> -->

+ 30 - 0
pages/my/index.js

@@ -0,0 +1,30 @@
+import {
+    getUserInfo
+} from '~/api/user'
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        userInfo: {}
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    async onLoad(options) {
+        let userInfo = await getUserInfo()
+        console.log(userInfo);
+        this.setData({
+            userInfo
+        })
+    },
+    switcher({
+        currentTarget
+    }) {
+        wx.reLaunch({
+            url: `/pages/index/index?tabbarIndx=${currentTarget.dataset.index}`
+        });
+    }
+})

+ 3 - 0
pages/my/index.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

+ 96 - 0
pages/my/index.less

@@ -0,0 +1,96 @@
+.container {
+    padding: 30rpx;
+
+    .top-tab {
+        position: fixed;
+        top: 0;
+        left: 0rpx;
+        width: 100%;
+        height: 80rpx;
+        background: #ededed;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        z-index: 999;
+        padding: 0 48rpx;
+
+        .tabbar {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 100rpx;
+            height: 58rpx;
+            line-height: 60rpx;
+            font-size: 40rpx;
+            opacity: 0.7;
+            font-weight: 800;
+            border-bottom: none;
+            color: #333;
+        }
+
+        .select {
+            color: #333;
+            font-size: 40rpx;
+            border-bottom: 6rpx solid #14c962;
+            opacity: 1;
+        }
+
+    }
+
+    .userBox {
+        margin-top: 85rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background-color: white;
+        padding: 30rpx 12rpx;
+        border-radius: 20rpx;
+
+        .avatar {
+            width: 152rpx;
+            height: 152rpx;
+            border-radius: 50%;
+            position: relative;
+        }
+
+        .userRight {
+            flex: 1;
+            margin-left: 40rpx;
+
+            .uRtop {
+                display: flex;
+                justify-content: space-between;
+
+                .uRtopleft {
+                    .nickName {
+                        color: #333;
+                        font-size: 30rpx;
+                    }
+
+                    .gradeText {
+                        margin: 14rpx 0rpx 8rpx;
+                        font-size: 23rpx;
+                        color: #989A9C;
+                    }
+                }
+
+                .uRtopRight {
+                    display: flex;
+                    align-items: center;
+
+                    .edit {
+                        width: 25rpx;
+                        height: 25rpx;
+                    }
+
+                    text {
+                        margin: 0px 10rpx;
+                        font-size: 24rpx;
+                        color: #666;
+                    }
+                }
+            }
+        }
+    }
+}

+ 34 - 0
pages/my/index.wxml

@@ -0,0 +1,34 @@
+<view class="container">
+    <view class="top-tab">
+        <view class="tabbar select">
+            <text>我的</text>
+        </view>
+        <view class="tabbar" bindtap="switcher" data-index="0">
+            <text>推荐</text>
+        </view>
+        <view class="tabbar" bindtap="switcher" data-index="1">
+            <text>关注</text>
+        </view>
+        <view class="tabbar" bindtap="switcher" data-index="2">
+            <text>资源</text>
+        </view>
+    </view>
+    <view class="userBox">
+        <image class='avatar' src='{{ userInfo.user.avatar  }}'></image>
+        <view class="userRight">
+            <view class="uRtop">
+                <view class="uRtopleft">
+                    <view class="nickName">昵称:喔喔奶糖</view>
+                    <view class="gradeText">年级:三年级</view>
+                </view>
+                <view class="uRtopRight">
+                    <image src="/static/image/edit_new.png" class="edit" />
+                    <text>编辑</text>
+                </view>
+            </view>
+            <view class="uRBtm">
+
+            </view>
+        </view>
+    </view>
+</view>

+ 81 - 0
pages/my/index.wxss

@@ -0,0 +1,81 @@
+.container {
+  padding: 30rpx;
+}
+.container .top-tab {
+  position: fixed;
+  top: 0;
+  left: 0rpx;
+  width: 100%;
+  height: 80rpx;
+  background: #ededed;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  z-index: 999;
+  padding: 0 48rpx;
+}
+.container .top-tab .tabbar {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100rpx;
+  height: 58rpx;
+  line-height: 60rpx;
+  font-size: 40rpx;
+  opacity: 0.7;
+  font-weight: 800;
+  border-bottom: none;
+  color: #333;
+}
+.container .top-tab .select {
+  color: #333;
+  font-size: 40rpx;
+  border-bottom: 6rpx solid #14c962;
+  opacity: 1;
+}
+.container .userBox {
+  margin-top: 85rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: white;
+  padding: 30rpx 12rpx;
+  border-radius: 20rpx;
+}
+.container .userBox .avatar {
+  width: 152rpx;
+  height: 152rpx;
+  border-radius: 50%;
+  position: relative;
+}
+.container .userBox .userRight {
+  flex: 1;
+  margin-left: 40rpx;
+}
+.container .userBox .userRight .uRtop {
+  display: flex;
+  justify-content: space-between;
+}
+.container .userBox .userRight .uRtop .uRtopleft .nickName {
+  color: #333;
+  font-size: 30rpx;
+}
+.container .userBox .userRight .uRtop .uRtopleft .gradeText {
+  margin: 14rpx 0rpx 8rpx;
+  font-size: 23rpx;
+  color: #989A9C;
+}
+.container .userBox .userRight .uRtop .uRtopRight {
+  display: flex;
+  align-items: center;
+}
+.container .userBox .userRight .uRtop .uRtopRight .edit {
+  width: 25rpx;
+  height: 25rpx;
+}
+.container .userBox .userRight .uRtop .uRtopRight text {
+  margin: 0px 10rpx;
+  font-size: 24rpx;
+  color: #666;
+}

+ 2 - 1
project.private.config.json

@@ -67,5 +67,6 @@
             ]
         }
     },
-    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "libVersion": "2.27.3"
 }

+ 5 - 21
utils/httpUtilNoLogin.js

@@ -12,14 +12,8 @@ function genAPIUrl(action) {
 
 // 登录
 function wxLogin(successcallback, failcallback) {
-    // wx.showToast({
-    //     title: '加载中...',
-    //     icon: 'loading',
-    //     duration: 1500,
-    //     mask: true
-    // })
     wx.login({
-        success: function (res) {
+        success: function(res) {
             if (res.code) {
                 // 获取openid
                 console.log('登录登录登录登录code', res.code)
@@ -38,17 +32,8 @@ function wxLogin(successcallback, failcallback) {
 // 获取原来的 openid 和 session_key
 /* 新增参数grade 需要给游客添加grade参数 */
 function getOpenidNoLogin(successcallback, failcallback, grade) {
-    // if (wx.getStorageSync('user')) {
-    //     successcallback(
-    //         wx.getStorageSync('user'),
-    //         //分享小程序按钮
-    //         wx.showShareMenu({
-    //             withShareTicket: true
-    //         })
-    //     );
-    //     return;
-    // }
-    wxLogin(function (res) {
+
+    wxLogin(function(res) {
         console.log('wx.login', res)
         if (res.data.code == 200) {
             let sessionKey = res.data.data.session_key;
@@ -71,13 +56,12 @@ function getOpenidNoLogin(successcallback, failcallback, grade) {
             }).fail(() => {});
         }
 
-    }, function (res) {
+    }, function(res) {
         failcallback(res);
     })
 }
 
 
-
 module.exports = {
     getOpenidNoLogin
-}
+}

+ 47 - 0
utils/request.js

@@ -0,0 +1,47 @@
+let baseUrl = 'https://reader-api.ai160.com/wx'
+
+
+function request(url, method, data, abort = false) {
+    let header = {
+        'uid': wx.getStorageSync('uid') || ''
+    }
+    if (getApp() && getApp().globalData.requestTasks) {
+        try {
+            //getApp() 获取全局app对象内容
+            getApp().globalData.requestTasks.abort()
+        } catch (e) {
+            console.error(e)
+        }
+    }
+    return new Promise((reslove, reject) => {
+        wx.request({
+            url: baseUrl + url,
+            method: method,
+            data: data,
+            header: header,
+            success: (result) => {
+                let {
+                    data: {
+                        code,
+                        data = {},
+                        message
+                    }
+                } = result
+                if (code == '200') {
+                    reslove(data)
+                } else if (code == '1102' || code == '1204') {
+                    wx.clearStorage()
+                } else {
+                    reject(data)
+                }
+            },
+            fail: (res) => {
+                console.error(res)
+                reject(res)
+            },
+        })
+    })
+}
+module.exports = {
+    request,
+}