From a4c501780fb7c2179e7842cffda65756947ba951 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 19 五月 2023 09:38:50 +0800
Subject: [PATCH] no message
---
uniapp/pages/login/login.vue | 42 ++++
uniapp/pages.json | 8
uniapp/static/images/tabBar/fqbico_in.png | 0
uniapp/manifest.json | 4
uniapp/static/images/tabBar/talentSay.png | 0
uniapp/pages/login/bindingPhone.vue | 32 +++
uniapp/pages/rankinglist/fengqiang.vue | 14 +
uniapp/static/images/tabBar/fqbico_un.png | 0
uniapp/App.vue | 35 +++
uniapp/pages/mine/mine.vue | 39 ++++
uniapp/utils/utils.js | 1
uniapp/pages/login/wxlogin.vue | 41 +++-
uniapp/pages/mine/mt.vue | 18 +-
uniapp/pages/active/tmsearch.vue | 12
uniapp/pages/index/index.vue | 20 ++
uniapp/static/images/tabBar/find.png | 0
uniapp/pages/login/setInviteCode.vue | 244 +++++++++++++++++++++++++++
17 files changed, 458 insertions(+), 52 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index 0f3d6de..360af37 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -171,13 +171,41 @@
...mapMutations(['login']),
getAppInfo: function() {
var that = this;
+ // #ifdef APP-PLUS
+ if (plus.os.name == 'iOS') {
+ if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+ that.globalData.ifwt = 0
+ } else {
+ if (plus.runtime.isApplicationExist({
+ action: 'weixin://'
+ }) && plus.runtime.isApplicationExist({
+ action: 'taobao://'
+ })) {
+ that.globalData.ifwt = 1 //鏄惁瀹夎寰俊鍜屾窐瀹� 1浠ｈ〃瀹夎
+ } else {
+ that.globalData.ifwt = 0
+ }
+ }
+ } else {
+ if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
+ action: 'weixin://'
+ })) {
+ console.log("瀹夊崜绔凡瀹夎寰俊")
+ that.globalData.ifwt = 1 //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
+ } else {
+ console.log("瀹夊崜绔湭瀹夎寰俊")
+ that.globalData.ifwt = 0
+ }
+ }
+ // #endif
+
this.$u.api.comminInt({}).then(e => {
if (e.code != 0) return that.$alert(e.msg)
that.globalData.appinfo = e.data.basic
utils.setCache('appInfo', e.data.basic)
utils.setCache('baseUrl', this.$u.http.config.baseUrl)
// #ifdef APP-PLUS
- if (plus.os.name == 'iOS') {
+ /* if (plus.os.name == 'iOS') {
if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
that.globalData.ifwt = 0
} else {
@@ -195,15 +223,16 @@
if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
action: 'weixin://'
})) {
+ console.log("瀹夊崜绔凡瀹夎寰俊")
that.globalData.ifwt = 1 //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
} else {
console.log("瀹夊崜绔湭瀹夎寰俊")
that.globalData.ifwt = 0
}
- }
+ } */
// #endif
}).catch(function(err) {})
-
+
},
},
}
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 7c67119..cfca45d 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
"name" : "澶ц繑瀹�",
"appid" : "__UNI__FC8858A",
"description" : "澶ц繑瀹榓pp",
- "versionName" : "1.0.7",
- "versionCode" : 107,
+ "versionName" : "1.1.0",
+ "versionCode" : 110,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/uniapp/pages.json b/uniapp/pages.json
index bf53169..47e9af8 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -753,6 +753,10 @@
{
"path": "pages/login/wxlogin"
},
+ //濉啓閭�璇风爜
+ {
+ "path": "pages/login/setInviteCode"
+ },
{
"path": "pages/mine/seckill",
"style": {
@@ -858,8 +862,8 @@
},
{
"pagePath": "pages/rankinglist/fengqiang",
- "iconPath": "static/images/tabBar/classify.png",
- "selectedIconPath": "static/images/tabBar/classifyActive.png",
+ "iconPath": "static/images/tabBar/fqbico_un.png",
+ "selectedIconPath": "static/images/tabBar/fqbico_in.png",
"text": "鐤姠姒�"
},
{
diff --git a/uniapp/pages/active/tmsearch.vue b/uniapp/pages/active/tmsearch.vue
index 2de88e6..033b1a6 100644
--- a/uniapp/pages/active/tmsearch.vue
+++ b/uniapp/pages/active/tmsearch.vue
@@ -8,7 +8,7 @@

</view>
<view class="titleBox rowCen" :style="'color:'+ (scrollTop<fiexdtop?'#DD2425;':'#ffffff;')">
- 澶╃尗
+
</view>
<view class="rightEmpty">
</view>
@@ -18,11 +18,11 @@
<view class="search-region colCen">
<view class="pageTitle-bar rowCenCen">
<view class="leftIcon defIcon">
- <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/tmlogo.png" mode="aspectFill"></image>
+ <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/tblogo.jpeg" mode="aspectFill"></image>
</view>
<view class="titleInfo colSta">
<view class="topfont">
- 澶╃尗浼樻儬鍒稿ぇ鏀鹃��
+ 娣樺疂浼樻儬鍒稿ぇ鏀鹃��
</view>
<view class="bottomfont">
鍏堥鍒� 鍐嶈喘鐗� 鐪佸崈鍏�
@@ -202,7 +202,7 @@
top: 0;
left: 0;
z-index: 110;
- background: linear-gradient(266deg, #E7251C, #E7251C);
+ background: linear-gradient(266deg, #F97B24, #F97B24);
.headerBar-container {
width: 100%;
@@ -235,7 +235,7 @@
width: 100%;
height: 340rpx;
padding: 0 75rpx;
- background: linear-gradient(266deg, #E7251C, #E7251C);
+ background: linear-gradient(266deg, #F97B24, #F97B24);
.pageTitle-bar {
width: 100%;
@@ -291,7 +291,7 @@
.right-btn {
width: 116rpx;
height: 60rpx;
- background: linear-gradient(266deg, #FF012E, #FF1017);
+ background: linear-gradient(266deg, #F97B24, #F97B24);
border-radius: 30rpx;
font-size: 24rpx;
font-weight: 500;
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index e67397e..667f00d 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -122,8 +122,24 @@
}
},
onLoad() {
- this.getCategoryList();
- this.getPopBannerInfo()
+ if(!this.hasLogin){
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ }
+ var user= uni.getStorageSync('userInfo');
+ if(!user.invitation_code)
+ {
+ uni.reLaunch({
+ //url:"/pages/login/setInviteCode"
+ url:"/pages/login/wxlogin"
+ })
+ }
+ else
+ {
+ this.getCategoryList();
+ this.getPopBannerInfo();
+ }
},
onShow() {
if(this.categoryList){
diff --git a/uniapp/pages/login/bindingPhone.vue b/uniapp/pages/login/bindingPhone.vue
index 2e4cf65..606ec64 100644
--- a/uniapp/pages/login/bindingPhone.vue
+++ b/uniapp/pages/login/bindingPhone.vue
@@ -103,6 +103,33 @@
})
}
},
+ targetToIndex(e)
+ {
+ var that = this;
+
+ that.login(e.data.userinfo);
+ utils.setCache('userInfo', e.data.userinfo)
+ getApp().globalData.userInfo = e.data.userinfo
+ that.$alert('鐧诲綍鎴愬姛')
+ setTimeout(function(){
+ console.log(e.data.userinfo)
+ if(!e.data.userinfo.invitation_code)
+ {
+ uni.redirectTo({
+ url: './setInviteCode'
+ })
+ }
+ else if (e.data.userinfo.isPwd == 'N') {
+ uni.redirectTo({
+ url: './setPass'
+ })
+ } else {
+ uni.switchTab({
+ url: '../index/index'
+ })
+ }
+ },1000)
+ },
bindMobile(){
var that = this;
if(!this.hasLogin && this.wxUser != ""){
@@ -113,7 +140,8 @@
}).then(e => {
console.log(e)
if (e.code != 0) return that.$alert(e.msg)
- that.login(e.data.userinfo);
+ this.targetToIndex(e);
+ /* that.login(e.data.userinfo);
that.$alert('鐧诲綍鎴愬姛')
setTimeout(function() {
if (e.data.userinfo.isPwd ==
@@ -126,7 +154,7 @@
url: '../index/index'
})
}
- }, 1000)
+ }, 1000) */
}).catch(function (err) {
console.log(err)
})
diff --git a/uniapp/pages/login/login.vue b/uniapp/pages/login/login.vue
index 50fdbff..09cb9e6 100644
--- a/uniapp/pages/login/login.vue
+++ b/uniapp/pages/login/login.vue
@@ -23,7 +23,6 @@
</view>
</view>
</view>
-
<view class="input-container colCen" v-else>
<view class="outSidebox rowCenBet" data-type='pass' :class="selectedInput=='code'?'outSidebox-active':''">
<input @focus="changeType" @blur="cleanActive" data-type='code' type="number" v-model="code" placeholder="璇疯緭鍏ラ獙璇佺爜"
@@ -105,6 +104,7 @@
if(this.isread){
if (this.ifPasslogin) {
+ //瀵嗙爜鐧诲綍
var param = {
account: this.phone,
password: this.pass,
@@ -112,23 +112,27 @@
}
this.$u.api.login(param).then(e => {
if(e.code != 0) return that.$alert(e.msg)
- that.login(e.data.userinfo);
+ this.targetToIndex(e);
+ /* that.login(e.data.userinfo);
that.$alert('鐧诲綍鎴愬姛')
setTimeout(function(){
uni.switchTab({
url: '../index/index'
});
- },1000)
+ },1000) */
}).catch(function (err) {
})
} else {
+ //楠岃瘉鐮佺櫥褰�
this.$u.api.mobileLogin({
mobile: this.phone,
captcha: this.code,
push_cid:this.clientid
}).then(e => {
- if(e.code != 0) return that.$alert(e.msg)
that.login(e.data.userinfo);
+ if(e.code != 0) return that.$alert(e.msg)
+ this.targetToIndex(e);
+ /* that.login(e.data.userinfo);
utils.setCache('userInfo', e.data.userinfo)
getApp().globalData.userInfo = e.data.userinfo
that.$alert('鐧诲綍鎴愬姛')
@@ -142,7 +146,7 @@
url: '../index/index'
})
}
- },1000)
+ },1000) */
}).catch(function (err) {
})
@@ -190,6 +194,34 @@
});
}
},
+
+ targetToIndex(e)
+ {
+ var that = this;
+
+ that.login(e.data.userinfo);
+ utils.setCache('userInfo', e.data.userinfo)
+ getApp().globalData.userInfo = e.data.userinfo
+ that.$alert('鐧诲綍鎴愬姛')
+ setTimeout(function(){
+ console.log(e.data.userinfo)
+ if(!e.data.userinfo.invitation_code)
+ {
+ uni.redirectTo({
+ url: './setInviteCode'
+ })
+ }
+ else if (e.data.userinfo.isPwd == 'N') {
+ uni.redirectTo({
+ url: './setPass'
+ })
+ } else {
+ uni.switchTab({
+ url: '../index/index'
+ })
+ }
+ },1000)
+ },
showPassfnc() {
this.showPass = !this.showPass
diff --git a/uniapp/pages/login/setInviteCode.vue b/uniapp/pages/login/setInviteCode.vue
new file mode 100644
index 0000000..7e9825d
--- /dev/null
+++ b/uniapp/pages/login/setInviteCode.vue
@@ -0,0 +1,244 @@
+<template style="background:#fff">
+ <view class="invite-code-container colCen borderBox">
+ <view class="model-title rowCenCen">
+ 璇疯緭鍏ラ個璇风爜
+ </view>
+ <view class="grey-input-content rowCen borderBox">
+ <input class="iptclas" type="text" v-model="inviteCode" placeholder="璇峰～鍐欓個璇风爜" placeholder-class="pla-input"/>
+ </view>
+ <view class="model-tips" v-if="appInfo.isOpenOfficialCode==1">
+ <view>濉啓閭�璇风爜鏈夊姪浜庢偍鐨勮喘鐗╄繑浣ｅ摝锛�</view>
+ </view>
+
+ <template v-if="isShowCode">
+ <view class="copy-bar rowCenBet borderBox" v-if="appInfo.isOpenOfficialCode==1">
+ <view class="left-code">
+ {{appInfo.officialInvitationCode}}
+ </view>
+ <view class="copybtn rowCenCen" @tap="useCode()">
+ <view>浣跨敤閭�璇风爜</view>
+ </view>
+ </view>
+ </template>
+ <view @click="setCode" class="login-btn rowCenCen" :class="inviteCode?'colorfulbtn':''" >
+ <view class="btn-font" >
+ 纭畾
+ </view>
+ </view>
+
+ <view class="yqmtip rowCenCen">
+ <span @click="showinvite">娌℃湁閭�璇风爜锛�</span>
+ </view>
+ <u-popup v-model="inviterShow" mode="center" border-radius="32" v-if="inviterShow" :mask-close-able='true'>
+ <inviter-model ref='invitermodel' @rewrite='rewriteCode' @setInvite='setCodebtn'></inviter-model>
+ </u-popup>
+
+ </view>
+</template>
+
+<script>
+ import inviterModel from '../../components/inviterModel.vue'
+ import util from '../../utils/utils.js'
+ export default {
+ components: {
+ inviterModel
+ },
+ data(){
+ return{
+ isShowCode:false,
+ inviteCode:'',
+ appInfo:'',
+ inviterShow:false
+ }
+ },
+ mounted() {
+ this.appInfo = uni.getStorageSync('appInfo')
+ },
+ methods: {
+ useCode()
+ {
+ this.inviteCode=this.appInfo.officialInvitationCode;
+ },
+ rewriteCode()
+ {
+ this.inviterShow=false;
+ },
+ setCodebtn(){
+ this.inviterShow=false;
+ this.getuserInfo()
+ },
+ showinvite() {
+ var that=this;
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: "鎮ㄥ彲鍚戞帹鑽愭偍浣跨敤澶ц繑瀹樼殑濂藉弸鑾峰彇閭�璇风爜~",
+ cancelText:'娌℃湁鎺ㄨ崘浜�',
+ confirmText:'鑱旂郴鎺ㄨ崘浜�',
+ success:function(res)
+ {
+ that.isShowCode=res.cancel;
+ console.log(that.isShowCode)
+ }
+ });
+ },
+ getuserInfo() {
+ var that = this;
+ this.$u.api.getUserInfo({}).then(e => {
+ console.log(e)
+ util.setCache('userInfo', e.data.userinfo);
+ if (e.data.userinfo.isPwd == 'N') {
+ uni.redirectTo({
+ url: './setPass'
+ })
+ } else {
+ uni.switchTab({
+ url: '../index/index'
+ })
+ }
+ }).catch(function (err) {
+ console.log(err)
+ })
+ },
+ setCode()
+ {
+ var that=this;
+ if(this.inviteCode)
+ {
+ this.$u.api.getInviteInfo({
+ invite_code:this.inviteCode
+ }).then(e => {
+ console.log(e)
+ if(e.code != 0) return that.$alert(e.msg)
+ uni.setStorageSync('inviterInfo',e.data)
+ this.inviterShow = true
+ }).catch(function (err) {
+ })
+ }
+ }
+
+ }
+ }
+</script>
+
+<style lang="scss">
+ body
+ {
+ background: #fff;
+ }
+
+ .yqmtip
+ {
+ width: 100%;
+ position: fixed;
+ bottom: 100rpx;
+ bottom: calc(100rpx + constant(safe-area-inset-bottom));
+ bottom: env(100rpx + constant(safe-area-inset-bottom));
+ left: 0;
+ z-index: 1;
+ color: #999999;
+ }
+ .login-btn {
+ width: 100%;
+ height: 86rpx;
+ background: #E2E2E2;
+ border-radius: 43rpx;
+ margin-top: 80rpx;
+ pointer-events: none;
+
+ .btn-font {
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ }
+ .colorfulbtn {
+ background: #FD002F;
+ pointer-events: auto;
+ }
+ .invite-code-container{
+ background: #FFFFFF;
+ padding: 0 46rpx;
+ .model-title{
+ width: 100%;
+ height: 135rpx;
+ font-size: 54rpx;
+ font-weight: 500;
+ color: #333333;
+ margin-top: 250rpx;
+ }
+ .grey-input-content{
+ width: 100%;
+ height: 90rpx;
+ background: #F8F8F8;
+ border-radius: 45rpx;
+ padding: 0 21rpx;
+ margin-bottom: 35rpx;
+ .iptclas{
+ flex: 1;
+ }
+ .pla-input{
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #999999;
+ }
+ }
+
+ .btn-bar{
+ width: 100%;
+ margin-bottom: 50rpx;
+ .close-btn{
+ width: 263rpx;
+ height: 90rpx;
+ background: #F7F7F7;
+ border: 1rpx solid #CBCBC9;
+ border-radius: 45rpx;
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #999999;
+ }
+ .next-btn{
+ width: 263rpx;
+ height: 90rpx;
+ background: #CBCBC9;
+ border-radius: 45rpx;
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ .pinkbtn{
+ background-color: #FD002F;
+ }
+ }
+
+ .model-tips{
+ width: 100%;
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #999999;
+ margin-bottom: 25rpx;
+ }
+
+ .copy-bar{
+ width: 100%;
+ height: 72rpx;
+ background: #F8F8F8;
+ border-radius: 12rpx;
+ margin-bottom: 30rpx;
+ padding: 0 20rpx;
+ .left-code{
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #FF002C;
+ }
+ .copybtn{
+ width: 158rpx;
+ height: 54rpx;
+ background: #FFFFFF;
+ border-radius: 12rpx;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #333333;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index f91d1e3..3eaa859 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -62,6 +62,32 @@
})
}
},
+ targetToIndex(e)
+ {
+ var that = this;
+
+ that.login(e.data.userinfo);
+
+ that.$alert('鐧诲綍鎴愬姛')
+ setTimeout(function(){
+ console.log(e.data.userinfo)
+ if(!e.data.userinfo.invitation_code)
+ {
+ uni.redirectTo({
+ url: './setInviteCode'
+ })
+ }
+ else if (e.data.userinfo.isPwd == 'N') {
+ uni.redirectTo({
+ url: './setPass'
+ })
+ } else {
+ uni.switchTab({
+ url: '../index/index'
+ })
+ }
+ },1000)
+ },
wxlogin() {
var that = this;
if (this.isread) {
@@ -80,20 +106,7 @@
if (e.code != 0) return that.$alert(e.msg)
var res = e.data;
if(res.type == 'goUser'){
- that.login(e.data.userinfo);
- that.$alert('鐧诲綍鎴愬姛')
- setTimeout(function() {
- if (res.userinfo.isPwd ==
- 'N') {
- uni.redirectTo({
- url: './setPass'
- })
- } else {
- uni.switchTab({
- url: '../index/index'
- })
- }
- }, 1000)
+ this.targetToIndex(e);
}else if(res.type == 'bindMobile'){
uni.navigateTo({
url: "./bindingPhone?wx="+encodeURIComponent(JSON.stringify(res.info))
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index 05781b9..61fa61f 100644
--- a/uniapp/pages/mine/mine.vue
+++ b/uniapp/pages/mine/mine.vue
@@ -129,7 +129,7 @@
<swiper class="banerContent" :autoplay="true" :interval="3000" :duration="1000" circular>
<swiper-item v-for="(items,index) in bannerList" :key="index" @tap="goUrl(items)">
<view class="swiper-items defIcon">
- <image :src="items.pic" mode="aspectFit"></image>
+ <image :src="items.image" mode="aspectFit"></image>
</view>
</swiper-item>
</swiper>
@@ -322,12 +322,12 @@
console.log(err)
})
},
-
getbanner() {
// banner鏁版嵁
var that = this;
this.$u.api.getBanner({type:'2'}).then(e => {
if(e.code == 1)return that.$alert(e.msg);
+ console.log(e.data.info)
that.bannerList = e.data.info;
}).catch(function (err) {
})
@@ -381,7 +381,40 @@
},
goUrl(info) {
- util.goUrl(info,this)
+ console.log(info)
+ if(info.url_type == 15)
+ {//寰俊瀹㈡湇
+ let wechat = null
+ let parameter = info.parameter_json;
+ plus.share.getServices(res => {
+ wechat = res.find(i => i.id === 'weixin')
+ if (wechat) {
+ wechat.openCustomerServiceChat({
+ corpid: parameter.cmark, //浼佷笟ID
+ url: parameter.url, //瀹㈡湇鍦板潃
+ }, src => {
+ console.log("success:", JSON.stringify(src))
+ }, err => {
+ console.log("error:", JSON.stringify(err))
+ })
+ } else {
+ uni.showToast({
+ title: '褰撳墠鐜涓嶆敮鎸佸井淇℃搷浣�',
+ icon: "error"
+ });
+ }
+ }, function() {
+ uni.showToast({
+ title: "鑾峰彇鏈嶅姟澶辫触锛屼笉鏀寔璇ユ搷浣溿��" + JSON.stringify(e),
+ icon: 'none'
+ })
+ });
+ }
+ else
+ {
+ util.goUrl(info,this)
+ }
+
},
diff --git a/uniapp/pages/mine/mt.vue b/uniapp/pages/mine/mt.vue
index e9b8719..3aa525e 100644
--- a/uniapp/pages/mine/mt.vue
+++ b/uniapp/pages/mine/mt.vue
@@ -21,14 +21,14 @@
</view>
<view class="options-bar-content rowCenCen">
- <view class="center-container rowCenBet">
- <block v-for="(items,index) in optionsList" :key="index">
+ <!-- <view class="center-container rowCenBet">
+ <block v-for="(items,index) in optionsList" :key="index">
<view class="items-content rowCenCen" @tap="navTap(items.type)" :class="{ 'yellow':items.type == optionsCurrent && [1,3].includes(optionsCurrent), 'green': items.type == optionsCurrent && optionsCurrent ==2 }">
<view>{{items.label}}</view>
</view>
</block>
<div class="items-active" :style="{'transform':'translateX('+(optionsCurrent-1) * 120 +'rpx)'}"></div>
- </view>
+ </view> -->
</view>
<image class="pageBac" :src="pageBac" mode="aspectFill">
@@ -55,16 +55,15 @@
瑙勫垯璇存槑锛�
</view>
<view class="richtext-content">
- 1.鏈娲诲姩涓孩鍖呴鍙栨椂闂存埅姝㈣嚦2021骞�12鏈�31鏃�24鐐�;</br>
- 2.姝ゆ椿鍔ㄤ负閮ㄥ垎鍖哄煙鏈夋晥锛屼互娲诲姩椤甸潰瀹為檯灞曠ず涓哄噯;绾㈠寘鍙戞斁鏁伴噺鍙婄孩鍖呴噾棰濆叿鏈夐殢鏈烘��;鍏蜂綋绾㈠寘浣跨敤鏈夋晥鏈熷強绾㈠寘閲戦浠ュ疄闄呮敹鍒颁负鍑�;</br>
- 3.绾㈠寘浣跨敤瑙勫垯:</br>
+ 1.姝ゆ椿鍔ㄤ负閮ㄥ垎鍖哄煙鏈夋晥锛屼互娲诲姩椤甸潰瀹為檯灞曠ず涓哄噯;绾㈠寘鍙戞斁鏁伴噺鍙婄孩鍖呴噾棰濆叿鏈夐殢鏈烘��;鍏蜂綋绾㈠寘浣跨敤鏈夋晥鏈熷強绾㈠寘閲戦浠ュ疄闄呮敹鍒颁负鍑�;</br>
+ 2.绾㈠寘浣跨敤瑙勫垯:</br>
(1)绾㈠寘浣跨敤闂ㄦ銆佷娇鐢ㄦ湡闄愬強浣跨敤瑙勫垯绛変互绾㈠寘鍒搁潰灞曠ず淇℃伅涓哄噯;</br>
(2)绾㈠寘鍙湪缇庡洟鎴栫編鍥㈠鍗栨渶鏂扮増瀹㈡埛绔�佺編鍥㈠鍗栧皬绋嬪簭涓嬪崟涓旈�夋嫨鍦ㄧ嚎鏀粯鏃朵娇鐢�;涓旂孩鍖呬粎闄愰潪鍒板簵鑷彇澶栧崠璁㈠崟锛屼笅鍗堣尪銆佸瀹点�佺編椋熴�佽泲绯曘�佸洟椁愰閬撱�佺敎鐐�
楗搧棰戦亾浣跨敤; </br>
(3)澶栧崠鏂颁汉棣栧崟绾㈠寘闄愭柊鐢ㄦ埛(璁惧銆佹墜鏈哄彿銆� 绾㈠寘
鍙峰潎鏈湪缇庡洟澶栧崠涓嬭繃鍗�)棣栨涓嬪崟浣跨敤锛屼笖涓嶄笌鍏朵粬浼樻儬(棣栧噺銆佹弧鍑忋�佹弧璧犮�佸椁愬銆佹姌鎵ｈ彍)鍚屼韩;闈為鍗曠孩鍖呭彲涓庝笂杩颁紭鎯犲彔鍔犱娇鐢�;</br>
(4)浣跨敤绾㈠寘鏃朵笅鍗曟墜鏈哄彿鐮佸繀椤讳笌鏀堕浜烘墜鏈哄彿鐮併�侀鍙栫孩鍖呮椂杈撳叆鐨勬墜鏈哄彿鐮佷竴鑷�:</br>
- 4.璁㈠崟璺熷崟瑙勫垯涓烘偍閫氳繃鏈椿鍔ㄩ〉鐐瑰嚮璺宠浆鑷崇編鍥㈠悗鍙浜х敓鏈夋晥鐐瑰嚮鍗冲彲杩涜璺熷崟锛岀偣鍑绘湁鏁堟湡鏈�闀夸负7澶�</br>
+ 3.璁㈠崟璺熷崟瑙勫垯涓烘偍閫氳繃鏈椿鍔ㄩ〉鐐瑰嚮璺宠浆鑷崇編鍥㈠悗鍙浜х敓鏈夋晥鐐瑰嚮鍗冲彲杩涜璺熷崟锛岀偣鍑绘湁鏁堟湡鏈�闀夸负7澶�</br>
</view>
</view>
</view>
@@ -79,14 +78,15 @@
optionsList: [{
label: "澶栧崠",
type: 1
- },
+ }
+ /* ,
{
label: "鍟嗚秴",
type: 2
}, {
label: "浼橀��",
type: 3
- }
+ } */
],
mtInfo: null,
wxQrcodeUrl: ''
diff --git a/uniapp/pages/rankinglist/fengqiang.vue b/uniapp/pages/rankinglist/fengqiang.vue
index ea3a51d..d1b7d54 100644
--- a/uniapp/pages/rankinglist/fengqiang.vue
+++ b/uniapp/pages/rankinglist/fengqiang.vue
@@ -18,10 +18,16 @@
}
},
onLoad(options) {
- //console.log(options);
- const value = uni.getStorageSync('userInfo');
- console.log(value.token);
- this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
+ if(!this.hasLogin){
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ }
+ else{
+ const value = uni.getStorageSync('userInfo');
+ this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
+ }
+
},
onReady() {
this.clearMuiBack();
diff --git a/uniapp/static/images/tabBar/find.png b/uniapp/static/images/tabBar/find.png
index 86d0603..8199e00 100644
--- a/uniapp/static/images/tabBar/find.png
+++ b/uniapp/static/images/tabBar/find.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/fqbico_in.png b/uniapp/static/images/tabBar/fqbico_in.png
new file mode 100644
index 0000000..30516cc
--- /dev/null
+++ b/uniapp/static/images/tabBar/fqbico_in.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/fqbico_un.png b/uniapp/static/images/tabBar/fqbico_un.png
new file mode 100644
index 0000000..a4bfb9f
--- /dev/null
+++ b/uniapp/static/images/tabBar/fqbico_un.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/talentSay.png b/uniapp/static/images/tabBar/talentSay.png
index 38083de..e697bdc 100644
--- a/uniapp/static/images/tabBar/talentSay.png
+++ b/uniapp/static/images/tabBar/talentSay.png
Binary files differ
diff --git a/uniapp/utils/utils.js b/uniapp/utils/utils.js
index 46e5ad9..2557f02 100644
--- a/uniapp/utils/utils.js
+++ b/uniapp/utils/utils.js
@@ -211,6 +211,7 @@
})
}
}
+
} else {
uni.redirectTo({
url: '/pages/login/wxlogin'
--
Gitblit v1.9.3