4 Commits 8bea8514d5 ... 426a481cb3

Author SHA1 Message Date
  zhangningning 426a481cb3 ``` 2 months ago
  zhangningning d40367ccd3 ``` 2 months ago
  zhangningning fb1fc60202 Merge branch 'master' of http://git.dgtis.com/zhangningning/ali_ai_learn_web 2 months ago
  zhangningning 7464a6b6b1 ``` 2 months ago

+ 4 - 1
.env.development

@@ -1,6 +1,5 @@
 # 乔功
 # VITE_API_BASE_URL=http://192.168.100.134:8080/api
-VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
 # VITE_API_BASE_URL=http://192.168.100.134:8080/api
 # VITE_API_BASE_URL=http://192.168.101.12:8080/api
 # 高运甲
@@ -8,3 +7,7 @@ VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
 # VITE_API_BASE_URL=http://192.168.101.12:8080/api
 
 
+# 线上环境
+VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
+
+

+ 8 - 4
src/App.vue

@@ -47,9 +47,13 @@
       <el-footer>
         <div class="footer-content" >
           <p> 
-            <span class="cursor-pointer" @click="router.push({name:'Agreement',query:{type:'service_agreement'}})">{{ $t('agreement.service_agreement') }}</span>
+            <span class="cursor-pointer" @click="router.push({name:'Agreement',query:{type:'service_agreement'}})">
+              《{{ $t('agreement.service_agreement') }}》
+            </span>
             <span class="gray999"> | </span>
-            <span class="cursor-pointer" @click="router.push({name:'Agreement',query:{type:'privacy_policy'}})">{{ $t('agreement.privacy_policy') }}</span> 
+            <span class="cursor-pointer" @click="router.push({name:'Agreement',query:{type:'privacy_policy'}})">
+              《{{ $t('agreement.privacy_policy') }}》
+            </span> 
             <span class="gray999"> | </span>
             <span @click="openNewTab('https://beian.miit.gov.cn/')" class="cursor-pointer">粤ICP备2025364959号-1</span>
             <span class="gray999"> | </span>
@@ -206,9 +210,9 @@ provide('openLoginDialog', openLoginDialog);
   padding: 0;
   
   .header-content {
-    max-width: 1520px;
+    max-width: 1430px;
     width: 80%;
-    min-width: 1200px;
+    min-width: 1430px;
     margin: 0 auto;
     display: flex;
     align-items: center;

+ 2 - 2
src/components/LoginDialog.vue

@@ -281,8 +281,8 @@ const activeTab = ref('sms')
 
 // 密码登录表单
 const passwordForm = reactive({
-  account: '13925214105',//
-  password: 'zhangning13Z',//
+  account: '',//
+  password: '',//
   captcha: '',
   uuid: ''
 })

+ 1 - 1
src/components/course-card.vue

@@ -120,7 +120,7 @@ const startUsing = () => {
 
 <style scoped lang="scss">
 .course-card {
-  width: 368px;
+  width: 345px;
   border: 1px solid #ffffff;
   // background-color: rgba(255, 255, 255, 0.5);
   background-color: #ffffff;

+ 1 - 1
src/pages/LearningSystem/LearningSystem.vue

@@ -306,7 +306,7 @@
     }
   }
   .course-item{
-    width: 368px;
+    width: 345.5px;
     background-color: #ffffff;
     border-radius: 8px;
     overflow: hidden;

+ 1 - 1
src/pages/Personal/Workflow.vue

@@ -177,7 +177,7 @@ li {
     margin-top: 16px;
 
     li {
-      width: 380px;
+      width: 350px;
       cursor: pointer;
       position: relative;
       background: #F5F7FA;

+ 5 - 1
src/pages/WorkflowAdd.vue

@@ -49,7 +49,11 @@
                 />
               </el-form-item>
               <el-form-item :label="$t('workflowTrade.workflowDescription')" prop="description"  v-show="!isFullscreen">
-                <el-input type="textarea" v-model="ruleForm.description" :placeholder="$t('workflowTrade.placeholderWorkflowDescription')"  maxlength="500" show-word-limit/>
+                <el-input type="textarea" 
+                v-model="ruleForm.description" 
+                :autosize="{ minRows: 2 }"
+                :placeholder="$t('workflowTrade.placeholderWorkflowDescription')"  
+                maxlength="500" show-word-limit/>
               </el-form-item>
               <el-form-item :label="$t('common.coverImage')" prop="coverImage"  v-show="!isFullscreen">
                 <!-- 图片类型 -->

+ 3 - 3
src/pages/mibiShop/mibiShop.vue

@@ -5,7 +5,7 @@
       <div class="list_item bg_color_fff border_radius_16 box_shadow_card list_item_animation"
       v-for="item in list" :key="item"
       >
-        <img :src="item.imageUrl" alt="" style="width: 291.2px; height: 291.2px;border-radius: 16px 16px 0 0;" class="bg_color_f5">
+        <img :src="item.imageUrl" alt="" style="width: 271.2px; height: 271.2px;border-radius: 16px 16px 0 0;" class="bg_color_f5">
         <div class="item_info padding16">
           <div class="line2 font_size18 bold line_height24">
             {{item.itemName}}
@@ -102,10 +102,10 @@ const getList = async (type) => {
 .mibiShop{
   .list{
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(291.2px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(271.2px, 1fr));
     gap: 16px;
     .list_item{
-      width: 291.2px;
+      width: 271.2px;
       .item_info{
         height: 144px;
         .line2{

+ 3 - 3
src/styles/index.scss

@@ -82,10 +82,10 @@ li {
 // 3. 公共样式类(全局可复用)
 // 容器宽度限制(统一页面最大宽度,居中显示)
 .container {
-	max-width: 1528px;
+	max-width: 1438px;
 	width: 100%;
 	// min-width: 1200px;
-	min-width: 1528px;
+	min-width: 1438px;
 	margin: 0 auto;
 	// padding: 20px;
 	padding: 0 4px;
@@ -566,7 +566,7 @@ wx-image {
 //课程网格布局
 .course-grid {
 	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
+	grid-template-columns: repeat(auto-fill, minmax(345px, 1fr));
 	gap: 16px;
 }