From 2892879358ecc6d2c1068c2280a5dc25d99ff346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E5=AD=A6=E5=9D=A4?= <1107410514@qq.com>
Date: Wed, 16 Oct 2019 18:11:49 +0800
Subject: [PATCH] kun 19/10/16 18:12

---
 .env.production                   |   2 +-
 src/views/Registered.vue          | 121 ------------------------------
 src/views/home/NewsList.vue       |   6 +-
 src/views/personal/Apply.vue      |   1 -
 src/views/personal/Collection.vue |   1 -
 src/views/personal/Declare.vue    |   2 +-
 src/views/project/Project.vue     |   2 -
 src/views/project/Schedule.vue    |   1 -
 vue.config.js                     |   2 +-
 9 files changed, 7 insertions(+), 131 deletions(-)

diff --git a/.env.production b/.env.production
index 8150bd8..589c219 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://chaoyang.yulongcode.com/api/'
\ No newline at end of file
+VUE_APP_BASE_API = 'http://api.cyteam.org.cn/'
\ No newline at end of file
diff --git a/src/views/Registered.vue b/src/views/Registered.vue
index 7873d48..fa34c75 100644
--- a/src/views/Registered.vue
+++ b/src/views/Registered.vue
@@ -26,126 +26,6 @@
               <span v-if="index === 0" class="span1">注：组织名称将用于用户登录</span>
             </label>
           </template>
-          <!-- 请输入密码 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-suo"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input class="input" type="password" placeholder="请输入密码" v-model="fieldsName.password" />
-          </label>-->
-          <!-- 请再次输入密码 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-suo"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="password"
-              placeholder="请再次输入密码"
-              v-model="fieldsName.confirm_password"
-            />
-          </label>-->
-          <!-- 请输入统一社会信用代码 -->
-          <!-- <label>
-            <span class="two">
-              <img :src="imgUrl.yy" alt style="width:20px;height:20px;margin-top:0px;" />
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="password"
-              placeholder="请输入统一社会信用代码"
-              v-model="fieldsName.credit_code"
-            />
-          </label>-->
-          <!-- 请输入法人代表 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-fuzeren"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="text"
-              placeholder="请输入法人代表"
-              v-model="fieldsName.legal_representative"
-            />
-          </label>-->
-          <!-- 请输入单位属性 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-icon-test"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="text"
-              placeholder="请输入单位属性"
-              v-model="fieldsName.unit_attribute"
-            />
-          </label>-->
-          <!-- 请输入业务主管单位名称 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-zhuzhuangtu"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="text"
-              placeholder="请输入业务主管单位名称"
-              v-model="fieldsName.entity_name"
-            />
-          </label>-->
-          <!-- 请输入负责人姓名 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-renxiang-"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="text"
-              placeholder="请输入负责人姓名"
-              v-model="fieldsName.charge_name"
-            />
-          </label>-->
-          <!-- 请输入负责人职务 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-lingdai"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="text"
-              placeholder="请输入负责人职务"
-              v-model="fieldsName.charge_position"
-            />
-          </label>-->
-          <!-- 请输入负责人电话 -->
-          <!-- <label>
-            <span class="two">
-              <span class="iconfont icon-dianhua"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="tel"
-              placeholder="请输入负责人电话"
-              v-model="fieldsName.charge_phone"
-            />
-          </label>-->
-          <!-- 管理平台协 -->
-          <!-- <label class="label">
-            <input class="checkout" type="checkbox" v-model="agre" />
-            <span class="span2">
-              我已阅读并接受
-              <span class="span3">《管理平台协议》</span>
-            </span>
-          </label>-->
           <label class="s" @click="submit()">
             <input type="submit" class="sub" value="立即注册" />
           </label>
