Merge branch 'hat' of git.oa00.com:SWS/EXEEED into dev

app.js

@@ -1,4 +1,5 @@
 // app.js
+import {host} from "./utils/config"
 App({
   onLaunch() {
     // 展示本地存储能力
@@ -14,6 +15,7 @@ App({
     })
   },
   globalData: {
-    userInfo: null
+    userInfo: null,
+    host
   }
 })

app.json

@@ -18,7 +18,8 @@
     "pages/lookup/lookimg/img",
     "pages/user/subpage/newest/newest",
     "pages/user/subpage/tutorial/tutorial",
-    "pages/user/subpage/quest/quest"
+    "pages/user/subpage/quest/quest",
+    "pages/user/subpage/integral/integral"
   ],
   "tabBar": {
     "borderStyle": "white",
@@ -66,7 +67,9 @@
     "l-water-flow": "/miniprogram_npm/lin-ui/water-flow/index",
     "s-spu-preview": "/components/spu-preview/index",
     "l-arc-popup": "/miniprogram_npm/lin-ui/arc-popup/index",
-    "l-dialog": "/miniprogram_npm/lin-ui/dialog/index"
+    "l-dialog": "/miniprogram_npm/lin-ui/dialog/index",
+    "l-collapse": "/miniprogram_npm/lin-ui/collapse/index",
+    "l-collapse-item": "/miniprogram_npm/lin-ui/collapse-item/index"
   },
   "style": "v2",
   "sitemapLocation": "sitemap.json"

pages/lookup/loockvideo/video.js

