theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qxf #113

Merged
qxf merged 13 commits from qxf into master 2020-11-27 11:41:51 +08:00
Conversation 0 Commits 13 Files Changed 9 +75 -41
9 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
manifest.json
View File

@ -61,7 +61,13 @@
"abiFilters" : [ "armeabi-v7a", "x86" ]
},
/* ios打包配置 */
"ios" : {},
"ios" : {
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "应用将在您上传图文视频等服务中使用您的相册。",
"NSMicrophoneUsageDescription" : "应用将会在您开启直播时使用您的麦克风。",
"NSCameraUsageDescription" : "应用将会在您开启直播时使用您的摄像头。"
}
},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {},
@ -71,13 +77,13 @@
},
"icons" : {
"android" : {
"hdpi" : "E:/Source-code/appleidmore/安卓png/72x72psd.PNG",
"xhdpi" : "E:/Source-code/appleidmore/安卓png/96x96psd.PNG",
"xxhdpi" : "E:/Source-code/appleidmore/安卓png/144x144.PNG",
"xxxhdpi" : "E:/Source-code/appleidmore/安卓png/192x192.PNG"
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "E:/Source-code/appleidmore/苹果png/appstore 1024X1024.PNG",
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
@ -90,27 +96,27 @@
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
"app@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
"notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
"notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG",
"settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
"settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
"spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
"spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG"
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
},
"splashscreen" : {
"iosStyle" : "storyboard",
"ios" : {
"storyboard" : "E:/Source-code/deming/static/CustomStoryboard.zip"
"storyboard" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/CustomStoryboard.zip"
},
"androidStyle" : "default",
"android" : {
"hdpi" : "E:/Source-code/deming/static/app/start/480x762.png",
"xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.png",
"xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.png"
"hdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/480x762.png",
"xhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/720x1242.png",
"xxhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/1080x1882.png"
}
}
}

2
pages/index/otherdetails.vue
View File

