Merge branch 'developer' of http://git.caimei365.com/zhengjinyi/caimei-authentic-www into developerX

.env.development

@@ -17,7 +17,8 @@ STATIC_URL = 'https://static.caimei365.com/www/authentic'
 CIMEI_LOCAL = 'https://www-b.caimei365.com'
 
 # 项目运行地址
-HOST = '192.168.2.92'
+# HOST = '192.168.2.92'
+HOST = '192.168.2.93'
 # HOST = '192.168.1.102'
 
 # 项目端口号
@@ -25,3 +26,7 @@ PORT = '8888'
 
 # HTTPS flag
 HTTPS = false
+
+# OSS 上传目录
+# UPLOAD_DIR = 'dev/authFile/'
+UPLOAD_DIR = 'beta/authFile/'

.env.production

@@ -21,4 +21,7 @@ HOST = '172.31.165.23'
 PORT = '8105'
 
 # HTTPS flag
-HTTPS = false
+HTTPS = false
+
+# OSS 上传目录
+UPLOAD_DIR = 'prod/authFile/'

.env.staging

@@ -20,4 +20,7 @@ HOST = '172.31.165.28'
 PORT = '8105'
 
 # HTTPS flag
-HTTPS = false
+HTTPS = false
+
+# OSS 上传目录
+UPLOAD_DIR = 'beta/authFile/'

.prettierrc

@@ -1,4 +1,5 @@
 {
   "semi": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "printWidth": 120
 }

apis/index.js

@@ -2,6 +2,8 @@ import authApi from './module/auth'
 import commonApi from './module/common'
 import userApi from './module/user'
 import docApi from './module/doc'
+import challengeApi from './module/challenge'
+import jssdkApi from './module/jssdk'
 
 export default ($axios) => {
   return {
@@ -9,5 +11,7 @@ export default ($axios) => {
     ...authApi($axios),
     ...userApi($axios),
     ...docApi($axios),
+    ...challengeApi($axios),
+    ...jssdkApi($axios),
   }
 }

apis/module/challenge.js

@@ -0,0 +1,38 @@
+// 抖音挑战赛
+export default ($axios) => {
+  const challengeApis = {}
+
+  challengeApis.fetchVideoList = (params = {}) => $axios.get('/wx/auth/get/published/video/list', { params })
+
+  challengeApis.publishVideoSave = (data = {}) => $axios.post('/wx/auth/save/video/info', data)
+
+  challengeApis.checkActivityPublish = (data = {}) => $axios.post('/wx/auth/check/video/info', data)
+
+  challengeApis.fetchActivityStatus = (params = {}) => $axios.get('/wx/auth/get/activitty', { params })
+
+  // 报名时新增参赛机构信息(资质上传)
+  challengeApis.clubSignUpActivity = (data = {}) => $axios.post('/wx/auth/save/ross/info', data)
+
+  // 获取挑战赛主页左上角已经报名的机构
+  challengeApis.fetchEnteredClubList = (params = {}) => $axios.get('/wx/auth/get/contested/info', { params })
+
+  // 获取当前机构已上传的视频
+  challengeApis.fetchOwnerVideoList = (params = {}) => $axios.get('/wx/auth/get/video/username', { params })
+
+  // 获取全部机构视频
+  challengeApis.fetchClubVideoList = (params = {}) => $axios.get('/wx/auth/get/video/all', { params })
+
+  // 验证机构是否还能上传视频
+  challengeApis.beforeUploadCheck = (params = {}) => $axios.get('/wx/auth/check/video/username', { params })
+
+  // 校验用户是否已报名
+  challengeApis.checkContestInfo = (params = {}) => $axios.get('/wx/auth/check/contest/info', { params })
+
+  // 保存抖音视频
+  challengeApis.publishVideo = (data = {}) => $axios.post('/wx/auth/save/video', data)
+
+  // 视频点赞
+  challengeApis.diggcountVideo = (data = {}) => $axios.post('/wx/auth/up/video/diggcount', data)
+
+  return challengeApis
+}

apis/module/common.js

@@ -2,48 +2,37 @@ export default ($axios) => {
   const commonApis = {}
 
   // 订阅号用户登录
-  commonApis.customLogin = (data) =>
-    $axios.post('/wx/user/login/subscribe/verify/code', data)
+  commonApis.customLogin = (data) => $axios.post('/wx/user/login/subscribe/verify/code', data)
 
   // 订阅号用户绑定邀请码登录
-  commonApis.customLoginWithCode = (data) =>
-    $axios.post('/wx/user/login/subscribe/invitation/code', data)
+  commonApis.customLoginWithCode = (data) => $axios.post('/wx/user/login/subscribe/invitation/code', data)
 
   // 服务号微信授权登录
-  commonApis.wechatLogin = (data) =>
-    $axios.post('/wx/user/login/authorization', data)
+  commonApis.wechatLogin = (data) => $axios.post('/wx/user/login/authorization', data)
 
   // 服务号微信授权绑定邀请码登录
-  commonApis.wechatLoginWithCode = (data) =>
-    $axios.post('/wx/user/login/service/invitation/code', data)
+  commonApis.wechatLoginWithCode = (data) => $axios.post('/wx/user/login/service/invitation/code', data)
 
   // 公众号类型
-  commonApis.checkAccountType = (params = {}) =>
-    $axios.get('/wx/sdk/account/type', { params })
+  commonApis.checkAccountType = (params = {}) => $axios.get('/wx/sdk/account/type', { params })
 
   // 获取jssdk配置参数
-  commonApis.initWxConfig = (params = {}) =>
-    $axios.get('/wx/sdk/config/data', { params })
+  commonApis.initWxConfig = (params = {}) => $axios.get('/wx/sdk/config/data', { params })
 
   // 发送验证码
-  commonApis.sendVerifyCode = (data = {}) =>
-    $axios.post('/wx/user/login/verify/code/send', data)
+  commonApis.sendVerifyCode = (data = {}) => $axios.post('/wx/user/login/verify/code/send', data)
 
   // 用户反馈
-  commonApis.feedback = (data = {}) =>
-    $axios.post('/wx/data/feedback/submit', data)
+  commonApis.feedback = (data = {}) => $axios.post('/wx/data/feedback/submit', data)
 
   // 验证token是否到期
-  commonApis.checkToken = (params = {}) =>
-    $axios.get('/wx/user/login/token/check', params)
+  commonApis.checkToken = (params = {}) => $axios.get('/wx/user/login/token/check', params)
 
   // 校验token并返回用户信息
-  commonApis.checkTokenResult = (params) =>
-    $axios.get('/wx/data/token/check', params)
+  commonApis.checkTokenResult = (params) => $axios.get('/wx/data/token/check', params)
 
   // 获取城市列表(树状)
-  commonApis.fetchCityList = (params = {}) =>
-    $axios.get('/wx/address/select', { params })
+  commonApis.fetchCityList = (params = {}) => $axios.get('/wx/address/select', { params })
 
   // 获取城市列表(列表)
   commonApis.fetchAllCityList = () => $axios.get('/wx/address/select/all')

apis/module/doc.js

@@ -1,6 +1,10 @@
 export default ($axios) => {
   const docApis = {}
 
+  // 阿里云oss初始化
+  docApis.fetchOssInit = (params = {}) =>
+    $axios.get('/database/oss/token', { params })
+
   // 获取文章列表
   docApis.getArticleList = (params = {}) =>
     $axios.get('/wx/data/article/list', { params })

apis/module/jssdk.js

@@ -0,0 +1,13 @@
+export default ($axios) => {
+  // $axios.setBaseURL('https://api.weixin.qq.com')
+  const jssdkApis = {}
+  // 判断用户手机号是否绑定了机构信息
+  jssdkApis.getAccessToken = (params = {}) =>
+    $axios.get('https://api.weixin.qq.com/cgi-bin/token', { params })
+
+  // 判断用户手机号是否绑定了机构信息
+  jssdkApis.getTicket = (params = {}) =>
+    $axios.get('https://api.weixin.qq.com/cgi-bin/ticket/getticket', { params })
+
+  return jssdkApis
+}

assets/css/global.css

@@ -12,3 +12,9 @@
     background-color: #ddd;
   }
 }
+
+.scroll-none {
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+}

assets/css/iconfont.css

@@ -0,0 +1,150 @@
+@font-face {
+  font-family: 'iconfont'; /* Project id 2996139 */
+  src: url('../fonts/iconfont.woff2?t=1670468041210') format('woff2'),
+    url('../fonts/iconfont.woff?t=1670468041210') format('woff'),
+    url('../fonts/iconfont.ttf?t=1670468041210') format('truetype');
+}
+
+.iconfont {
+  font-family: 'iconfont' !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-profile:before {
+  content: '\e6a2';
+}
+
+.icon-eye-open:before {
+  content: '\e666';
+}
+
+.icon-eye-close:before {
+  content: '\e66f';
+}
+
+.icon-arrow-left:before {
+  content: '\e601';
+}
+
+.icon-arrow-right:before {
+  content: '\e605';
+}
+
+.icon-arrow-left-block:before {
+  content: '\e609';
+}
+
+.icon-arrow-top-block:before {
+  content: '\e60a';
+}
+
+.icon-arrow-right-block:before {
+  content: '\e60b';
+}
+
+.icon-arrow-down-block:before {
+  content: '\e60c';
+}
+
+.icon-close:before {
+  content: '\e616';
+}
+
+.icon-refresh:before {
+  content: '\e61a';
+}
+
+.icon-switch:before {
+  content: '\e61e';
+}
+
+.icon-fangda:before {
+  content: '\e625';
+}
+
+.icon-suoxiao:before {
+  content: '\e626';
+}
+
+.icon-error:before {
+  content: '\e627';
+}
+
+.icon-right:before {
+  content: '\e628';
+}
+
+.icon-home:before {
+  content: '\e62c';
+}
+
+.icon-location:before {
+  content: '\e633';
+}
+
+.icon-choose:before {
+  content: '\e635';
+}
+
+.icon-play:before {
+  content: '\e63b';
+}
+
+.icon-link:before {
+  content: '\e63e';
+}
+
+.icon-serach:before {
+  content: '\e63f';
+}
+
+.icon-heart:before {
+  content: '\e644';
+}
+
+.icon-upload:before {
+  content: '\e646';
+}
+
+.icon-download:before {
+  content: '\e647';
+}
+
+.icon-delete:before {
+  content: '\e652';
+}
+
+.icon-praise-linear:before {
+  content: '\e65d';
+}
+
+.icon-praise:before {
+  content: '\e65e';
+}
+
+.icon-star-linear:before {
+  content: '\e661';
+}
+
+.icon-star:before {
+  content: '\e662';
+}
+
+.icon-add:before {
+  content: '\e664';
+}
+
+.icon-sub:before {
+  content: '\e665';
+}
+
+.icon-arrow-up:before {
+  content: '\e602';
+}
+
+.icon-arrow-down:before {
+  content: '\e604';
+}

assets/css/utils.scss

@@ -0,0 +1,22 @@
+/* mixin混入 */
+@use 'sass:meta'; // 注意这一句不要忘了
+
+/* scss中可以用mixin来扩展 */
+@mixin ellipsis($line: 1) {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: $line;
+  -webkit-box-orient: vertical;
+}
+
+@mixin triangle($width, $rest...) {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: middle;
+  border: $width solid transparent;
+  @each $key, $color in meta.keywords($rest) {
+    border-#{$key}-color: $color;
+  }
+}