diff --git a/pages/pointsRedemption/index.vue b/pages/pointsRedemption/index.vue
index 82fd56c9..250382d1 100644
--- a/pages/pointsRedemption/index.vue
+++ b/pages/pointsRedemption/index.vue
@@ -7,6 +7,10 @@
我的ETC积分
{{ userPoints || 0 }}
+
+ 我的彩云驿积分
+ {{ platformUserPoints || 0 }}
+
@@ -15,22 +19,26 @@
积分兑换
-
+
- ETC积分
- {{ conversionDirection === 'etcToPlatform' ? 'ETC积分' : '彩云驿积分' }}
+
+ 可用余额: {{ conversionDirection === 'etcToPlatform' ? userPoints :
+ platformUserPoints }}
-
-
+
+
+ ⇅
兑换比例 {{ exchangeRate }}:1
-
+
+
- 彩云驿积分
- {{ platformPoints }}
+ {{ conversionDirection === 'etcToPlatform' ? '彩云驿积分' : 'ETC积分' }}
+ {{ destinationPointsOutput }}
@@ -82,48 +90,52 @@
\r\n\r\n","import mod from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-2!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--10-oneOf-1-3!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-5!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&id=137d5072&lang=less&scoped=true&\"; export default mod; export * from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-2!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--10-oneOf-1-3!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-5!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&id=137d5072&lang=less&scoped=true&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1764654231220\n var cssReload = require(\"E:/workfile/HBuilderX4.45/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"/\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["uni-app:///main.js",null,"webpack:///E:/workfile/minprogram/caiyunyi/pages/user/index.vue?0b9e","webpack:///E:/workfile/minprogram/caiyunyi/pages/user/index.vue?3cd9","webpack:///E:/workfile/minprogram/caiyunyi/pages/user/index.vue?cae3","uni-app:///pages/user/index.vue","webpack:///E:/workfile/minprogram/caiyunyi/pages/user/index.vue?1eac","webpack:///E:/workfile/minprogram/caiyunyi/pages/user/index.vue?70b9"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page","components","tabbar","shopTabbar","data","showContent","isFirstLoad","isFirstShow","skeletonControl","isRefreshing","pageType","menu","orderFunList","label","value","src","commonFunList","springSrc","foodFunList","cards","userInfo","safeHeight","serviceDetail","seat","chargingObj","inShop","shopCarListCount","showErrorText","mallOrderCountList","foodOrderCountList","onLoad","uni","url","height","userData","setTimeout","behaviorRecordDesc","onShow","shopOrderStatus","foodOrderStatus","foodTab","item","shopCarList","count","console","computed","user","phone","onUnload","onPullDownRefresh","methods","handleGoPointsRedemption","handleGetYNUserInfo","params","mobile","outUserId","time","req","app_id","biz_content","charset","pid","service","utc_timestamp","version","sign_type","signText","method","header","success","resolve","sign","reject","tweetsData","onContact","handleRefresh","title","icon","duration","handleGoCustomerService","hanldGoBalance","content","handleGoDetail","handleGoMap","latitude","longitude","scale","name","fail","handleGetServiceDetail","id","ServerpartId","obj","handleMergeDetail","LIVESTOCKPACKING","STATEGRIDCHARGE","LIAUTOCHARGE","GACENERGYCHARGE","OTHERCHARGE","REFUELINGGUN92","REFUELINGGUN95","REFUELINGGUN0","HASPANTRY","HASWIFI","TOILETCOUNT","HASSHOWERROOM","HASWATERROOM","MICROWAVEOVEN","WASHERCOUNT","SLEEPINGPODS","HASPILOTLOUNGE","HASCHILD","VEHICLEWATERFILLING","SMALLPARKING","PACKING","TRUCKPACKING","DANPACKING","DININGBXCOUNT","DININGROOMCOUNT","HASBACKGROUNDRADIO","POINTCONTROLCOUNT","BUSINESSTYPE","TOILET_PAPER","MABROOMWATER_DISPENSER","NURSING_TABLE","BABY_COT","CHANGING_TABLE","DROOMWATER_DISPENSER","haveREFUELINGGUN","havePARKING","haveWC","HASMOTHER","sumObj","handleGetChargingStation","_this","list","result","sum","use","have","rank","hanldGoConfig","handleGoPoint","handleGoCoupon","onChooseAvatar","filePath","formData","Tabletype","membershipId","headImgUrl","userInfoData","handleGetUserDetail","getCoop","action_type","WechatUserId","noLoading","then","_data","handleGo","handleGoFoodOrder","handleGoBindCar","handleGetCarCode","res","handleGoNormal","handleShowPayCode","timeStamp","nonceStr","appId","package","signType","reqSign","parameters","paySign","handleLastFun","extInfo","corpId","handleGoOrder","goSelectServer","handleGoUserCode","handleGoCollect","handleGetOrderDetail","salebillType","salebillState","PageIndex","pageSize","ownerUnitId","requestType","obligation","pendingShipment","pendingReceiptOfGoods","reqFood","dataFood"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,cAAI,CAAC,C;;;;;;;;;;;;;ACLhB;AAAA;AAAA;AAAA;AAAA;AAAA;AAA8H;AAC9H;AACyD;AACL;AACsC;;;AAG1F;AACuK;AACvK,gBAAgB,iLAAU;AAC1B,EAAE,2EAAM;AACR,EAAE,4FAAM;AACR,EAAE,qGAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,gGAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM;AACN;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACxBA;AAAA;AAAA;AAAA;AAAsnB,CAAgB,moBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;;;;ACsU1oB;AACA;AAGA;AAAA;AAAA;AAAA;EAAA;IAAA;EAAA;AAAA;AAAA;EAAA;IAAA;EAAA;AAAA;AAAA,eACA;EACAC;IAAAC;IAAAC;EAAA;EACAC;IACA;MACAC;MAAA;MACAC;MAAA;MACAC;MAAA;MACAC;MAAA;MACAC;MAAA;MACAC;MAAA;MACAC;MACAC,eACA;QACAC;QACAC;QACAC;MACA,GACA;QACAF;QACAC;QACAC;MACA,GACA;QACAF;QACAC;QACAC;MACA,GACA;QACAF;QACAC;QACAC;MACA,EACA;MAAA;MACAC,gBACA;QACAH;QACAC;QACAC;QACAE;MACA,GACA;QACAJ;QACAC;QACAC;QACAE;MACA,GACA;QACAJ;QACAC;QACAC;QACAE;MACA,EACA;MAAA;MACAC,cACA;QACAL;QACAC;QACAC;MACA,GACA;QACAF;QACAC;QACAC;MACA,GACA;QACAF;QACAC;QACAC;MACA,GACA;QACAF;QACAC;QACAC;MACA,GACA,GACA;MACAI;MACAC;MACAC;MACAC;MAAA;MACAC;MACAC;MACAC;MAAA;MACAC;MAAA;MACAC;MACAC;MAAA;MACAC;IACA;EACA;EACAC;IAAA;IAAA;MAAA;MAAA;QAAA;UAAA;YAAA;cACA;cACA;cACA;cACA;cAEA;gBACAC;kBAAAC;gBAAA;cACA;cACA;cAEAC;cACA;;cAEA;cACAC;cACA;gBACA;gBACA;cACA;cACA;cAAA;cAAA,OACA;YAAA;cAAA;cAAA,OAKA;YAAA;cACA;;cAGA;cACA;;cAGA;cACA;cACA;cACA;;cAGA;cACA;gBACAC;kBAAA;oBAAA;sBAAA;wBAAA;0BAAA,KACA;4BAAA;4BAAA;0BAAA;0BAAA;0BAAA,OACA;wBAAA;0BACA;0BACA;wBAAA;wBAAA;0BAAA;sBAAA;oBAAA;kBAAA;gBAAA,CAEA;cACA;gBACA;gBACA;gBACA;cACA;cAEA;gBACAC;cACA;YAAA;YAAA;cAAA;UAAA;QAAA;MAAA;IAAA;EACA;EACAC;IAAA;IAAA;MAAA;MAAA;QAAA;UAAA;YAAA;cACA;cACA;cACA;gBACA;cACA;;cAEA;cAAA,KACA;gBAAA;gBAAA;cAAA;cACA;cAEAZ;cACA;;cAEA;cACAa;cACAC;cAEA;cAEA;gBACAC;gBACAA;kBACA;oBACAC;kBACA;oBACAA;kBACA;oBACAA;kBACA;gBACA;gBACA;cACA;cAEA;gBACA;gBACAC;gBACA;kBACAA;gBACA;kBACAA;gBACA;gBACAC;gBACA;kBACAD;oBACAC;kBACA;gBACA;gBACA;cACA;;cAEA;cACAT;cACA;gBACA;gBACA;gBACA;cACA;cAAA;YAAA;cAIAT;cACA;;cAEA;cACAa;cACAC;cACAK;cAEA;cAEA;gBACAJ;gBACAA;kBACA;oBACAC;kBACA;oBACAA;kBACA;oBACAA;kBACA;gBACA;gBACA;cACA;;cAEA;cACA;cACA;;cAIA;cACA;cACA;cACA;;cAEA;cACA;cACA;;cAEA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;cACA;;cAEA;gBACA;gBACAC;gBACA;kBACAA;gBACA;kBACAA;gBACA;gBACAC;gBACA;kBACAD;oBACAC;kBACA;gBACA;gBACA;cACA;;cAIA;cACAT;cACA;gBACA;gBACA;gBACA;cACA;cAAA;cAAA,OAEA;YAAA;cAAA;cAAA,OAEA;YAAA;cACA;YAAA;YAAA;cAAA;UAAA;QAAA;MAAA;IAAA;EAEA;EAEAW,0CACA;IACAC;EACA;IACAC;MACA;QACA;QACA;QACA;MACA;QACA;MACA;IACA;EAAA,EACA;EACAC;IACA;EACA;EACA;EACAC;IACA;IACA;EACA;EACAC;IACAC;MACApB;QAAAC;MAAA;IACA;IACA;IACAoB;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBACAC;kBACA;kBACAC;kBACA;kBACAC;gBACA;gBACAC;gBACAC;kBACAC;kBACAC;kBACAC;kBACAC;kBACAC;kBACAC;kBACAC;kBACAC;gBACA;gBACAC,gNAEA;gBAAA;gBAAA,OACA;kBACAnC;oBACAC;oBACA;oBACAmC;oBACA/D;oBACAgE;sBACA;oBACA;oBACAC;sBACAzB;sBAEA0B;oBACA;kBACA;gBACA;cAAA;gBAfAC;gBAiBA3B;;gBAEA;gBACAa;gBAAA;gBAAA,OAEA;kBACA1B;oBACAC;oBACAmC;oBACA/D;oBACAgE;sBACA;oBACA;oBACAC;sBACAzB;sBACA;wBACA0B;sBACA;wBACAA;sBACA;oBACA;oBACAE;sBACA5B;oBAEA;kBACA;gBACA;cAAA;gBArBA6B;gBAuBA7B;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IAEA;IACA8B;MACA;IAAA,CACA;IACA;IACAC;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBAAA;gBAAA;gBAAA,OAGA;kBAAA;gBAAA;cAAA;gBAAA;gBAAA,OAGA;cAAA;gBAAA;gBAAA,OAEA;cAAA;gBACA;gBACAzC;gBACA;kBACA;kBACA;gBACA;gBACA;gBAAA;gBAAA;cAAA;gBAAA;gBAAA;gBAGAU;gBACAb;kBACA6C;kBACAC;kBACAC;gBACA;cAAA;gBAAA;gBAEA;gBACA;gBACA/C;gBAAA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IAEA;IACA;IACAgD;MACAhD;QAAAC;MAAA;IACA;IACA;IACAgD;MACA;QACA;QACAjD;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACAkD;MACAnD;QACAC;MACA;IACA;IACA;IACAmD;MACApD;QACAqD;QACAC;QACAC;QAAA;QACAC;QACA;QACAlB,iCACA;QACAmB,0BACA;MACA;IACA;IACA;IACAC;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBAAA,IACAC;kBAAA;kBAAA;gBAAA;gBAAA;cAAA;gBAGAjC;kBACAkC;kBACAP;kBACAC;gBACA;gBAAA;gBAAA,OACA,iBACA,6CACA5B,IACA;cAAA;gBAHArD;gBAIAwF;gBACA;gBACA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;IAAA;IACAC;MACA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;QAAA;QACAC;MACA;MACA;QACAvC;UACAwC;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UACAA;UAEA;YACAA;UACA;UAIA;YACAA;UACA;UAEA;YACAA;UACA;UACA;YACAA;UACA;UACA;YACAA;UACA;UACAA;UACAA;UACAA;UACAA;UAEA,IACAA,6BACAA,6BACAA,0BACA;YACAA;UACA;UAEA,IACAA,2BACAA,sBACAA,2BACAA,uBACA;YACAA;UACA;UACA,IACAA,wBACAA,sBACAA,wBACA;YACAA;UACA;QACA;MACA;MACA;IACA;IACA;IACAC;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBACAC;gBACAvG;kBACAC;kBAAA;kBACAmC;kBACAE;oBACA;oBACA;oBACA;sBACAkE;wBACA,IACA9F,0CACAmD,6CACAnD,yCACAmD,4CACAnD,yCACAmD,4CACAnD,yCACAmD,0CACA;0BACA4C;wBACA;sBACA;oBACA;oBACA;oBACA;oBACA;oBAEA;sBACAA;wBACA;0BACAC;wBACA;sBACA;oBACA;oBACA;sBACAC;sBACA;wBACA;0BACAC;wBACA;0BACAA;wBACA;sBACA;wBACAA;sBACA;oBACA;sBACAA;sBACA;sBACA,eACA;wBACAC;wBACA7G;sBACA;sBACA2G;oBACA;oBACAJ;sBACAK;sBACAD;oBACA;oBACAJ;kBACA;gBACA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;IACA;IACAO;MACA;QACA;QACA9G;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACA8G;MACA;QACA;QACA/G;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACA+G;MACA;QACA;QACAhH;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACAgH;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBAAA,MACA;kBAAA;kBAAA;gBAAA;gBACAV;gBACAvG;kBACA6C;kBACAK;kBACAZ;oBACA;sBACAtC;wBAAAC;sBAAA;oBACA;kBACA;gBACA;gBAAA;cAAA;gBAGAsG;gBACAA;gBACAvG;kBACAC;kBAAA;kBACAiH;kBACA1D;kBAAA;kBACA2D;oBACAC;kBACA;;kBACA9E;oBAAA;sBAAA;sBAAA;wBAAA;0BAAA;4BAAA;8BACAjE;8BACA4B;8BAAA,KACAA;gCAAA;gCAAA;8BAAA;8BACAyB;gCACA2F;gCACAC;8BACA;8BACAf;8BACAA;8BAAA;8BAAA,OACAA,gBACA,4BACA7E,IACA;4BAAA;8BAHA6F;8BAIA;gCACAhB;8BACA;4BAAA;4BAAA;8BAAA;0BAAA;wBAAA;sBAAA;oBAAA,CAEA;oBAAA;sBAAA;oBAAA;oBAAA;kBAAA;kBACA9C;oBACA8C;kBACA;gBACA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;IACA;IACAiB;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBACAjB;gBACAA,WACAkB;kBACAC;kBACAC;kBACAC;gBACA,GACAC;kBACA;oBACA;oBACAtB;oBACAA;oBACAA;oBACAA,mCACAuB;oBACAvB;oBACAA;oBACAA;oBACAA;oBACAA;oBACAA,oCACAuB;oBACAvB;oBACAA;oBACAA;oBACAA;oBACAA,oCACAuB;oBACAvB;oBAEAA;oBACAA;oBACAA;kBACA;oBACA;oBACAA;kBACA;gBACA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;IACA;IACAwB;MACA;QACA;QACA/H;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACA+H;MACA;QACA;QACAhI;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACAgI;MACA;QACA;QACAjI;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACAiI;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBACA3B;gBACAvG;kBAAA6C;gBAAA;gBAAA;gBAAA,OACA;kBAAA6E;gBAAA;cAAA;gBAAAS;gBACA3B;gBACA;kBACAD;gBACA;gBACAvG;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;IACA;IACAoI;MACA;QACA;QACApI;UACAC;QACA;QACA;MACA;QACA;QACA;MACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;MAAA;IAEA;IACA;IACAoI;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBACAC;gBACAC;gBACA7G;kBACA8G;kBACAF;kBACAC;kBACAE;kBACAC;gBACA;gBACAC;kBACAC;kBACA;kBACA;kBACA;kBACA;kBACA;kBACA;kBACA;gBACA;gBAAA;gBAAA,OAEA;cAAA;gBAAAvK;gBACAR;kBACA2K;kBACAF;kBACAC;kBACAE;kBACAC;kBACAG;kBACAvG,gCACA;gBACA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;IACA;IACAwG;MACA;QACA;QACA;QACA;QACA;QACAjL;UACAkL;YACA9I;UACA;;UAAA;UACA+I;UAAA;UACA1G,gCACA;QACA;MACA;QACA;QACAtC;UACAC;QACA;MACA;IACA;IACA;IACAgJ;MACA;QACA;QACAjJ;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACA;QACAD;UACAC;QACA;MACA;QACAD;UACAC,kFACAtB;QACA;MACA;IACA;IACA;IACAuK;MACAlJ;QAAAC;MAAA;IACA;IACA;IACAkJ;MACA;QACA;QACAnJ;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC;MACA;IACA;IACA;IACAmJ;MACA;QACA;QACApJ;UACA6C;UACAK;UACAZ;YACA;cACAtC;gBAAAC;cAAA;YACA;UACA;QACA;QACA;MACA;MACAD;QACAC,KACA;MACA;IACA;IACAoJ;MAAA;MAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBAAA,MACA;kBAAA;kBAAA;gBAAA;gBAAA;cAAA;gBAGA;gBACA3H;kBACAgG;kBACA4B;kBACAC;kBACAC;kBACAC;kBACAC;kBACAC;kBACA/B;gBACA;gBAAA;gBAAA,OACA;cAAA;gBAAAvJ;gBACA;kBACAmI,uBACA;kBACAoD,iBACA;kBACAC,sBACA;kBACAC;kBACA;oBACAtD;sBACA;wBACAoD;sBACA;wBACAC;sBACA;wBACAC;sBACA;oBACA;kBACA;kBAEAjK,mFACAgK,4EACAC;kBACA;gBACA;kBACA;gBACA;gBAEA;gBACA9J;gBAEA+J;kBACArC;kBACA4B;kBACAC;kBACAC;kBACAC;kBACAC;kBACAC;kBACA/B;gBACA;gBAAA;gBAAA,OACA;cAAA;gBAAAoC;gBACA;kBACAxD,4BACA;kBACAoD,kBACA;kBACAC,uBACA;kBACAC;kBAEA;oBACAtD;sBACA;wBACAoD;sBACA;wBACAC;sBACA;wBACAC;sBACA;oBACA;kBACA;kBAEAhK,sFACA+J,+EACAC,kGACA;kBACArJ;kBACAA;oBACA;sBACAC;oBACA;sBACAA;oBACA;sBACAA;oBACA;kBACA;kBACA;kBACAV;gBACA;kBACA,uBACA;oBACAlB;oBACAC;oBACAC;kBACA,GACA;oBACAF;oBACAC;oBACAC;kBACA,GACA;oBACAF;oBACAC;oBACAC;kBACA,GACA;oBACAF;oBACAC;oBACAC;kBACA,EACA;gBACA;gBAEA;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA;IACA;EACA;AACA;AAAA,2B;;;;;;;;;;;;;ACh9CA;AAAA;AAAA;AAAA;AAAyqC,CAAgB,2nCAAG,EAAC,C;;;;;;;;;;;ACA7rC;AACA,OAAO,KAAU,EAAE,kBAKd","file":"pages/user/index.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/user/index.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./index.vue?vue&type=template&id=137d5072&scoped=true&\"\nvar renderjs\nimport script from \"./index.vue?vue&type=script&lang=js&\"\nexport * from \"./index.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index.vue?vue&type=style&index=0&id=137d5072&lang=less&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"137d5072\",\n null,\n false,\n components,\n renderjs\n)\n\ncomponent.options.__file = \"pages/user/index.vue\"\nexport default component.exports","export * from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--17-0!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=137d5072&scoped=true&\"","var components\nvar render = function () {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n var g0 = !!_vm.showContent\n ? _vm.$utils.handleFormatNumber(_vm.userInfo.MEMBERSHIP_POINT || 0)\n : null\n var g1 =\n !!_vm.showContent && _vm.userInfo && _vm.userInfo.INDUSTRY_MEMBERSHIP_ID\n ? _vm.$utils.handleFormatNumber(_vm.userInfo.ACCOUNT_BALANCE || 0)\n : null\n _vm.$mp.data = Object.assign(\n {},\n {\n $root: {\n g0: g0,\n g1: g1,\n },\n }\n )\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js&\"","\r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n {{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME || user.MEMBERSHIP_NAME || \"微信用户\")\r\n :\r\n (userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME || \"未填写名称\") }}\r\n \r\n \r\n \r\n \r\n {{ user.MEMBERSHIP_LEVEL_TEXT || \"\" }}\r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n 会员码\r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n {{ userInfo.COUPON_COUNT || 0 }}\r\n 优惠券\r\n \r\n \r\n \r\n {{\r\n $utils.handleFormatNumber(userInfo.MEMBERSHIP_POINT || 0)\r\n }}\r\n 积分\r\n \r\n \r\n \r\n {{\r\n $utils.handleFormatNumber(userInfo.ACCOUNT_BALANCE || 0)\r\n }}\r\n 工会福利\r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n 我的服务\r\n \r\n \r\n \r\n \r\n 商品收藏\r\n \r\n\r\n \r\n \r\n 会员权益\r\n \r\n\r\n \r\n \r\n 绑定车辆\r\n \r\n \r\n \r\n 积分兑换\r\n \r\n \r\n \r\n\r\n \r\n \r\n 设置\r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n 我的订单\r\n \r\n \r\n\r\n \r\n \r\n
\r\n 未付款\r\n 0\">{{ mallOrderCountList[0] }}\r\n \r\n\r\n \r\n
\r\n 待发货\r\n 0\">{{ mallOrderCountList[1] }}\r\n \r\n\r\n \r\n
\r\n 待收货\r\n 0\">{{ mallOrderCountList[2] }}\r\n \r\n\r\n \r\n
\r\n 待评价\r\n \r\n\r\n \r\n
\r\n 退换货\r\n \r\n \r\n \r\n\r\n \r\n \r\n 商城订单\r\n \r\n \r\n \r\n \r\n \r\n \r\n {{ item.label }}\r\n \r\n \r\n\r\n \r\n \r\n \r\n 退换/售后\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 工会订单\r\n \r\n \r\n \r\n \r\n \r\n \r\n {{ item.label }}\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n 我的点餐\r\n \r\n \r\n \r\n \r\n \r\n \r\n {{ item.label }}\r\n 0\">{{ item.orderCount }}\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n 常用功能\r\n\r\n \r\n \r\n \r\n 会员权益\r\n \r\n \r\n \r\n 我的爱车\r\n \r\n \r\n \r\n \r\n 建议反馈\r\n \r\n \r\n \r\n\r\n\r\n \r\n \r\n 客服帮助\r\n\r\n \r\n \r\n \r\n \r\n\r\n\r\n \r\n 服务热线\r\n 伴您行程无忧\r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n \r\n\r\n\r\n\r\n\r\n","import mod from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-2!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--10-oneOf-1-3!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-5!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&id=137d5072&lang=less&scoped=true&\"; export default mod; export * from \"-!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-2!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--10-oneOf-1-3!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--10-oneOf-1-5!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../HBuilderX4.45/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&id=137d5072&lang=less&scoped=true&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1764668671270\n var cssReload = require(\"E:/workfile/HBuilderX4.45/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"/\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/user/index.js b/unpackage/dist/dev/mp-weixin/pages/user/index.js
index 720a6812..7ce3ee1b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/user/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/user/index.js
@@ -302,7 +302,7 @@ var _default = {
// }
// 请求一下云南那边的积分信息
- _this2.handleGetYNUserInfo();
+ // this.handleGetYNUserInfo()
// 拿到订单信息
// await this.handleGetOrderDetail()
@@ -340,7 +340,7 @@ var _default = {
_this2.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了我的页面"
});
- case 16:
+ case 15:
case "end":
return _context2.stop();
}
diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json
index c0ff04df..1e6d771b 100644
--- a/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.private.config.json
@@ -8,6 +8,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "pages/user/index",
+ "pathName": "pages/user/index",
+ "query": "",
+ "scene": null,
+ "launchMode": "default"
+ },
{
"name": "pages/pointsRedemption/index",
"pathName": "pages/pointsRedemption/index",