TmOct5/dou_fire
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: TmOct5:up-line
Branches Tags
TmOct5:master TmOct5:dev TmOct5:up-line
...
pull from: TmOct5:master
Branches Tags
TmOct5:dev TmOct5:up-line TmOct5:master

8 Commits
up-line ... master

Author SHA1 Message Date
唐明明
9619d8f84d 合并工作台 2023-07-06 10:46:00 +08:00
唐明明
cfb5ff334d 处理冲突 2023-07-06 10:43:14 +08:00
唐明明
be73fea618 解决冲突 2023-07-06 10:39:57 +08:00
唐明明
7bacaf7cc4 更新工作台 2023-07-06 10:33:44 +08:00
唐明明
cf6df19182 Merge pull request '1.4.6' (#5) from dev into master 
Reviewed-on: https://git.yuzhankeji.cn/TmOct5/dou_fire/pulls/5
 2023-06-14 10:28:23 +08:00
zhangdongxue
84809068c9 .. 2023-05-24 16:29:05 +08:00
唐明明
67a2f91b36 同步 2023-04-26 13:44:35 +08:00
唐明明
ba89cc726f 调整团队卡片点击区域 2023-04-25 16:27:29 +08:00
4 changed files with 7 additions and 6 deletions
Expand all files Collapse all files

4
apis/index.js
View File

@@ -10,8 +10,8 @@ import router from '../router'
// 基础配置 // 基础配置
const config = { const config = {
// apiUrl : 'https://douhuo.douhuofalv.com/api/', apiUrl : 'https://douhuo.douhuofalv.com/api/',
apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 // apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
timeout : 60000 timeout : 60000
} }

4
manifest.json
View File

@@ -1,8 +1,8 @@
{ {
"name" : "抖火数字化咨询服务平台", "name" : "抖火法律",
"appid" : "__UNI__C305C03", "appid" : "__UNI__C305C03",
"description" : "纵有疾风起，人生不言弃", "description" : "纵有疾风起，人生不言弃",
"versionName" : "1.4.8", "versionName" : "1.4.9",
"versionCode" : 104, "versionCode" : 104,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */

1
pages/auth/auth.vue
View File

@@ -61,6 +61,7 @@
this.$store.commit('setToken', res.token_type + ' ' + res.access_token); this.$store.commit('setToken', res.token_type + ' ' + res.access_token);
this.onBack() this.onBack()
}).catch(err => { }).catch(err => {
console.log(err)
uni.showToast({ uni.showToast({
title: err.message, title: err.message,
icon : 'none' icon : 'none'

4
pages/user/team.vue
View File

@@ -9,7 +9,7 @@
</view> </view>
<block v-if="users.length > 0"> <block v-if="users.length > 0">
<view class="team-item" v-for="(item, index) in users" :key="index" @click="onCallPhone(item.real_username)"> <view class="team-item" v-for="(item, index) in users" :key="index">
<u-avatar :src="item.avatar" size="48"></u-avatar> <u-avatar :src="item.avatar" size="48"></u-avatar>
<view class="team-content"> <view class="team-content">
<view class="nowrap name">{{item.nickname}}</view> <view class="nowrap name">{{item.nickname}}</view>
@@ -23,7 +23,7 @@
<view class="nowrap submit">联系电话：{{item.username}}</view> <view class="nowrap submit">联系电话：{{item.username}}</view>
<view class="nowrap submit">注册时间：{{item.created_at}}</view> <view class="nowrap submit">注册时间：{{item.created_at}}</view>
</view> </view>
<view class="mobile"> <view class="mobile" @click="onCallPhone(item.real_username)">
<uni-icons class="mobile-icon" type="phone-filled" size="18" color="white"></uni-icons> <uni-icons class="mobile-icon" type="phone-filled" size="18" color="white"></uni-icons>
</view> </view>
</view> </view>