14 Commits

28 changed files with 1361 additions and 599 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
.vscode .vscode
node_modules node_modules
unpackage

24
App.vue
View File

@@ -1,18 +1,18 @@
<script> <script>
export default { export default {
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch');
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show');
}, },
onHide: function() { onHide: function() {
console.log('App Hide') console.log('App Hide');
}
} }
};
</script> </script>
<style lang="scss"> <style lang="scss">
/*每个页面公共css */ /*每个页面公共css */
@import "uview-ui/index.scss"; @import 'uview-ui/index.scss';
</style> </style>

View File

@@ -8,7 +8,7 @@ const install = (Vue, vm) => {
return vm.$u.get("Streaming/getLiveSpec") return vm.$u.get("Streaming/getLiveSpec")
}, },
login({member_name,member_password}){ login({member_name,member_password}){
return vm.$u.post("Login/login",{member_name,member_password}) return vm.$u.get("/Login/expertLogin",{member_name,member_password})
}, },
createLivesp({spec_name}){ createLivesp({spec_name}){
return vm.$u.post("Streaming/createLivesp",{spec_name}) return vm.$u.post("Streaming/createLivesp",{spec_name})
@@ -21,7 +21,40 @@ const install = (Vue, vm) => {
}, },
liveStreamList(){ liveStreamList(){
return vm.$u.post("Streaming/liveStreamList") return vm.$u.post("Streaming/liveStreamList")
} },
// 获取订单列表
getorderlist(){
return vm.$u.get("/Order/orderList")
},
// 获取轮播图列表
getswiper(){
return vm.$u.get("/Order/orderList")
},
// 商家登陆
shoplogin(obj){
return vm.$u.get("/Login/storeLogin",obj)
},
// 获取个人信息
getshopinfo(obj){
return vm.$u.post("/member/memberInfo",obj)
},
// 获取粉丝列表
myfanlist(obj){
return vm.$u.post("/member/myFansList",obj)
},
// 商家登陆
getshopinfo(obj){
return vm.$u.post("/member/memberInfo",obj)
},
// 修改个人信息
changeinfo(obj){
return vm.$u.post("/Member/changeMemberInfo",obj)
},
// 获取内容列表
articlelist(obj){
return vm.$u.post("/Article/articleList",obj)
},
} }
// 将各个定义的接口名称统一放进对象挂载到vm.$u.api(因为vm就是this也即this.$u.api)下 // 将各个定义的接口名称统一放进对象挂载到vm.$u.api(因为vm就是this也即this.$u.api)下
vm.$u.api = api; vm.$u.api = api;

View File

