From 09ba9226143a3f16927eb43466583cf47541f7ff Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 15:26:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
h5/pages/index/index.vue | 36 ++++++++----------------------------
h5/static/ic_logout@2x.png | 0
h5/utils/request.js | 3 ++-
company_admin/src/views/business/anchor.vue | 8 ++++++++
company_admin/.env.production | 4 ++--
5 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/company_admin/.env.production b/company_admin/.env.production
index c1fd590..87d6b63 100644
--- a/company_admin/.env.production
+++ b/company_admin/.env.production
@@ -3,11 +3,11 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-# VUE_APP_API = 'http://127.0.0.1/'
+VUE_APP_API = 'http://127.0.0.1:10022/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
-VUE_APP_API = 'http://127.0.0.1:10022/'
+# VUE_APP_API = 'http://127.0.0.1:10022/'
# VUE_APP_API = 'https://dm.ahapp.net/preselect_interface/'
diff --git a/company_admin/src/views/business/anchor.vue b/company_admin/src/views/business/anchor.vue
index 67d44ff..6b397dc 100644
--- a/company_admin/src/views/business/anchor.vue
+++ b/company_admin/src/views/business/anchor.vue
@@ -38,6 +38,11 @@
<el-table-column prop="username" label="鐧诲綍璐﹀彿"></el-table-column>
<el-table-column prop="realname" label="濮撳悕"></el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙�"></el-table-column>
+ <el-table-column label="涓绘挱绔湴鍧�">
+ <template slot-scope="{row}">
+ <el-link type="primary" @click="openLink(row.zhuboRoomUrl)">鐐瑰嚮璁块棶</el-link>
+ </template>
+ </el-table-column>
<el-table-column label="鐘舵��">
<template slot-scope="{row}">
<el-switch
@@ -116,6 +121,9 @@
this.search()
},
methods: {
+ openLink(link) {
+ window.open(link)
+ },
editPass(row) {
let obj = {
id: row.id
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index 2336445..0e00306 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -2,8 +2,8 @@
<view class="box">
<view class="box_bg" :style="{backgroundImage: 'url(' + Config.resourcePath + Config.bgImg + ')'}"></view>
<view class="box_user">
- <text>娆㈣繋{{User.username}}鐧诲綍</text>
- <view class="box_user_btn" @click="loginOut">閫�鍑虹櫥褰�</view>
+ <text>{{User.username}}</text>
+ <image src="@/static/ic_logout@2x.png" mode="widthFix" @click="loginOut"></image>
</view>
<view class="box_content" :style="{maxWidth: Config.rangeSize + 'px', minWidth: Config.rangeSize + 'px'}">
<!-- 骞垮憡鍥� -->
@@ -246,16 +246,6 @@
</view>
</template>
- <!-- 鏌ョ湅澶у浘 -->
- <bigImg
- ref="bigImg"
- :imgList="imgList"/>
- <!-- 鏌ョ湅澶у浘 -->
- <bigImg1
- ref="bigImg1"
- :imgList="imgList"/>
- <!-- 鎼滅储 -->
-
<!-- 鎼滅储缁勪欢 -->
<search
ref="search"
@@ -270,8 +260,6 @@
</template>
<script>
- import bigImg from '@/components/bigImg.vue'
- import bigImg1 from '@/components/bigImg1.vue'
import search from '@/components/search.vue'
import noData from '@/components/noData.vue'
import { mapState } from 'vuex'
@@ -352,7 +340,7 @@
page: 1
}
},
- components: { bigImg, search, noData, bigImg1 },
+ components: { search, noData },
onLoad() {
var that = this
// 鐩戝惉閿洏缁勫悎閿�
@@ -1110,7 +1098,7 @@
background-size: 100% 100%;
}
.box_user {
- z-index: 99;
+ z-index: 9;
position: fixed;
top: 30px;
right: 40px;
@@ -1122,19 +1110,11 @@
font-weight: 500;
color: #FFFFFF;
}
- .box_user_btn {
- width: 80px;
- height: 34px;
- line-height: 34px;
- text-align: center;
- border-radius: 8px;
- border: 2px solid #FFFFFF;
- font-size: 16px;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 22px;
+ image {
+ width: 18px;
+ height: 18px;
cursor: pointer;
+ margin-left: 10px;
}
}
.box_content {
diff --git a/h5/static/ic_logout@2x.png b/h5/static/ic_logout@2x.png
new file mode 100644
index 0000000..7990846
--- /dev/null
+++ b/h5/static/ic_logout@2x.png
Binary files differ
diff --git a/h5/utils/request.js b/h5/utils/request.js
index 1f27e12..9726052 100644
--- a/h5/utils/request.js
+++ b/h5/utils/request.js
@@ -15,8 +15,9 @@
// http://yx.doumee.com/preselect_interface/
// http://127.0.0.1/interface/ http://192.168.0.15:10024/ preselect_web_interface
// https://dmtest.ahapp.net/preselect_web_interface/${url} http://127.0.0.1:10022/ http://192.168.0.35:10024/
+ // http://127.0.0.1:10024/ 娴嬭瘯
uni.request({
- url: `http://192.168.0.15:10024/${url}`,
+ url: `http://127.0.0.1:10024/${url}`,
method,
data,
header: {
--
Gitblit v1.9.3