充值记录查看凭证，检查二维码和上传凭证问题，首页获取商户列表更改

app.json

@@ -41,12 +41,6 @@
         "iconPath": "/assets/tabbar/home.png",
         "selectedIconPath": "/assets/tabbar/home_select.png"
       },
-      {
-        "pagePath": "pages/special/index",
-        "text": "专区",
-        "iconPath": "/assets/tabbar/special.png",
-        "selectedIconPath": "/assets/tabbar/special_select.png"
-      },
       {
         "pagePath": "pages/my/index",
         "text": "我的",

childPackage/pages/billDetail/index.js

@@ -1,5 +1,5 @@
 import { getReportDetail } from "../../../service/report";
-import { alertInfo, getPixelRatio } from "../../../utils/index";
+import { alertInfo, alertSuccess, getPixelRatio } from "../../../utils/index";
 import request from '../../../utils/request'
 import * as echarts from '../../components/echarts/echarts';
 const { OK } = request
@@ -134,18 +134,27 @@ Page({
             case 'develop':
               wx.setClipboardData({
                 data: `http://1.92.72.5:8080/user-report/?report=${id}&tenement=${tenement}`,
+                success: () => {
+                  alertSuccess("复制成功")
+                }
               })
               break;
             // 体验版
             case 'trial':
               wx.setClipboardData({
                 data: `http://1.92.72.5:8080/user-report/?report=${id}&tenement=${tenement}`,
+                success: () => {
+                  alertSuccess("复制成功")
+                }
               })
               break;
             // 正式版
             case 'release':
               wx.setClipboardData({
                 data: `https://zgd.hbhcbn.com/user-report/?report=${id}&tenement=${tenement}`,
+                success: () => {
+                  alertSuccess("复制成功")
+                }
               })
               break;
           }

childPackage/pages/billDetail/index.wxml

@@ -81,7 +81,7 @@
         </van-col>
         <van-col span="6">
           <view class="tableTitle"> 倍率 </view>
-          <view class="tableContent"> {{item.displayRatio}} </view>
+          <view class="tableContent"> {{item.ratio}} </view>
         </van-col>
       </van-row>
       <van-row>

components/mp-html/index.js

@@ -0,0 +1,8 @@
+"use strict";function e(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}/*!
+ * mp-html v2.5.0
+ * https://github.com/jin-yufeng/mp-html
+ *
+ * Released under the MIT license
+ * Author: Jin Yufeng
+ */
+var t=require("./parser"),n=[];Component({data:{nodes:[]},properties:{containerStyle:String,content:{type:String,value:"",observer:function(e){this.setContent(e)}},copyLink:{type:Boolean,value:!0},domain:String,errorImg:String,lazyLoad:Boolean,loadingImg:String,pauseVideo:{type:Boolean,value:!0},previewImg:{type:null,value:!0},scrollTable:Boolean,selectable:null,setTitle:{type:Boolean,value:!0},showImgMenu:{type:Boolean,value:!0},tagStyle:Object,useAnchor:null},created:function(){this.plugins=[];for(var e=n.length;e--;)this.plugins.push(new n[e](this))},detached:function(){this._hook("onDetached")},methods:{in:function(e,t,n){e&&t&&n&&(this._in={page:e,selector:t,scrollTop:n})},navigateTo:function(t,n){var i=this;return new Promise(function(o,r){if(!i.data.useAnchor)return void r(Error("Anchor is disabled"));var a=wx.createSelectorQuery().in(i._in?i._in.page:i).select((i._in?i._in.selector:"._root")+(t?"".concat(">>>","#").concat(t):"")).boundingClientRect();i._in?a.select(i._in.selector).scrollOffset().select(i._in.selector).boundingClientRect():a.selectViewport().scrollOffset(),a.exec(function(t){if(!t[0])return void r(Error("Label not found"));var a=t[1].scrollTop+t[0].top-(t[2]?t[2].top:0)+(n||parseInt(i.data.useAnchor)||0);i._in?i._in.page.setData(e({},i._in.scrollTop,a)):wx.pageScrollTo({scrollTop:a,duration:300}),o()})})},getText:function(e){var t="";return function e(n){for(var i=0;i<n.length;i++){var o=n[i];if("text"===o.type)t+=o.text.replace(/&amp;/g,"&");else if("br"===o.name)t+="\n";else{var r="p"===o.name||"div"===o.name||"tr"===o.name||"li"===o.name||"h"===o.name[0]&&o.name[1]>"0"&&o.name[1]<"7";r&&t&&"\n"!==t[t.length-1]&&(t+="\n"),o.children&&e(o.children),r&&"\n"!==t[t.length-1]?t+="\n":"td"!==o.name&&"th"!==o.name||(t+="\t")}}}(e||this.data.nodes),t},getRect:function(){var e=this;return new Promise(function(t,n){wx.createSelectorQuery().in(e).select("._root").boundingClientRect().exec(function(e){return e[0]?t(e[0]):n(Error("Root label not found"))})})},pauseMedia:function(){for(var e=(this._videos||[]).length;e--;)this._videos[e].pause()},setPlaybackRate:function(e){this.playbackRate=e;for(var t=(this._videos||[]).length;t--;)this._videos[t].playbackRate(e)},setContent:function(e,n){var i=this;this.imgList&&n||(this.imgList=[]),this._videos=[];var o={},r=new t(this).parse(e);if(n)for(var a=this.data.nodes.length,s=r.length;s--;)o["nodes[".concat(a+s,"]")]=r[s];else o.nodes=r;if(this.setData(o,function(){i._hook("onLoad"),i.triggerEvent("load")}),this.data.lazyLoad||this.imgList._unloadimgs<this.imgList.length/2){var l=0,c=function e(t){t&&t.height||(t={}),t.height===l?i.triggerEvent("ready",t):(l=t.height,setTimeout(function(){i.getRect().then(e).catch(e)},350))};this.getRect().then(c).catch(c)}else this.imgList._unloadimgs||this.getRect().then(function(e){i.triggerEvent("ready",e)}).catch(function(){i.triggerEvent("ready",{})})},_hook:function(e){for(var t=n.length;t--;)this.plugins[t][e]&&this.plugins[t][e]()},_add:function(e){e.detail.root=this}}});

components/mp-html/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"node":"./node/node"}}

