31 Commits

Author SHA1 Message Date
9e8d4d4b58 更换 2020-09-25 17:41:56 +08:00
fb5c8aa476 更换图片 2020-09-19 16:14:56 +08:00
gyh
a732778481 Merge pull request 'gdpao' (#106) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/106
2020-09-18 14:23:48 +08:00
Gdpao
2d7922ff96 gdpao 2020-09-18 14:22:31 +08:00
5b3dbd1dc2 Merge pull request '更改了字体 修复了10秒消失' (#105) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/105
2020-09-18 09:52:24 +08:00
880ce7487b 更改了字体 修复了10秒消失 2020-09-18 09:51:48 +08:00
a6a65153ea Merge pull request 'xbx' (#104) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/104
2020-09-17 19:44:21 +08:00
c77a7a4d5b 删除了断流提示 2020-09-17 19:18:42 +08:00
32bcfb92e1 消除了退出之后的探矿 2020-09-17 19:11:27 +08:00
100d4d67b9 一分钟之后文字消失 2020-09-17 19:04:55 +08:00
a1d9339948 Merge pull request 'xbx' (#103) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/103
2020-09-16 19:06:03 +08:00
a4fee4682f 删除了清楚定时器 2020-09-16 19:05:13 +08:00
f74c8a8776 十秒提交一次 2020-09-16 19:01:33 +08:00
gyh
2f62fde4f6 Merge pull request 'gdpas' (#102) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/102
2020-09-16 17:08:29 +08:00
Gdpao
905ae3b9da gdpas 2020-09-16 11:33:14 +08:00
gyh
341d733a16 Merge pull request 'gdpao' (#101) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/101
2020-09-15 17:41:25 +08:00
Gdpao
c02acd7259 gdpao 2020-09-15 16:46:40 +08:00
aa0d7a4a06 Merge pull request '修复了清楚图片' (#100) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/100
2020-09-11 20:43:37 +08:00
45b6086398 修复了清楚图片 2020-09-11 20:43:21 +08:00
f81ce05547 Merge pull request 'xbx' (#99) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/99
2020-09-11 20:23:56 +08:00
fb81800253 涉黄提示 2020-09-11 20:23:34 +08:00
1f6d2b4ab3 删除了派送方式 2020-09-11 20:03:26 +08:00
52277be0c9 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-11 19:46:31 +08:00
f770b05dcd Merge pull request '修改了热度 => 观看人数' (#98) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/98
2020-09-11 16:46:32 +08:00
gyh
909082f7ca Merge pull request 'gdpao' (#97) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/97
2020-09-11 15:37:57 +08:00
Gdpao
dadb891236 gdpao 2020-09-11 15:25:57 +08:00
42e3c7d6a7 Merge pull request 'xbx' (#96) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/96
2020-09-10 17:21:57 +08:00
gyh
541d8f9f6e Merge pull request 'gdzb' (#95) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/95
2020-09-10 16:14:22 +08:00
5f56b7a27c Merge pull request 'xbx' (#94) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/94
2020-09-10 16:01:29 +08:00
Gdpao
c270f238bd gdzb 2020-09-10 14:48:17 +08:00
5add00c60a Merge pull request 'xbx' (#93) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/93
2020-09-10 11:38:51 +08:00
12 changed files with 147 additions and 41 deletions

View File

@@ -4,6 +4,11 @@ export default {
im: {}
},
onLaunch: function() {
// 禁止旋转
// #ifdef APP-PLUS
plus.screen.lockOrientation('portrait-primary');
// #endif
getApp().globalData.im = this.imService
console.log('App Launch');
// 缓存token

View File

@@ -157,7 +157,12 @@ const install = (Vue, vm) => {
// 达人登录
starLogin({member_mobile,sms_code}) {
return vm.$u.post("/Login/platformExpertPhoneLogin",{member_mobile,sms_code})
}
},
//上传直播间人数
//https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber?live_id=1&realtime_number=10
changeLiveRealtimeNumber({id,number}){
return vm.$u.post("Streaming/changeLiveRealtimeNumber",{live_id:id,realtime_number:number})
}
}
// 将各个定义的接口名称统一放进对象挂载到vm.$u.api(因为vm就是this也即this.$u.api)下

View File

@@ -16,19 +16,19 @@
</view>
</view>
<u-radio-group class="box" v-model="value" v-if="type>3">
<view class="goods-info" v-for="list in info.refund_list">
<image :src="list.goods_image"></image>
<view class="goods-info" v-for="list in info.goods_list">
<image :src="list.image_480_url"></image>
<view class="info-right">
<view class="name u-line-1">{{ list.goods_name }}</view>
<view class="info">
<view class="num">{{ list.goods_num }}件商品</view>
<view class="price">
实付
<span>{{ list.refund_amount }}</span>
<span>{{ list.goods_pay_price }}</span>
</view>
</view>
</view>
<u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
<!-- <u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange"> -->
</u-radio >
</view>
</u-radio-group>
@@ -43,16 +43,20 @@
</view>
<view>
<view class="title">手机号</view>
<view class="value">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
</view>
<view>
<view class="title">收货地址</view>
<view class="value u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
<view class="value u-line-2" @longtap="longtap(info.extend_order_common.reciver_info.address)">{{ info.extend_order_common.reciver_info.address }}</view>
</view>
<view>
<view class="title">派送方式</view>
<view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
</view>
<view class="remark">
<view class="title">订单备注</view>
<view class="value" @longtap="longtap(info.extend_order_common.order_message)">{{ info.extend_order_common.order_message }}</view>
</view>
<view @click="showInvoice">
<view class="title">开具发票</view>
<view class="invoice">
@@ -80,11 +84,11 @@
</view>
</view>
<!-- 待处理 -->
<view class="delivery" v-if="type == 1">
<view class="delivery" v-if="type == 1 && cur != -1">
<view class="title">派送方式</view>
<view class="methods">
<view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
<view :class="{ active: cur == 2 }" @click="pushstyleC">自提</view>
</view>
<view v-if="pushstyleBshow && (pushid || selctcar)" >
@@ -276,6 +280,7 @@ export default {
this.type = option.type;
// console.log(this.type)
this.orderid = option.id;
this.resetinfo();
if (this.type == 1) {
// 获取快递公司
@@ -330,26 +335,39 @@ export default {
this.refundid = e
console.log(e);
},
pushstyle(index) {
// console.log(this.users_type);
if (this.users_type == 1 && index == 1) {
this.showcompany = true;
} else if (this.users_type == 2 && index == 2) {
this.show = true;
} else if (this.users_type == 3 && index == 3) {
this.cur = 2;
}
},
// 人工配送
pushstyleA() {
if(this.cur != 0){
console.log(this.cur)
if(this.cur != 0 && this.cur != -1){
return ;
}
this.cur = 0;
this.showcompany = true;
},
// 选择骑手
pushstyleB() {
if(this.cur != 1){
if(this.cur != 1 && this.cur != -1){
return ;
}
this.cur = 1;
this.show = true;
},
// 选择骑手
// 自提
pushstyleC() {
if(this.cur != 2){
if(this.cur != 2 && this.cur != -1){
return ;
}
this.cur = 2;
this.pushstyleBshow = true
},
// 获取物流公司列表
@@ -379,7 +397,8 @@ export default {
})
return
}
this.showExpress = false;
this.showExpress = false;
this.pushstyleBshow = true
},
// 取消退款
cancel() {
@@ -389,14 +408,15 @@ export default {
//
confirm() {
this.showRefunds = false;
if (!this.refundid) {
this.$refs.uToast.show({
title: "请选择商品",
type: "warning"
});
return;
}
// if (!this.refundid) {
// this.$refs.uToast.show({
// title: "请选择商品",
// type: "warning"
// });
// return;
// }
if (this.cur == 0) {
console.log(this.refundid);
// 确定退款
this.$u.api.refund({
refund_id: this.refundid,
@@ -547,6 +567,7 @@ export default {
// 选择骑手
getselect(e) {
this.selctcar = this.list[e[0].value];
this.pushstyleBshow = true
},
// 获取订单信息
resetinfo() {
@@ -567,11 +588,14 @@ export default {
this.is_invoice = this.invoiceList.invoice_id || false;
this.invoice_type = this.invoiceList.invoice_type;
this.ordered_type = res.data.store_deliver_type; // 发货方式
// console.log(this.users_type,this.cur);
// 骑手
this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息
// 自提
this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
// 退款id
this.refundid = res.data.refund_list[0].refund_id;
// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
}
});
@@ -599,6 +623,15 @@ export default {
urls: this.mineBy_img,
current: 1
})
},
// 复制到粘贴板
longtap(text) {
console.log(text);
uni.setClipboardData({
data: text,
success: (res) => {
}
});
}
}
};
@@ -745,10 +778,16 @@ export default {
padding: 0 30rpx;
background-color: #ffffff;
margin-bottom: 20rpx;
.remark {
padding: 10rpx 0;
height: 100%;
min-height: 88rpx;
}
> view {
height: 88rpx;
display: flex;
align-items: center;
height: 88rpx;
padding: 10rpx 0;
color: rgba(51, 51, 51, 1);
&:not(:last-child) {
border-bottom: 2rpx solid #ececec;
@@ -809,11 +848,11 @@ export default {
}
.btn {
position: absolute;
bottom: 40rpx;
left: 50%;
transform: translate(-50%, 0);
width: 690rpx;
height: 98rpx;
margin: 40rpx 0;
background: rgba(255, 120, 15, 1);
border-radius: 49rpx;
font-size: 36rpx;

View File

@@ -20,7 +20,7 @@
<view class="" v-if="state==0">
<view class="labales">
<image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghao" type="text" placeholder="请输入账号" />
<input v-model="zhanghao" type="text" @blur="getBlurVal" placeholder="请输入账号" />
</view>
<view class="labales">
<image src="../../static/image/login/login(1).png"></image>
@@ -30,7 +30,7 @@
<view class="" v-else-if="state==1">
<view class="labales">
<image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
<input v-model="zhanghaoA" type="text" @blur="getBlurVal1" placeholder="请输入账号" />
</view>
<view class="labales">
<image src="../../static/image/login/login(1).png"></image>
@@ -128,6 +128,15 @@ export default {
}
})
},
// 失去焦点获取数据
getBlurVal(e) {
// console.log(e.detail.value);
this.zhanghao = this.$u.trim(e.detail.value,"all");
},
getBlurVal1(e) {
this.zhanghaoA = this.$u.trim(e.detail.value,"all");
// console.log(this.$u.trim(this.zhanghaoA));
},
logins() {
// 判断是否可以点击
// console.log(this.zhanghao);

View File

@@ -149,7 +149,6 @@ export default {
this.getLiveSpec();
this.device = uni.getSystemInfoSync(); // 获取信息
console.log(this.device);
},
methods: {
publish() {
@@ -158,7 +157,7 @@ export default {
for (let index in arr) {
newarr.push(arr[index].file_id);
}
console.log(this.imgarrA);
console.log(this.imgarrA,newarr);
this.$u.api
.publishphoto({
article_title: this.form.name,

View File

@@ -13,7 +13,7 @@
<view id="content_tosign">
<u-form :model="form" ref="uForm">
<u-form-item label-position="right">
<u-input v-model="max" :placeholder="userinfo.rple != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
<u-input v-model="max" :placeholder="userinfo.role != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
</u-form-item>
<view class="values"><text>{{this.titleMaxLength - this.max.length}}</text>/20</view>
<u-form-item label-position="right">
@@ -28,7 +28,7 @@
<!-- 标签的引入 -->
<tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign>
<view class="titles">直播封面图</view>
<u-upload :form-data="{'name':'article_cover'}" action='https://mall.dmygkeji.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
<u-upload ref="upload" :form-data="{'name':'article_cover'}" action='https://mall.dmygkeji.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
</view>
<view class="button-uview">
<u-button :hair-line="false" @click="kaibo">{{relerest}}</u-button>
@@ -112,9 +112,19 @@
tupian(a){
// console.log(JSON.parse(a.data));
let info = JSON.parse(a.data);
console.log(info.data);
console.log(info);
// console.log(JSON.stringify(a.data))
if(info.errCode == 1){
this.$refs.uToast.show({
title: info.message,
type: 'error'
});
this.$refs.upload.clear()
return ;
}
this.image = info.data.file_name;
},
navto(url){
this.$u.route({
@@ -179,6 +189,7 @@
this.token = uni.getStorageSync('token');
this.userinfo = uni.getStorageSync("userinfo")
console.log(this.userinfo)
var config = {
appkey: 'mgb7ka1',
debug:true

View File

@@ -47,7 +47,7 @@
<image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>
<image v-if="zhibo" class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
<image v-if="zhibo && list.length != 0" class="shoptapimg" @click="xianshi" src="../../static/image/shop.png" ></image>
<text v-if="zhibo" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">本平台提倡绿色健康直播,严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为,若有违反,将向相关部门依法追究您的法律责任。如因此给平台造成损失,有权向您全额追偿。
<text v-if="zhibo && fen" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx;">本平台提倡绿色健康直播,严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为,若有违反,将向相关部门依法追究您的法律责任。如因此给平台造成损失,有权向您全额追偿。
</text>
<div v-if="zhibo" class="danmulist">
<text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
@@ -139,7 +139,7 @@
font-size: 30rpx;
color:#fff;
width: 350rpx;
position: fixed;
position: absolute;
top: 70rpx;
left: 31rpx;
height: 31rpx;
@@ -344,10 +344,11 @@
width: 690rpx;
}
.danmuitem{
font-size: 26rpx;
font-size: 30rpx;
color: #fff;
flex-direction: column-reverse;
word-wrap:anywhere;
font-weight: bold;
}
.livePusher{
width: 750rpx;
@@ -374,7 +375,9 @@
danmulist:[],
zhibo:true,
jieshu:{},
renshumax:0
renshumax:0,
changeLiveRealtimeNumber:{},
fen:true
},
onLaunch: function() {
console.log('App Launch');
@@ -386,9 +389,16 @@
this.stop()
this.startPreview()
this.start()
// var message = {
// senderNickname : this.room.currentUser.nickname ,
// type : 1,
// content : '重连'
// }
// this.chatRoomService.sendMessages(this.room.id, message);
},
onHide: function() {
console.log('App Hide');
this.chatRoomService.warrings = ()=>{};
},
//模拟onshow生命周期
created() {
@@ -438,6 +448,7 @@
return true;
},
onLoad(a){
console.log(getApp().globalData.im)
uni.setKeepScreenOn({
keepScreenOn: true
@@ -448,6 +459,7 @@
console.log('Bearer' + " " + token)
this.chatroom_id = a.id
this.live_id = a.live_id
uni.request({
url:"https://mall.dmygkeji.com/storeapi/Streaming/liveStreamList",
method:"POST",
@@ -489,6 +501,7 @@
that.chatRoomService.warrings = that.jinggao
//获取当前聊天室数据
that.room = that.chatRoomService.room;
console.log(that.room)
that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
}
})
@@ -501,6 +514,9 @@
miao = parseInt(miao)
miao = miao + 1
// console.log(miao)
if(fen > 0){
that.fen = false;
}
if(miao == 60){
miao = 0;
fen +=1
@@ -520,6 +536,24 @@
}
that.time = shi + ":" + fen + ":" + miao
}, 1000);
setInterval(()=>{
console.log("定时")
uni.request({
url:"https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber",
method:"POST",
header:{
'Authorization' : 'Bearer' + " " + token
},
data:{
live_id:that.live_id,
realtime_number: that.room.onlineUsers.users.length - 1 < 0 ? 0 : that.room.onlineUsers.users.length - 1
},
success(res){
console.log(JSON.stringify(res))
}
})
},
10 * 1000)
// var roomToken = JSON.parse(options.roomToken);
@@ -635,6 +669,8 @@
});
return ;
}
this.chatRoomService.warrings = ()=>{};
const token = uni.getStorageSync('token');
let that = this
console.log(that.url)

View File

@@ -6,16 +6,16 @@
<view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号{{info.member_name}}</text>
<text>个性签名{{info.signature==""?"该用户很懒没有签名!":info.signature}}</text>
<text class="u-line-2">个性签名{{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>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="toOthersPage('content')">
<view class="nav" @click="toOthersPage('content')">
<text>内容管理</text>
<image src="/static/image/user/1.png"></image>
</view>
@@ -160,6 +160,7 @@ export default {
align-items: center;
>image{
flex-shrink: 0;
width: 110rpx;
height: 110rpx;
border-radius: 50%;

View File

@@ -6,7 +6,7 @@
<view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号{{info.member_name}}</text>
<text>个性签名{{info.signature==""?"该用户很懒没有签名!":info.signature}}</text>
<text class="u-line-2">个性签名{{info.signature==""?"该用户很懒没有签名!":info.signature}}</text>
</view>
</view>
<image src="/static/image/user/1.png"></image>
@@ -278,6 +278,7 @@ export default {
align-items: center;
>image{
flex-shrink: 0;
width: 110rpx;
height: 110rpx;
border-radius: 50%;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
static/image/shopback.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@@ -36,7 +36,7 @@ function CurrentUser(uuid, name, avatar) {
function IMService() {
this.im = GoEasyIM.getInstance({
host:'hangzhou.goeasy.io',//qos=1
appkey:'BC-453aa755c4ea48148abefc55a86df283'
appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
});
//当前“我”
this.currentUser = null;