@@ -1,20 +1,21 @@
const install = (Vue, vm) => { const install = (Vue, vm) => {
// 此为自定义配置参数,具体参数见上方说明 // 此为自定义配置参数,具体参数见上方说明
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
baseUrl: 'https://dmmall.sdbairui.com//storeapi', baseUrl: 'https://dmmall.sdbairui.com/storeapi',
loadingText: '努力加载中~', loadingText: '努力加载中~',
loadingTime: 800, loadingTime: 800,
// 设置自定义头部content-type originalData: true,
// header: {
// "Authorization" : "122"
// }
// ......
}); });
Vue.prototype.$u.http.interceptor.request = (config) => { Vue.prototype.$u.http.interceptor.request = (config) => {
const token = uni.getStorageSync('token'); const token = uni.getStorageSync('token');
config.header.Authorization = 'Bearer' + " " + token; config.header.Authorization = 'Bearer' + " " + token;
return config; return config;
} }
Vue.prototype.$u.http.interceptor.response = (res) => {
// todo 判断状态码
return res.data;
}
} }
export default { export default {

View File

@@ -1,24 +1,24 @@
<template> <template>
<view class="content-item"> <view class="content-item">
<view class="image"> <view class="image">
<image class="cover"></image> <image class="cover" :src="info.article_pic"></image>
<image src="/static/image/user/5.png" class="play-icon" v-if="cur==1"></image> <image src="/static/image/user/5.png" class="play-icon" v-if="type==2"></image>
</view> </view>
<view class="right" @click="toDetailsPage"> <view class="right" >
<u-icon name="close" color="#999999" size="27" @click.stop="showPopup"></u-icon> <u-icon name="close" color="#999999" size="27" @click="showPopup(info.article_id)"></u-icon>
<view class="tags u-line-2">#配饰就该这么搭#</view> <view class="tags u-line-2" @click="toDetailsPage">{{info.article_title}}</view>
<view class="data"> <view class="data">
<view> <view>
<image src="/static/image/user/2.png"></image> <image src="/static/image/user/2.png"></image>
<text>2.5w</text> <text>{{info.comment_num}}</text>
</view> </view>
<view> <view>
<image src="/static/image/user/3.png"></image> <image src="/static/image/user/3.png"></image>
<text>2.5w</text> <text>{{info.collect_num}}</text>
</view> </view>
<view> <view>
<image src="/static/image/user/4.png"></image> <image src="/static/image/user/4.png"></image>
<text>2.5w</text> <text>{{info.like_num}}</text>
</view> </view>
</view> </view>
</view> </view>
@@ -30,15 +30,23 @@ export default {
return {} return {}
}, },
props: { props: {
cur: [Number, String], info:{
type: Object,
default: null
},
type:{
type: Number,
default: 1
},
delItem: { delItem: {
type: Function, type: Function,
default: null default: null
} }
}, },
methods: { methods: {
showPopup() { showPopup(id) {
this.delItem(); console.log(12345,id)
this.$emit("del",id)
}, },
toDetailsPage() { toDetailsPage() {
uni.navigateTo({ uni.navigateTo({

View File

@@ -1,15 +1,18 @@
<template> <template>
<view class="fans-item"> <view class="fans-item">
<image></image> <image :src="info.friend_frommavatar"></image>
<view class="name">兽兽</view> <view class="name">{{info.fromMemberNickname}}</view>
<view class="date">2017-10-14</view> <view class="date">{{info.fromMemberFriendAddtime}}</view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return {} return {}
} },
props: {
info: Object
},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@@ -2,11 +2,17 @@
<view class="item" @click="toDetailsPage"> <view class="item" @click="toDetailsPage">
<image></image> <image></image>
<view class="goods"> <view class="goods">
<view class="status" v-if="cur==4">待处理订单</view> <view class="">
<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view> <view class="">
编号{{info.order_sn}}
</view>
<view class="status" v-if="cur==4">待处理订单</view>
</view>
<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
<view class="info"> <view class="info">
<view class="num">件商品</view> <view class="num">{{info.extend_order_goods[0].goods_num}}件商品</view>
<view class="price">实付<span>199.9</span></view> <view class="price">实付<span>{{info.extend_order_goods[0].goods_pay_price}}</span></view>
</view> </view>
</view> </view>
</view> </view>
@@ -17,10 +23,12 @@ export default {
return {} return {}
}, },
props: { props: {
cur: [Number, String] cur: [Number, String],
info: Object
}, },
methods: { methods: {
toDetailsPage() { toDetailsPage() {
console.log(this.info)
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/details?current=' + this.cur url: '/pages/index/details?current=' + this.cur
}); });

5
package-lock.json generated
View File

@@ -6,13 +6,8 @@
"dependencies": { "dependencies": {
"uview-ui": { "uview-ui": {
"version": "1.5.2", "version": "1.5.2",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz", "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
"integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w==" "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
=======
"resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
"integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
>>>>>>> fa383397b331ec0091096becf886f978cc1277fc
} }
} }
} }

View File

@@ -2,8 +2,7 @@
"easycom": { "easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
}, },
"pages": [ "pages": [{
{
"path": "pages/login/login", "path": "pages/login/login",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
@@ -31,9 +30,9 @@
"style": { "style": {
"navigationBarTitleText": "消息", "navigationBarTitleText": "消息",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -43,9 +42,9 @@
"style": { "style": {
"navigationBarTitleText": "德铭阳光在线", "navigationBarTitleText": "德铭阳光在线",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -55,8 +54,8 @@
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -91,12 +90,25 @@
{ {
"path": "pages/user/index", "path": "pages/user/index",
"style": { "style": {
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
}
}
}
},
{
"path": "pages/user/myinfo",
"style": {
"navigationBarTitleText": "达人中心",
"app-plus": {
"titleNView": {
"backgroundColor": "#FFFFFF",
"titleColor": "#333333"
} }
} }
} }
@@ -118,9 +130,15 @@
"style": { "style": {
"navigationBarTitleText": "个人资料", "navigationBarTitleText": "个人资料",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333",
"buttons": [ //原生标题栏按钮配置,
{
"text": "保存",
"fontSize":"14px"
}
]
} }
} }
} }
@@ -130,9 +148,9 @@
"style": { "style": {
"navigationBarTitleText": "修改密码", "navigationBarTitleText": "修改密码",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -142,9 +160,9 @@
"style": { "style": {
"navigationBarTitleText": "我的粉丝", "navigationBarTitleText": "我的粉丝",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -154,9 +172,9 @@
"style": { "style": {
"navigationBarTitleText": "内容管理", "navigationBarTitleText": "内容管理",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -165,9 +183,9 @@
"path": "pages/user/contentDetails", "path": "pages/user/contentDetails",
"style": { "style": {
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -177,9 +195,9 @@
"style": { "style": {
"navigationBarTitleText": "骑手投诉", "navigationBarTitleText": "骑手投诉",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -189,9 +207,9 @@
"style": { "style": {
"navigationBarTitleText": "骑手投诉详情", "navigationBarTitleText": "骑手投诉详情",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"titleColor": "#333333" "titleColor": "#333333"
} }
} }
} }
@@ -201,9 +219,9 @@
"style": { "style": {
"navigationBarTitleText": "选择商品", "navigationBarTitleText": "选择商品",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#2D2D2D", "backgroundColor": "#2D2D2D",
"titleColor": "#FFFFFF" "titleColor": "#FFFFFF"
} }
} }
} }
@@ -226,28 +244,34 @@
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
}, },
"tabBar":{ "tabBar": {
"color": "#7A7E83", "color": "#7A7E83",
"selectedColor": "#3cc51f", "selectedColor": "#3cc51f",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"height": "50px", "height": "50px",
"fontSize": "10px", "fontSize": "10px",
"iconWidth": "24px", "iconWidth": "24px",
"spacing": "3px", "spacing": "3px",
"list": [{ "list": [{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "", "iconPath": "",
"selectedIconPath": "", "selectedIconPath": "",
"text": "首页", "text": "首页",
"selectedColor":"#FBFBFB" "selectedColor": "#FBFBFB"
}, { }, {
"pagePath": "pages/user/index", "pagePath": "pages/messages/messagesList",
"iconPath": "", "iconPath": "",
"selectedIconPath": "", "selectedIconPath": "",
"text": "消息",
"selectedColor": "#FBFBFB"
}, {
"pagePath": "pages/user/index",
"iconPath": "",
"selectedIconPath": "",
"text": "我的", "text": "我的",
"selectedColor":"#FBFBFB" "selectedColor": "#FBFBFB"
}] }]
} }
} }

View File

@@ -1,31 +1,37 @@
<template> <template>
<view class="home"> <view class="home">
<view class="image-swiper"> <view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
<u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper>
</view>
<view class="tab-swiper"> <view class="tab-swiper">
<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="26" height="98" :show-bar="false" swiperWidth="750" gutter="52"></u-tabs-swiper> <u-tabs-swiper
ref="uTabs"
:list="list"
:current="current"
@change="tabsChange"
active-color="#FF780F"
inactive-color="#333333"
font-size="26"
height="98"
:show-bar="false"
swiperWidth="750"
gutter="52"
></u-tabs-swiper>
</view> </view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish"> <swiper :current="swiperCurrent" @animationfinish="animationfinish">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list"> <scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list">
<view v-for="(item, index) in 5" :key="index"> <view v-for="(item, index) in allorder" :key="index">
<OrderItem :cur="current"></OrderItem> <OrderItem :info="item"></OrderItem>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;"> <scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 5" :key="index"> <view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
<OrderItem :cur="current"></OrderItem>
</view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;"> <scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 5" :key="index"> <view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
<OrderItem :cur="current"></OrderItem>
</view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
@@ -34,41 +40,37 @@
<view class="select-container"> <view class="select-container">
<view class="title">选择骑手</view> <view class="title">选择骑手</view>
<view class="worker" v-if="JSON.stringify(worker) != '{}'"> <view class="worker" v-if="JSON.stringify(worker) != '{}'">
<view>{{ worker.company + " " + worker.name }}</view> <view>{{ worker.company + ' ' + worker.name }}</view>
<u-icon name="edit-pen" @click="worker={}"></u-icon> <u-icon name="edit-pen" @click="worker = {}"></u-icon>
</view> </view>
<view v-else class="select" @click="showSelect=true"> <view v-else class="select" @click="showSelect = true">
<view>请选择</view> <view>请选择</view>
<image src="/static/image/home/5.png"></image> <image src="/static/image/home/5.png"></image>
</view> </view>
</view> </view>
<view class="textarea"> <view class="textarea">
<view class="title">投诉简介</view> <view class="title">投诉简介</view>
<textarea placeholder-style="color:#999999" placeholder="请输入内容" /> <textarea placeholder-style="color:#999999" placeholder="请输入内容" />
</view> </view>
<!-- 事件 --> <!-- 事件 -->
<view class="btn" @click="showComplaint=true">确定</view> <view class="btn" @click="showComplaint = true">确定</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;"> <scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 5" :key="index"> <view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
<OrderItem :cur="current"></OrderItem>
</view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;"> <scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 15" :key="index"> <view v-for="(item, index) in 15" :key="index"><OrderItem :cur="current"></OrderItem></view>
<OrderItem :cur="current"></OrderItem>
</view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="release-btn" @click="publish"> <view class="release-btn" @click="publish">
<image src="/static/home/1.png"></image> <image src="../../static/image/index/publish.png"></image>
<view class="text" @click="release()">发布</view> <view class="text">发布</view>
</view> </view>
<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select> <u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
<u-popup v-model="showComplaint" mode="center" border-radius="10"> <u-popup v-model="showComplaint" mode="center" border-radius="10">
@@ -84,45 +86,50 @@
<view class="publish"> <view class="publish">
<view class="list"> <view class="list">
<view @click="navto('release/tosign')"> <view @click="navto('release/tosign')">
<image></image> <image src="../../static/image/index/live.png"></image>
<text>直播</text> <text>直播</text>
</view> </view>
<view @click="navto('release/index')"> <view @click="navto('release/index')">
<image></image> <image src="../../static/image/index/photo.png"></image>
<text>图文</text> <text>图文</text>
</view> </view>
<view @click="navto('release/video')"> <view @click="navto('release/video')">
<image></image> <image src="../../static/image/index/video.png"></image>
<text>视频</text> <text>视频</text>
</view> </view>
</view> </view>
<image class="off"></image> <image src="../../static/image/index/close.png" class="off" @click="close"></image>
</view> </view>
</u-popup> </u-popup>
</view> </view>
</template> </template>
<script> <script>
import OrderItem from '@/components/order-item/index' import OrderItem from '@/components/order-item/index';
export default { export default {
data() { data() {
return { return {
list: [{ list: [
name: '全部订单' {
}, { name: '全部订单'
name: '试穿订单' },
}, { {
name: '待处理订单' name: '试穿订单'
}, { },
name: '投诉骑手' {
}, { name: '待处理订单'
name: '已完成订单' },
}, { {
name: '退货订单' name: '投诉骑手'
}], },
imageList: [ {
{}, {}, {} name: '已完成订单'
},
{
name: '退货订单'
}
], ],
imageList: [],
showSelect: false, showSelect: false,
current: 0, current: 0,
swiperCurrent: 0, swiperCurrent: 0,
@@ -157,28 +164,67 @@ export default {
] ]
} }
], ],
publishstate:true publishstate: false,
} num: 0,
allorder:[],//所有订单
};
}, },
components: { components: {
OrderItem OrderItem
}, },
onLoad() { onLoad() {
this.getswiper();
this.getallorder();
// 订单状态0:已取消 10:未付款 20:已付款 30:已发货 40:已收货
},
onReachBottom() {
this.num++
}, },
methods: { methods: {
release(){ // 关闭发布弹窗
this.publishstate = true close() {
this.publishstate = false;
}, },
publish(){ // 获取全部订单
getallorder() {
let that = this;
this.$u.api.getorderlist({
page: that.num
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.allorder = res.data
}
});
},
// 获取轮播图
getswiper() {
this.imageList =[{
image: '../../static/image/index/swiper.png'
},
{
image: '../../static/image/index/swiper.png'
},
{
image: '../../static/image/index/swiper.png'
}
]
},
// 打开发布弹窗
publish() {
this.publishstate = true;
}, },
setWorker(e) { setWorker(e) {
// console.log(e); // console.log(e);
this.worker = { this.worker = {
company: e[0].label, company: e[0].label,
name: e[1].label name: e[1].label
} };
}, },
tabsChange(index) { tabsChange(index) {
this.swiperCurrent = index; this.swiperCurrent = index;
@@ -189,22 +235,22 @@ export default {
this.swiperCurrent = current; this.swiperCurrent = current;
this.current = current; this.current = current;
}, },
navto(url){ navto(url) {
this.$u.route({ this.$u.route({
url:`/pages/${url}` url: `/pages/${url}`
}) });
// console.log(`/pages/${url}`) // console.log(`/pages/${url}`)
// uni.navigateTo({ // uni.navigateTo({
// url: `/pages/${url}` // url: `/pages/${url}`
// }); // });
} }
} }
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.home { .home {
min-height: calc(100vh - var(--window-top)); min-height: calc(100vh - var(--window-top));
background-color: #ECECEC; background-color: #ececec;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// padding-bottom: 100rpx; // padding-bottom: 100rpx;
@@ -229,14 +275,14 @@ export default {
margin-bottom: 60rpx; margin-bottom: 60rpx;
.title { .title {
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
margin-right: 20rpx; margin-right: 20rpx;
} }
.select { .select {
padding: 18rpx 20rpx; padding: 18rpx 20rpx;
width: 490rpx; width: 490rpx;
height: 60rpx; height: 60rpx;
background: rgba(236,236,236,1); background: rgba(236, 236, 236, 1);
border-radius: 6rpx; border-radius: 6rpx;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -255,7 +301,7 @@ export default {
align-items: center; align-items: center;
> view { > view {
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
margin-right: 20rpx; margin-right: 20rpx;
} }
} }
@@ -265,7 +311,7 @@ export default {
display: flex; display: flex;
.title { .title {
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
margin-right: 20rpx; margin-right: 20rpx;
} }
> textarea { > textarea {
@@ -280,10 +326,10 @@ export default {
margin: 90rpx auto 0; margin: 90rpx auto 0;
width: 630rpx; width: 630rpx;
height: 88rpx; height: 88rpx;
background: rgba(255,120,15,1); background: rgba(255, 120, 15, 1);
border-radius: 44rpx; border-radius: 44rpx;
font-size: 36rpx; font-size: 36rpx;
color: rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
line-height: 88rpx; line-height: 88rpx;
text-align: center; text-align: center;
} }
@@ -295,8 +341,8 @@ export default {
right: 30rpx; right: 30rpx;
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
background: rgba(255,120,15,1); background: rgba(255, 120, 15, 1);
box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255,120,15,0.22); box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255, 120, 15, 0.22);
border-radius: 50%; border-radius: 50%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -310,7 +356,7 @@ export default {
} }
.text { .text {
font-size: 20rpx; font-size: 20rpx;
color: rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
} }
} }
.confirm-complaint { .confirm-complaint {
@@ -321,7 +367,7 @@ export default {
width: 420rpx; width: 420rpx;
padding: 55rpx 112rpx; padding: 55rpx 112rpx;
font-size: 28rpx; font-size: 28rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
line-height: 4r2px; line-height: 4r2px;
> view:first-child { > view:first-child {
margin-bottom: 20rpx; margin-bottom: 20rpx;
@@ -330,38 +376,37 @@ export default {
.btn { .btn {
width: 200rpx; width: 200rpx;
height: 60rpx; height: 60rpx;
background: rgba(255,120,15,1); background: rgba(255, 120, 15, 1);
border-radius: 30rpx; border-radius: 30rpx;
text-align: center; text-align: center;
line-height: 60rpx; line-height: 60rpx;
font-size: 28rpx; font-size: 28rpx;
color: rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
margin: 0 auto; margin: 0 auto;
} }
} }
.publish{ .publish {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 50rpx 84rpx 31rpx 78rpx; padding: 50rpx 84rpx 31rpx 78rpx;
image{ image {
background-color: #0f0;
} }
.list{ .list {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
>view{ > view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
>image{ > image {
width: 94rpx; width: 94rpx;
height: 80rpx; height: 80rpx;
} }
>text{ > text {
margin-top: 10rpx; margin-top: 10rpx;
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
@@ -369,7 +414,7 @@ export default {
} }
} }
} }
.off{ .off {
margin-top: 81rpx; margin-top: 81rpx;
width: 37rpx; width: 37rpx;
height: 37rpx; height: 37rpx;

View File

@@ -2,353 +2,424 @@
<!-- login页面 --> <!-- login页面 -->
<view> <view>
<view class="login"> <view class="login">
<image class="images" src=""></image> <image class="images" :src="url"></image>
<view class="backes"></view> <view class="backes"></view>
<view class="title_top">德铭阳光在线-商家端</view>
<view class="content"> <view class="content">
<view class="title_top">德铭阳光在线-商家端</view> <view class="title">
<view class="title">账号登录</view> <view v-bind:class="[state==0 ? 'show' : '']" @click="changetab(0)">
<view class="labales"> 商家登录
<image src=""></image> </view>
<input v-model="zhanghao" type="tel" placeholder="请输入账号" /> <view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
达人登录
</view>
</view> </view>
<view class="labales"> <view class="" v-if="state==0">
<image src=""></image> <view class="labales">
<input v-model="mima" type="password" placeholder="请输入密码" /> <image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghao" type="text" placeholder="请输入账号" />
</view>
<view class="labales">
<image src="../../static/image/login/login(1).png"></image>
<input v-model="mima" type="password" placeholder="请输入密码" />
</view>
</view> </view>
<view class="" v-else>
<view class="labales">
<image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
</view>
<view class="labales">
<image src="../../static/image/login/login(1).png"></image>
<input v-model="mimaA" type="password" placeholder="请输入密码" />
</view>
</view>
</view> </view>
<!-- denglu QQ weixin --> <!-- denglu QQ weixin -->
<u-button @click="logins">{{login}}</u-button> <button @click="logins">{{ login }}</button>
<!-- <u-button :custom-style="customStyle" ></u-button> -->
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
list: [{ list: [
{
checked: false, checked: false,
disabled: false disabled: false
}], }
value: '', ],
login: '登录', value: '',
show: false, login: '登录',
zhanghao:"", show: false,
mima:"" zhanghao: 'seller',
mima: '123456789',
}; zhanghaoA: '18953829598 ',
mimaA: '123456',
url: '',
state:0
};
},
methods: {
// 改变登陆类型
changetab(num){
this.state = num
}, },
methods: { // 选中某个复选框时由checkbox时触发
// 选中某个复选框时由checkbox时触发 checkboxChange(e) {
checkboxChange(e) { //console.log(e);
//console.log(e); },
}, // 选中任一checkbox时由checkbox-group触发
// 选中任一checkbox时由checkbox-group触发 checkboxGroupChange(e) {
checkboxGroupChange(e) { // console.log(e);
// console.log(e); },
}, mask_u() {
mask_u(){ this.show = !this.show;
this.show = !this.show },
}, // 获取验证码倒计时
// 获取验证码倒计时 getCode() {
getCode(){ console.log('11');
console.log("11") this.loading();
this.loading() },
}, loading() {},
loading(){ logins() {
// 清除本地存储才可以正常登陆(具体原因没有仔细检查)
}, uni.clearStorage();
logins(){ // 账号登录1达人0商家
this.$u.api.login({member_name:this.zhanghao,member_password:this.mima}).then((res)=>{ if(this.state==1){
console.log(res) this.$u.api.login({ member_name: this.zhanghaoA, member_password: this.mimaA }).then(res => {
if(res.errCode != 0){ console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: 'error' type: 'error'
}) });
}else{ } else {
uni.setStorageSync("token",res.data.token) uni.setStorageSync('token', res.data.token);
uni.setStorageSync("userinfo",res.data) uni.setStorageSync('userinfo', res.data);
uni.setStorageSync('rongyun',res.data.rongcloud_token) uni.setStorageSync('rongyun', res.data.rongcloud_token);
this.$u.route({ this.$u.route({
url:"/pages/index/index", url: '/pages/user/myinfo'
type:"switchTab" });
})
} }
});
}) }else{
this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
uni.setStorageSync('token', res.data.token);
uni.setStorageSync('userinfo', res.data);
uni.setStorageSync('rongyun', res.data.rongcloud_token);
this.$u.route({
url: '/pages/index/index',
type: 'switchTab'
});
}
});
} }
},
onLoad(){
let token = uni.getStorageSync('token');
if(token != undefined && token){
this.$u.route({
url:"/pages/index/index"
})
}
} }
}; },
onLoad() {
let token = uni.getStorageSync('token');
if (token != undefined && token) {
this.$u.route({
url: '/pages/index/index'
});
}
}
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.login {
.login { // background: url(../../static/pageA/loginbackground.png) no-repeat!important;
.images {
// background: url(../../static/pageA/loginbackground.png) no-repeat!important; position: fixed;
.images { width: 100%;
position: fixed; height: 100%;
width: 100%; top: 0;
height: 100%; left: 0;
top: 0; z-index: -1;
left: 0;
z-index: -1;
}
.backes {
background: rgba(0, 0, 0, 0.4);
position: fixed;
width: 100%;
height: 100%;
z-index: -1;
}
text {
z-index: 9;
color: #fff;
}
.more_Login {
overflow: hidden;
zoom: 1;
width: 630rpx;
margin: 0 auto;
}
.more_Login text {
display: inline-block;
width: 50%;
float: left;
font-size: 30rpx;
color: rgba(255, 255, 255, 1);
line-height: 36px;
margin: 97rpx 0;
}
.more_Login .other {
text-align: right;
}
} }
.title { .backes {
font-size: 36rpx; background: rgba(0, 0, 0, 0.4);
font-weight: bold; position: fixed;
margin-bottom: 150rpx; width: 100%;
height: 100%;
z-index: -1;
}
text {
z-index: 9;
color: #fff; color: #fff;
letter-spacing: 3rpx;
} }
.content { .more_Login {
overflow: hidden;
zoom: 1;
width: 630rpx; width: 630rpx;
z-index: 99999;
margin: 0 auto; margin: 0 auto;
padding-top: 300rpx;
.labales text {
font-size: 30rpx;
}
.labales {
border-bottom: 1px #fff solid;
margin-bottom: 180rpx;
height: 70rpx;
line-height: 70rpx;
position: relative;
input{
width: 80%;
margin-left: 60rpx;
color: #fff;
letter-spacing: 2rpx;
background-color: none;
}
}
.labales image{
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 39rpx;
height: 40rpx;
}
.labales:nth-child(3) {
position: relative;
margin-bottom: 60rpx;
}
.identifying {
position: absolute;
right: 0;
top: 0;
bottom: 0;
margin: auto;
font-size: 30rpx;
font-weight: 500;
color: rgba(255, 120, 15, 1);
line-height: 20px;
}
} }
.uni-input-input, .uni-input-placeholder{
color:#fff!important;
letter-spacing: 2rpx;
}
.pact text { .more_Login text {
font-size: 22rpx; display: inline-block;
font-weight: 400; width: 50%;
float: left;
font-size: 30rpx;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
line-height: 36px; line-height: 36px;
margin: 97rpx 0;
} }
.pact_text { .more_Login .other {
font-size: 22px; text-align: right;
font-weight: 400; }
color: rgba(129, 188, 253, 1) !important; }
line-height: 36px;
.title {
font-size: 36rpx;
font-weight: bold;
margin-bottom: 150rpx;
color: #fff;
display: flex;
justify-content: flex-start;
}
.title view{
height: 100rpx;
line-height: 100rpx;
font-size: 24rpx;
padding: 0 20rpx;
}
.title .show{
font-size: 34rpx;
font-weight: bold;
}
.content {
width: 630rpx;
z-index: 99999;
margin: 0 auto;
padding-top: 300rpx;
.labales text {
font-size: 30rpx;
} }
//单选框的样式 .labales {
.pact { border-bottom: 1px #fff solid;
margin-bottom: 180rpx;
height: 70rpx;
line-height: 70rpx;
position: relative; position: relative;
padding-left: 40rpx; input {
overflow:hidden; //超出的文本隐藏 width: 80%;
text-overflow:ellipsis; //溢出用省略号显示 margin-left: 60rpx;
white-space:nowrap; //溢出不换行 color: #fff;
letter-spacing: 2rpx;
background-color: none;
}
} }
.labales image {
.u-checkbox-group {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
bottom: 0; bottom: 0;
margin: auto; width: 39rpx;
height: 40rpx;
} }
.labales:nth-child(3) {
.u-checkbox__icon--square {
border-radius: 50rpx !important;
width: 22rpx;
height: 22rpx;
}
.u-btn {
width: 628rpx;
height: 98rpx;
background: rgba(255, 120, 15, 1) !important;
border-radius: 49rpx;
margin: 0 auto;
font-size: 36rpx;
color: rgba(255, 255, 255, 1) !important;
line-height: 36px;
border: 1px #ff780f solid;
outline: none;
border-color: rgba(255, 120, 15, 1) !important;
}
.warp {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}
.rect {
width: 558rpx;
height: 300rpx;
background-color: #fff;
border-radius: 20rpx;
overflow: hidden;
zoom: 1;
position: relative; position: relative;
display: flex; margin-bottom: 60rpx;
flex-wrap:wrap; }
display: -webkit-flex; /* Safari */
.rect_view{ .identifying {
width: 100rpx; position: absolute;
height: 100rpx; right: 0;
.image{ top: 0;
bottom: 0;
margin: auto;
font-size: 30rpx;
font-weight: 500;
color: rgba(255, 120, 15, 1);
line-height: 20px;
}
}
.uni-input-input,
.uni-input-placeholder {
color: #fff !important;
letter-spacing: 2rpx;
}
.pact text {
font-size: 22rpx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 36px;
}
.pact_text {
font-size: 22px;
font-weight: 400;
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
}
//单选框的样式
.pact {
position: relative;
padding-left: 40rpx;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
}
.u-checkbox-group {
position: absolute;
left: 0;
top: 0;
bottom: 0;
margin: auto;
}
.u-checkbox__icon--square {
border-radius: 50rpx !important;
width: 22rpx;
height: 22rpx;
}
.u-btn {
width: 628rpx;
height: 98rpx;
background: rgba(255, 120, 15, 1) !important;
border-radius: 49rpx;
margin: 0 auto;
font-size: 36rpx;
color: rgba(255, 255, 255, 1) !important;
line-height: 36px;
border: 1px #ff780f solid;
outline: none;
border-color: rgba(255, 120, 15, 1) !important;
}
.warp {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}
.rect {
width: 558rpx;
height: 300rpx;
background-color: #fff;
border-radius: 20rpx;
overflow: hidden;
zoom: 1;
position: relative;
display: flex;
flex-wrap: wrap;
display: -webkit-flex; /* Safari */
.rect_view {
width: 100rpx;
height: 100rpx;
.image {
width: 45rpx; width: 45rpx;
height: 53rpx; height: 53rpx;
display: inline-block; display: inline-block;
}
flex: 1;
margin-top: 77rpx;
}
.rect_view:nth-child(2) image {
width: 57rpx;
height: 45rpx;
}
} .rect_butoon {
flex:1; width: 100%;
margin-top: 77rpx;
}
.rect_view:nth-child(2) image{
width: 57rpx;
height: 45rpx;
}
.rect_butoon{
width: 100%;
position: absolute;
bottom: 0;
height: 85rpx;
text-align: center;
line-height: 85rpx;
border-top: 1px #999999 solid;
}
view{
color: #666;
font-size:24rpx;
margin-top: 30rpx;
}
}
.rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
float: right;
}
.rect_view:nth-child(1) image{
margin-right: 20rpx;
}
.rect_view:nth-child(1){
position: relative;
margin-right: 79rpx;
}
.rect_view:nth-child(1) view{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 0; height: 85rpx;
text-align: center;
line-height: 85rpx;
border-top: 1px #999999 solid;
} }
.rect_view:nth-child(2) image,.rect_view:nth-child(2) view{ view {
float: left; color: #666;
font-size: 24rpx;
margin-top: 30rpx;
} }
.rect_view:nth-child(2) image{ }
margin-left: 20rpx; .rect_view:nth-child(1) image,
} .rect_view:nth-child(1) view {
.rect_view:nth-child(2){ float: right;
position: relative; }
} .rect_view:nth-child(1) image {
.rect_view:nth-child(2) view{ margin-right: 20rpx;
position: absolute; }
bottom: 0; .rect_view:nth-child(1) {
left: 0; position: relative;
} margin-right: 79rpx;
.title_top { }
position: fixed; .rect_view:nth-child(1) view {
top: 36rpx; position: absolute;
left: 0; bottom: 0;
right: 0; right: 0;
margin: auto; }
font-size:36rpx; .rect_view:nth-child(2) image,
color:rgba(255,255,255,1); .rect_view:nth-child(2) view {
text-align: center; float: left;
width: 100%; }
/* 如果您想让slot内容占满整个导航栏的宽度 */ .rect_view:nth-child(2) image {
/* flex: 1; */ margin-left: 20rpx;
/* 如果您想让slot内容与导航栏左右有空隙 */ }
/* padding: 0 30rpx; */ .rect_view:nth-child(2) {
background: none; position: relative;
letter-spacing: 4rpx; }
} .rect_view:nth-child(2) view {
position: absolute;
bottom: 0;
left: 0;
}
.title_top {
position: fixed;
top: calc(var(--status-bar-height) + 18px);
left: 0;
right: 0;
margin: auto;
font-size: 36rpx;
color: rgba(255, 255, 255, 1);
text-align: center;
width: 100%;
/* 如果您想让slot内容占满整个导航栏的宽度 */
/* flex: 1; */
/* 如果您想让slot内容与导航栏左右有空隙 */
/* padding: 0 30rpx; */
background: none;
letter-spacing: 4rpx;
}
button{
width: 670rpx;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
border-radius: 50rpx;
height: 100rpx;
padding: 0 40rpx;
background-color: #ff780f;
color: #FFFFFF;
}
</style> </style>