components/mp-html/index.wxml

@@ -0,0 +1 @@
+<view class="_root {{selectable?'_select':''}}" style="{{containerStyle}}"><slot wx:if="{{!nodes[0]}}"/><node id="_root" childs="{{nodes}}" opts="{{[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]}}" catchadd="_add"/></view>

components/mp-html/index.wxss

@@ -0,0 +1 @@
+._root{padding:1px 0;overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}._select{-webkit-user-select:text;user-select:text}

components/mp-html/node/node.js

@@ -0,0 +1 @@
+"use strict";function t(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),r.push.apply(r,i)}return r}function e(e){for(var i=1;i<arguments.length;i++){var o=null!=arguments[i]?arguments[i]:{};i%2?t(Object(o),!0).forEach(function(t){r(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):t(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}function r(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}Component({data:{ctrl:{},isiOS:wx.getSystemInfoSync().system.includes("iOS")},properties:{childs:Array,opts:Array},options:{addGlobalClass:!0},attached:function(){this.triggerEvent("add",this,{bubbles:!0,composed:!0})},methods:{noop:function(){},getNode:function(t){try{for(var e=t.split("_"),r=this.data.childs[e[0]],i=1;i<e.length;i++)r=r.children[e[i]];return r}catch(t){return{text:"",attrs:{},children:[]}}},play:function(t){var r=t.target.dataset.i,i=this.getNode(r);if(this.root.triggerEvent("play",{source:i.name,attrs:e(e({},i.attrs),{},{src:i.src[this.data.ctrl[r]||0]})}),this.root.data.pauseVideo){for(var o=!1,s=t.target.id,a=this.root._videos.length;a--;)this.root._videos[a].id===s?o=!0:this.root._videos[a].pause();if(!o){var n=wx.createVideoContext(s,this);n.id=s,this.root.playbackRate&&n.playbackRate(this.root.playbackRate),this.root._videos.push(n)}}},imgTap:function(t){var e=this.getNode(t.target.dataset.i);if(e.a)return this.linkTap(e.a);if(!e.attrs.ignore&&(this.root.triggerEvent("imgtap",e.attrs),this.root.data.previewImg)){var r=this.root.imgList[e.i];wx.previewImage({showmenu:this.root.data.showImgMenu,current:r,urls:this.root.imgList})}},imgLoad:function(t){var e,i=t.target.dataset.i,o=this.getNode(i);o.w?(this.data.opts[1]&&!this.data.ctrl[i]||-1===this.data.ctrl[i])&&(e=1):e=t.detail.width,e&&this.setData(r({},"ctrl."+i,e)),this.checkReady()},checkReady:function(){var t=this;this.root.data.lazyLoad||(this.root.imgList._unloadimgs-=1,this.root.imgList._unloadimgs||setTimeout(function(){t.root.getRect().then(function(e){t.root.triggerEvent("ready",e)}).catch(function(){t.root.triggerEvent("ready",{})})},350))},linkTap:function(t){var e=t.currentTarget?this.getNode(t.currentTarget.dataset.i):{},r=e.attrs||t,i=r.href;this.root.triggerEvent("linktap",Object.assign({innerText:this.root.getText(e.children||[])},r)),i&&("#"===i[0]?this.root.navigateTo(i.substring(1)).catch(function(){}):i.split("?")[0].includes("://")?this.root.data.copyLink&&wx.setClipboardData({data:i,success:function(){return wx.showToast({title:"链接已复制"})}}):wx.navigateTo({url:i,fail:function(){wx.switchTab({url:i,fail:function(){}})}}))},mediaError:function(t){var e=t.target.dataset.i,i=this.getNode(e);if("video"===i.name||"audio"===i.name){var o=(this.data.ctrl[e]||0)+1;if(o>i.src.length&&(o=0),o<i.src.length)return this.setData(r({},"ctrl."+e,o))}else"img"===i.name&&(this.data.opts[2]&&this.setData(r({},"ctrl."+e,-1)),this.checkReady());this.root&&this.root.triggerEvent("error",{source:i.name,attrs:i.attrs,errMsg:t.detail.errMsg})}}});

components/mp-html/node/node.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"node":"./node"}}

components/mp-html/node/node.wxml

@@ -0,0 +1 @@
+<wxs module="isInline">var e={abbr:!0,b:!0,big:!0,code:!0,del:!0,em:!0,i:!0,ins:!0,label:!0,q:!0,small:!0,span:!0,strong:!0,sub:!0,sup:!0};module.exports=function(n,i){return e[n]||-1!==(i||"").indexOf("inline")};</wxs><template name="el"><block wx:if="{{n.name==='img'}}"><rich-text wx:if="{{n.t}}" style="display:{{n.t}}" nodes="<img class='_img' style='{{n.attrs.style}}' src='{{n.attrs.src}}'>" data-i="{{i}}" catchtap="imgTap"/><block wx:else><image wx:if="{{(opts[1]&&!ctrl[i])||ctrl[i]<0}}" class="_img" style="{{n.attrs.style}}" src="{{ctrl[i]<0?opts[2]:opts[1]}}" mode="widthFix"/><image id="{{n.attrs.id}}" class="_img {{n.attrs.class}}" style="{{ctrl[i]===-1?'display:none;':''}}width:{{ctrl[i]||1}}px;height:1px;{{n.attrs.style}}" src="{{n.attrs.src}}" mode="{{!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))}}" lazy-load="{{opts[0]}}" webp="{{n.webp}}" show-menu-by-longpress="{{opts[3]&&!n.attrs.ignore}}" data-i="{{i}}" bindload="imgLoad" binderror="mediaError" catchtap="imgTap" bindlongpress="noop"/></block></block><text wx:elif="{{n.text}}" user-select="{{opts[4]=='force'&&isiOS}}" decode>{{n.text}}</text><text wx:elif="{{n.name==='br'}}">\n</text><view wx:elif="{{n.name==='a'}}" id="{{n.attrs.id}}" class="{{n.attrs.href?'_a ':''}}{{n.attrs.class}}" hover-class="_hover" style="display:inline;{{n.attrs.style}}" data-i="{{i}}" catchtap="linkTap"><node childs="{{n.children}}" opts="{{opts}}" style="display:inherit"/></view><video wx:elif="{{n.name==='video'}}" id="{{n.attrs.id}}" class="{{n.attrs.class}}" style="{{n.attrs.style}}" autoplay="{{n.attrs.autoplay}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" muted="{{n.attrs.muted}}" object-fit="{{n.attrs['object-fit']}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" bindplay="play" binderror="mediaError"/><audio wx:elif="{{n.name==='audio'}}" id="{{n.attrs.id}}" class="{{n.attrs.class}}" style="{{n.attrs.style}}" author="{{n.attrs.author}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" name="{{n.attrs.name}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" bindplay="play" binderror="mediaError"/><rich-text wx:else id="{{n.attrs.id}}" style="{{n.f}}" user-select="{{opts[4]}}" nodes="{{[n]}}"/></template><block wx:for="{{childs}}" wx:for-item="n1" wx:for-index="i1" wx:key="i1"><template wx:if="{{!n1.c&&(!n1.children||n1.name==='a'||!isInline(n1.name,n1.attrs.style))}}" is="el" data="{{n:n1,i:''+i1,opts:opts,ctrl:ctrl}}"/><view wx:else id="{{n1.attrs.id}}" class="_{{n1.name}} {{n1.attrs.class}}" style="{{n1.attrs.style}}"><block wx:for="{{n1.children}}" wx:for-item="n2" wx:for-index="i2" wx:key="i2"><template wx:if="{{!n2.c&&(!n2.children||n2.name==='a'||!isInline(n2.name,n2.attrs.style))}}" is="el" data="{{n:n2,i:i1+'_'+i2,opts:opts,ctrl:ctrl}}"/><view wx:else id="{{n2.attrs.id}}" class="_{{n2.name}} {{n2.attrs.class}}" style="{{n2.attrs.style}}"><block wx:for="{{n2.children}}" wx:for-item="n3" wx:for-index="i3" wx:key="i3"><template wx:if="{{!n3.c&&(!n3.children||n3.name==='a'||!isInline(n3.name,n3.attrs.style))}}" is="el" data="{{n:n3,i:i1+'_'+i2+'_'+i3,opts:opts,ctrl:ctrl}}"/><view wx:else id="{{n3.attrs.id}}" class="_{{n3.name}} {{n3.attrs.class}}" style="{{n3.attrs.style}}"><block wx:for="{{n3.children}}" wx:for-item="n4" wx:for-index="i4" wx:key="i4"><template wx:if="{{!n4.c&&(!n4.children||n4.name==='a'||!isInline(n4.name,n4.attrs.style))}}" is="el" data="{{n:n4,i:i1+'_'+i2+'_'+i3+'_'+i4,opts:opts,ctrl:ctrl}}"/><view wx:else id="{{n4.attrs.id}}" class="_{{n4.name}} {{n4.attrs.class}}" style="{{n4.attrs.style}}"><block wx:for="{{n4.children}}" wx:for-item="n5" wx:for-index="i5" wx:key="i5"><template wx:if="{{!n5.c&&(!n5.children||n5.name==='a'||!isInline(n5.name,n5.attrs.style))}}" is="el" data="{{n:n5,i:i1+'_'+i2+'_'+i3+'_'+i4+'_'+i5,opts:opts,ctrl:ctrl}}"/><node wx:else id="{{n5.attrs.id}}" class="_{{n5.name}} {{n5.attrs.class}}" style="{{n5.attrs.style}}" childs="{{n5.children}}" opts="{{opts}}"/></block></view></block></view></block></view></block></view></block>

components/mp-html/node/node.wxss

@@ -0,0 +1 @@
+._a{padding:1.5px 0 1.5px 0;color:#366092;word-break:break-all}._hover{text-decoration:underline;opacity:.7}._img{max-width:100%;-webkit-touch-callout:none}._b,._strong{font-weight:700}._code{font-family:monospace}._del{text-decoration:line-through}._em,._i{font-style:italic}._h1{font-size:2em}._h2{font-size:1.5em}._h3{font-size:1.17em}._h5{font-size:.83em}._h6{font-size:.67em}._h1,._h2,._h3,._h4,._h5,._h6{display:block;font-weight:700}._ins{text-decoration:underline}._li{display:list-item}._ol{list-style-type:decimal}._ol,._ul{display:block;padding-left:40px;margin:1em 0}._q::before{content:'"'}._q::after{content:'"'}._sub{font-size:smaller;vertical-align:sub}._sup{font-size:smaller;vertical-align:super}._tbody,._tfoot,._thead{display:table-row-group}._tr{display:table-row}._td,._th{display:table-cell;vertical-align:middle}._th{font-weight:700;text-align:center}._ul{list-style-type:disc}._ul ._ul{margin:0;list-style-type:circle}._ul ._ul ._ul{list-style-type:square}._abbr,._b,._code,._del,._em,._i,._ins,._label,._q,._span,._strong,._sub,._sup{display:inline}._blockquote,._div,._p{display:block}

pages/apply/index.js

@@ -20,7 +20,9 @@ Page({
    */
   onLoad(options) {
     const querys = decodeURIComponent(options.scene)
+    console.log('querys', querys)
     const id = querys.slice(querys.indexOf("=") + 1)
+    console.log("id", id)
     this.getInfo(id);
   },
   async getInfo(id) {

pages/encyclopediaDetail/index.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
-    "navigator": "/components/navigator/index"
+    "navigator": "/components/navigator/index",
+    "mp-html": "/components/mp-html/index"
   },
   "navigationStyle": "custom"
 }

pages/encyclopediaDetail/index.wxml

@@ -2,5 +2,7 @@
 <navigator title="百科详情" canBack="{{true}}" />
 <view class="contentWrapper">
     <view class="title">{{detail.title}}</view>
-    <view class="content">{{detail.content}}</view>
+    <view class="content">
+        <mp-html content="{{detail.content}}" />
+    </view>
 </view>

pages/handleLogin/index.js

@@ -97,6 +97,7 @@ Page({
     wx.scanCode({
       scanType: "qrCode",
       success: ({ path }) => {
+        console.log('path', path)
         wx.navigateTo({
           url: '/' + path,
         })

pages/home/index.js

@@ -193,7 +193,7 @@ Page({
         // const oldValue = value;
         wx.setStorageSync('tenement', newVal)
         that.getMeters(newVal);
-        that.setUser();
+        that.setUser(newVal.id);
         value = newVal;
       }
     });
@@ -260,8 +260,8 @@ Page({
       url: '/childPackage/pages/electricQuery/index',
     })
   },
-  async setUser() {
-    const result = await getUserInfo();
+  async setUser(id) {
+    const result = await getUserInfo(id);
     if (result.code !== OK) {
       const user = wx.getStorageSync('user')
       this.setData({ user: user })
@@ -292,14 +292,26 @@ Page({
     const updateDatas = {}
     if (!park || !park.id) {
       const storagePark = wx.getStorageSync('park')
-      updateDatas.park = storagePark || firstPark
+      if (data.find(item => item.id !== storagePark.id)) {
+        updateDatas.park = firstPark
+      } else {
+        updateDatas.park = storagePark
+      }
     }
     if (!tenement || !tenement.id) {
       const storageTenement = wx.getStorageSync('tenement')
       if (!park || !park.id) {
-        updateDatas.tenement = storageTenement || firstPark.tenements?.[0]
+        if (firstPark.tenements?.find(item => item.id !== storageTenement.id)) {
+          updateDatas.tenement = firstPark.tenements?.[0]
+        } else {
+          updateDatas.tenement = storageTenement
+        }
       } else {
-        updateDatas.tenement = storageTenement || park.tenements?.[0];
+        if (park.tenements?.find(item => item.id !== storageTenement.id)) {
+          updateDatas.tenement = park.tenements?.[0]
+        } else {
+          updateDatas.tenement = storageTenement
+        }
       }
     }
     updateDatas.all = data;

pages/login/index.js

@@ -89,7 +89,7 @@ Page({
   noPermission() {
     Dialog.confirm({
       title: '提示',
-      message: '当前手机号不是用电管理联系账号',
+      message: '当前手机号未录入系统，请联系管理员，或点击手动绑定',
       confirmButtonText: '手动绑定',
       cancelButtonText: '取消',
     })

pages/publicTransfer/index.js

@@ -41,6 +41,7 @@ Page({
   async upload(res) {
     
     const result = await uploadPublicFile(res.tempFiles[0]?.tempFilePath)
+    console.log('upload result', result)
     if (result.statusCode !== 200) {
       alertInfo("上传失败")
       return;
@@ -107,6 +108,16 @@ Page({
   handleDelete() {
     this.setData({ fileList: [] })
   },
+  copy() {
+    wx.setClipboardData({
+      data: `河北华昌宝能售电有限公司  
+建行新石北路支行  
+13050161563600000908`,
+      success: () => {
+        alertSuccess("复制成功")
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/publicTransfer/index.wxml

@@ -11,6 +11,7 @@
             点击上传
         </van-button>
     </van-field>
+
 </van-cell-group>
 
 <view style="padding: 20rpx;">
@@ -23,4 +24,16 @@
 
     <van-button bind:tap="handleSubmit" type="info" block style="margin-top: 20rpx;"> 提交 </van-button>
 </view>
-<van-dialog id="van-dialog" />
+<van-dialog id="van-dialog" />
+
+<view style="margin: 30rpx;">
+    <view style="display: flex; justify-content: space-between;margin-bottom: 30rpx;"> 
+        <view style="flex: 1;">
+            请使用对公账号向以下账号汇款，并将付款成功截图上传至充值凭证。
+        </view>
+        <view class="primaryTextBtn" bind:tap="copy" style="width: 100rpx;"> 复制 </view> 
+    </view>
+    <view> 河北华昌宝能售电有限公司  </view>
+    <view> 建行新石北路支行 </view>
+    <view> 13050161563600000908 </view>
+</view>

pages/qrCode/index.js

@@ -40,6 +40,7 @@ Page({
   },
   async getCode() {
     const tenement = wx.getStorageSync('tenement');
+    console.log("tenement", tenement)
     const { code, message, data } = await getWxCode(tenement.id)
     if (code !== OK) {
       alertInfo(message)

pages/rechargeDetail/index.js

@@ -1,6 +1,6 @@
 // pages/rechargeDetail/index.js
 import { getRechargeDetail } from "../../service/recharge";
-import { alertError, alertInfo, loadingFunc } from "../../utils/index";
+import { alertError, alertInfo, loadingFunc, getFileName } from "../../utils/index";
 import { getRechargeOperateType, getRechargeOperateWay } from "../../utils/data";
 import request from "../../utils/request"
 const { OK } = request
@@ -29,7 +29,14 @@ Page({
       return;
     }
     this.setData({
-      detail: { ...data, way: getRechargeOperateWay(data.way), type: getRechargeOperateType(data.type) }
+      detail: { 
+        ...data, 
+        way: getRechargeOperateWay(data.way), 
+        type: getRechargeOperateType(data.type),
+        fileList: data?.images ? [{
+          url: data.images, name: getFileName(data.images)
+        }] : []
+      }
     })
   },
   record() {
@@ -77,18 +84,33 @@ Page({
                 alertInfo("下载文件失败")
                 return;
               }
-              wx.openDocument({
-                filePath: res.tempFilePath,
-                fileType: [ "pdf"], // 3. 这个必须写合法类型，不然下载不了 ！！！
-                success: function (res) {
-                  resolve()
+              const fs = wx.getFileSystemManager()
+              const newPath = `${wx.env.USER_DATA_PATH}/收据-${detail.time.slice(0, 10)}.pdf`
+              fs.rename({
+                oldPath: res.tempFilePath,
+                newPath: newPath,
+                success(r) {
+                  wx.openDocument({
+                    filePath: newPath,
+                    fileType: [ "pdf"], // 3. 这个必须写合法类型，不然下载不了 ！！！
+                    success: function (res) {
+                      resolve()
+                    },
+                    fail: function (e) {
+                      alertError("打开失败")
+                      console.log('打开失败错误为', e)
+                      rej()
+                    }
+                  });
                 },
-                fail: function (e) {
-                  alertError("打开失败")
-                  console.log('打开失败错误为', e)
+                fail(res) {
+                  console.error(res)
+                  alertInfo("下载失败")
                   rej()
                 }
               })
+              
+              
             }
           }
         })

pages/rechargeDetail/index.json

@@ -2,6 +2,7 @@
   "usingComponents": {
     "navigator": "/components/navigator/index",
     "van-field": "@vant/weapp/field/index",
+    "van-uploader": "@vant/weapp/uploader/index",
     "van-button": "@vant/weapp/button/index"
   },
   "navigationStyle": "custom"

pages/rechargeDetail/index.wxml

@@ -114,6 +114,25 @@
     border="{{ false }}"
     wx:if="{{detail.orderStatus === 2}}"
   />
+  <van-field
+    use-input-slot
+    label="凭证"
+    readonly
+    border="{{ false }}"
+    wx:if="{{detail.images}}"
+  >
+
+
+  </van-field>
+  <view slot="input" style="margin-top: 20rpx; margin-left: 30rpx;">
+      <van-uploader
+        file-list="{{ detail.fileList }}"
+        show-upload="{{false}}"
+        disabled="{{true}}"
+        readonly="{{true}}"
+        deletable="{{false}}"
+      />
+    </view>
 </van-cell-group>
 
 <view class="operate">

pages/special/index.wxml

@@ -2,9 +2,9 @@
 <navigator title="专区" />
 <view class="servicesWrapper">
     <van-row>
-        <van-col span="8" wx:for="{{ servicesList }}" wx:key="id">
+        <van-col span="24" wx:for="{{ servicesList }}" wx:key="id">
             <view class="image" bind:tap="clickService" data-data="{{item}}">
-                <van-image fit="cover" width="200rpx" height="200rpx" src="{{item.url}}"  />
+                <van-image fit="cover" width="100%" height="200rpx" src="{{item.url}}"  />
             </view>
         </van-col>
     </van-row>

pages/special/index.wxss

@@ -2,10 +2,12 @@
 .image {
     width: 100%;
     height: auto;
-    padding: 40rpx;
+    padding: 20rpx 40rpx 10rpx;
+    box-sizing: border-box;
 }
 
 .servicesWrapper {
     min-height: 80vh;
+    padding-top: 12rpx;
     background: linear-gradient(to bottom, var(--middle-green), #fff );
 }

project.private.config.json

@@ -11,8 +11,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "childPackage/pages/electricQuery/index",
-          "pathName": "childPackage/pages/electricQuery/index",
+          "name": "pages/publicTransfer/index",
+          "pathName": "pages/publicTransfer/index",
+          "query": "money=50&meterId=METER00071009940341737&tenementId=T00069259189616641&tenementName=%E5%8D%8E%E6%98%8C%E5%AE%9D%E8%83%BD&park=P00070370277523457",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/special/index",
+          "pathName": "pages/special/index",
           "query": "",
           "launchMode": "default",
           "scene": null

service/user.js

@@ -13,6 +13,7 @@ export const userValidate = async function(data) {
 
 // 获取用户邀请二维码
 export const getWxCode = async function(id) {
+  console.log("id", id)
   return await GET(`/wx/getWxCode?id=${id}`);
 }
 
@@ -32,8 +33,8 @@ export const removeUser = async function(uid, tid) {
 }
 
 // 获取用户最新信息
-export const getUserInfo = async function() {
-  return await GET('/wx/getUserInfo');
+export const getUserInfo = async function(id) {
+  return await GET('/wx/getUserInfo?tenement=' + id);
 }
 
 // 非管理员重新提交申请

utils/request.js

@@ -82,13 +82,12 @@ const parseResponse = function (response, url) {
     alertError("服务异常")
     return
   }
-  // const { statusCode } = response;
-  const { code } = response?.data || {};
-  console.log('url', url,'code', code,  'response.data', response.data)
-  if (!code) {   
+  const { statusCode } = response;
+  if (!statusCode) {
     alertError("服务异常")
     return
   }
+  console.log('url', url,'statusCode', statusCode,  'response.data', response)
   if (code === 401) {
     const currentUrl = getPageUrl()
     
@@ -113,6 +112,8 @@ const parseResponse = function (response, url) {
   if (500 <= code && code < 600) {
     return { code: 500, message: "服务错误" }
   }
+  const { code } = response?.data || {};
+
   return response.data;
 }