@@ -5,7 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    data: {},
+    host: getApp().globalData.host
   },
 
   /**
@@ -26,6 +27,17 @@ Page({
     wx.setBackgroundColor({
       backgroundColor: '#000000',
     })
+    let that = this
+    wx.getStorage({
+      key: 'video',
+      success(res){
+        console.log('todata')
+        console.log(res)
+        that.setData({
+          data: res.data
+        })
+      }
+    })
   },
 
   /**

pages/lookup/loockvideo/video.wxml

@@ -1,8 +1,8 @@
 <!--utils/video/video.wxml-->
 <view class="main">
-  <video style="width: 100%;" src="http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400"></video>
+  <video style="width: 100%;" src="{{host+data.fileUrl}}"></video>
   <view class="bottom">
-    <view class="title">3月31日上海展厅摄影视频</view>
+    <view class="title">{{data.title}}</view>
     <view class="cards">
       <view class="card">星途追风</view>
       <view class="card">星途凌云</view>

pages/material/material.js

@@ -1,4 +1,5 @@
 // pages/quest/quest.js
+import {http} from "../../utils/util"
 Page({
 
   /**
@@ -114,7 +115,8 @@ Page({
         url: '../quest/subpage/detail/image/short/img_xtuone@2x.png',
         tip: '媒体测评'
       }
-    ]
+    ],
+    page: 1
   },
   // 点击菜单栏触发的事件函数
   handleClick: function (e) {
@@ -196,6 +198,13 @@ Page({
       url: e.currentTarget.dataset.url,
     })
   },
+  getdata(){
+    http("/reference/list", "post",{
+      pageNum: this.data.page
+    }).then(res=>{
+      this.setData({})
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -207,6 +216,7 @@ Page({
     wx.setBackgroundColor({
       backgroundColor: '#F9F9F9',
     })
+    this.getdata()
   },
 
   /**

pages/material/subpage/newest/newest.js

@@ -97,11 +97,15 @@ Page({
     listNum: -1,
     // 下拉选项的隐藏和显示，默认隐藏
     showOrHide: false,
+    ac: false,
+    choose: false
   },
   to(e) {
-    wx.navigateTo({
+    if (this.data.choose) {} else {
-      url: e.currentTarget.dataset.url,
+      wx.navigateTo({
-    })
+        url: e.currentTarget.dataset.url,
+      })
+    }
   },
   // 点击菜单栏触发的事件函数
   handleClick: function (e) {
@@ -178,6 +182,18 @@ Page({
       selectedItem
     })
   },
+  tochoose () {
+    this.setData({
+      choose:!this.data.choose
+    })
+    
+  },
+  choose (e) {
+    console.log(e)
+    this.setData({
+      ac:!this.data.ac
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/material/subpage/newest/newest.wxml

@@ -23,19 +23,28 @@
     <view class="mat_card">
       <view class="card_top">今天</view>
       <view class="cards">
-        <view class="card" data-url="/pages/lookup/loockvideo/video" bindtap="to">
+        <view class="card" data-url="/pages/lookup/loockvideo/video" bindtap="to" capture-bind:longtap="tochoose">
           <!-- 封面图片 -->
           <image style="width: 144rpx;height: 144rpx;border-radius: 8rpx;" src="../../../quest/subpage/detail/image/short/img_xtuone@2x.png"></image>
           <!-- 左下角播放时长 -->
           <view class="time">
             <image style="width: 16rpx;height: 18rpx;margin-right: 5rpx;" src="/images/img_bofang@2x.png"></image>03:32
           </view>
+          <!-- 收藏标志 -->
+          <image class="shouca" src="/images/ic_shouc@2x.png"></image>
+          <!-- 多选 -->
+          <view wx:if="{{choose}}" class="choose {{ac?'active':'non'}}" catchtap="choose"></view>
         </view>
         <view class="card" data-url="/pages/lookup/loockvideo/video" bindtap="to">
           <image style="width: 144rpx;height: 144rpx;border-radius: 8rpx;" src="../../../quest/subpage/detail/image/short/img_xtutwo@2x.png"></image>
           <view class="time">
             <image style="width: 16rpx;height: 18rpx;margin-right: 5rpx;" src="/images/img_bofang@2x.png"></image>03:32
           </view>
+          <!-- 收藏标志 -->
+          <image class="shouca" src="/images/ic_shouc@2x.png"></image>
+          <!-- 多选 -->
+          <view catchtap="choose" class="choose {{ac?'active':'non'}}">
+          </view>
         </view>
         <view class="card" data-url="/pages/lookup/lookimg/img" bindtap="to">
           <image style="width: 144rpx;height: 144rpx;border-radius: 8rpx;" src="../../../quest/subpage/detail/image/short/img_xtuthr@2x.png"></image>

pages/material/subpage/newest/newest.wxss

@@ -163,4 +163,33 @@
   font-weight: 400;
   color: #FFFFFF;
   line-height: 18rpx;
+}
+
+.shouca {
+  width: 32rpx;
+  height: 32rpx;
+  position: relative;
+  bottom: 165rpx;
+  left: 105rpx;
+}
+
+.choose.non{
+  width: 32rpx;
+  height: 32rpx;
+  background: rgba(0, 0, 0, 0.3);
+  border: 2rpx solid #FFFFFF;
+  position: relative;
+  bottom: 113rpx;
+  left: 100rpx;
+  border-radius: 32rpx;
+}
+.choose.active{
+  width: 32rpx;
+  height: 32rpx;
+  background: #006BFF;
+  border: 2rpx solid #FFFFFF;
+  position: relative;
+  bottom: 113rpx;
+  left: 100rpx;
+  border-radius: 32rpx;
 }

pages/quest/quest.js

@@ -110,81 +110,9 @@ Page({
     listNum: -1,
     // 下拉选项的隐藏和显示，默认隐藏
     showOrHide: false,
-    questes: [
+    questes: [],
-      {
+    maxpage: 1,
-        time: '2022-3-18～2022-5-18',
+    page: 1,
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      },{
-        time: '2022-3-18～2022-5-18',
-        status: 1,
-        title: '星途揽月新款抖音视频需求需要马上贯彻落实',
-        text: '以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上以一流的设计和领先的技术为基础以人工智能为差异化,从外观、性能上...',
-        url: 'https://www.oa00.com/#/attendance/index',
-        tip: '媒体测评',
-        model: ['星途凌云','星途揽月']
-      }
-    ]
   },
   // 点击菜单栏触发的事件函数
   handleClick: function (e) {
@@ -265,6 +193,20 @@ Page({
     wx.navigateTo({
       url: e.currentTarget.dataset.url
     })
+    wx.setStorage({
+      key: 'quest',
+      data: e.currentTarget.dataset.quest
+    })
+  },
+  getdata () {
+    http("/task/list", "post", {
+      pageNum: this.data.page
+    }).then(res=>{
+      this.setData({
+        'questes': this.data.questes.concat(res.data.records),
+        'maxpage': res.data.pages,
+      })
+    })
   },
   /**
    * 生命周期函数--监听页面加载
@@ -274,7 +216,7 @@ Page({
       title: '任务中心',
       success: function (res) {}
     })
-    http("/task/list", "post", '')
+    this.getdata()
   },
 
   /**
@@ -316,7 +258,18 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom() {
-
+    if (this.data.page === this.data.maxpage) {
+      wx.showToast({
+        title: '到底啦~',
+        icon: 'none',
+        duration: 2000
+      })
+    } else {
+      this.setData({
+        'page' : this.data.page + 1
+      })
+      this.getdata()
+    }
   },
 
   /**

pages/quest/quest.wxml

@@ -20,26 +20,29 @@
   <view class="{{showOrHide?'shadow':''}}" bind:tap="closeMask" />
   <!-- 任务展示 -->
   <view class="quest">
-    <view class="quest_crad" wx:for="{{questes}}" wx:key="index" data-url="/pages/quest/subpage/detail/detail" bindtap="to">
+    <view class="quest_crad" wx:for="{{questes}}" wx:key="index" data-url="/pages/quest/subpage/detail/detail" data-quest="{{item}}" bindtap="to">
       <view class="card_top">
-        <view class="card_time">{{item.time}}</view>
+        <view class="card_time">{{item.start}}-{{item.end}}</view>
         <view class="card_status">{{item.status === 1 ? '进行中' : '已完成'}}</view>
       </view>
       <view class="card_main">
         <view class="crad_left">
           <view class="crad_left_top">
             <view class="card_title">{{item.title}}</view>
-            <view class="crad_text">{{item.text}}</view>
+            <view class="crad_text">{{item.subtitle}}</view>
           </view>
           <view class="card_tip">
-            <view class="card_tip1">{{item.tip}}</view>
+            <view wx:for="{{item.tagList}}" wx:key="index" class="card_tip1">
-            <view wx:for="{{item.model}}" wx:key="index" class="card_model">
+              {{item.title}}
-              {{item}}
+            </view>
+            <!-- <view class="card_tip1">{{item.tip}}</view> -->
+            <view wx:for="{{item.brandList}}" wx:key="index" class="card_model">
+              {{item.name}}
             </view>
           </view>
         </view>
         <!-- <view class="crad_image"></view> -->
-        <image class="crad_image" src="/pages/quest/subpage/detail/image/short/img_xtuone@2x.png"></image>
+        <image class="crad_image" src="{{item.coverUrl}}"></image>
       </view>
     </view>
   </view>

pages/quest/subpage/detail/components/collection/collection.js

@@ -1,4 +1,5 @@
 // pages/quest/subpage/detail/components/collection/collection.js
+import {http} from '../../../../../../utils/util'
 Component({
   /**
    * 组件的属性列表
@@ -15,30 +16,55 @@ Component({
       name: '',
       tel: '',
       add: [],
-      type: '',
+      type: null,
       tip: ''
-    }
+    },
+    brand: false,
+    brandpage: 1,
+    brandmax: null,
+    brands: []
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-    blur(e) {
+    blur(e){
-      console.log(e)
       let a = "form." + e.currentTarget.dataset.mes
       let b = e.detail.value
       this.setData({
         [a]: b
       })
-      console.log(this.data)
     },
-    getUserProvince(e) {
+    getUserProvince(e){
-      console.log(e.detail.value)
-      console.log(this.data)
       this.setData({
         'form.add': e.detail.value
       })
     },
+    getbrand(){
+      this.setData({
+        brand: true
+      })
+      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
+          })
+          this.getbrand()
+        }
+      })
+    },
+    choosebrand(e){
+      this.setData({
+        'form.type': e.currentTarget.dataset.mes,
+        brand: false
+      })
+    },
+    update () {
+      console.log(this.data.form)
+    }
   }
 })

pages/quest/subpage/detail/components/collection/collection.wxml

@@ -20,35 +20,37 @@
   </view>
   <!-- <input class="placeholder" placeholder="输入姓名" bindblur="blur" data-mes="name"></input> -->
   <picker mode="region" bindchange="getUserProvince">
-  <view class="placeholder">
+    <view class="placeholder">
-    <text wx:if="{{form.add[2]}}">{{form.add}}</text>
+      <text wx:if="{{form.add[2]}}">{{form.add}}</text>
-    <text style="color:gray;" wx:else="{{true}}">请选择地区</text>
+      <text style="color:gray;" wx:else="{{true}}">请选择地区</text>
-  </view>
+    </view>
   </picker>
   <view class="hr"></view>
   <view class="title">
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/ic_gzcx@2x.png"></image>
     关注车型
   </view>
-  <view class="placeholder" style="color:gray;">请选择关注车型
+  <!-- <view class="placeholder" style="color:gray;" bindtap="getbrand">请选择关注车型
-  </view>
+  </view> -->
+  <view class="placeholder" wx:if="{{form.type.name}}" bindtap="getbrand">{{form.type.name}}</view>
+  <view class="placeholder" style="color:gray;" wx:else="{{true}}" bindtap="getbrand">请选择关注车型</view>
   <view class="hr"></view>
   <view class="title">
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/ic_bz@2x.png"></image>
     备注
   </view>
-  <textarea class="placeholder" placeholder="输入备注信息" bindblur="blur" data-mes="name" auto-height></textarea>
+  <textarea class="placeholder" placeholder="输入备注信息" bindblur="blur" data-mes="tip" auto-height></textarea>
   <!-- <view class="placeholder" style="height: 180rpx;">请输入备注信息 -->
   <!-- </view> -->
 </view>
 <!-- 底部按钮 -->
 <view class="bot">
-  <view class="button">上传</view>
+  <view class="button" bindtap="update">上传</view>
 </view>
 <!-- 选择关注车型 -->
-<l-arc-popup show="{{platformdia}}" max-height="700" min-height="200">
+<l-arc-popup show="{{brand}}" max-height="700" min-height="200">
-  <view class="platitle">选择平台</view>
+  <view class="platitle">选择车型</view>
-  <view class="pla" wx:for="{{platforms}}" wx:key="index" data-mes="{{platforms[index]}}" bindtap="plachoose2">{{item.name}}
+  <view class="pla" wx:for="{{brands}}" wx:key="index" data-mes="{{brands[index]}}" bindtap="choosebrand">{{item.name}}
-  <view class="plaline" wx:if="{{index < platforms.length - 1}}"></view>
+    <view class="line" wx:if="{{index < brands.length - 1}}"></view>
   </view>
 </l-arc-popup>

pages/quest/subpage/detail/components/collection/collection.wxss

@@ -45,7 +45,7 @@
   justify-content: center;
   align-items: center;
   position: fixed;
-  z-index: 999;
+  z-index: 1;
   bottom: 10rpx;
 }
 
@@ -62,4 +62,32 @@
   display: flex;
   justify-content: center;
   align-items: center;
+}
+.pla {
+  height: 96rpx;
+  background: #FFFFFF;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-direction: column;
+}
+
+.line {
+  width: 686rpx;
+  height: 2rpx;
+  background: #FFFFFF;
+  box-shadow: inset 0rpx -1rpx 0rpx 0rpx #E8E8E8;
+}
+
+.platitle {
+  height: 96rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #333333;
+  line-height: 32rpx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-direction: column;
 }

pages/quest/subpage/detail/components/detailed/detailed.js

@@ -1,4 +1,7 @@
 // pages/quest/subpage/detail/components/detailed/detailed.js
+import {
+  lookup
+} from "../../../../../../utils/util"
 Component({
   /**
    * 组件的属性列表
@@ -6,10 +9,11 @@ Component({
   properties: {
     table: {
       type: Array,
-      value: [{
+      value: []
-        one: '传播值',
+    },
-        tow: '奖励积分'
+    data: {
-      }]
+      type: Object,
+      value: {}
     }
   },
 
@@ -18,6 +22,7 @@ Component({
    */
   data: {
     // table: String
+    host: getApp().globalData.host
   },
 
   /**
@@ -26,6 +31,9 @@ Component({
   methods: {
     lo(str) {
       console.log(str)
-    }
+    },
+    lookup (e) {
+      lookup(e.currentTarget.dataset.look)
+    },
   }
 })

pages/quest/subpage/detail/components/detailed/detailed.wxml

@@ -1,24 +1,26 @@
 <!--pages/quest/subpage/detail/components/detailed/detailed.wxml-->
 <!-- 展示 -->
 <view class="main">
-  <view class="status">
+  <view class="status" wx:if="{{data.status !== 0}}">
-    <view>进行中</view>
+    <view>{{data.status === 1 ? '进行中' : '已完成'}}</view>
-    <view class="status_tip">任务进行中，如已发布视频请上传链接</view>
+    <view class="status_tip">{{data.status === 1 ? '任务进行中，如已发布视频请上传链接' : '任务已结束，感谢您的努力工作！'}}</view>
   </view>
-  <view class="main_title">星途揽月新款抖音视频宣传推广视频图文需求</view>
+  <view class="main_title">{{data.title}}</view>
-  <view class="main_text">4月8日凌云S上市，抖音上市传播需求，从外观性能和参数等多角度来切入完成对该车辆的推广宣传效果。</view>
+  <view class="main_text">{{data.subtitle}}</view>
   <view class="main_line"></view>
   <view class="in">
     <view class="he">起止时间</view>
-    <view class="mes">2022-05-06～2022-06-0</view>
+    <view class="mes">{{data.start}}~{{data.end}}</view>
   </view>
   <view class="in">
     <view class="he">视频标签</view>
-    <view class="mes">媒体评测</view>
+    <view class="mes" wx:for="{{data.tagList}}" wx:key="index">{{item.title}}</view>
   </view>
   <view class="in">
     <view class="he">关联车型</view>
-    <view class="mes">星途凌云、星途凌云S、星途追风</view>
+    <view class="mes" wx:for="{{data.brandList}}" wx:key="index">{{item.name}}
+      <text></text>
+    </view>
   </view>
 </view>
 <view class="main">
@@ -29,11 +31,8 @@
     </view> -->
   </view>
   <view class="image">
-    <image class="img" style="margin-right: 24rpx;" src="../../image/short/img_xtuone@2x.png"></image>
+    <image wx:for="{{data.referenceList}}" wx:key="index" class="img" style="margin-right: {{(index+1)%3 === 0 ? '0rpx' : '24rpx'}};" data-look="{{item}}" bindtap="lookup" src="{{host+'/'+item.coverUrl}}">
-    <image class="img" style="margin-right: 24rpx;" src="../../image/short/img_xtutwo@2x.png"></image>
+    </image>
-    <image class="img" src="../../image/short/img_xtuthr@2x.png"></image>
-    <image class="img" style="margin-right: 24rpx;" src="../../image/short/img_xtuthr@2x.png"></image>
-    <image class="img" style="margin-right: 24rpx;" src="../../image/short/img_xtuone@2x.png"></image>
   </view>
 </view>
 <view class="main">
@@ -52,15 +51,17 @@
   </view>
   <view class="table">
     <view class="cells">
-      <view class="cell {{index === 0 ? 'cell_top' : 'cell_mes'}}" wx:for="{{table}}" wx:key="index" style="background-color: {{index%2 === 0 ? '#F5FAFF' : 'white'}};">{{item.one}}</view>
+      <view class="cell cell_top" style="background-color:white;">传播值</view>
+      <view class="cell cell_mes" wx:for="{{table}}" wx:key="index" style="background-color: {{index%2 === 0 ? '#F5FAFF' : 'white'}};">{{item.min}}~{{item.max}}</view>
     </view>
     <view class="lin"></view>
     <view>
-      <view class="cell {{index === 0 ? 'cell_top' : 'cell_mes'}}" wx:for="{{table}}" wx:key="index" style="background-color: {{index%2 === 0 ? '#F5FAFF' : 'white'}};">{{item.two}}</view>
+      <view class="cell cell_top" style="background-color:white;">奖励积分</view>
+      <view class="cell cell_mes" wx:for="{{table}}" wx:key="index" style="background-color: {{index%2 === 0 ? '#F5FAFF' : 'white'}};">{{item.reward}}</view>
     </view>
   </view>
 </view>
 <!-- 底部按钮 -->
-<view class="bot">
+<view class="bot" wx:if="{{data.status === 0}}">
   <view class="button">接受任务</view>
 </view>

pages/quest/subpage/detail/components/link/link.js

@@ -11,50 +11,81 @@ Component({
    * 组件的初始数据
    */
   data: {
-    platforms: [
+    platforms: [{
-      {
+      id: 1,
-        id: 1,
+      name: '抖音'
-        name: '抖音'
+    }, {
-      },{
+      id: 2,
-        id: 2,
+      name: '快手'
-        name: '快手'
+    }, {
-      },{
+      id: 3,
-        id: 3,
+      name: '朋友圈'
-        name: '朋友圈'
+    }, {
-      },{
+      id: 4,
-        id: 4,
+      name: '视频号'
-        name: '视频号'
+    }],
-      }
-    ],
     platform: null,
     platformdia: false,
-    link: ''
+    link: '',
+    host: getApp().globalData.host,
+    link_type: false
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-    plachoose(e){
+    plachoose(e) {
       this.setData({
         platformdia: true
       })
     },
-    plachoose2(e){
+    plachoose2(e) {
       console.log(e.currentTarget.dataset.mes)
+      if (e.currentTarget.dataset.mes.id === 3) {
+        this.setData({
+          link_type: true
+        })
+      } else {
+        this.setData({
+          link_type: false
+        })
+      }
       this.setData({
         platform: e.currentTarget.dataset.mes,
         platformdia: false
       })
     },
-    linkin(e){
+    linkin(e) {
       console.log(e.detail.value)
       this.setData({
         link: e.detail.value
       })
     },
-    up(e){
+    up(e) {
-      console.log(this.data.platform,this.data.link)
+      console.log(this.data.platform, this.data.link)
+    },
+    chooseImage() {
+      let that = this
+      wx.chooseImage({
+        success(res) {
+          const tempFilePaths = res.tempFilePaths
+          // console.log(res)
+          wx.uploadFile({
+            url: that.data.host + '/util/upload',
+            filePath: tempFilePaths[0],
+            name: 'file',
+            // formData: {
+            //   '11111111': 'test'
+            // },
+            success(res) {
+              const data = res.data
+              console.log(res)
+              //do something
+            }
+          })
+        }
+      })
     }
   }
-})
+})

