From bd39d8bf79e4d96ba7ade4341423c81027b7642c Mon Sep 17 00:00:00 2001
From: Tuisku <chen30204073@163.com>
Date: Wed, 8 Jun 2022 15:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  37 ++++-
 components/search/searchbar.js                |   1 +
 components/search/searchbar.wxml              |  17 +--
 pages/lookup/lookimg/img.wxml                 |   5 +-
 pages/material/material.js                    |  64 +++------
 pages/material/subpage/newest/newest.js       | 127 ++++++++----------
 pages/material/subpage/newest/newest.wxml     |   8 +-
 pages/material/subpage/newest/newest.wxss     |   4 +-
 pages/quest/quest.js                          |  45 ++++---
 .../components/collection/collection.js       |  48 ++++---
 .../components/collection/collection.wxml     |   6 +-
 .../detail/components/detailed/detailed.wxml  |   4 +-
 .../detail/components/detailed/detailed.wxss  |   4 +-
 .../detail/components/effect/effect.wxss      |   1 -
 .../subpage/detail/components/link/link.js    |  69 ++++++----
 .../subpage/detail/components/link/link.wxml  |   2 +-
 pages/quest/subpage/detail/detail.js          |   4 +-
 pages/user/subpage/relation/relation.wxml     |   8 +-
 pages/user/user.js                            |  31 +++--
 project.private.config.json                   |   2 +-
 utils/config.js                               |   3 +-
 utils/util.js                                 |   4 +-
 22 files changed, 270 insertions(+), 224 deletions(-)

diff --git a/app.js b/app.js
index 8dab547..0a99250 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,6 @@
 // app.js
 import {host,cdn} from "./utils/config"
