y595705120 4 years ago
parent
commit
abc8a883ec

+ 2 - 1
pages/task/demand/index.js

@@ -6,6 +6,7 @@ Page({
     CustomBar: app.globalData.CustomBar,
     loadModal:false,
     userInfo:{},
+    name:'',
     from:0,
     size:6,
     list:[
@@ -56,7 +57,7 @@ Page({
     })
   },
   getTaskList: function( newFrom, cb){
-    let param = { from: newFrom, size:this.data.size }
+    let param = { from: newFrom, size:this.data.size,name: this.data.name }
     let list = this.data.list
     let that = this
     util.http("/wx/getDemandCenter", param, function (err, res) {

+ 2 - 0
pages/task/info/b2bInfo.js

@@ -1,6 +1,7 @@
 // pages/user/info/index.js
 const app = getApp();
 const util = require("../../../util/util.js")
+var WxParse = require('../../../wxParse/wxParse.js');
 Page({
   data: {
     info:{}
@@ -11,6 +12,7 @@ Page({
     util.http('/wx/getWxB2BInfo', {id}, (err,res)=>{
       if( err != 0) return;
       console.log( "res", res)
+      WxParse.wxParse('content', 'html', res.content, this, 5)
       this.setData({info: res})
     })
   },

+ 4 - 2
pages/task/info/b2bInfo.wxml

@@ -2,7 +2,7 @@
   <view slot="backText">返回</view>
   <view slot="content">B2B详情</view>
 </cu-custom>
-
+<import src="../../../wxParse/wxParse.wxml" />
 <view class="cu-list menu" style="margin-top:{{StatusBar}}px;">
   <view class="cu-form-group">
     <view class="title solids-right"> 产品名称</view>
@@ -93,6 +93,8 @@
   </view>
 
   <view class="cu-form-group">
-    <rich-text  nodes="{{info.content}}"></rich-text>
+    <view style="width:100%;padding:10rpx">
+      <template is="wxParse" data="{{wxParseData:content.nodes}}" />
+    </view>
   </view>
 </view>

+ 2 - 1
pages/task/info/info.js

@@ -1,6 +1,7 @@
 // pages/user/info/index.js
 const app = getApp();
 const util = require("../../../util/util.js")
+var WxParse = require('../../../wxParse/wxParse.js');
 Page({
   data: {
     info:{}
@@ -9,7 +10,7 @@ Page({
     let id = +options.id||200123;
     util.http('/wx/getWxTaskInfo', {id}, (err,res)=>{
       if( err != 0) return;
-      console.log( "res", res)
+      WxParse.wxParse('content', 'html', res.content, this, 5)
       this.setData({info: res})
     })
   },

+ 4 - 1
pages/task/info/info.wxml

@@ -3,6 +3,7 @@
   <view slot="content">任务详情</view>
 </cu-custom>
 
+<import src="../../../wxParse/wxParse.wxml" />
 <view class="cu-list menu" style="margin-top:{{StatusBar}}px;">
   <view class="cu-form-group">
     <view class="title solids-right">任务标题</view>
@@ -100,7 +101,9 @@
   </view>
 
   <view class="cu-form-group">
-    <rich-text  nodes="{{info.content}}"></rich-text>
+    <view style="width:100%;padding:10rpx">
+      <template is="wxParse" data="{{wxParseData:content.nodes}}" />
+    </view>
   </view>
 
   

+ 7 - 0
pages/tool/band/band.js

@@ -34,6 +34,13 @@ Page({
   takeBand(){
     this.setData( {showcamara:true, type:'band'})
   },
+  previewImage: function (e) {
+    var current = e.target.dataset.src;
+    wx.previewImage({
+      current: current, 
+      urls: [current]
+    })
+  },
   identify( err, {url} ){
     if( err !=0 || !url ) {
       util.showMsg("图片上传失败")