pages/quest/subpage/detail/components/link/link.wxml

@@ -7,14 +7,17 @@
   <view class="platform" bindtap="plachoose">{{platform ? platform.name:'请选择平台'}}
     <l-icon name="right" color="#999999" size="24"></l-icon>
   </view>
-  <view class="title">
+  <view class="title" wx:if="{{!link_type}}">
     <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/img_srlj@2x.png"></image>
     输入链接
   </view>
-  <!-- <view class="link">
+  <textarea wx:if="{{!link_type}}" class="link" placeholder="输入链接" maxlength="500" bindblur="linkin" auto-height></textarea>
-    输入链接
+  <!-- 上传图片 -->
-  </view> -->
+  <view class="title" wx:if="{{link_type}}">
-  <textarea class="link" placeholder="输入链接" maxlength="500" bindblur="linkin" auto-height></textarea>
+    <image style="width: 48rpx;height: 48rpx;margin-right: 16rpx;" src="../../image/img_srlj@2x.png"></image>
+    上传图片
+  </view>
+  <view class="link2" bindtap="chooseImage" wx:if="{{link_type}}">+</view>
   <view class="but" bindtap="up">上传</view>
 </view>
 <!-- 上传记录 -->

pages/quest/subpage/detail/components/link/link.wxss

@@ -120,4 +120,18 @@
   justify-content: flex-start;
   align-items: center;
   flex-direction: column;