@ -165,7 +165,7 @@ export default {
} else {
this.$u.api.agreetest({
goods_try_id: this.orderid,
type: 1,
type: 2,
takeawayer_id: this.selctcar.takeawayer_id
}).then(res => {
console.log(res);

36
pages/login/login.vue
View File

@ -147,18 +147,32 @@ export default {
// console.log(this.$u.trim(this.zhanghaoA));
},
logins() {
// 检查网络
uni.getNetworkType({
success: (res) => {
console.log(res.networkType);
if (res.networkType == 'none') {
this.$refs.uToast.show({
title: '网络似乎断开了，请检查网络后重试',
type: 'error'
});
}
},
});
// if(!this.consentPact) return false;
// 判断是否可以点击
// console.log(this.zhanghao);
if(this.clickstate==false){
this.clickstate=true
}else{
this.$refs.uToast.show({
title: "不能重复提交",
type: 'error'
});
return
}
// if(this.clickstate==false){
// this.clickstate=true
// }else{
// 此验证存在逻辑问题,会出现卡死在这里的情况
// this.$refs.uToast.show({
// title: "不能重复提交",
// type: 'error'
// });
// return
// }
// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
// uni.clearStorage();
// 账号登录1达人0商家
@ -167,7 +181,7 @@ export default {
console.log(JSON.stringify(res))
if (res.errCode != 0) {
// 恢复按钮可点击状态
this.clickstate=false
// this.clickstate=false
this.$refs.uToast.show({
title: res.message,
type: 'error'
@ -218,7 +232,7 @@ export default {
console.log(JSON.stringify(res))
if (res.errCode != 0) {
// 恢复按钮可点击状态
this.clickstate=false
// this.clickstate=false
this.$refs.uToast.show({
title: res.message,
type: 'error'

15
pages/release/video.vue
View File

@ -91,11 +91,18 @@ let COS = require('../../common/cos-wx-sdk-v5.js');
const upload_file_server = (_this, filepath) => {
// 腾讯云配置
let cosConfig = {
Bucket: 'dmmall-1300406074', //replace with yours
Bucket: 'dmmall-1302895943', //replace with yours
Region: 'ap-shanghai', //replace with yours
SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
SecretId: 'AKID7z1lFeo0tV9YmmvZ52mrxlNmvqHTcuCF', //replace with yours
SecretKey: 'd3zTJ0RFwMYVE7jAMJzQ4UbS4YmmJiPq' //replace with yours
};
// 腾讯云配置
// let cosConfig = {
// Bucket: 'dmmall-1300406074', //replace with yours
// Region: 'ap-shanghai', //replace with yours
// SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
// SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
// };
// 获取本地文件
let filePath = filepath;
// 自定义文件名以及路径
@ -125,7 +132,7 @@ const upload_file_server = (_this, filepath) => {
console.log(err, data, 12345);
if (err == null) {
if (data.statusCode == 200) {
_this.videopath = 'https://dmmall-1300406074.cos.ap-shanghai.myqcloud.com/' + Key;
_this.videopath = 'https://dmmall-1302895943.cos.ap-shanghai.myqcloud.com/' + Key;
uni.hideLoading();
_this.videostate = true;
} else {

10
pages/release/zhibo.nvue
View File

@ -139,8 +139,8 @@
font-size: 30rpx;
color:#fff;
width: 350rpx;
position: absolute;
top: 70rpx;
position: absolute;
top: 70rpx;
left: 31rpx;
height: 31rpx;
}
@ -234,7 +234,9 @@
border-bottom-width: 2rpx;
border-style: solid;
border-color: #ECECEC;
/* #ifndef APP-PLUS-NVUE */
display: flex;
/* #endif */
flex-direction: row;
align-items: center;
}
@ -269,7 +271,9 @@
border-bottom-width: 2rpx;
border-style: solid;
border-color: #ECECEC;
/* #ifndef APP-PLUS-NVUE */
display: flex;
/* #endif */
flex-direction: row;
align-items: center;
justify-content: space-between;
@ -347,7 +351,9 @@
font-size: 30rpx;
color: #fff;
flex-direction: column-reverse;
/* #ifndef APP-PLUS-NVUE */
word-wrap:anywhere;
/* #endif */
font-weight: bold;
}
.livePusher{

2
pages/user/contentDetails.vue
View File

@ -36,7 +36,7 @@
<view class="name">{{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}}</view>
<view class="time">{{item.create_time}}</view>
</view>
<view class="btn" @click="showreply(item.id,item.member_id)">回复</view>
<view class="btn" @click="showreply(item.id,item.member_id)" v-if="item.pid==0">回复</view>
</view>
<view class="content u-line-1">{{item.content}}</view>
</view>

5
pages/user/info.vue
View File

@ -5,7 +5,8 @@
<text>更换头像</text>
</view>
<view class="item">
<text class="title">店铺名称</text>
<text class="title" v-if="role == 2">店铺名称</text>
<text class="title" v-else>达人名称</text>
<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
</view>
<view class="item">
@ -114,7 +115,7 @@ export default {
},
success: uploadFileRes => {
let obj = JSON.parse(uploadFileRes.data)
that.fileurl = obj.data.file_path
that.fileurl = obj.data.file_path+'?'+new Date().getTime()
that.filename = obj.data.file_name
that.num++
console.log(that.fileurl,that.filename)

2
pages/user/myinfo.vue
View File

@ -2,7 +2,7 @@
<view class="user">
<view class="head" @click="toOthersPage('info')">
<view class="info">
<image :src="info.member_avatar"></image>
<image :src="info.member_avatar + '?' + (new Date().getTime())"></image>
<view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号：{{info.member_name}}</text>

2
static/chatservice.js
View File

@ -62,7 +62,7 @@ function ChatRoomService(room, user) {
//获取实例
ChatRoomService.prototype.connectGoEasyIM = function () {
this.im = GoEasyIM.getInstance({
appkey: 'BC-453aa755c4ea48148abefc55a86df283',
appkey: 'BC-d9b5e639006b4ee2a4bc9eddc4235a6a',
host: 'hangzhou.goeasy.io'
});