From 3ee7719b1c5297b5f2e4a2c2a0295c7fd2b4e920 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 2 Mar 2021 14:33:37 +0800
Subject: [PATCH] no message
---
app.json | 1 +
pages/agent/ability/index.js | 14 +------
pages/agent/ability/index.json | 4 +-
pages/agent/ability/index.wxml | 6 +--
pages/agent/ability/index.wxss | 64 +----------------------------
pages/agent/focus-fragment/index.js | 10 +++--
pages/agent/index/index.js | 3 +-
7 files changed, 14 insertions(+), 88 deletions(-)
diff --git a/app.json b/app.json
index 86e8229..c17d264 100644
--- a/app.json
+++ b/app.json
@@ -51,6 +51,7 @@
"pages/morder/detail/index",
"pages/order/detail/index",
"pages/agent/index/index",
+ "pages/agent/ability/index",
"pages/agent/factory/index",
"pages/agent/edit/index",
"pages/agent/order/index",
diff --git a/pages/agent/ability/index.js b/pages/agent/ability/index.js
index d115f79..5420ec7 100644
--- a/pages/agent/ability/index.js
+++ b/pages/agent/ability/index.js
@@ -76,20 +76,10 @@ Page({
})
}
} else {
- this.setData({
- finished: true,
- requesting: false,
- loading: false,
- pageNum: 1
- })
+ this.setData({ requesting: false, finished: true, loading: false })
}
}).catch(err => {
- //异常回调
- this.setData({
- requesting: false,
- finished: true,
- loading: false,
- })
+ this.setData({ requesting: false, finished: true, loading: false })
})
}
diff --git a/pages/agent/ability/index.json b/pages/agent/ability/index.json
index 0faa308..841a51d 100644
--- a/pages/agent/ability/index.json
+++ b/pages/agent/ability/index.json
@@ -5,10 +5,8 @@
"wux-skeleton-paragraph": "/components/skeleton-paragraph/index",
"wux-button": "/components/button/index",
"refresh-view": "/components/refresher/index",
- "wux-tabi": "/components/tabi/index",
"wux-image": "/components/image/index",
"wux-divider": "/components/divider/index",
- "agent-item": "/pages/agent/agent-item/index",
- "wux-dialog": "/components/dialog/index"
+ "agent-item": "/pages/agent/agent-item/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/ability/index.wxml b/pages/agent/ability/index.wxml
index 063cf62..f559ab8 100644
--- a/pages/agent/ability/index.wxml
+++ b/pages/agent/ability/index.wxml
@@ -14,7 +14,7 @@
-
+
@@ -27,6 +27,4 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/agent/ability/index.wxss b/pages/agent/ability/index.wxss
index 3b89291..14f8cb0 100644
--- a/pages/agent/ability/index.wxss
+++ b/pages/agent/ability/index.wxss
@@ -1,63 +1 @@
-/* pages/agent/index/index.wxss */
-.bj{
- height: 1300rpx;
- background-color: white;
-}
-.bgImgView {
- width: 100%;
- height: 548rpx;
- padding: 160rpx 186rpx 94rpx 186rpx;
- background-color: white;
-}
-
-.imgsj {
- height: 294rpx;
- width: 378rpx;
-}
-
-.midText {
- width: 100%;
- height: 67rpx;
- padding: 0rpx 279rpx 0rpx 279rpx;
-}
-
-.midText2 {
- font-size: 48rpx;
- color: #000000;
- letter-spacing: 0;
- text-align: left;
-}
-
-.midText3 {
- width: 100%;
- height: 45px;
- padding: 0rpx 199rpx 0rpx 199rpx;
- margin-top: 12rpx;
-}
-
-.midText4 {
- font-size: 32rpx;
- color: rgba(0, 0, 0, 0.75);
- letter-spacing: 0;
- text-align: left;
-}
-.bg-blue{
- color: #FFFFFF;
- background-color: #008AFF;
-}
-
-.offer-btn {
- width: 480rpx;
- height: 88rpx;
- background: linear-gradient(312deg, rgba(38, 125, 214, 1) 0%, rgba(0, 138, 255, 1) 100%);
- box-shadow: 0px 10px 13px -8px rgba(35, 126, 217, 0.53);
- border-radius: 10rpx;
- color: white;
- font-size: 32rpx;
- margin-left: 32rpx;
-}
-.bottomBtn{
- width: 100%;
- height: 88rpx;
- padding:0rpx 135rpx 0rpx 135rpx;
-}
\ No newline at end of file
+/* pages/agent/index/index.wxss */
\ No newline at end of file
diff --git a/pages/agent/focus-fragment/index.js b/pages/agent/focus-fragment/index.js
index f95105f..2b0eb8a 100644
--- a/pages/agent/focus-fragment/index.js
+++ b/pages/agent/focus-fragment/index.js
@@ -1,3 +1,4 @@
+import util from "../../../utils/util"
// pages/agent/index/index.js
import { getFactoryPrice, getBaseInfo, updateUserInfo } from "../../api/ztb"
const event = require('../../../utils/event')
@@ -51,6 +52,9 @@ Component({
}
},
onRestart: function () {
+ if(!app.globalData.userInfo){
+ return
+ }
getBaseInfo().then(result => {
if (result.data.isSetProxyTag == false) {
updateUserInfo({ isSetProxyTag: true }).then(result => {})
@@ -65,9 +69,7 @@ Component({
text: '确定',
type: 'primary',
onTap(e) {
- wx.navigateTo({
- url: '/pages/home/attentionPaperList/index'
- })
+ util.navigateTo('/pages/home/attentionPaperList/index')
}
}]
})
@@ -134,7 +136,7 @@ Component({
})
},
goattentionIndex: function () {
- wx.navigateTo({ url: '/pages/home/attentionPaperList/index' })
+ util.navigateTo('/pages/home/attentionPaperList/index')
}
}
diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js
index 9c29366..0e87f4d 100644
--- a/pages/agent/index/index.js
+++ b/pages/agent/index/index.js
@@ -6,7 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
- height: app.globalData.fragmentHeight - 90,
+ height: app.globalData.fragmentHeight,
CustomBar: app.globalData.CustomBar,
TabList: [
{ index: 0, value: 'focus', name: '关注' },
@@ -20,7 +20,6 @@ Page({
onLoad: function (options) {
this.setData({
height: app.globalData.fragmentHeight,
- kg: app.globalData.kg,
StatusBar: app.globalData.StatusBar || 40,
CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
})