View File

@@ -28,7 +28,7 @@
<!-- 标签的引入 --> <!-- 标签的引入 -->
<tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign> <tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign>
<view class="titles">直播封面图</view> <view class="titles">直播封面图</view>
<u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :max-count="1" :show-progress="false" @on-change="tupian" del-color="#ececec" upload-text="上传" del-bg-color="#fff"></u-upload> <u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" del-color="#ececec" upload-text="上传" del-bg-color="#fff"></u-upload>
</view> </view>
<view class="button-uview"> <view class="button-uview">
<u-button @click="kaibo">{{relerest}}</u-button> <u-button @click="kaibo">{{relerest}}</u-button>
@@ -60,7 +60,8 @@
relerest: '开始直播', relerest: '开始直播',
fileListes:[], fileListes:[],
rSelect:[], rSelect:[],
image:"" image:"",
token:""
}; };
}, },
methods: { methods: {
@@ -90,7 +91,7 @@
this.init() this.init()
}, },
tupian(a){ tupian(a){
console.log(JSON.parse(a.data).data) console.log(JSON.parse(a.data))
this.image = JSON.parse(a.data).data.file_name this.image = JSON.parse(a.data).data.file_name
}, },
navto(url){ navto(url){
@@ -111,7 +112,8 @@
url:"/pages/release/zhibo", url:"/pages/release/zhibo",
params:{ params:{
url:res.data.url.replace("&","*"), url:res.data.url.replace("&","*"),
id:res.data.chat_id id:res.data.chat_id,
live_id: res.data.live_id
} }
}) })
}) })
@@ -137,6 +139,14 @@
onLoad(){ onLoad(){
this.init() this.init()
uni.removeStorageSync('gouwudai') uni.removeStorageSync('gouwudai')
//
this.token = uni.getStorageSync('token');
var config = {
appkey: 'mgb7ka1',
debug:true
};
} }
}; };
</script> </script>
@@ -472,5 +482,6 @@
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
z-index: 10;
} }
</style> </style>

