소스 검색

线上测试修改

lrf 1 년 전
부모
커밋
fed1b2a036
7개의 변경된 파일37개의 추가작업 그리고 33개의 파일을 삭제
  1. 25 24
      app.js
  2. 1 1
      commpents/newsList/index.js
  3. 1 1
      commpents/newsList/index.wxml
  4. 1 2
      pages/news/detail.js
  5. 3 2
      pages/news/index.js
  6. 1 1
      utils/httpUtil.js
  7. 5 2
      utils/login.js

+ 25 - 24
app.js

@@ -6,39 +6,39 @@ import * as httpUtil from "./utils/httpUtil";
 App({
   onLaunch() {
     // 展示本地存储能力
-    const logs = wx.getStorageSync('logs') || []
-    logs.unshift(Date.now())
-    wx.setStorageSync('logs', logs)
+    const logs = wx.getStorageSync('logs') || [];
+    logs.unshift(Date.now());
+    wx.setStorageSync('logs', logs);
     wx.login({
-      success: res => {
-        const app = getApp()
-        const { code: js_code } = res
+      success: (res) => {
+        const app = getApp();
+        const { code: js_code } = res;
         // 发送 res.code 到后台换取 openId, sessionKey, unionId
         wx.request({
           url: `${app.globalData.publicUrl}/st/api/weixin/appAuth?js_code=` + js_code,
-          method: "get",
-          success: res => {
-            const { errcode, data } = res.data
+          method: 'get',
+          success: (res) => {
+            const { errcode, data } = res.data;
             if (errcode === 0) {
               app.globalData.wxInfo = data;
             }
           },
-          error: err => {
+          error: (err) => {
             wx.showToast({
               title: err.msg,
-              icon: 'error'
-            })
-          }
-        })
-      }
-    })
+              icon: 'error',
+            });
+          },
+        });
+      },
+    });
     //获取设备顶部窗口的高度(不同设备窗口高度不一样,根据这个来设置自定义导航栏的高度
     wx.getSystemInfo({
       success: (res) => {
-        this.globalData.height = res.statusBarHeight
-        this.globalData.windowHeight = res.windowHeight
-      }
-    })
+        this.globalData.height = res.statusBarHeight;
+        this.globalData.windowHeight = res.windowHeight;
+      },
+    });
   },
   globalData: {
     // 微信用户基本信息
@@ -50,14 +50,15 @@ App({
     // 手机页面高度
     windowHeight: 0,
     // 请求接口
-    publicUrl: 'http://192.168.1.197:9902',
+    // publicUrl: 'http://192.168.1.197:9901',
+    publicUrl: 'https://broadcast.waityou24.cn',
     // publicUrl: 'https://www.waityou24.cn',
     // 图片请求接口
-    fileUrl: "http://broadcast.waityou24.cn",
+    fileUrl: 'https://broadcast.waityou24.cn',
   },
   // 微信openid回调
   toLogin: login.toLogin,
-  ...httpUtil
-})
+  ...httpUtil,
+});
 
 

+ 1 - 1
commpents/newsList/index.js

@@ -19,7 +19,7 @@ Component({
    */
   methods: {
     detail: function (e) {
-      this.triggerEvent('detail', { id: e.currentTarget.dataset.id })
+      this.triggerEvent('detail', { id: e.currentTarget.dataset.id });
     }
   }
 })

+ 1 - 1
commpents/newsList/index.wxml

@@ -1,5 +1,5 @@
 <view class="main">
-  <view class="list" wx:key="item" wx:for="{{list}}" bindtap="detail" data-id="{{item.id}}">
+  <view class="list" wx:key="item" wx:for="{{list}}" bindtap="detail" data-id="{{item._id}}">
     <view class="left">
       <view class="title">
         {{item.title}}

+ 1 - 2
pages/news/detail.js

@@ -24,9 +24,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: async function (options) {
-    console.log(options.id);
     const res = await app.$get(`/news/${options.id}`);
-    var result = res.data.data;
+    var result = res.data;
     result.content = formatRichText(result.content);
     this.setData({ detailInfo: result });
     // wx.request({

+ 3 - 2
pages/news/index.js

@@ -32,6 +32,7 @@ Page({
     }
   },
   detail: function (data) {
+    console.log(data)
     wx.navigateTo({
       url: `/pages/news/detail?id=${data.detail.id}`,
     });
@@ -42,10 +43,10 @@ Page({
   onLoad: async function (options) {
     this.searchST();
     const res = await app.$get('/news', { type: '国内新闻' });
-    let data = this.dealImg(res.data.data);
+    let data = this.dealImg(res.data);
     this.setData({ oneList: data });
     const res2 = await app.$get('/news', { type: '健康资讯' });
-    let data2 = this.dealImg(res2.data.data);
+    let data2 = this.dealImg(res2.data);
     this.setData({ twoList: data2 });
   },
   dealImg(list) {

+ 1 - 1
utils/httpUtil.js

@@ -1,4 +1,4 @@
-let baseUrl = 'http://192.168.1.197:9902/st/api';
+let baseUrl = 'https://broadcast.waityou24.cn/st/api';
 const $get = (uri, data) => {
     return new Promise((resolve, reject) => {
         wx.request({

+ 5 - 2
utils/login.js

@@ -1,12 +1,14 @@
 module.exports = {
   toLogin() {
     return new Promise((resolve, reject) => {
+      console.log('line 4 in function:');
       // 登录
       wx.login({
         success: res => {
           const app = getApp()
           const { code: js_code } = res
           // 发送 res.code 到后台换取 openId, sessionKey, unionId
+          console.log(`${app.globalData.publicUrl}/st/api/weixin/appAuth?js_code=` + js_code);
           wx.request({
             url: `${app.globalData.publicUrl}/st/api/weixin/appAuth?js_code=` + js_code,
             method: "get",
@@ -18,10 +20,11 @@ module.exports = {
               }
             },
             error: err => {
+              console.log(err);
               wx.showToast({
                 title: err.msg,
-                icon: 'error'
-              })
+                icon: 'error',
+              });
               reject('error');
             }
           })