From 8ac5111337441076b44c0316854dd49663aa5fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= <itgaojian@163.com>
Date: Mon, 6 Sep 2021 09:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packagecard/purse/takecash.wxml | 10 ++++++----
 packagecard/purse/takecash.wxss | 17 ++++++++++++++---
 pages/index/index.js            | 16 ++++++++--------
 pages/mine/index/index.wxml     |  3 ++-
 pages/mine/index/index.wxss     |  7 +++++++
 project.config.json             |  6 +++---
 utils/api.js                    |  5 +++--
 7 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/packagecard/purse/takecash.wxml b/packagecard/purse/takecash.wxml
index 969057e..a1f540e 100644
--- a/packagecard/purse/takecash.wxml
+++ b/packagecard/purse/takecash.wxml
@@ -5,7 +5,7 @@
     <view class="content-box">
         <view>
             <view class="money">
-                <text style="font-size: 40rpx;line-height: 20rpx;">¥</text>
+                <text style="font-size: 80rpx;line-height: 80rpx;">¥</text>
                 <text
                     style="font-size: 80rpx;line-height: 80rpx;margin-left: 15rpx;">{{accountInfo.accountMoney/100}}</text>
             </view>
@@ -13,11 +13,13 @@
         </view>
     </view>
     <view class="cash-box">
-        <view class="title">提现金额</view>
+        <view class="title-box">
+            <view class="title">提现金额</view>
+            <view catchtap="takeAll">全部提现</view>
+        </view>
         <view class="input-box">
-            <text style="line-height: 1.4rem;text-align: center;">¥</text>
+            <text style="text-align: center;">¥</text>
             <input type="digit" value="{{takeValue}}" bindinput="inputWatch" />
-            <view style="width: 25%;" catchtap="takeAll">全部提现</view>
         </view>
     </view>
     <text class="cuIcon-edit text-white" style="font-size: 60rpx;position: absolute;top: 150rpx;right: 30rpx;"
diff --git a/packagecard/purse/takecash.wxss b/packagecard/purse/takecash.wxss
index f957d88..cd283ac 100644
--- a/packagecard/purse/takecash.wxss
+++ b/packagecard/purse/takecash.wxss
@@ -24,12 +24,11 @@
     padding: 15rpx;
     display: flex;
     flex-direction: column;
-    justify-content: space-between;
+    justify-content: space-around;
     align-items: flex-start;
     width: 90%;
     background-color: #fff;
     border-radius: 15rpx;
-    min-height: 200rpx;
     position: absolute;
     top: 450rpx;
     box-shadow: 0 4rpx 8rpx 0 #DFDBDB, 0 6rpx 20rpx 0 #DFDBDB;
@@ -45,9 +44,21 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    font-size: 80rpx;
 }
 
 .input-box input {
-    padding-left: 15rpx;
     width: 100%;
+    text-align: center;
+    line-height: 80rpx;
+    height: 80rpx;
+}
+
+.title-box {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    font-size: 32rpx;
 }
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 432dd0a..2a3791f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -890,16 +890,16 @@ Page({
   // 展示名片码
   showBarCode: function () {
     // TODO 测试
-    wx.navigateTo({
-      url: '/packagecard/moments/publish/momentpublish',
-    })
-    // this.setData({
-    //   isNeedRefresh: false
-    // })
-    // var _self = this
     // wx.navigateTo({
-    //   url: '/packagecard/sharePage/cardcode?cardImg=' + _self.data.cardInfo.cardTemplateUsePhotoUrl + '&id=' + _self.data.cardInfo.cardTemplateUseBarcode,
+    //   url: '/packagecard/moments/publish/momentpublish',
     // })
+    this.setData({
+      isNeedRefresh: false
+    })
+    var _self = this
+    wx.navigateTo({
+      url: '/packagecard/sharePage/cardcode?cardImg=' + _self.data.cardInfo.cardTemplateUsePhotoUrl + '&id=' + _self.data.cardInfo.cardTemplateUseBarcode,
+    })
   },
   // 隐藏名片码
   hideBarCode: function () {
diff --git a/pages/mine/index/index.wxml b/pages/mine/index/index.wxml
index 486cbd4..320f2ab 100644
--- a/pages/mine/index/index.wxml
+++ b/pages/mine/index/index.wxml
@@ -101,7 +101,8 @@
             <view class="text-28">钱包</view>
           </view>
           <view class="item">
-            <view class="price">¥{{accountInfo.accountMoney/100}}</view>
+            <view class="price">
+              ¥{{accountInfo.accountMoney/100}}</view>
             <view class="text-28">余额</view>
           </view>
         </view>
diff --git a/pages/mine/index/index.wxss b/pages/mine/index/index.wxss
index 7a9e772..02cfdb6 100644
--- a/pages/mine/index/index.wxss
+++ b/pages/mine/index/index.wxss
@@ -277,6 +277,13 @@ map,
 .price {
   font-size: 32rpx;
   color: #000;
+  line-height: 64rpx;
+  height: 64rpx;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 180rpx;
 }
 
 .img-48 {
diff --git a/project.config.json b/project.config.json
index a69dadf..5cd973a 100644
--- a/project.config.json
+++ b/project.config.json
@@ -21,9 +21,9 @@
         "checkSiteMap": true,
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
-        "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": true,
+        "useMultiFrameRuntime": false,
+        "useApiHook": false,
+        "useApiHostProcess": false,
         "babelSetting": {
             "ignore": [],
             "disablePlugins": [],
diff --git a/utils/api.js b/utils/api.js
index 8183067..2352406 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -21,6 +21,7 @@ var apis = {
 
 
     shopUrl: `https://www.tenlion.com.cn/systemcard/app/shoptemplateconfig/pagerelease/`,
+    // shopUrl: `http://192.168.0.115:8091/systemcard/app/shoptemplateconfig/pagerelease/`,
     doSaveUserInfo: `app/miniapp/user/update-info`, //保存微信头像与名称
     doUpdatePhone: `app/miniapp/update-phone`, //绑定手机号 token, {phone:''} put
     doUploadImg: `app/file/uploadimage`, //上传图片
@@ -114,13 +115,13 @@ var apis = {
     getMomentsField: `app/configcolumndata/listfield/{configColumnId}`, //获取栏目字段列表
     doDelMoment: `app/configcolumndata/delete/{configColumnId}/{uid}`, //删除栏目数据
     getMomentsContent: `app/configcolumndata/get/{configColumnId}/{uid}`, //获取栏目数据
-    getMainColumn: `app/configcolumn/listhome`, //获取首页显示栏目
+    getMainColumn: `app/cardconfigcolumn/listhome`, //获取首页显示栏目
+    getColumnListByGroupId: `app/cardconfigcolumn/list`, //根据栏目组id获取栏目?   configColumnGroupId 
     getMainMoment: `app/configcolumndata/list/{configColumnId}`, //获取首页栏目数据 通过栏目ID获取栏目下的数据列表(包含每条数据的字段集合)  传入userId参数则查询指定人的 , 没传入userId参数则查询当前token的
     getMineColumnList: `app/configcolumnset/list`, //获取我的栏目配置列表
     doSaveColumnDisplay: `app/configcolumnset/savedisplay`, //保存我的栏目隐藏显示
     doSaveColumnName: `app/configcolumnset/savename`, //保存我的栏目名称
     doOrderColumn: `app/configcolumnset/saveorder`, //保存栏目排序, post {configColumnId, configColumnOrder}
-    getColumnListByGroupId: `app/configcolumn/list`, //根据栏目组id获取栏目?   configColumnGroupId 
     //评论 点赞 收藏
     doSaveCollect: `app/contentcollect/save`, //保存取消收藏 businessId=xxx&projectId=poster
     doSaveLike: `app/contentlike/save`, //保存取消点赞 ?businessId