+import {http} from './utils/util'
 App({
   onLaunch() {
     // 展示本地存储能力
@@ -10,7 +11,41 @@ App({
     // 登录
     wx.login({
       success: res => {
-        // 发送 res.code 到后台换取 openId, sessionKey, unionId
+        // this.setData({
+        //   code: res.code
+        // })
+        http("/user/login", "post", {
+          code: res.code
+        }).then(res => {
+          if (res.msg === "未注册！") {
+            // this.getUserProfile()
+            wx.showToast({
+              title: '您尚未注册，请点击个人头像位置以注册登录',
+              icon: 'none',
+              duration: 2000
+            })
+          } else {
+            getApp().globalData.token = res.data.token
+            // this.setData({
+            //   user_avatar:res.data.user.avatar,
+            //   user_name:res.data.user.name,
+            //   user_tip:'欢迎来到星途～'
+            // })
+            wx.setStorage({
+              key: 'user',
+              data: res.data.user
+            })
+            wx.setStorage({
+              key: 'token',
+              data: res.data.token
+            })
+            // wx.getStorage({
+            //   key: 'token',
+            //   success (res) {
+            //   }
+            // })
+          }
+        })
       }
     })
   },
diff --git a/components/search/searchbar.js b/components/search/searchbar.js
index 49fc52b..b766b8a 100644
--- a/components/search/searchbar.js
+++ b/components/search/searchbar.js
@@ -42,6 +42,7 @@ Component({
     },
     // 用户点击确定触发
     handleConfirm() {
+      console.log('handleConfirm', this.data.inputValue)
       this.triggerEvent('handleSearch', this.data.inputValue)
     }
   }
diff --git a/components/search/searchbar.wxml b/components/search/searchbar.wxml
index 9a9a253..64d6fbd 100644
--- a/components/search/searchbar.wxml
+++ b/components/search/searchbar.wxml
@@ -3,21 +3,14 @@
   <view class="content">
     <!-- <image src="../../assets/images/search.png" class="search-icon"></image> -->
     <l-icon name="research" color="#D0D0D0" size="30"></l-icon>
-    <input 
-      bindinput="handleInput"
-      bindconfirm="handleConfirm"
-      type="text"
-      value="{{inputValue}}" 
-      placeholder="{{placeholder}}" 
-      class="input"
-      confirm-type="search"
-    ></input>
-    <image
+    <input bindinput="handleInput" bindconfirm="handleConfirm" type="text" value="{{inputValue}}" placeholder="{{placeholder}}" class="input" confirm-type="search"></input>
+    <!-- <image
      wx:if="{{inputValue}}" 
      bindtap="handleDeleteClick"
      src="../../assets/images/delete-circle.png" 
      class="delete-icon"
-    ></image>
+    ></image> -->
+    <l-icon name="close" class="delete-icon" wx:if="{{inputValue}}" bindtap="handleDeleteClick" color="#D0D0D0" size="30"></l-icon>
   </view>
   <view wx:if="{{inputValue}}" bindtap="handleTextbtnClick" class="text-btn">取消</view>
-</view>
+</view>
\ No newline at end of file
diff --git a/pages/lookup/lookimg/img.wxml b/pages/lookup/lookimg/img.wxml
index 417c125..99f2d7e 100644
--- a/pages/lookup/lookimg/img.wxml
+++ b/pages/lookup/lookimg/img.wxml
@@ -1,12 +1,11 @@
 <!--pages/lookup/lookimg/img.wxml-->
 <!--utils/video/video.wxml-->
 <view class="main">
-  <image style="width: 100%;" src="{{cdn+data.fileUrl}}"></image>
+  <image mode="widthFix" style="width: 750rpx;" src="{{cdn+data.fileUrl}}"></image>
   <view class="bottom">
     <view class="title">{{data.title}}</view>
     <view class="cards">
-      <view class="card">星途追风</view>
-      <view class="card">星途凌云</view>
+      <view class="card" wx:for="{{data.brandList}}"></view>
     </view>
     <view class="operation">
       <button class="one" plain="{{true}}" open-type="share">
diff --git a/pages/material/material.js b/pages/material/material.js
index 2d85f42..7b1bd1d 100644
--- a/pages/material/material.js
+++ b/pages/material/material.js
@@ -24,27 +24,6 @@ Page({
       rank: [{
         name: '全部标签',
         is: true
-      }, {
-        name: '产品宣传',
-        is: false
-      }, {
-        name: '媒体测评',
-        is: false
-      }, {
-        name: '用户活动',
-        is: false
-      }, {
-        name: '趣味互动',
-        is: false
-      }, {
-        name: '用户互动',
-        is: false
-      }, {
-        name: '媒体测评',
-        is: false
-      }, {
-        name: '趣味活动',
-        is: false
       }]
     }, {
       id: 1,
@@ -69,27 +48,6 @@ Page({
       rank: [{
         name: '全部车型',
         is: true
-      }, {
-        name: '星途追风ET-I',
-        is: false
-      }, {
-        name: '星途追风',
-        is: false
-      }, {
-        name: '星途TX',
-        is: false
-      }, {
-        name: '星途凌云',
-        is: false
-      }, {
-        name: '星途凌云S',
-        is: false
-      }, {
-        name: '星途揽月',
-        is: false
-      }, {
-        name: '揽月探享版至尊享受',
-        is: false
       }]
     }],
     // 下拉选项，被选中那组的数据，由下面的js控制赋值
@@ -115,6 +73,7 @@ Page({
       backgroundColor: '#F9F9F9',
     })
     this.getdata()
+    // http("/douyin/code", "post",{}).then(res=>{})
   },
   to (e) {
     wx.navigateTo({
@@ -129,6 +88,27 @@ Page({
         questes:res.data.records
       })
     })
+    http("/brand/list", "post", {}).then(res => {
+      // console.log(res.data.records)
+      res.data.records.forEach(element => {
+        element.is = false
+        let a = element
+        this.setData({
+          'selectItem[2].rank': this.data.selectItem[2].rank.concat(a)
+        })
+      });
+    })
+    http("/tag/list", "post", {}).then(res => {
+      // console.log(res.data.records)
+      res.data.records.forEach(element => {
+        element.is = false
+        element.name = element.title
+        let a = element
+        this.setData({
+          'selectItem[0].rank': this.data.selectItem[0].rank.concat(a)
+        })
+      });
+    })
   },
   // 点击菜单栏触发的事件函数
   handleClick: function (e) {
diff --git a/pages/material/subpage/newest/newest.js b/pages/material/subpage/newest/newest.js
index ded0711..c8707c0 100644
--- a/pages/material/subpage/newest/newest.js
+++ b/pages/material/subpage/newest/newest.js
@@ -28,28 +28,7 @@ Page({
       rank: [{
         name: '全部标签',
         is: true
-      }, {
-        name: '产品宣传',
-        is: false
-      }, {
-        name: '媒体测评',
-        is: false
-      }, {
-        name: '用户活动',
-        is: false
-      }, {
-        name: '趣味互动',
-        is: false
-      }, {
-        name: '用户互动',
-        is: false
-      }, {
-        name: '媒体测评',
-        is: false
-      }, {
-        name: '趣味活动',
-        is: false
-      }]
+      },]
     }, {
       id: 1,
       rank: [{
@@ -73,27 +52,6 @@ Page({
       rank: [{
         name: '全部车型',
         is: true
-      }, {
-        name: '星途追风ET-I',
-        is: false
-      }, {
-        name: '星途追风',
-        is: false
-      }, {
-        name: '星途TX',
-        is: false
-      }, {
-        name: '星途凌云',
-        is: false
-      }, {
-        name: '星途凌云S',
-        is: false
-      }, {
-        name: '星途揽月',
-        is: false
-      }, {
-        name: '揽月探享版至尊享受',
-        is: false
       }]
     }],
     // 下拉选项，被选中那组的数据，由下面的js控制赋值
@@ -122,6 +80,27 @@ Page({
       title: options.name,
       success: function (res) {}
     })
+    http("/brand/list", "post", {}).then(res => {
+      // console.log(res.data.records)
+      res.data.records.forEach(element => {
+        element.is = false
+        let a = element
+        this.setData({
+          'selectItem[2].rank': this.data.selectItem[2].rank.concat(a)
+        })
+      });
+    })
+    http("/tag/list", "post", {}).then(res => {
+      // console.log(res.data.records)
+      res.data.records.forEach(element => {
+        element.is = false
+        element.name = element.title
+        let a = element
+        this.setData({
+          'selectItem[0].rank': this.data.selectItem[0].rank.concat(a)
+        })
+      });
+    })
   },
   getmore () {
     this.setData({
@@ -177,13 +156,13 @@ Page({
     })
   },
   to(e) {
-    // if (this.data.choose) {} else {
-    //   wx.navigateTo({
-    //     url: e.currentTarget.dataset.url,
-    //   })
-    // }
-    // console.log(e.currentTarget.dataset.item)
-    lookup(e.currentTarget.dataset.item)
+    if (this.data.choose) {} else {
+      // wx.navigateTo({
+      //   url: e.currentTarget.dataset.url,
+      // })
+      lookup(e.currentTarget.dataset.item)
+    }
+    // lookup(e.currentTarget.dataset.item)
   },
   // 点击菜单栏触发的事件函数
   handleClick: function (e) {
@@ -267,29 +246,31 @@ Page({
     let a = e.currentTarget.dataset.data.index
     let b = e.currentTarget.dataset.index
     let c = 'listdata[' + a + '].refrence[' + b + '].choose'
-    this.setData({
-      [c] : !this.data.listdata[a].refrence[b].choose
-    })
-    let flag = true
-    for (let i = 0; i < this.data.listdata[a].refrence.length; i++) {
-      if (this.data.listdata[a].refrence[i].choose) {
-      } else {
-        flag = false
-      }
-    }
-    if (flag) {
-      // this.data.listdata[a].all = true
-      let d = 'listdata[' + a + '].all'
-      this.setData({
-        [d]: true
-      })
-    } else {
-      // this.data.listdata[a].all = false
-      let d = 'listdata[' + a + '].all'
-      this.setData({
-        [d]: false
-      })
-    }
+    console.log(this.data,a,b)
+    // this.setData({
+    //   [c] : !this.data.listdata[a].refrence[b].choose
+    // })
+
+    // let flag = true
+    // for (let i = 0; i < this.data.listdata[a].refrence.length; i++) {
+    //   if (this.data.listdata[a].refrence[i].choose) {
+    //   } else {
+    //     flag = false
+    //   }
+    // }
+    // if (flag) {
+    //   // this.data.listdata[a].all = true
+    //   let d = 'listdata[' + a + '].all'
+    //   this.setData({
+    //     [d]: true
+    //   })
+    // } else {
+    //   // this.data.listdata[a].all = false
+    //   let d = 'listdata[' + a + '].all'
+    //   this.setData({
+    //     [d]: false
+    //   })
+    // }
   },
   chooseall (e) {
     let a = 'listdata[' + e.currentTarget.dataset.index + '].all'
diff --git a/pages/material/subpage/newest/newest.wxml b/pages/material/subpage/newest/newest.wxml
index a342f7d..20b3ab7 100644
--- a/pages/material/subpage/newest/newest.wxml
+++ b/pages/material/subpage/newest/newest.wxml
@@ -26,8 +26,8 @@
         <button class="allin" wx:if="{{choose}}" data-index="{{index}}" bindtap="chooseall">{{item.all?'全不选':'全选'}}</button>
       </view>
       <view class="cards">
-        <!-- <view class="card" wx:for="{{item.refrence}}" wx:key="index" data-item="{{item}}" data-in="{{index}}" data-url="/pages/lookup/loockvideo/video" bindtap="to" capture-bind:longtap="tochoose"> -->
-          <view class="card" wx:for="{{item.refrence}}" wx:key="index" data-item="{{item}}" data-in="{{index}}" bindtap="to">
+        <view class="card" wx:for="{{item.refrence}}" wx:key="index" data-item="{{item}}" data-in="{{index}}" data-url="/pages/lookup/loockvideo/video" bindtap="to" capture-bind:longtap="tochoose">
+          <!-- <view class="card" wx:for="{{item.refrence}}" wx:key="index" data-item="{{item}}" data-in="{{index}}" bindtap="to"> -->
           <!-- 封面图片 -->
           <image mode="aspectFill" style="width: 144rpx;height: 144rpx;border-radius: 8rpx;" src="{{item.type===1?cdn+item.coverUrl:cdn+item.fileUrl}}"></image>
           <!-- 左下角播放时长 -->
@@ -41,7 +41,7 @@
         </view>
       </view>
     </view>
-  <!-- 加载更多 -->
-  <button style="color: #D0D0D0;" bindtap="getmore">加载更多</button>
+    <!-- 加载更多 -->
+    <button style="color: #D0D0D0;" bindtap="getmore">加载更多</button>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/material/subpage/newest/newest.wxss b/pages/material/subpage/newest/newest.wxss
index 5f27f58..d5c6648 100644
--- a/pages/material/subpage/newest/newest.wxss
+++ b/pages/material/subpage/newest/newest.wxss
@@ -182,7 +182,7 @@
   background: rgba(0, 0, 0, 0.3);
   border: 2rpx solid #FFFFFF;
   position: relative;
-  bottom: 93rpx;
+  bottom: 140rpx;
   left: 100rpx;
   border-radius: 32rpx;
 }
@@ -193,7 +193,7 @@
   background: #006BFF;
   border: 2rpx solid #FFFFFF;
   position: relative;
-  bottom: 93rpx;
+  bottom: 140rpx;
   left: 100rpx;
   border-radius: 32rpx;
 }
diff --git a/pages/quest/quest.js b/pages/quest/quest.js
index 1523c3b..61d7f0b 100644
--- a/pages/quest/quest.js
+++ b/pages/quest/quest.js
@@ -92,27 +92,9 @@ Page({
       success: function (res) {}
     })
     this.getdata()
-    http("/brand/list", "post", {}).then(res => {
-      // console.log(res.data.records)
-      res.data.records.forEach(element => {
-        element.is = false
-        element.title = element.name
-        let a = element
-        this.setData({
-          'selectItem[3].rank': this.data.selectItem[3].rank.concat(a)
-        })
-      });
-    })
-    http("/tag/list", "post", {}).then(res => {
-      // console.log(res.data.records)
-      res.data.records.forEach(element => {
-        element.is = false
-        let a = element
-        this.setData({
-          'selectItem[1].rank': this.data.selectItem[1].rank.concat(a)
-        })
-      });
-    })
+  },
+  handleSearch (b) {
+    console.log(b)
   },
   to(e) {
     wx.navigateTo({
@@ -143,6 +125,27 @@ Page({
         'maxpage': res.data.pages,
       })
     })
+    http("/brand/list", "post", {}).then(res => {
+      // console.log(res.data.records)
+      res.data.records.forEach(element => {
+        element.is = false
+        element.title = element.name
+        let a = element
+        this.setData({
+          'selectItem[3].rank': this.data.selectItem[3].rank.concat(a)
+        })
+      });
+    })
+    http("/tag/list", "post", {}).then(res => {
+      // console.log(res.data.records)
+      res.data.records.forEach(element => {
+        element.is = false
+        let a = element
+        this.setData({
+          'selectItem[1].rank': this.data.selectItem[1].rank.concat(a)
+        })
+      });
+    })
   },
   // 点击菜单栏触发的事件函数
   handleClick: function (e) {
diff --git a/pages/quest/subpage/detail/components/collection/collection.js b/pages/quest/subpage/detail/components/collection/collection.js
index 02c450b..a6d1664 100644
--- a/pages/quest/subpage/detail/components/collection/collection.js
+++ b/pages/quest/subpage/detail/components/collection/collection.js
@@ -1,11 +1,12 @@
 // pages/quest/subpage/detail/components/collection/collection.js
-import {http} from '../../../../../../utils/util'
+import {
+  http
+} from '../../../../../../utils/util'
 Component({
   /**
    * 组件的属性列表
    */
-  properties: {
-  },
+  properties: {},
 
   /**
    * 组件的初始数据
@@ -28,42 +29,42 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    blur(e){
+    blur(e) {
       let a = "form." + e.currentTarget.dataset.mes
       let b = e.detail.value
       this.setData({
         [a]: b
       })
     },
-    getUserProvince(e){
+    getUserProvince(e) {
       this.setData({
         'form.add': e.detail.value
       })
     },
-    getbrand(){
+    getbrand() {
       this.setData({
         brand: true
       })
-      http("/brand/list", "post",).then(res=>{
-        if (this.data.brandpage === this.data.brandmax) {
-        } else {
+      http("/brand/list", "post", ).then(res => {
+        if (this.data.brandpage === this.data.brandmax) {} else {
           this.setData({
             brands: this.data.brands.concat(res.data.records),
             brandmax: res.data.pages,
-            brandpage : this.data.brandpage
+            brandpage: this.data.brandpage
           })
           this.getbrand()
         }
       })
     },
-    choosebrand(e){
+    choosebrand(e) {
       this.setData({
         'form.type': e.currentTarget.dataset.mes,
         brand: false
       })
     },
-    update () {
-      console.log(this.data.form)
+    update() {
+      // console.log(this.data.form)
+      // console.log(this.data.form.tel.match(/^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/))
       if (!this.data.form.name) {
         wx.showToast({
           title: '请输入姓名',
@@ -76,6 +77,12 @@ Component({
           icon: 'none',
           duration: 2000
         })
+      } else if (!this.data.form.tel.match(/^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/)) {
+        wx.showToast({
+          title: '请输入正确的手机号',
+          icon: 'none',
+          duration: 2000
+        })
       } else if (this.data.form.add.length === 0) {
         wx.showToast({
           title: '请选择地区',
@@ -83,18 +90,29 @@ Component({
           duration: 2000
         })
       } else {
-        http("/task/customerNote", "post",{
+        http("/task/customerNote", "post", {
           customerName: this.data.form.name,
           tel: this.data.form.tel,
           area: this.data.form.add.toString(),
           brandId: this.data.form.type ? this.data.form.type.id : '',
           remarks: this.data.form.tip
-        }).then(res=>{
+        }).then(res => {
           wx.showToast({
             title: res.data,
             icon: 'none',
             duration: 2000
           })
+          if (res.success) {
+            this.setData({
+              form: {
+                name: '',
+                tel: '',
+                add: [],
+                type: null,
+                tip: ''
+              }
+            })
+          }
         })
       }
     }
diff --git a/pages/quest/subpage/detail/components/collection/collection.wxml b/pages/quest/subpage/detail/components/collection/collection.wxml
index ef149f1..fdae1d7 100644
--- a/pages/quest/subpage/detail/components/collection/collection.wxml
+++ b/pages/quest/subpage/detail/components/collection/collection.wxml
@@ -4,13 +4,13 @@
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/ic_xingming@2x.png"></image>
     姓名<text style="color: red;">*</text>
   </view>
-  <input class="placeholder" placeholder="输入姓名" bindinput="blur" data-mes="name"></input>
+  <input class="placeholder" placeholder="输入姓名" bindinput="blur" data-mes="name" value="{{form.name}}"></input>
   <view class="hr"></view>
   <view class="title">
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/ic_sjh@2x.png"></image>
     手机号<text style="color: red;">*</text>
   </view>
-  <input class="placeholder" placeholder="输入手机号" bindinput="blur" data-mes="tel"></input>
+  <input class="placeholder" placeholder="输入手机号" bindinput="blur" data-mes="tel" value="{{form.tel}}"></input>
   <!-- <view class="placeholder">输入手机号 -->
   <!-- </view> -->
   <view class="hr"></view>
@@ -39,7 +39,7 @@
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/ic_bz@2x.png"></image>
     备注
   </view>
-  <textarea class="placeholder" placeholder="输入备注信息" bindinput="blur" data-mes="tip" auto-height></textarea>
+  <textarea class="placeholder" placeholder="输入备注信息" bindinput="blur" data-mes="tip" auto-height value="{{form.tip}}"></textarea>
   <!-- <view class="placeholder" style="height: 180rpx;">请输入备注信息 -->
   <!-- </view> -->
 </view>
diff --git a/pages/quest/subpage/detail/components/detailed/detailed.wxml b/pages/quest/subpage/detail/components/detailed/detailed.wxml
index ea7b147..1262617 100644
--- a/pages/quest/subpage/detail/components/detailed/detailed.wxml
+++ b/pages/quest/subpage/detail/components/detailed/detailed.wxml
@@ -10,12 +10,12 @@
   <view class="main_line"></view>
   <view class="in">
     <view class="he">起止时间</view>
-    <text class="mes">{{data.start}}\n~\n{{data.end}}</text>
+    <text class="mes">{{data.start}}~{{data.end}}</text>
   </view>
   <view class="in">
     <view class="he">任务标签</view>
     <view class="mes">
-      <view wx:for="{{data.tagList}}" wx:key="index">{{item.title}}\n
+      <view wx:for="{{data.tagList}}" wx:key="index">{{item.title}}<text wx:if="{{index<data.tagList.length-1}}">、</text>
       </view>
     </view>
   </view>
diff --git a/pages/quest/subpage/detail/components/detailed/detailed.wxss b/pages/quest/subpage/detail/components/detailed/detailed.wxss
index 3e5ac3a..12b45d8 100644
--- a/pages/quest/subpage/detail/components/detailed/detailed.wxss
+++ b/pages/quest/subpage/detail/components/detailed/detailed.wxss
@@ -67,13 +67,15 @@
 }
 
 .mes {
-  max-width: 265rpx;
+  max-width: 400rpx;
   font-size: 28rpx;
   font-family: MiSans-Demibold, MiSans;
   font-weight: 600;
   color: #333333;
   line-height: 28rpx;
   text-align: end;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .in {
diff --git a/pages/quest/subpage/detail/components/effect/effect.wxss b/pages/quest/subpage/detail/components/effect/effect.wxss
index d40fcd0..5a095cd 100644
--- a/pages/quest/subpage/detail/components/effect/effect.wxss
+++ b/pages/quest/subpage/detail/components/effect/effect.wxss
@@ -19,7 +19,6 @@
 }
 
 .count_num {
-  width: 124rpx;
   height: 64rpx;
   font-size: 64rpx;
   font-family: MiSans-Demibold, MiSans;
diff --git a/pages/quest/subpage/detail/components/link/link.js b/pages/quest/subpage/detail/components/link/link.js
index db7ffe2..208f77b 100644
--- a/pages/quest/subpage/detail/components/link/link.js
+++ b/pages/quest/subpage/detail/components/link/link.js
@@ -1,5 +1,7 @@
 // pages/quest/subpage/detail/components/link/link.js
-import {http} from '../../../../../../utils/util'
+import {
+  http
+} from '../../../../../../utils/util'
 Component({
   /**
    * 组件的属性列表
@@ -20,20 +22,20 @@ Component({
    */
   data: {
     platforms: [{
-      id: 1,
-      name: '抖音'
-    }, {
-      id: 2,
-      name: '快手'
-    }, 
-    // {
-    //   id: 3,
-    //   name: '朋友圈'
-    // }, {
-    //   id: 4,
-    //   name: '视频号'
-    // }
-  ],
+        id: 1,
+        name: '抖音'
+      }, {
+        id: 2,
+        name: '快手'
+      },
+      // {
+      //   id: 3,
+      //   name: '朋友圈'
+      // }, {
+      //   id: 4,
+      //   name: '视频号'
+      // }
+    ],
     platform: null,
     platformdia: false,
     link: '',
@@ -74,19 +76,38 @@ Component({
       })
     },
     up(e) {
-      http("/video/userAdd", "post",{
-        id: this.data.data.id,
-        type: this.data.platform.id,
-        url: this.data.link
-      }).then(res=>{
+      if (!this.data.platform) {
         wx.showToast({
-          title: res.data,
+          title: '请选择平台',
           icon: 'none',
           duration: 2000
-        }).then(res=>{
-          this.triggerEvent('getdata','')
         })
-      })
+      } else if (!this.data.link) {
+        wx.showToast({
+          title: '请输入链接',
+          icon: 'none',
+          duration: 2000
+        })
+      } else {
+        http("/video/userAdd", "post", {
+          id: this.data.data.id,
+          type: this.data.platform.id,
+          url: this.data.link
+        }).then(res => {
+          wx.showToast({
+            title: res.data,
+            icon: 'none',
+            duration: 2000
+          }).then(res => {
+            this.triggerEvent('getdata', '')
+            this.setData({
+              link_type: false,
+              platform: null,
+              link: ''
+            })
+          })
+        })
+      }
     },
     chooseImage() {
       let that = this
diff --git a/pages/quest/subpage/detail/components/link/link.wxml b/pages/quest/subpage/detail/components/link/link.wxml
index 0603c87..99307fb 100644
--- a/pages/quest/subpage/detail/components/link/link.wxml
+++ b/pages/quest/subpage/detail/components/link/link.wxml
@@ -11,7 +11,7 @@
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/img_srlj@2x.png"></image>
     输入链接
   </view>
-  <textarea wx:if="{{!link_type}}" class="link" placeholder="输入链接" maxlength="500" bindinput="linkin" auto-height></textarea>
+  <textarea wx:if="{{!link_type}}" class="link" placeholder="输入链接" maxlength="500" bindinput="linkin" auto-height value="{{link}}"></textarea>
   <!-- 上传图片 -->
   <view class="title" wx:if="{{link_type}}">
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/img_srlj@2x.png"></image>
diff --git a/pages/quest/subpage/detail/detail.js b/pages/quest/subpage/detail/detail.js
index 4dd6dde..7e47772 100644
--- a/pages/quest/subpage/detail/detail.js
+++ b/pages/quest/subpage/detail/detail.js
@@ -44,8 +44,8 @@ Page({
         table: res.data.rewardRuleList
       })
       this.setData({
-        'data.start': res.data.start.slice(0, 16),
-        'data.end': res.data.end.slice(0, 16)
+        'data.start': res.data.start.slice(0, 10),
+        'data.end': res.data.end.slice(0, 10)
       })
     })
     http("/video/addedRecord", "post", {
diff --git a/pages/user/subpage/relation/relation.wxml b/pages/user/subpage/relation/relation.wxml
index d9753bd..748f909 100644
--- a/pages/user/subpage/relation/relation.wxml
+++ b/pages/user/subpage/relation/relation.wxml
@@ -3,7 +3,7 @@
   <view class="card">
     <view class="top">
       <view class="top_titel">
-      <image class="ico" src="/pages/quest/subpage/detail/image/short/img_douyin@2x.png"></image>
+      <image class="ico" src="/pages/quest/subpage/detail/image/img_douyin@2x.png"></image>
       抖音
       </view>
       <view class="status">未提交</view>
@@ -25,7 +25,7 @@
   <view class="card">
     <view class="top">
       <view class="top_titel">
-      <image class="ico" src="/pages/quest/subpage/detail/image/short/img_kuaishou@2x.png"></image>
+      <image class="ico" src="/pages/quest/subpage/detail/image/img_kuaishou@2x.png"></image>
       快手
       </view>
       <view class="status">未提交</view>
@@ -47,7 +47,7 @@
   <view class="card">
     <view class="top">
       <view class="top_titel">
-      <image class="ico" src="/pages/quest/subpage/detail/image/short/img_pyq@2x.png"></image>
+      <image class="ico" src="/pages/quest/subpage/detail/image/img_pyq@2x.png"></image>
       朋友圈
       </view>
       <view class="status">未提交</view>
@@ -69,7 +69,7 @@
   <view class="card">
     <view class="top">
       <view class="top_titel">
-      <image class="ico" src="/pages/quest/subpage/detail/image/short/img_sph@2x.png"></image>
+      <image class="ico" src="/pages/quest/subpage/detail/image/img_sph@2x.png"></image>
       视频号
       </view>
       <view class="status">未提交</view>
diff --git a/pages/user/user.js b/pages/user/user.js
index a3c825d..c6f74c3 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -68,9 +68,9 @@ Page({
           } else {
             getApp().globalData.token = res.data.token
             this.setData({
-              user_avatar:res.data.user.avatar,
-              user_name:res.data.user.name,
-              user_tip:'欢迎来到星途～'
+              user_avatar: res.data.user.avatar,
+              user_name: res.data.user.name,
+              user_tip: '欢迎来到星途～'
             })
             wx.setStorage({
               key: 'user',
@@ -80,11 +80,11 @@ Page({
               key: 'token',
               data: res.data.token
             })
-            wx.getStorage({
-              key: 'token',
-              success (res) {
-              }
-            })
+            // wx.getStorage({
+            //   key: 'token',
+            //   success (res) {
+            //   }
+            // })
           }
         })
       }
@@ -139,7 +139,7 @@ Page({
       })
     })
   },
-  colse () {
+  colse() {
     this.data({
       phone: false
     })
@@ -157,6 +157,19 @@ Page({
         canIUseGetUserProfile: true
       })
     }
+    let that = this
+    wx.getStorage({
+      key: 'user',
+      success(res) {
+        // console.log('res')
+        // console.log(res)
+        that.setData({
+          user_avatar: res.data.avatar,
+          user_name: res.data.name,
+          user_tip: '欢迎来到星途～'
+        })
+      }
+    })
   },
 
   /**
diff --git a/project.private.config.json b/project.private.config.json
index b8295b9..742204b 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -2,7 +2,7 @@
   "projectname": "xx",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "libVersion": "2.24.2",
diff --git a/utils/config.js b/utils/config.js
index 90a7c3f..e22f0e2 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,6 +1,7 @@
-const host = 'https://api.sws010.com'
+const host = 'https://api.sws010.com/wxApp'
 const cdn = 'https://cdn.sws010.com'
 
+// https://api.sws010.com/wxApp
 // api.sws010.com
 // cdn.sws010.com
 
diff --git a/utils/util.js b/utils/util.js
index 4ae38de..a3c640b 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -32,8 +32,8 @@ const http = (url, method, data, isLoading = true) => {
         'token': wx.getStorageSync('token')
       }
     }
-    console.log(url)
-    console.log(method)
+    // console.log(url)
+    // console.log(method)
     wx.request({
       url: host + url,
       method: 'POST',