jufubao-base 1.0.279-beta103 → 1.0.279-beta105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.279-beta103",
+  "version": "1.0.279-beta105",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -55,7 +55,7 @@
       </view>
       <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
         >{{ addTitle
-        }}<view @click="handleToAdd" style="color: red"
+        }}<view @click="handleToAdd" :style="{color:mainColor}"
           >去添加<XdFontIcon
             size="28"
             icon="iconxiangyou_xian"

package/src/components/JfbBaseChoseCompany/cusAttr/style.js

@@ -176,7 +176,7 @@ export default (data, gValue, gColor, oldData) => {
       },
     },
     {
-      label: '商品投影',
+      label: '投影',
       ele: 'xd-shadow',
       labelInline: true,
       groupKey: 'style',

package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetail.vue

@@ -64,6 +64,7 @@ export default {
       list: [],
       amount: "",
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -77,10 +78,12 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.wallet_nnid = options.wallet_nnid;
       jfbRootExec("getRecordDetail", {
         vm: this,
         data: {
           trade_id: options.trade_id,
+          wallet_nnid: this.wallet_nnid
         },
       })
         .then((res) => {

package/src/components/JfbBaseWalletEffective/JfbBaseWalletEffective.vue

@@ -66,6 +66,7 @@ export default {
       type: "",
       wallet_type: "",
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -81,6 +82,7 @@ export default {
     async onJfbLoad(options) {
       this.wallet_type = options.wallet_type;
       this.type = options.type;
+      this.wallet_nnid = options.wallet_nnid;
       await this.getList();
       this.status = true;
     },
@@ -98,6 +100,7 @@ export default {
         vm: this,
         data: {
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
           page_size: this.page_size,
           page_token: this.page_token,
         },

package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndex.vue

@@ -64,8 +64,9 @@
             class="jfb-base-wallet-index__body-type-item"
             @click="handleToWalletDetail(item)"
           >
-            <view>{{ dividePrice(item.amount) }}</view>
-            <view :style="{ color: mainColor }">{{ item.wallet_name }}<text v-if="item.customer_name">({{item.customer_name}})</text></view>
+            <view class="jfb-base-wallet-index__body-type-item-name" :style="{ color: mainColor }">{{ item.wallet_name }}</view>
+            <view class="jfb-base-wallet-index__body-type-item-amount">{{ dividePrice(item.amount) }}</view>
+            <view class="jfb-base-wallet-index__body-type-item-company" v-if="item.customer_name">{{item.customer_name}}</view>
           </view>
         </view>
       </view>
@@ -275,6 +276,7 @@ export default {
       total_amount: 0,
       show_name: "",
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -387,6 +389,7 @@ export default {
         vm: this,
         data: {
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
         },
       })
         .then((res) => {
@@ -462,17 +465,18 @@ export default {
     },
     handleToWalletDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.walletDetailPath}?wallet_type=${item.wallet_type}&type=${this.type}`,
+        url: `${this.walletDetailPath}?wallet_type=${item.wallet_type}&type=${this.type}&wallet_nnid=${item.wallet_nnid}`,
       });
     },
     handleToBillDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.billDetailPath}?trade_id=${item.trade_id}`,
+        url: `${this.billDetailPath}?trade_id=${item.trade_id}&wallet_nnid=${item.wallet_nnid}`,
       });
     },
     handleShowQrcode() {
       if (this.typeList.length === 1) {
         this.wallet_type = this.typeList[0].wallet_type;
+        this.wallet_nnid = this.typeList[0].wallet_nnid;
         this.getQrcode();
       } else {
         this.showPayType = true;
@@ -482,8 +486,10 @@ export default {
       console.log(flat, item, "alalaalaal");
       if (flat) {
         this.wallet_type = item.wallet_type;
+        this.wallet_nnid = item.wallet_nnid;
       } else {
         this.wallet_type = null;
+        this.wallet_nnid = null;
       }
     },
     handleUse() {
@@ -589,12 +595,16 @@ export default {
       &-item {
         text-align: center;
         margin-bottom: 20rpx;
-        & > view:first-child {
+        &-name{
           font-size: 36rpx;
         }
-        & > view:last-child {
+        &-amount {
+          font-size: 36rpx;
+          margin: 10rpx 0;
+        }
+        &-company {
           font-size: 24rpx;
-          margin-top: 20rpx;
+          color: #999
         }
       }
     }

package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue

@@ -180,6 +180,7 @@ export default {
       wallet_type: "",
       walletInfo: {},
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -194,6 +195,7 @@ export default {
   methods: {
     async onJfbLoad(options) {
       this.type = options.type;
+      this.wallet_nnid = options.wallet_nnid;
       this.date = `${new Date().getFullYear()}-${String(
         new Date().getMonth() + 1
       ).padStart(2, "0")}`;
@@ -202,6 +204,7 @@ export default {
         vm: this,
         data: {
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
         },
       })
         .then((res) => {
@@ -226,6 +229,7 @@ export default {
           page_token: this.page_token,
           operate_type: this.operate_type,
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
         },
       })
         .then((res) => {
@@ -314,7 +318,7 @@ export default {
     },
     handleToBillDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.billDetailPath}?trade_id=${item.trade_id}`,
+        url: `${this.billDetailPath}?trade_id=${item.trade_id}&wallet_nnid=${this.wallet_nnid}`,
       });
     },
     handleConfirm(status) {
@@ -322,7 +326,7 @@ export default {
     },
     handleToEffective(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.effectivePath}?wallet_type=${this.wallet_type}&type=${this.type}`,
+        url: `${this.effectivePath}?wallet_type=${this.wallet_type}&type=${this.type}&wallet_nnid=${this.wallet_nnid}`,
       });
     },
     /**