修改协议及图片显示问题

app.json

@@ -6,6 +6,7 @@
     "pages/logs/logs",
     "pages/club/club",
     "pages/message/message",
+    "pages/webview/webview",
     "pages/rank/rank",
     "pages/center/center",
     "pages/index/search/search",

pages/club/club.js

@@ -125,8 +125,9 @@ Page({
     };
     re.request(Api.getMyJoinClubList(), '', header).then((res) => {
       let datas = res.data.data;
+      console.log(datas)
       for(var i=0;i<datas.length;i++){
-        datas[i].clubLogo = imgUrl + datas[i].clubLogo;
+        datas[i].clubLogo =  datas[i].clubLogo;
       }
       that.setData({
         myjoinList:datas
@@ -142,9 +143,9 @@ Page({
     };
     re.request(Api.getMyManageClubList(), '', header).then((res) => {
       let datas = res.data.data;
-      for(var i=0;i<datas.length;i++){
-        datas[i].clubLogo = imgUrl + datas[i].clubLogo;
-      }
+      // for(var i=0;i<datas.length;i++){
+      //   datas[i].clubLogo = imgUrl + datas[i].clubLogo;
+      // }
       that.setData({
         myjoinList:datas
       })

pages/club/clubDetail/clubDetail.js

@@ -36,7 +36,8 @@ jlbchengyuan(){
   })
 },
 tomanage:function(e){
-  let valData = JSON.stringify(this.data.company);//console.log('company-data:', this.data.company);
+  let valData = JSON.stringify(this.data.company);
+  console.log('company-data:', this.data.company);
   wx.navigateTo({
     url: '../manage/manage?val='+valData+''
   })
@@ -97,7 +98,7 @@ toactiveDetail:function(e){
     };
     re.request(Api.getclubDetail(), postData, header).then((res) => {
       let datas = res.data.data;
-      datas.clubLogo = imgUrl + datas.clubLogo;
+      datas.clubLogo =  datas.clubLogo;
       datas.clubBgimg = imgUrl + datas.clubBgimg;
       switch (datas.isJoin) {
         case 'false':

pages/club/manage/manage.js

@@ -84,6 +84,11 @@ Page({
    */
   onLoad: function (options) {
     let queryval = JSON.parse(options.val)
+    if(this.uploaderList === undefined) {
+      this.uploaderList = []
+    }
+    this.uploaderList.push(queryval.clubBgimg);
+    console.log( this.uploaderList)
     this.setData({
       company:queryval,
     })

pages/club/manage/manage.wxml

@@ -67,14 +67,14 @@
         <text>移除成员</text>
         <image src="../../../images/back.png" class="back"></image>
       </view>
-      <view class="formlist" bindtap="setDeputy"  wx:if="{{jurisdiction==1}}">
+      <!-- <view class="formlist" bindtap="setDeputy"  wx:if="{{jurisdiction==1}}">
         <text>设置副会长</text>
         <image src="../../../images/back.png" class="back"></image>
       </view>
       <view class="formlist" bindtap="tosetadmin" wx:if="{{jurisdiction<=2}}">
         <text>设置管理员</text>
         <image src="../../../images/back.png" class="back"></image>
-      </view>
+      </view> -->
       <view class="formlist"  wx:if="{{jurisdiction<=3}}">
         <text>俱乐部收款账户</text>
         <picker bindchange="accountChange" value="{{acctindex}}" range-key="name" range="{{accts}}"

pages/index/activeDetail/activeDetail.js

@@ -136,8 +136,8 @@ tojion:function(){
     };
     re.request(Api.getclubInfo(), postData, header).then((res) => {
       let datas = res.data.data;
-      console.log(datas);
-      datas.clubLogo = imgUrl + datas.clubLogo;
+      // console.log(datas);
+      // datas.clubLogo = imgUrl + datas.clubLogo;
       that.setData({
         company:datas
       })
@@ -201,7 +201,7 @@ tojion:function(){
     };
     re.request(Api.addClub(), postData, header).then((res) => {
       wx.showToast({
-        title: '请求已发送',
+        title: '加入成功',
         icon: 'none',
         duration: 1000
       })

pages/index/activeDetail/activeDetail.wxml

@@ -138,7 +138,7 @@
         <view>在线咨询</view>
       </button> -->
     </view>
-    <view class="bottom-right" bindtap="tojion" wx:if="{{detail.isJoin == 0}}">我要报名</view>
-	<view class="bottom-right" wx:if="{{detail.isJoin == 1}}">已报名</view>
+    <view class="bottom-right" bindtap="tojion">我要报名</view>
+	<!-- <view class="bottom-right" wx:if="{{detail.isJoin == 1}}">已报名</view> -->
   </view>
 </view>

pages/index/activeDetail/activeDetail.wxss

@@ -423,7 +423,7 @@
 #online {
   background-color: #00000000;
   color: #000;
-  padding: 0;
+  padding: 0 30rpx;
   margin: 0;
   margin-left: 50rpx;
 }

pages/index/myjoin/myjoin.js

@@ -22,6 +22,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    Agreement:'http://api.tuleduo.cn/privacy_agreement.html',
     genderdata: '',
     joiner: [{
       clubId: '',
@@ -71,6 +72,12 @@ Page({
       info: new Info(),
     });
   },
+  seexcieyi:function(e){
+    var webview= e.target.dataset.webview
+    wx.navigateTo({
+    url: '/pages/webview/webview?webview='+webview,
+    })
+  },
   deteleItem : function(e){
     var that = this;
     let info = this.data.info;

pages/index/myjoin/myjoin.wxml

@@ -75,7 +75,7 @@
   <view class="agree">
     <checkbox-group bindchange="xieyi">
       <checkbox name="box_check" checked="{{checked}}"></checkbox>
-      我已阅读并同意<text bindtap='seexcieyi'>《**活动报名协议》</text>
+      我已阅读并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《**活动报名协议》</text>
     </checkbox-group>
   </view>
 </view>

pages/index/order/order.js

@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    Agreement:'http://api.tuleduo.cn/privacy_agreement.html',
     groups:[],
     checked:false,
     id:'',
@@ -26,6 +27,12 @@ Page({
     that.getOrderPeople(options.id);
     // that.getOrderDetail(options.id);
   },
+  seexcieyi:function(e){
+    var webview= e.target.dataset.webview
+    wx.navigateTo({
+    url: '/pages/webview/webview?webview='+webview,
+    })
+  },
   backChange:function(e){
     var that = this;
     that.setData({

pages/index/order/order.wxml

@@ -72,7 +72,7 @@
     <checkbox-group bindchange="checkboxChange">
       <label class="xieyi-class">
         <checkbox checked="{{checked}}" name="box_check" value="{{checked}}" bind></checkbox>
-        我同意《XXX服务协议》，并确认活动真实性，同意支付报名
+        我并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《报名了服务协议》</text>，并确认活动真实性，同意支付报名
       </label>
     </checkbox-group>
   </view>

pages/release/addactive/addactive.js

@@ -9,7 +9,7 @@ Page({
    * 页面的初始数据 
    */
   data: {
-
+    Agreement:'http://api.tuleduo.cn/privacy_agreement.html',
     dateTime:'',
     dateTimeArray:'',
     startT:'',
@@ -426,12 +426,15 @@ console.log(startT);
     })
   },
   //查看协议
-  seexcieyi: function () {
-    var that = this;
-    that.setData({
-      flag: false
+  seexcieyi: function (e) {
+    // var that = this;
+    // that.setData({
+    //   flag: false
+    // })
+    var webview= e.target.dataset.webview
+    wx.navigateTo({
+    url: '/pages/webview/webview?webview='+webview,
     })
-    that.self();
   },
   //看完协议了
   know: function () {
@@ -440,17 +443,6 @@ console.log(startT);
       flag: true
     })
   },
-  self: function () {
-    var that = this;
-    var header = {};
-    var postData = {
-      type: 2
-    };
-    // re.request(Api.getAgreement(), postData, header).then((res) => {
-    //   var ftext = res.data.data[0].content;
-    //   WxParse.wxParse('ftext', 'html', ftext, that, 5);
-    // })
-  },
   // 删除图片
   clearImg: function (e) {
     var nowList = []; //新数据
@@ -657,7 +649,7 @@ uploadfront: function (e) {
     };
     if(!this.data.checked){
       wx.showToast({
-        title: '请先阅读并同意此协议',
+        title: '请先阅读并同意服务协议',
         icon: 'none',
         duration: 1500
       })
@@ -820,7 +812,6 @@ uploadfront: function (e) {
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-
   },
 
   /**

pages/release/addactive/addactive.wxml

@@ -256,7 +256,7 @@
       <view class="agree">
         <checkbox-group bindchange="xieyi">
          <checkbox name="box_check" value="{{checked}}"></checkbox>
-         我已阅读并同意<text bindtap='seexcieyi'>《****服务协议》</text>
+         我已阅读并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《报名了服务协议》</text>
        </checkbox-group>
       </view>
   </view>
@@ -264,7 +264,7 @@
 </view>
 
 <!-- 用户协议 -->
-<scroll-view class="modal-box" scroll-y="true" hidden="{{flag}}">
+<!-- <scroll-view class="modal-box" scroll-y="true" hidden="{{flag}}">
   <view class="modal-content"></view>
   <view class='modal'>
     <view class="choice ">
@@ -274,7 +274,7 @@
       <button class="knowBtn" bindtap='know'>我知道了</button>
     </view>
   </view>
-</scroll-view>
+</scroll-view> -->
 
 <!-- 模态框 -->
 <modal hidden="{{hidden}}" title="退款设置" confirm-text="确定" cancel-text="取消" 

pages/webview/webview.js

@@ -0,0 +1,68 @@
+// pages/webview/webview.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var webview=options.webview;
+    this.setData({
+    path: webview
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/webview/webview.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/webview/webview.wxml

@@ -0,0 +1,2 @@
+<!--pages/webview/webview.wxml-->
+<web-view src="{{path}}"></web-view>

pages/webview/webview.wxss

@@ -0,0 +1 @@
+/* pages/webview/webview.wxss */

utils/common.js

@@ -97,11 +97,11 @@ var HOST_URI = 'https://api.tuleduo.cn';
  let API_nicknameadd='/open/club/nickname/add'//新增个性化称号
  let API_nicknameedit='/open/club/nickname/edit'//修改个性化称号
  let API_memberremoveLikeList='/open/club/member/removeLikeList' //模糊查询
- 
  let API_memberList='/open/club/member/setList'//成员列表      
-  let API_Setmember='/open/club/member/edit'//成员列表      
+ let API_Setmember='/open/club/member/edit'//成员列表      
  let API_getClubMessagePage= '/open/massage/club/pages' //俱乐部消息
  let API_getSystemMessagePage= '/open/massage/system/pages' //系统消息
+
   function SetMember(){
    return HOST_URI + API_Setmember;
   }

utils/request.js

@@ -29,12 +29,16 @@ export function request(url,data,header){
             app.getPower();
           }
         }else if(res.data.code == '500'){
-
           wx.showToast({
-            title:'网络错误',
+            title:res.data.msg,
             icon: 'none',
             duration: 1000
           })
+          // wx.showToast({
+          //   title:'网络错误',
+          //   icon: 'none',
+          //   duration: 1000
+          // })
 
         }else if(res.data.code == '412'){
           wx.showToast({