From dfd9fb1b67a80663e99bd8068cbe99961306d0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Wed, 14 Oct 2020 15:31:40 +0800
Subject: [PATCH 01/12] Update manifest.json
---
manifest.json | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/manifest.json b/manifest.json
index d017f2e..840fdb5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -71,13 +71,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 +90,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"
}
}
}
From 2d76a8ea6310d38a687b1775f01023b55d9c7e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Wed, 14 Oct 2020 23:22:46 +0800
Subject: [PATCH 02/12] Update chatservice.js
---
static/chatservice.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/static/chatservice.js b/static/chatservice.js
index 8d6b39b..b8b5143 100644
--- a/static/chatservice.js
+++ b/static/chatservice.js
@@ -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'
});
From 8aab721c0ef112fc6924fc47cff7e125c7da8a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Thu, 15 Oct 2020 21:20:04 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=91=E6=89=8B?=
=?UTF-8?q?=E6=B4=BE=E9=80=81=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/otherdetails.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/index/otherdetails.vue b/pages/index/otherdetails.vue
index a13b39c..23e1168 100644
--- a/pages/index/otherdetails.vue
+++ b/pages/index/otherdetails.vue
@@ -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);
From 5757c4bce324fdf5f769b5e99d0672c0e3554281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Thu, 15 Oct 2020 22:52:53 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BE=BE=E4=BA=BA?=
=?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95=E6=94=B9=E4=B8=BA=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E8=BE=BE=E4=BA=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/info.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pages/user/info.vue b/pages/user/info.vue
index d1d5158..3e00ec7 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -5,7 +5,8 @@
更换头像
- 店铺名称
+ 店铺名称
+ 达人名称
From b139bf12246dcd02df577f6f1c7c15574044caf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Thu, 15 Oct 2020 22:53:10 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BB=85=E4=B8=BB=E8=AF=84=E8=AE=BA?=
=?UTF-8?q?=E5=8F=AF=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/contentDetails.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue
index 7c90a60..bc930e5 100644
--- a/pages/user/contentDetails.vue
+++ b/pages/user/contentDetails.vue
@@ -36,7 +36,7 @@
{{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}}
{{item.create_time}}
- 回复
+ 回复
{{item.content}}
From 812bb07e1e9f9b9bc34e58ae87135ff8e3bd3af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Sat, 17 Oct 2020 09:52:15 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=8D=A2?=
=?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=88=B7=E6=96=B0=E4=B8=8D=E5=8F=8A=E6=97=B6?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/info.vue | 2 +-
pages/user/myinfo.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/user/info.vue b/pages/user/info.vue
index 3e00ec7..5bb7d19 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -115,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)
diff --git a/pages/user/myinfo.vue b/pages/user/myinfo.vue
index 5266b52..9df80e2 100644
--- a/pages/user/myinfo.vue
+++ b/pages/user/myinfo.vue
@@ -2,7 +2,7 @@
-
+
{{info.member_nickname==null?"新用户":info.member_nickname}}
账号：{{info.member_name}}
From c330638827959e7564cb44d1dc2c9cbe9c39a330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Mon, 9 Nov 2020 09:47:18 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=85=BE=E8=AE=AF?=
=?UTF-8?q?=E4=BA=91cos=E9=85=8D=E7=BD=AE=E5=A4=B1=E6=95=88=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/release/video.vue | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/pages/release/video.vue b/pages/release/video.vue
index 036969a..7fa025f 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -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 {
From 005ae548a8e669a4ffb4e7e033d6e42ef2ee9031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Mon, 9 Nov 2020 09:48:34 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=BC=96=E8=AF=91nv?=
=?UTF-8?q?ue=E6=96=87=E4=BB=B6=E6=A0=B7=E5=BC=8F=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/release/zhibo.nvue | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue
index 74e4345..6632932 100644
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -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{
From da02e25fd1b3739e80b954e490603763b226759f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Mon, 9 Nov 2020 17:34:14 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=BD=91=E7=BB=9C?=
=?UTF-8?q?=E4=B8=8D=E9=80=9A=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/login.vue | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b2a36ea..65e4efb 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -138,16 +138,30 @@ export default {
// console.log(this.$u.trim(this.zhanghaoA));
},
logins() {
+ // 检查网络
+ uni.getNetworkType({
+ success: function (res) {
+ console.log(res.networkType);
+ if (res.networkType == 'none') {
+ this.$refs.uToast.show({
+ title: '网络似乎断开了，请检查网络后重试',
+ type: 'error'
+ });
+ }
+ }
+ });
+
// 判断是否可以点击
// console.log(this.zhanghao);
if(this.clickstate==false){
this.clickstate=true
}else{
- this.$refs.uToast.show({
- title: "不能重复提交",
- type: 'error'
- });
- return
+ // 此验证存在逻辑问题,会出现卡死在这里的情况
+ // this.$refs.uToast.show({
+ // title: "不能重复提交",
+ // type: 'error'
+ // });
+ // return
}
// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
// uni.clearStorage();
From 1529dcb6e693898ce3f7ad3c732d3ad94d8d1573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Mon, 9 Nov 2020 17:43:58 +0800
Subject: [PATCH 10/12] Update login.vue
---
pages/login/login.vue | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 65e4efb..c4a6039 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -148,7 +148,13 @@ export default {
type: 'error'
});
}
- }
+ },
+ fail: function () {
+ this.$refs.uToast.show({
+ title: '网络似乎断开了，请检查网络后重试!',
+ type: 'error'
+ });
+ }
});
// 判断是否可以点击
From 02d289b31db22da28c9d0df3eafc6c936c1613ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Fri, 27 Nov 2020 11:27:43 +0800
Subject: [PATCH 11/12] Update manifest.json
---
manifest.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/manifest.json b/manifest.json
index 840fdb5..ada4abc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,7 +61,13 @@
"abiFilters" : [ "armeabi-v7a", "x86" ]
},
/* ios打包配置 */
- "ios" : {},
+ "ios" : {
+ "privacyDescription" : {
+ "NSPhotoLibraryUsageDescription" : "应用将在您上传图文视频等服务中使用您的相册。",
+ "NSMicrophoneUsageDescription" : "应用将会在您开启直播时使用您的麦克风。",
+ "NSCameraUsageDescription" : "应用将会在您开启直播时使用您的摄像头。"
+ }
+ },
/* SDK配置 */
"sdkConfigs" : {
"ad" : {},
From 99ab0696ba19d63e2e76db76410a55f671712027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Fri, 27 Nov 2020 11:36:15 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E6=A3=80?=
=?UTF-8?q?=E6=9F=A5=E7=BD=91=E7=BB=9C=E8=BF=9E=E6=8E=A5=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/login.vue | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c4a6039..ad373e7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,7 +79,7 @@ export default {
phone: "",
code: "",
state:0,
- clickstate:false,
+ // clickstate:false,
// 时间
timer: null,
is_sendcode: false, // 60s
@@ -138,37 +138,33 @@ export default {
// console.log(this.$u.trim(this.zhanghaoA));
},
logins() {
+
// 检查网络
uni.getNetworkType({
- success: function (res) {
+ success: (res) => {
console.log(res.networkType);
if (res.networkType == 'none') {
this.$refs.uToast.show({
title: '网络似乎断开了，请检查网络后重试',
type: 'error'
});
- }
+ }
},
- fail: function () {
- this.$refs.uToast.show({
- title: '网络似乎断开了，请检查网络后重试!',
- type: 'error'
- });
- }
+
});
// 判断是否可以点击
// console.log(this.zhanghao);
- if(this.clickstate==false){
- this.clickstate=true
- }else{
+ // if(this.clickstate==false){
+ // this.clickstate=true
+ // }else{
// 此验证存在逻辑问题,会出现卡死在这里的情况
// this.$refs.uToast.show({
// title: "不能重复提交",
// type: 'error'
// });
// return
- }
+ // }
// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
// uni.clearStorage();
// 账号登录1达人0商家
@@ -177,7 +173,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'
@@ -228,7 +224,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'