+}
+
+.link2 {
+  width: 192rpx;
+  height: 192rpx;
+  background: #F9F9F9;
+  border-radius: 8rpx;
+  border: 2rpx solid #E8E8E8;
+  margin-bottom: 32rpx;
+  font-size: 72rpx;
+  color: #E8E8E8;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }

pages/quest/subpage/detail/detail.js

@@ -1,4 +1,7 @@
 // pages/quest/subpage/detail/detail.js
+import {
+  http
+} from '../../../../utils/util'
 Page({
 
   /**
@@ -25,32 +28,26 @@ Page({
       },
     ],
     flag: 0,
-    table: [
+    quest: null,
-      {
+    table: [],
-        one: '传播值',
+    data: null
-        two: '奖励积分'
-      },{
-        one: '0-1000（含）',
-        two: '200'
-      },{
-        one: '1000~5000（含）',
-        two: '300'
-      },{
-        one: '5000~10000（含）',
-        two: '500'
-      },{
-        one: '10000以上',
-        two: '1000'
-      }
-    ]
   },
   change(e) {
     this.setData({'flag':e.target.dataset.index})
   },
+  getdata(){
+    http("/task/detail" + "?id=" + this.data.quest.id, "post",).then(res=>{
+      this.setData({
+        data: res.data,
+        table: res.data.rewardRuleList
+      })
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    let that = this
     wx.setNavigationBarTitle({
       title: '任务详情',
     })
@@ -58,6 +55,16 @@ Page({
       backgroundColor: '#006BFF',
       frontColor: '#ffffff',
     })
+    wx.getStorage({
+      key: 'quest',
+      success (res) {
+        console.log(res)
+        that.setData({
+          quest: res.data
+        })
+        that.getdata()
+      }
+    })
   },
 
   /**

pages/quest/subpage/detail/detail.wxml

@@ -7,7 +7,7 @@
     <image wx:if="{{flag === index}}" class="sanjiao" src="./image/ic_sanjiao@2x.png"></image>
   </view>
 </view>
-<detailed wx:if="{{flag === 0}}" table="{{table}}"></detailed>
+<detailed wx:if="{{flag === 0}}" table="{{table}}" data="{{data}}"></detailed>
 <link wx:if="{{flag === 1}}"></link>
 <collection wx:if="{{flag === 2}}"></collection>
 <effect wx:if="{{flag === 3}}"></effect>

pages/user/subpage/integral/integral.js

@@ -1,19 +1,39 @@
-// pages/user/subpage/quest.js
+// pages/user/subpage/integral/integral.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    rearr: [{
+      isshow: false,
+      time: '2022年4月',
+      re: [{
+        title: '任务奖励',
+        time: '2022-04-15 16:35:09',
+        count: '+600'
+      }, {
+        title: '任务奖励',
+        time: '2022-04-15 16:35:09',
+        count: '+600'
+      }]
+    }]
   },
-
+  change(e) {
-  getlist() {
+    // console.log(e.currentTarget.dataset.mes)
+    let a = e.currentTarget.dataset.mes
+    let str = 'rearr[' + a + '].isshow'
+    this.setData({
+      [str]: !this.data.rearr[a].isshow
+    })
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    wx.setNavigationBarTitle({
+      title: '我的积分',
+    })
   },
 
   /**

pages/user/subpage/integral/integral.wxml

@@ -0,0 +1,36 @@
+<!--pages/user/subpage/integral/integral.wxml-->
+<view class="main">
+  <!-- <image style="width: 686rpx;height: 204rpx;" src="/images/img_wdjfbg@2x.png"></image> -->
+  <!-- 顶部卡片 -->
+  <view class="top">
+    <view class="top_title">
+      <view>当前积分数</view>
+      <view>累计获得积分</view>
+    </view>
+    <view class="top_num">
+      <view>300</view>
+      <view>1200</view>
+    </view>
+  </view>
+  <!-- 展示 -->
+  <view class="show">
+    <l-collapse>
+      <l-collapse-item wx:for="{{rearr}}" wx:key="index" customTitle="{{true}}">
+        <view class="show_tiltle" slot="title" bindtap="change" data-mes="{{index}}">
+          <view>积分明细</view>
+          <view class="show_tiltle2">{{item.time}}
+            <l-icon wx:if="{{!item.isshow}}" name="down" size="28" color="#333333" />
+            <l-icon wx:if="{{item.isshow}}" name="up" size="28" color="#333333" />
+          </view>
+        </view>
+        <view wx:for="{{item.re}}" wx:key="index" class="card" style="border-bottom: {{index<item.length ? 'rgba(223, 223, 223, 0.589) solid 1rpx': ''}};">
+          <view class="card_left">
+            <view class="card_title">{{item.title}}</view>
+            <view class="card_tip">{{item.time}}</view>
+          </view>
+          <view class="card_right">{{item.count}}</view>
+        </view>
+      </l-collapse-item>
+    </l-collapse>
+  </view>
+</view>

pages/user/subpage/quest.wxml

@@ -1,2 +0,0 @@
-<!--pages/user/subpage/quest.wxml-->
-<text>pages/user/subpage/quest.wxml</text>

pages/user/subpage/quest.wxss

@@ -1 +0,0 @@
-/* pages/user/subpage/quest.wxss */

pages/user/user.wxml

@@ -14,7 +14,7 @@
         <view class="user_tip">{{user_tip}}</view>
       </view>
     </view>
-    <view class="balance">
+    <view class="balance" data-url="/pages/user/subpage/integral/integral" bindtap="to">
       <view class="b_image">
         <image src="/images/img_jf@3x.png" style="width: 100%;height: 100%;"></image>
       </view>