@@ -189,7 +69,6 @@ export default {
           object: _this.obj
         }
       }).then(res => {
-        console.log(res)
         if (res.data.code === 200) {
           alert(res.data.data.msg)
           _this.$router.push({
diff --git a/src/views/home/NewsList.vue b/src/views/home/NewsList.vue
index a3ffa0f..9c3829b 100644
--- a/src/views/home/NewsList.vue
+++ b/src/views/home/NewsList.vue
@@ -2,7 +2,7 @@
   <div class="wrapper">
     <header-nav :index_num="index_num"></header-nav>
     <div id="box">
-      <template v-if="bgData.info.length > 0">
+      <template v-if="cd > 0">
         <div id="news" v-for="(info,index) in bgData.info" :key="index" @click="$jParams('newsDetails',{id:info.id,type:getType})">
           <div class="news-box">
             <img :src="info.cover ? info.cover : moren" />
@@ -60,7 +60,8 @@ export default {
       currentPage: 1,/** 当前页数 */
       totalCount: 1,/** 总页数 */
       bgData: [],
-      getType: null
+      getType: null,
+      cd:Number
     };
   },
   computed: {},
@@ -78,6 +79,7 @@ export default {
       }).then(res => {
         if (res.data.data.code === 200) {
           _this.bgData = res.data.data.data
+          _this.cd = _this.bgData.info.length
           _this.totalCount = _this.bgData.allPage
         } else {
           _this.$message.error('请求数据有问题！')
diff --git a/src/views/personal/Apply.vue b/src/views/personal/Apply.vue
index 556bd46..8d70654 100644
--- a/src/views/personal/Apply.vue
+++ b/src/views/personal/Apply.vue
@@ -404,7 +404,6 @@ export default {
             _this.is_value = true
           }
           _this.bgData = res.data.data
-          console.log(_this.bgData)
         } else {
           _this.$message.error('请求数据有问题！')
         }
diff --git a/src/views/personal/Collection.vue b/src/views/personal/Collection.vue
index d46dd5d..c3c6872 100644
--- a/src/views/personal/Collection.vue
+++ b/src/views/personal/Collection.vue
@@ -66,7 +66,6 @@ export default {
         }
       }).then(res => {
         if (res.data.data.code === 200) {
-          console.log(res.data.data)
         } else {
           _this.$message.error('请求数据有问题！')
         }
diff --git a/src/views/personal/Declare.vue b/src/views/personal/Declare.vue
index 2bd8285..37713a9 100644
--- a/src/views/personal/Declare.vue
+++ b/src/views/personal/Declare.vue
@@ -98,7 +98,7 @@
                 class="list"
                 v-for="(item,index) in bgData.info"
                 :key="index"
-                @click="$jump('schedule')"
+                @click="$jParams('schedule',{id:item.id})"
               >
                 <div class="div">
                   <div class="bb">
diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue
index fbb55da..c9206d5 100644
--- a/src/views/project/Project.vue
+++ b/src/views/project/Project.vue
@@ -268,8 +268,6 @@ export default {
       }).then(res => {
         if (res.data.code === 200) {
           _this.bgValue = res.data.data
-
-          console.log(_this.bgValue)
           _this.cd = _this.bgValue.announcement.length
         } else {
           _this.$message.error('请求数据有问题！')
diff --git a/src/views/project/Schedule.vue b/src/views/project/Schedule.vue
index 00eec03..c00447d 100644
--- a/src/views/project/Schedule.vue
+++ b/src/views/project/Schedule.vue
@@ -283,7 +283,6 @@ export default {
         if (res.data.data.code === 200) {
           _this.zData = res.data.data.data.ProjectDetails
           _this.zDate = res.data.data.data.ProjectReview
-          console.log(res.data.data.data)
         } else {
           alert('请求失败！')
         }
diff --git a/vue.config.js b/vue.config.js
index d63911b..18a4bcb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,7 +12,7 @@ module.exports = {
     hotOnly: false,
     proxy: {
       '/url/': {
-        target: 'http://chaoyang.yulongcode.com/api/',
+        target: 'http://api.cyteam.org.cn/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {