Merge pull request 'xbx' (#124) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/124

babel.config.js

@@ -1,5 +1,10 @@
+let build = []
+if (process.env.NODE_ENV === 'production') {
+    build = ['transform-remove-console']
+}
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
-  ]
+  ],
+  plugins: [...build]
 }

package.json

@@ -33,6 +33,7 @@
     "@vue/cli-service": "~4.5.0",
     "@vue/compiler-sfc": "^3.0.0-0",
     "@vue/eslint-config-typescript": "^5.0.2",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^7.0.0-0",
     "node-sass": "^4.14.1",

src/api/index.ts

@@ -233,6 +233,7 @@ interface VideoDetail{
     share: number;
     watch: number;
     score: string;
+    statusdesc: string;
 }
 
 export async function videodetail(data?: any,ifupdate?: number) {
@@ -264,8 +265,8 @@ export async function videodetail(data?: any,ifupdate?: number) {
             updatedAt: res.data.updated_at,
             watch: res.data.watch,
             share: res.data.share,
-            score: res.data.score
+            score: res.data.score,
-
+            statusdesc: res.data.statusdesc
         }
     }
 

src/components/ReviewItem.vue

@@ -14,7 +14,7 @@
                 <div class="num">{{(score+'').split('.')[1]?score:score+'.0'}} {{lan.$t('fen')}}</div>
             </div>
             <div class="all" @click="findall(replyid)" >
-                <span>={{lan.$t('suoyouhuifu')}}</span>
+                <span>{{lan.$t('suoyouhuifu')}}</span>
                 <img src="@/static/images/arrowdownblue.png" alt="">
             </div>
         </div>

src/components/VideoReview.vue

@@ -118,13 +118,20 @@ export default defineComponent({
     },
     setup(prop,context){
         const lan: any = useI18n();
-        const reviewlist=ref({})
+        const reviewlist=ref<any>({data: []})
         const commentval=ref<string>('')
         const uinfo=ref<any>({})
         const replylist =ref({})
         const videoid=ref(useRoute().query.id)
+        const url = useRoute().path
         onMounted(async () => {
-            reviewlist.value=await getcommentlist({type: 2,id: videoid.value})
+            let type = 1;
+            if(url == '/regime/livedetail'){
+                type = 1;
+            }else{
+                type = 2;
+            }
+            reviewlist.value=await getcommentlist({type: type,id: videoid.value})
         })
         console.log(useRoute().query)
         console.log(store.state.userinfo.memberid,"userifno")

src/views/login/Sign.vue

@@ -28,12 +28,14 @@
                                     @change="getquhao"
                                     class="getcode"
 									style="width: 50%"
+                                    option-label-prop="label"
                                     show-search
                                 >
                                     <a-select-option
                                         v-for="(i, j) in quhaolist"
                                         :key="j"
                                         :value="i.name + '+' + i.code"
+                                        :label="'+' + i.code"
                                     >
                                         {{ i.name }}+{{ i.code }}
                                     </a-select-option>
@@ -394,6 +396,13 @@ export default defineComponent({
         function navto(url: string) {
             router.push(url);
         }
+
+        function getquhao(e?: any){
+            console.log(e)
+            phone.value.quhao = e.toString()
+            phone.value.quhao = phone.value.quhao.split("+")[1];
+        }
+
         return {
             formLayout,
             getcode,
@@ -408,6 +417,7 @@ export default defineComponent({
             navto,
             lan,
             quhaolist,
+            getquhao
         };
     },
 });

src/views/mine/Archives.vue

@@ -334,7 +334,7 @@
                             {{ lan.$t("wanchengrenzheng") }}
                         </div>
                         <div class="title sub-title">
-                            {{ lan.$t("shuru") }} {{ userinfo.mobile }}
+                            {{ lan.$t("shuru") }}{{ userinfo.code }} {{ userinfo.mobile }}
                             {{ lan.$t("shoudaodeyzm") }}
                         </div>
                         <div class="form-box">
@@ -381,14 +381,19 @@
                                 <!-- <a-input size="small" v-model:value="bindPhone.number" /> -->
                                 <a-input-group compact class="telbox">
                                     <a-select
-                                        :default-value="quhaolist[0].code"
+                                        :default-value="quhaolist[0].name + '+' + quhaolist[0].code"
                                         size="small"
                                         @change="getquhao"
+                                        option-label-prop="label"
+                                        style="width: 1rem;"
+                                        show-search
                                     >
                                         <a-select-option
                                             v-for="(i, j) in quhaolist"
                                             :key="j"
-                                            :value="i.code"
+                                            :value="i.name + '+' + i.code"
+                                            
+                                            :label="'+' + i.code"
                                         >
                                             {{ i.name }}+{{ i.code }}
                                         </a-select-option>
@@ -740,6 +745,7 @@ export default defineComponent({
         function getquhao(e?: any) {
             console.log(e);
             myquhao.value = e.toString();
+            myquhao.value = myquhao.value.split("+")[1];
         }
         // 是否显示修改密码框
         const updatePasswordVisible: Ref<boolean> = ref(false);
@@ -1036,6 +1042,7 @@ export default defineComponent({
     .telbox {
         margin-left: 15px;
         font-size: 12px;
+        // width: 200px;
     }
     .update-btn {
         font-size: 11px;

src/views/regime/Livedetail.vue

@@ -7,7 +7,7 @@
 
         <LiveCount :info="liveinfo.studentlist" :livestatus="liveinfo.livestatus" :zid="liveinfo.liveid"></LiveCount>
     </div>
-    <VideoReview class="review" v-if="liveinfo.livestatus == 2 && liveinfo.score != '0.0'" :videoinfo="liveinfo.score"></VideoReview>
+    <VideoReview class="review" v-if="liveinfo.livestatus == 2" :videoinfo="liveinfo.score"></VideoReview>
   </div>
 </template>
 <style lang="scss" scoped>

yarn.lock

@@ -2151,6 +2151,11 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
+babel-plugin-transform-remove-console@^6.9.4:
+  version "6.9.4"
+  resolved "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
+  integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"