View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<live-pusher id='livePusher' ref="livePusher" class="livePusher" :url="url" <live-pusher id='livePusher' ref="livePusher" class="livePusher" :url="url"
mode="SD" :muted="true" :enable-camera="true" :auto-focus="true" :beauty="1" whiteness="2" mode="SD" :muted="false" :enable-camera="true" :auto-focus="true" :beauty="meiyan + 1" whiteness="2"
aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error = "error" aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error = "error"
:style="{'height':height + 'px'}" :style="{'height':height + 'px'}"
></live-pusher> ></live-pusher>
@@ -41,9 +41,33 @@
<image class="userhead" :src="info.member_avatar"></image> <image class="userhead" :src="info.member_avatar"></image>
<div class="userinfo"> <div class="userinfo">
<text class="username">{{info.member_name}}</text> <text class="username">{{info.member_name}}</text>
<text class="username" style="font-size:20rpx">asdasdsa | sadasdas</text> <text class="username" style="font-size:20rpx">{{time}} | sadasdas</text>
</div> </div>
</div> </div>
<image class="closeimg" src="../../static/image/close.png" @click="closes"></image>
<image class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
<image class="shoptapimg" @click="xianshi" src="../../static/image/shop.png"></image>
<text style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">德铭阳光在线绿色直播请遵循相关法律法规警察叔叔24小时巡查哦。为了保障直播系统稳定现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
</text>
<div class="bottom" :style="{'height':height + 'px'}" v-if="tool" @click="tool = false">
<view class="menu" @click="zuzhi">
<view class="menuback"></view>
<text class="menutitle">直播工具</text>
<view class="menutool">
<view class="menutoolitem" @click="switchCamera">
<image class="menutoolitemimg"></image>
<text class="menutoolitemtitle">翻转</text>
</view>
<picker @change="bindPickerChange" :value="meiyan" :range="[1,2,3,4,5,6,7,8,9]">
<view class="menutoolitem">
<image class="menutoolitemimg"></image>
<text class="menutoolitemtitle">美颜</text>
</view>
</picker>
</view>
</view>
</div>
<!-- <button class="btn" @click="start">开始推流1</button> <!-- <button class="btn" @click="start">开始推流1</button>
<button class="btn" @click="pause">暂停推流</button> <button class="btn" @click="pause">暂停推流</button>
<button class="btn" @click="resume">resume</button> <button class="btn" @click="resume">resume</button>
@@ -56,6 +80,27 @@
</div> </div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.shoptapimg{
width: 65rpx;
height: 65rpx;
position: fixed;
right: 26rpx;
bottom: 24rpx;
}
.menuimg{
width: 60rpx;
height: 55rpx;
position: fixed;
left: 26rpx;
bottom: 24rpx;
}
.closeimg{
position: fixed;
top: 70rpx;
right: 31rpx;
width: 31rpx;
height: 31rpx;
}
.username{ .username{
font-size: 24rpx; font-size: 24rpx;
color: #fff; color: #fff;
@@ -97,7 +142,6 @@
.shopimg{ .shopimg{
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
background-color: #0f0;
} }
@@ -164,18 +208,67 @@
z-index: 20; z-index: 20;
} }
.menu{
width: 750rpx;
height: 335rpx;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
overflow: hidden;
position: fixed;
bottom: 0;
left: 0;
}
.menuback{
background-color: #000;
opacity: 0.8;
position: absolute;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
overflow: hidden;
top: 0;
left: 0;
}
.menutitle{
font-size: 30rpx;
color: #fff;
margin-left: 30rpx;
margin-top: 30rpx;
}
.menutool{
flex-direction: row;
margin-top: 59rpx;
margin-left: 30rpx;
}
.menutoolitem{
align-items: center;
margin-right: 60rpx;
}
.menutoolitemtitle{
margin-top: 30rpx;
font-size: 28rpx;
color: #fff;
}
.menutoolitemimg{
width: 100rpx;
height: 100rpx;
}
</style> </style>
<script> <script>
const RongIMLib = require('../../static/rongyun.js'); const RongIMLib = require('../../static/rongyun.js');
export default { export default {
data: { data: {
fil: true, fil: true,
url:'', url:'',
height:0, height:0,
show:true, show:false,
list:[], list:[],
info:{}, info:{},
im:{} im:{},
chatroom_id:0,
live_id:0,
tool:false,
meiyan:0,
time:'00:00:00'
}, },
onReady() { onReady() {
// 注意需要在onReady中 或 onLoad 延时 // 注意需要在onReady中 或 onLoad 延时
@@ -195,10 +288,13 @@ const RongIMLib = require('../../static/rongyun.js');
this.url = a.url.replace("*","&") this.url = a.url.replace("*","&")
let that = this let that = this
const token = uni.getStorageSync('token'); const token = uni.getStorageSync('token');
console.log('Bearer' + " " + token)
this.chatroom_id = a.id
this.live_id = a.live_id
uni.request({ uni.request({
url:"https://dmmall.sdbairui.com//storeapi/Streaming/liveStreamList", url:"https://dmmall.sdbairui.com/storeapi/Streaming/liveStreamList",
method:"POST", method:"POST",
headers:{ header:{
'Authorization' : 'Bearer' + " " + token 'Authorization' : 'Bearer' + " " + token
}, },
success(res){ success(res){
@@ -209,56 +305,130 @@ const RongIMLib = require('../../static/rongyun.js');
uni.request({ uni.request({
url:"https://dmmall.sdbairui.com/storeapi/member/memberInfo", url:"https://dmmall.sdbairui.com/storeapi/member/memberInfo",
method:"POST", method:"POST",
headers:{ header:{
'Authorization' : 'Bearer' + " " + token 'Authorization' : 'Bearer' + " " + token
}, },
success(res){ success(res){
console.log(res.data.data.memberInfo) console.log(res.data)
that.info = res.data.data.memberInfo that.info = res.data.data.memberInfo
} }
}) })
var config = { let shi = 0;
appkey: 'mgb7ka1', let fen = 0;
debug:true let miao = 0;
}; setInterval(() => {
var im = RongIMLib.init(config); shi = parseInt(shi)
var conversationList = []; // 当前已存在的会话列表 fen = parseInt(fen)
im.watch({ miao = parseInt(miao)
conversation: function(event){ miao = miao + 1
var updatedConversationList = event.updatedConversationList; // 更新的会话列表 console.log(miao)
console.log('更新会话汇总:', updatedConversationList); if(miao == 60){
console.log('最新会话列表:', im.Conversation.merge({ miao = 0;
conversationList, fen +=1
updatedConversationList
}));
},
message: function(event){
var message = event.message;
console.log('收到新消息:', message);
},
status: function(event){
var status = event.status;
console.log('连接状态码:', status);
} }
}); if(fen == 60){
var user = { shi += 1
token: uni.getStorageSync('rongyun') fen = 0
}; }
im.connect(user).then(function(user) { if(shi < 10){
console.log('链接成功, 链接用户 id 为: ', user.id); shi = '0' + shi
}).catch(function(error) { }
console.log('链接失败: ', error.code, error.msg); if(fen < 10){
}); fen = '0' + fen
var chatRoom = im.ChatRoom.get({ }
id: a.id if(miao < 10){
}); miao = '0' + miao
chatRoom.join({ }
count: 20 // 进入后, 自动拉取 20 条聊天室最新消息 that.time = shi + ":" + fen + ":" + miao
}).then(function() { }, 1000);
console.log('加入聊天室成功'); // var config = {
}); // appkey: 'mgb7ka1',
// debug:true
// };
// var im = RongIMLib.init(config);
// var conversationList = []; // 当前已存在的会话列表
// im.watch({
// conversation: function(event){
// var updatedConversationList = event.updatedConversationList; // 更新的会话列表
// console.log('更新会话汇总:', updatedConversationList);
// console.log('最新会话列表:', im.Conversation.merge({
// conversationList,
// updatedConversationList
// }));
// },
// message: function(event){
// var message = event.message;
// console.log('收到新消息:', message);
// },
// status: function(event){
// var status = event.status;
// console.log('连接状态码:', status);
// }
// });
// var user = {
// token: uni.getStorageSync('rongyun')
// };
// console.log(user,123)
// im.connect(user).then(function(user) {
// console.log('链接成功, 链接用户 id 为: ', user.id);
// }).catch(function(error) {
// console.log('链接失败: ', error.code, error);
// });
// var chatRoom = im.ChatRoom.get({
// id: a.id
// })
// chatRoom.join({
// count: 20 // 进入后, 自动拉取 20 条聊天室最新消息
// }).then(function() {
// console.log('加入聊天室成功');
// }).catch((err)=>{
// console.log(err,262)
// })
}, },
methods: { methods: {
bindPickerChange(a){
console.log(a.detail.value)
this.meiyan = a.detail.value
uni.showToast({
title: '切换成功',
duration: 2000
});
},
closes(){
const token = uni.getStorageSync('token');
let that = this
console.log(that.url)
uni.showModal({
title: '提示',
content: '是否关闭直播',
success: function (res) {
if (res.confirm) {
uni.request({
url:"https://dmmall.sdbairui.com/storeapi/Streaming/destroyChatRoom",
data:{
chatroom_id:that.chatroom_id,
live_id:that.live_id,
url: that.url
},
method:"POST",
header:{
"Authorization" : 'Bearer' + " " + token
},
success(res){
console.log(res)
uni.navigateBack({
delta: 1
});
// that.list= res.data.data
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
statechange(e) { statechange(e) {
console.log("statechange:" + JSON.stringify(e)); console.log("statechange:" + JSON.stringify(e));
}, },
@@ -338,6 +508,10 @@ const RongIMLib = require('../../static/rongyun.js');
} }
}); });
}, },
xianshi(){
this.show = true;
console.log(111)
},
guanbi(){ guanbi(){
this.show = false this.show = false
console.log(123) console.log(123)
@@ -361,7 +535,7 @@ const RongIMLib = require('../../static/rongyun.js');
data:{ data:{
goods_id:arr.join(',') goods_id:arr.join(',')
}, },
headers:{ header:{
'Authorization' : 'Bearer' + " " + token 'Authorization' : 'Bearer' + " " + token
}, },
success(res){ success(res){
@@ -369,7 +543,7 @@ const RongIMLib = require('../../static/rongyun.js');
uni.request({ uni.request({
url:"https://dmmall.sdbairui.com//storeapi/Streaming/liveStreamList", url:"https://dmmall.sdbairui.com//storeapi/Streaming/liveStreamList",
method:"POST", method:"POST",
headers:{ header:{
'Authorization' : 'Bearer' + " " + token 'Authorization' : 'Bearer' + " " + token
}, },
success(res){ success(res){

View File

@@ -1,20 +1,20 @@
<template> <template>
<view class="content"> <view class="content">
<view class="tab-swiper"> <view class="tab-swiper">
<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="30" gutter="317" height="98" :show-bar="false" swiperWidth="750" :is-scroll=false></u-tabs-swiper> <u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="30" gutter="317" height="98" :show-bar="false" swiperWidth="750" :is-scroll="false"></u-tabs-swiper>
</view> </view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish"> <swiper :current="swiperCurrent" >
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;" class="list"> <scroll-view scroll-y style="height: 100%;width: 100%;" class="list">
<view v-for="(item, index) in 5" :key="index"> <view v-for="(item, index) in newlist" :key="index">
<ContentItem :cur="current" :delItem="showPopup"></ContentItem> <ContentItem :info="item" :type="type" del="del"></ContentItem>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;" class="video-list"> <scroll-view scroll-y style="height: 100%;width: 100%;" class="video-list">
<view v-for="(item, index) in 5" :key="index"> <view v-for="(item, index) in newlist" :key="index">
<ContentItem :cur="current" :delItem="showPopup"></ContentItem> <ContentItem :info="item" :type="type" @del="del"></ContentItem>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
@@ -43,23 +43,61 @@ export default {
}, { }, {
name: '视频' name: '视频'
}], }],
type:1,
num:1,
newlist:[]
} }
}, },
components: { components: {
ContentItem ContentItem
}, },
onLoad() {
this.getlist()
},
onReachBottom() {
this.num++
this.getlist()
},
methods: { methods: {
showPopup() { getlist(){
this.show = true; let that = this;
this.$u.api.articlelist({
type:that.type,
page:that.num
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
let arr = res.data.articleList
for(let index in arr){
that.newlist.push(arr[index])
}
}
});
},
del(e) {
// 删除元素
this.show=true
console.log(e)
}, },
tabsChange(index) { tabsChange(index) {
this.swiperCurrent = index; this.swiperCurrent = index;
this.type=index+1;
this.num=0
this.newlist=[]
this.getlist()
}, },
animationfinish(e) { animationfinish(e) {
console.log(12345666)
let current = e.detail.current; let current = e.detail.current;
// this.$refs.uTabs.setFinishCurrent(current);
this.swiperCurrent = current; this.swiperCurrent = current;
this.current = current; this.current = current;
this.type=current+1;
}, },
}, },
}; };

View File

@@ -3,16 +3,16 @@
<view class="lately"> <view class="lately">
<view class="title">最新</view> <view class="title">最新</view>
<view class="items"> <view class="items">
<view v-for="(item, index) in 3" :key="index"> <view v-for="(item, index) in myfans" :key="index">
<FansItem></FansItem> <FansItem :info="item"></FansItem>
</view> </view>
</view> </view>
</view> </view>
<view class="before"> <view class="before">
<view class="title">早前</view> <view class="title">早前</view>
<view class="items"> <view class="items">
<view v-for="(item, index) in 13" :key="index"> <view v-for="(item, index) in newfans" :key="index">
<FansItem></FansItem> <FansItem :info="item"></FansItem>
</view> </view>
</view> </view>
</view> </view>
@@ -22,10 +22,35 @@
import FansItem from '@/components/fans-item/index' import FansItem from '@/components/fans-item/index'
export default { export default {
data() { data() {
return {} return {
myfans:[],
newfans:[]
}
}, },
components: { components: {
FansItem FansItem
},
onLoad() {
this.fans()
},
methods:{
fans(){
let that = this;
this.$u.api.myfanlist({
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
that.myfans = res.data.fans
that.newfans = res.data.fansNewest
console.log(that.myfans,that.newfans)
}
});
}
} }
}; };
</script> </script>

View File

@@ -2,11 +2,11 @@
<view class="user"> <view class="user">
<view class="head" @click="toOthersPage('info')"> <view class="head" @click="toOthersPage('info')">
<view class="info"> <view class="info">
<image></image> <image :src="info.member_avatar"></image>
<view class="name"> <view class="name">
<text>萨大赛</text> <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号123456789</text> <text>账号{{info.member_name}}</text>
<text>个性签名为梦努力</text> <text>个性签名{{info.signature==""?"该用户很懒没有签名!":info.signature}}</text>
</view> </view>
</view> </view>
<image src="/static/image/user/1.png"></image> <image src="/static/image/user/1.png"></image>
@@ -28,7 +28,31 @@
<script> <script>
export default { export default {
name:"user", name:"user",
data() {
return {
info:{}
}
},
onLoad() {
this.getmyinfo()
},
methods: { methods: {
// 获取个人信息
getmyinfo(){
let that = this;
this.$u.api.getshopinfo({
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data.memberInfo
}
});
},
toOthersPage(url) { toOthersPage(url) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/user/' + url url: '/pages/user/' + url

View File

@@ -1,45 +1,106 @@
<template> <template>
<view class="info"> <view class="info">
<view class="head" @click="showImage=true"> <view class="head" @click="chooseImage">
<image></image> <image :src="fileurl" :key="num"></image>
<text>更换头像</text> <text>更换头像</text>
</view> </view>
<view class="item">
<text class="title">用户名</text>
<text class="value">兽兽</text>
</view>
<view class="item"> <view class="item">
<text class="title">个性签</text> <text class="title">用户</text>
<text class="value">变瘦变高变有钱</text> <input type="text" :value="info.member_nickname==null?'新用户':info.member_nickname" />
</view> </view>
<view class="item">
<text class="title">个性签名</text>
<input type="text" :value="info.signature==''?'该用户很懒没有签名!':info.signature" />
</view>
<view class="password" @click="updatePwd"> <view class="password" @click="updatePwd">
<text>修改密码</text> <text>修改密码</text>
<image src="/static/image/user/1.png"></image> <image src="/static/image/user/1.png"></image>
</view> </view>
<u-popup v-model="showImage" mode="bottom"> <u-toast ref="uToast" />
<view class="image-popup"> </view>
<view @click="chooseImage('camera')">拍摄新照片</view>
<view @click="chooseImage('album')">从相册选取</view>
</view>
</u-popup>
</view>
</template> </template>
<script> <script>
export default { export default {
name:"info", name: 'info',
data() { data() {
return { return {
showImage: false fileurl: "",
} filename:"",
info:{},
num:0
};
},
onLoad() {
this.getmyinfo()
},
onNavigationBarButtonTap() {
let that = this;
this.$u.api.changeinfo({
nickname:that.info.member_nickname,
avatar:that.filename,
signature:that.info.signature
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
}, },
methods: { methods: {
// 获取个人信息
getmyinfo(){
let that = this;
this.$u.api.getshopinfo({
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data.memberInfo
this.fileurl = res.data.memberInfo.member_avatar
}
});
},
// 获取图片,上传图片
chooseImage(sourceType) { chooseImage(sourceType) {
let that = this
const token = uni.getStorageSync('token');
uni.chooseImage({ uni.chooseImage({
count: 1, count: 1,
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
sourceType: [sourceType], success: function(res) {
success: function (res) {
console.log(JSON.stringify(res.tempFilePaths)); console.log(JSON.stringify(res.tempFilePaths));
const tempFilePaths = res.tempFilePaths;
that.fileurl = tempFilePaths[0]
uni.uploadFile({
url: 'https://dmmall.sdbairui.com/storeapi/Upload/uploadFile',
filePath: tempFilePaths[0],
name: 'avatar',
formData:{
name:"avatar"
},
header:{
Authorization:'Bearer' + " " + token
},
success: uploadFileRes => {
let obj = JSON.parse(uploadFileRes.data)
that.fileurl = obj.data.file_path
that.filename = obj.data.file_name
that.num++
console.log(that.fileurl,that.filename)
}
});
} }
}); });
}, },
@@ -48,50 +109,49 @@ export default {
url: '/pages/user/updatePassword' url: '/pages/user/updatePassword'
}); });
} }
}, }
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.info{ .info {
min-height: calc(100vh - var(--window-top)); min-height: calc(100vh - var(--window-top));
background: #ececec; background: #ececec;
.head{ .head {
height: 202rpx; height: 202rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #fff; background-color: #fff;
margin-bottom: 2rpx; margin-bottom: 2rpx;
>image{ > image {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
border-radius: 50%; border-radius: 50%;
background-color: #0f0; }
} > text {
>text{ font-size: 24rpx;
font-size: 24rpx; color: #ff780f;
color: #FF780F; margin-top: 20rpx;
margin-top: 20rpx; }
} margin-bottom: 2rpx;
margin-bottom: 2rpx; }
}
.item { .item {
display: flex; display: flex;
align-items: center; align-items: center;
height: 98rpx; height: 98rpx;
background: rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
padding: 0 30rpx; padding: 0 30rpx;
margin-bottom: 2rpx; margin-bottom: 2rpx;
.title { .title {
width: 120rpx; width: 120rpx;
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
margin-right: 120rpx; margin-right: 120rpx;
} }
.value { .value {
font-size: 30rpx; font-size: 30rpx;
color: rgba(101,101,101,1); color: rgba(101, 101, 101, 1);
} }
} }
.password { .password {
@@ -101,10 +161,10 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
> text { > text {
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
} }
> image { > image {
width: 11rpx; width: 11rpx;
@@ -114,12 +174,12 @@ export default {
.image-popup { .image-popup {
padding: 0 30rpx; padding: 0 30rpx;
> view { > view {
font-size: 28rpx; font-size: 28rpx;
color: rgba(51,51,51,1); color: rgba(51, 51, 51, 1);
line-height: 98rpx; line-height: 98rpx;
text-align: center; text-align: center;
&:first-child { &:first-child {
border-bottom: 2rpx solid #EBEBEB; border-bottom: 2rpx solid #ebebeb;
} }
} }
} }

217
pages/user/myinfo.vue Normal file
View File

@@ -0,0 +1,217 @@
<template>
<view class="user">
<view class="head" @click="toOthersPage('info')">
<view class="info">
<image :src="info.member_avatar"></image>
<view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号{{info.member_name}}</text>
<text>个性签名{{info.signature==""?"该用户很懒没有签名!":info.signature}}</text>
</view>
</view>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="toOthersPage('fans')">
<text>我的粉丝</text>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="toOthersPage('content')">
<text>内容管理</text>
<image src="/static/image/user/1.png"></image>
</view>
<view class="release-btn" @click="publish">
<image src="../../static/image/index/publish.png"></image>
<view class="text">发布</view>
</view>
<u-popup v-model="publishstate" mode="bottom">
<view class="publish">
<view class="list">
<view @click="navto('release/tosign')">
<image src="../../static/image/index/live.png"></image>
<text>直播</text>
</view>
<view @click="navto('release/index')">
<image src="../../static/image/index/photo.png"></image>
<text>图文</text>
</view>
<view @click="navto('release/video')">
<image src="../../static/image/index/video.png"></image>
<text>视频</text>
</view>
</view>
<image src="../../static/image/index/close.png" class="off" @click="close"></image>
</view>
</u-popup>
</view>
</template>
<script>
export default {
name:"user",
data() {
return {
publishstate:false,
info:{},
}
},
onLoad() {
this.getmyinfo()
},
methods: {
// 获取个人信息
getmyinfo(){
let that = this;
this.$u.api.getshopinfo({
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data.memberInfo
}
});
},
toOthersPage(url) {
uni.navigateTo({
url: '/pages/user/' + url
});
},
// 打开发布弹窗
publish() {
this.publishstate = true;
},
// 关闭发布弹窗
close() {
this.publishstate = false;
},
// 跳转发布页面
navto(url) {
this.$u.route({
url: `/pages/${url}`
});
}
},
}
</script>
<style lang="scss" scoped>
.release-btn {
position: fixed;
bottom: 475rpx;
right: 30rpx;
width: 100rpx;
height: 100rpx;
background: rgba(255, 120, 15, 1);
box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255, 120, 15, 0.22);
border-radius: 50%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
> image {
width: 36rpx;
height: 36rpx;
flex-shrink: 0;
margin-bottom: 2rpx;
}
.text {
font-size: 20rpx;
color: rgba(255, 255, 255, 1);
}
}
.publish {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
padding: 50rpx 84rpx 31rpx 78rpx;
image {
}
.list {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
> view {
display: flex;
flex-direction: column;
align-items: center;
> image {
width: 94rpx;
height: 80rpx;
}
> text {
margin-top: 10rpx;
font-size: 28rpx;
color: #333;
font-weight: 400;
}
}
}
.off {
margin-top: 81rpx;
width: 37rpx;
height: 37rpx;
}
}
.user{
min-height: calc(100vh - var(--window-top));
background: #ececec;
.head{
width: 100%;
height: 220rpx;
background-color: #FF780F;
padding: 0 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
.info{
display: flex;
align-items: center;
>image{
width: 110rpx;
height: 110rpx;
border-radius: 50%;
background-color: #0f0;
}
.name{
font-size: 24rpx;
color: #fff;
display: flex;
flex-direction: column;
margin-left: 26rpx;
>text{
margin-top: 14rpx;
}
>text:first-child{
font-size: 28rpx;
margin-top: 0;
}
}
}
>image{
width: 12rpx;
height: 20rpx;
}
}
.nav{
width: 100%;
height: 100rpx;
display: flex;
padding: 30rpx;
align-items: center;
justify-content: space-between;
font-size: 30rpx;
margin-bottom: 2rpx;
color:#333;
background-color: #fff;
>image{
width: 13rpx;
height: 25rpx;
}
}
}
</style>

View File

@@ -15,7 +15,8 @@
</u-form> </u-form>
</view> </view>
<text class="tips">密码必须是8-16至少含数字/字母/字符两种组合</text> <text class="tips">密码必须是8-16至少含数字/字母/字符两种组合</text>
<view class="btn">确定</view> <view class="btn" @click="update">确定</view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script> <script>
@@ -28,6 +29,29 @@ export default {
rePassword: '' rePassword: ''
}, },
} }
},
methods:{
update(){
let that = this;
this.$u.api.editpassword({
old_password:that.model.password,
password:that.model.newPassword,
repassword:that.model.rePassword
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
},
} }
}; };
</script> </script>

BIN
static/image/close.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

BIN
static/image/index/live.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/image/menu.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/image/shop.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB