diff --git a/App.vue b/App.vue index d9d18293..f23398d7 100644 --- a/App.vue +++ b/App.vue @@ -92,10 +92,18 @@ export default { sourceType: ['album'], compressed: false, success(e) { - console.log(JSON.stringify(e)); - uni.navigateTo({ - url: '/pages/publish/publish?fileObjectEvent=' + JSON.stringify(e) - }); + console.log(e); + if (e.duration <= 30) { + uni.navigateTo({ + url: '/pages/publish/publish?fileObjectEvent=' + JSON.stringify(e) + }); + } else { + uni.showToast({ + title: '时长不能超过30秒', + icon: 'none', + duration: 3000 + }); + } } }); }); diff --git a/components/m-share/index.vue b/components/m-share/index.vue index 4d1a6eed..dbb22a46 100644 --- a/components/m-share/index.vue +++ b/components/m-share/index.vue @@ -1,47 +1,66 @@ diff --git a/components/vlog/guanzhu.nvue b/components/vlog/guanzhu.nvue new file mode 100644 index 00000000..614804db --- /dev/null +++ b/components/vlog/guanzhu.nvue @@ -0,0 +1,1260 @@ + + + diff --git a/components/vlog/local.nvue b/components/vlog/local.nvue new file mode 100644 index 00000000..4d53ba04 --- /dev/null +++ b/components/vlog/local.nvue @@ -0,0 +1,1262 @@ + + + diff --git a/components/vlog/tuijian.nvue b/components/vlog/tuijian.nvue new file mode 100644 index 00000000..5c267327 --- /dev/null +++ b/components/vlog/tuijian.nvue @@ -0,0 +1,1234 @@ + + + diff --git a/components/vlog/videoDetail.vue b/components/vlog/videoDetail.vue index 21aab802..83a9b098 100755 --- a/components/vlog/videoDetail.vue +++ b/components/vlog/videoDetail.vue @@ -49,7 +49,7 @@ > @@ -687,8 +687,9 @@ export default { } .play-btn { position: absolute; - width: 120rpx; - height: 120rpx; + width: 160rpx; + height: 160rpx; + opacity: 0.2; } .icon { width: 80rpx; diff --git a/config/api.js b/config/api.js index 2dce8a58..8a46559e 100644 --- a/config/api.js +++ b/config/api.js @@ -8,7 +8,7 @@ const dev = { // buyer: "https://buyer-api.pickmall.cn", common: "http://192.168.1.211:8890", buyer: "http://192.168.1.211:8888", - vlog: "http://192.168.1.211:8099", + vlog: "http://192.168.1.86:8099", web: "http://192.168.1.211:8099", }; // 生产环境 @@ -17,7 +17,7 @@ const prod = { // buyer: "https://buyer-api.pickmall.cn", common: "http://192.168.1.211:8890", buyer: "http://192.168.1.211:8888", - vlog: "http://192.168.1.211:8099", + vlog: "http://192.168.1.86:8099", }; //默认生产环境 diff --git a/config/config.js b/config/config.js index 155a8ffb..953f46d1 100644 --- a/config/config.js +++ b/config/config.js @@ -1,17 +1,17 @@ const name = "无终街"; //全局商城name -const schemeName = 'lilishop' //唤醒app需要的schemeName +const schemeName = 'wuzhongjie' //唤醒app需要的schemeName export default { - name: name, - schemeLink: `${schemeName}://`, //唤起app地址 - downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址,下载app的地址 - shareLink: "https://m-b2b2c.pickmall.cn", //分享地址,也就是在h5中默认的复制地址 - appid: "wx6f10f29075dc1b0b", //小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态) - appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看 - aMapKey: "AOHBZ-VCEL3-XX73N-O623U-FMTP6-ASBTD", //在腾讯的中申请web端key - scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转 - iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看 - logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址 - customerServiceMobile:"13161366885", //客服电话 - customerServiceEmail:"lili@lili.com", //客服邮箱 - img:'https://wzjbucket.oss-rg-china-mainland.aliyuncs.com', //图片地址,聊天分享的图片地址 -}; + name: name, + schemeLink: `${schemeName}://`, //唤起app地址 + downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址,下载app的地址 + shareLink: "https://m-b2b2c.pickmall.cn", //分享地址,也就是在h5中默认的复制地址 + appid: "wx6f10f29075dc1b0b", //小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态) + appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看 + aMapKey: "AOHBZ-VCEL3-XX73N-O623U-FMTP6-ASBTD", //在腾讯的中申请web端key + scanAuthNavigation: ['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转 + iosAppId: "id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看 + logo: "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址 + customerServiceMobile: "13161366885", //客服电话 + customerServiceEmail: "lili@lili.com", //客服邮箱 + img: 'https://wzjbucket.oss-rg-china-mainland.aliyuncs.com', //图片地址,聊天分享的图片地址 +}; diff --git a/manifest.json b/manifest.json index af3a1d9b..bb555d97 100644 --- a/manifest.json +++ b/manifest.json @@ -68,7 +68,7 @@ "" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], - "schemes" : "lilishop", + "schemes" : "wuzhongjie", "minSdkVersion" : 21 }, "ios" : { @@ -81,7 +81,7 @@ "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示", "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息" }, - "urltypes" : "lilishop", + "urltypes" : "wuzhongjie", "dSYMs" : false }, /* ios打包配置 */ diff --git a/pages.json b/pages.json index 9d68a29d..ac75990f 100644 --- a/pages.json +++ b/pages.json @@ -113,72 +113,6 @@ } } }, - { - "path": "pages/me/me", - "style": { - "app-plus": { - "titleNView": false //禁用原生导航栏 - } - } - }, - { - "path": "pages/me/myBackImg", - "style": { - "app-plus": { - "titleNView": false //禁用原生导航栏 - } - } - }, - { - "path": "pages/me/myFace", - "style": { - "app-plus": { - "titleNView": false //禁用原生导航栏 - } - } - }, - { - "path": "pages/me/myInfo", - "style": { - "navigationBarTitleText": "修改个人资料", - "navigationBarBackgroundColor": "#181b27" - } - }, - { - "path": "pages/me/modifyNickname", - "style": { - "navigationBarTitleText": "修改昵称", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#181b27", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "保存", - "color": "#ef274d", - "width": "60px", - "fontSize": "15px", - "fontWeight": "bold" - }] - } - } - } - }, - { - "path": "pages/publish/preview", - "style": { - "navigationBarTitleText": "预览视频", - "navigationBarBackgroundColor": "#181b27", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/me/vlogerInfo", - "style": { - "app-plus": { - "titleNView": false //禁用原生导航栏 - } - } - }, { "path": "pages/me/vlog", "style": { @@ -489,14 +423,6 @@ "navigationBarBackgroundColor": "#181b27" } }, - { - "path": "pages/me/settings", - "style": { - "navigationBarTitleText": "设置", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#181b27" - } - }, { "path": "pages/me/myFans", "style": { @@ -566,13 +492,12 @@ { "root": "pages/mine", - "pages": [ - { + "pages": [{ "path": "mydistribution/index", "style": { "navigationBarTitleText": "我的分销" } - }, + }, { "path": "mydistribution/my/myindex", "style": { @@ -590,43 +515,43 @@ "style": { "navigationBarTitleText": "赚钱" } - }, + }, { "path": "invite", "style": { "navigationBarTitleText": "我的推荐" } - }, + }, { "path": "inviteinput", "style": { "navigationBarTitleText": "输入邀请码" } - }, + }, { "path": "expert/index", "style": { "navigationBarTitleText": "达人申请" } - }, + }, { "path": "openShop/index", "style": { "navigationBarTitleText": "店铺申请" } - }, + }, { "path": "openShop/secon", "style": { "navigationBarTitleText": "店铺申请" } - }, + }, { "path": "openShop/ThirdApply", "style": { "navigationBarTitleText": "店铺申请" } - }, + }, { "path": "signIn", "style": { @@ -1389,7 +1314,7 @@ "text": "消息" }, { - "pagePath": "pages/tabbar/user/my", + "pagePath": "pages/me/me", "text": "我的" } ], diff --git a/pages/me/chooseCity.nvue b/pages/me/chooseCity.nvue index ddb97d0e..77583a3b 100755 --- a/pages/me/chooseCity.nvue +++ b/pages/me/chooseCity.nvue @@ -1,115 +1,117 @@ - diff --git a/pages/me/chooseDistrict.nvue b/pages/me/chooseDistrict.nvue index 2ed43370..48c126bf 100755 --- a/pages/me/chooseDistrict.nvue +++ b/pages/me/chooseDistrict.nvue @@ -1,92 +1,92 @@ - diff --git a/pages/me/chooseProvince.nvue b/pages/me/chooseProvince.nvue index ed7d9b57..cd34267d 100755 --- a/pages/me/chooseProvince.nvue +++ b/pages/me/chooseProvince.nvue @@ -1,106 +1,106 @@ - diff --git a/pages/me/me.nvue b/pages/me/me.nvue index 189dd300..8982018c 100755 --- a/pages/me/me.nvue +++ b/pages/me/me.nvue @@ -1,696 +1,767 @@ - - - - - \ No newline at end of file + + + + + diff --git a/pages/me/modifyBirthday.vue b/pages/me/modifyBirthday.vue index e53ea41b..a97b401f 100755 --- a/pages/me/modifyBirthday.vue +++ b/pages/me/modifyBirthday.vue @@ -1,164 +1,162 @@ diff --git a/pages/me/modifyDesc.vue b/pages/me/modifyDesc.vue index 6b1c7245..2fa22bca 100755 --- a/pages/me/modifyDesc.vue +++ b/pages/me/modifyDesc.vue @@ -1,151 +1,150 @@ - diff --git a/pages/me/modifyNickname.vue b/pages/me/modifyNickname.vue index 4dffd1fe..6cbbbcb3 100755 --- a/pages/me/modifyNickname.vue +++ b/pages/me/modifyNickname.vue @@ -1,179 +1,182 @@ diff --git a/pages/me/myBackImg.nvue b/pages/me/myBackImg.nvue deleted file mode 100755 index c1357f47..00000000 --- a/pages/me/myBackImg.nvue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - diff --git a/pages/me/myBackImg.vue b/pages/me/myBackImg.vue new file mode 100755 index 00000000..2720f0b4 --- /dev/null +++ b/pages/me/myBackImg.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/pages/me/myFans.nvue b/pages/me/myFans.nvue index 52a28df6..1153c771 100755 --- a/pages/me/myFans.nvue +++ b/pages/me/myFans.nvue @@ -1,238 +1,251 @@ - + + + + diff --git a/pages/me/myFollows.nvue b/pages/me/myFollows.nvue index 4aa40bd7..6207c0b6 100755 --- a/pages/me/myFollows.nvue +++ b/pages/me/myFollows.nvue @@ -1,233 +1,248 @@ - - - - - \ No newline at end of file + + + + + diff --git a/pages/me/myInfo.vue b/pages/me/myInfo.vue index bffc6cbd..e9a1d940 100755 --- a/pages/me/myInfo.vue +++ b/pages/me/myInfo.vue @@ -1,87 +1,126 @@ diff --git a/pages/me/vlog.nvue b/pages/me/vlog.nvue old mode 100755 new mode 100644 index 70087b87..24d6bc86 --- a/pages/me/vlog.nvue +++ b/pages/me/vlog.nvue @@ -1,87 +1,1291 @@ - - diff --git a/pages/me/vlog_old.nvue b/pages/me/vlog_old.nvue new file mode 100755 index 00000000..70087b87 --- /dev/null +++ b/pages/me/vlog_old.nvue @@ -0,0 +1,87 @@ + + + + + diff --git a/pages/me/vlogerInfo.nvue b/pages/me/vlogerInfo.nvue index 2322906e..e5a05115 100755 --- a/pages/me/vlogerInfo.nvue +++ b/pages/me/vlogerInfo.nvue @@ -1,687 +1,718 @@ diff --git a/pages/publish/publish.nvue b/pages/publish/publish.nvue index caba8b93..c9b6a0e7 100755 --- a/pages/publish/publish.nvue +++ b/pages/publish/publish.nvue @@ -63,7 +63,7 @@