Merge branch 'bug_fix' into feature

src/views/activity/detail.vue

@@ -51,7 +51,7 @@
             </div>
         </div>
         <Share :show="showShare" @closeShare="showShare = false" />
-        <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
+        <register-dialog v-if="showRegister" @close="showRegister = false" :registerFlag="registerFlag" :content="'请您先进行注册。'"></register-dialog>
 
         </div>
     <Android @send-number="handleNumber"/>

src/views/activity/index.vue

@@ -20,7 +20,7 @@
                 </div>
             </div>
         </van-list>
-        <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
+        <register-dialog v-if="showRegister" @close="showRegister = false" :registerFlag="registerFlag" :content="'请您先进行注册。'"></register-dialog>
         <Android></Android>
     </div>
 </template>

src/views/discussion/index.vue

@@ -22,7 +22,7 @@
                     </div>
                 </div>
             </van-list>
-            <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
+            <register-dialog v-if="showRegister" @close="showRegister = false" :registerFlag="registerFlag" :content="'请您先进行注册。'"></register-dialog>
 
         </div>
         <Android></Android>

src/views/home/index.vue

@@ -337,6 +337,7 @@ export default {
                     if (this.$store.state.app.userInfo.mobile) {
                         this.$router.push({ path: `/${path}` });
                     } else {
+                        this.tipContent = '请您先进行注册。'
                         this.showRegister = true;
                     }
                 }

vue.config.js

@@ -31,7 +31,7 @@ module.exports = defineConfig({
     proxy: {
       //配置跨域
       '/api': {
-        target: `https://epmet-preview.elinkservice.cn`,
+        target: `http://192.168.1.144`,//http://192.168.1.144
         // target: `http://127.0.0.1:8080`,
         changeOrigin: true,
         ws: false,