jufubao-base 1.0.56-beta8 → 1.0.56

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -33,11 +33,8 @@
         </view>
         <view v-if="loaded && showLocation==='Y'" class="header_wrap-city">
           <xd-city-show-api
-            city-location-type="baidu"
-            :getCityInfoByLocation="getCityInfoByLocation"
             @done="handleCityDone"
             @onChange="handleCityChange"
-            @alertChange="handleAlertChange"
             :color="textColor"
             :icon="locationIcon"
             :bgColor="locationBackgroundColor"
@@ -173,7 +170,6 @@
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
         // this.showSwitchCity = getContainerPropsValue(container, "content.showSwitchCity", "N");
-        this.setShowSwitchCity(true);
 
         
         //基础
@@ -220,44 +216,17 @@
           })
         }
       },
-
-      getCityInfoByLocation(options, cb){
-        jfbRootExec("getLoadingCityBaseHeaderByLocationLv4", {
-          vm: this,
-          data: options
-        }).then(res => {
-          cb(res)
-        }).catch(e => {
-          this.$xdLog.setARMSCustomError('get_city_info_by_location_base_header', this.$runtime.getErrorInfo(e));
-          cb({data: this.$settings.defaultCity})
-        })
-      },
+      
       /***
        * @description 定位完成事件
        * @param city
        */
       handleCityDone({city}) {
-        console.log('handleCityDone', city);
         if(JSON.stringify(this.city) === JSON.stringify(city)) return false;
         this.city = city;
-        storage.set(this.saveKey, city);
         jfbRootFnExec(this, 'onCustomEvent')("baseHeader@city", city);
       },
-      handleAlertChange(cityInfo){
-        this.$xdConfirm({
-          $vm: this,
-          width: '90%',
-          content: `当前显示您在${cityInfo.city_name}，是否切换到该城市？`,
-          success: (res) => {
-            if (res.confirm) {
-             this.setCityInfo(cityInfo);
-            }else{
-            
-            }
-          }
-        })
-      },
-
+      
       handleCityChange() {
         this.$xdUniHelper.navigateTo({
           url: this.choseCityPath

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -56,6 +56,17 @@
           </view>
         </view>
       </view>
+      <!--settle-->
+      <view class="settle" v-if="info.settleInfo !== null" :style="{marginBottom: jfbListSpacing + 'rpx',}">
+        <view class="settle-item" v-for="(settle,index) in info.settleInfo" :key="index">
+          <view>{{settle.label}}：</view>
+          <view v-if="settle.type === 'price'">
+            <xd-unit :price="settle.value" unit="" :is-old="false"></xd-unit>
+          </view>
+          <view v-else v-html="settle.value"></view>
+        </view>
+      </view>
+      <!--settle end-->
       <view class="jfb-base-success__body-other">
         <view
           v-if="info.codes && info.codes.length > 0 && is_show_code === 'Y'"
@@ -111,22 +122,8 @@
               v-for="(item, index) in info.codes"
               :key="index"
             >
-              <view
-                style="
-                  color: #999;
-                  background: #eee;
-                  border-radius: 20rpx;
-                  width: 80rpx;
-                  text-align: center;
-                  vertical-align: middle;
-                  font-size: 24rpx;
-                  padding: 10rpx 0;
-                  margin: 32rpx 0 32rpx 32rpx;
-                "
-                >{{
-                  info.codes.length > 10 ? index + 1 : `0${index + 1}`
-                }}</view
-              >
+              <view class="codes-index">{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view>
+              <!--codes-->
               <view
                 class="jfb-base-success__body-card jfb-base-success__body-num"
                 v-if="item.show_type === 'text' && !item.password"
@@ -137,31 +134,27 @@
                 <view
                   class="jfb-base-success__body-num-info-copy"
                   @click="copy(item.code)"
-                  >复制</view
-                >
+                >复制</view>
                 <view
-                  v-if="item.code_end_time"
+                  v-if="item['code_end_time']"
                   class="jfb-base-success__body-cashier-code"
                   :style="{
                     borderColor: mainColor,
                     color: mainColor,
                     background: bgColor,
                   }"
-                >
-                  {{ item.code_end_time }}
-                </view>
+                >{{ item['code_end_time'] }}</view>
               </view>
-
               <view
                 class="jfb-base-success__body-card"
                 v-if="item.show_type === 'text' && item.password"
               >
                 <view
                   class="jfb-base-success__body-num"
-                  style="
-                    border-bottom: 1px solid #f2f2f2;
-                    padding-bottom: 48rpx;
-                  "
+                  :style="{
+                    'borderBottom': '1px solid #f2f2f2',
+                    'paddingBottom': '48rpx'
+                  }"
                 >
                   <view class="jfb-base-success__body-num-info">
                     <view>{{ item.can_read_code }}</view>
@@ -169,12 +162,11 @@
                   <view
                     class="jfb-base-success__body-num-info-copy"
                     @click="copy(item.code)"
-                    >复制</view
-                  >
+                  >复制</view>
                 </view>
                 <view
                   class="jfb-base-success__body-num"
-                  style="padding-top: 48rpx"
+                  :style="{paddingTop: '48rpx'}"
                 >
                   <view class="jfb-base-success__body-num-info">
                     <view>{{ item.can_read_password }}</view>
@@ -182,10 +174,9 @@
                   <view
                     class="jfb-base-success__body-num-info-copy"
                     @click="copy(item.password)"
-                    >复制</view
-                  >
+                  >复制</view>
                   <view
-                    v-if="item.code_end_time"
+                    v-if="item['code_end_time']"
                     class="jfb-base-success__body-cashier-code"
                     :style="{
                       borderColor: mainColor,
@@ -193,11 +184,10 @@
                       background: bgColor,
                     }"
                   >
-                    {{ item.code_end_time }}
+                    {{ item['code_end_time'] }}
                   </view>
                 </view>
               </view>
-
               <view
                 class="jfb-base-success__body-card"
                 v-if="item.show_type === 'qrcode'"
@@ -209,10 +199,9 @@
                   <view
                     class="jfb-base-success__body-num-info-copy"
                     @click="handleShowCode(item)"
-                    >查看二维码</view
-                  >
+                  >查看二维码</view>
                   <view
-                    v-if="item.code_end_time"
+                    v-if="item['code_end_time']"
                     class="jfb-base-success__body-cashier-code"
                     :style="{
                       borderColor: mainColor,
@@ -220,11 +209,10 @@
                       background: bgColor,
                     }"
                   >
-                    {{ item.code_end_time }}
+                    {{ item['code_end_time'] }}
                   </view>
                 </view>
               </view>
-
               <view
                 class="jfb-base-success__body-card"
                 v-if="item.show_type === 'barcode'"
@@ -236,10 +224,9 @@
                   <view
                     class="jfb-base-success__body-num-info-copy"
                     @click="handleShowCode(item)"
-                    >查看一维码</view
-                  >
+                    >查看一维码</view>
                   <view
-                    v-if="item.code_end_time"
+                    v-if="item['code_end_time']"
                     class="jfb-base-success__body-cashier-code"
                     :style="{
                       borderColor: mainColor,
@@ -247,11 +234,10 @@
                       background: bgColor,
                     }"
                   >
-                    {{ item.code_end_time }}
+                    {{ item['code_end_time'] }}
                   </view>
                 </view>
               </view>
-
               <view
                 class="jfb-base-success__body-card jfb-base-success__body-num"
                 v-if="item.show_type === 'url'"
@@ -263,14 +249,14 @@
                   <view
                     class="jfb-base-success__body-num-info-copy"
                     @click="handleToLink(item.code)"
-                    >访问</view>
+                  >访问</view>
                 </view>
                 <view
                   class="jfb-base-success__body-num-info-copy"
                   @click="copy(item.code)"
                 >复制</view>
                 <view
-                  v-if="item.code_end_time"
+                  v-if="item['code_end_time']"
                   class="jfb-base-success__body-cashier-code"
                   :style="{
                     borderColor: mainColor,
@@ -278,9 +264,10 @@
                     background: bgColor,
                   }"
                 >
-                  {{ item.code_end_time }}
+                  {{ item['code_end_time'] }}
                 </view>
               </view>
+              <!--codes end-->
             </view>
           </view>
         </view>
@@ -330,6 +317,7 @@
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdDailog from "@/components/XdDailog/XdDailog";
 import XdButton from "@/components/XdButton/XdButton";
+import XdUnit from "@/components/XdUnit/XdUnit";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseSuccessMixin from "./JfbBaseSuccessMixin";
 import componentsMixins from "@/mixins/componentsMixins";
@@ -367,6 +355,7 @@ export default {
     XdDailog,
     XdButton,
     XdContentXss,
+    XdUnit
   },
   mixins: [componentsMixins, extsMixins, JfbBaseSuccessMixin],
   data() {
@@ -499,7 +488,7 @@ export default {
           this.handleOrderResolve(res);
         })
         .catch((err) => {
-          console.log(err, "err");
+          this.$xdLog.catch(err)
         });
     },
 
@@ -565,11 +554,17 @@ export default {
             info["productDetail"] = res.content;
           })
           .catch((err) => {
-            console.log(err, "err");
+            this.$xdLog.catch(err)
           });
       }
       this.info = info;
-
+      
+      //显示核销信息
+      info['settleInfo'] = null;
+      if(info['settle_info'] && info['settle_info'].length > 0) {
+        info['settleInfo'] = info['settle_info']
+      }
+      
       //订单完成
       if (this.info.status.status_type === "success") {
         if (this.timeer) {
@@ -799,4 +794,38 @@ export default {
     }
   }
 }
+
+.codes-index {
+  color: #999;
+  background: #eee;
+  border-radius: unit(20, rpx);
+  width: unit(80, rpx);
+  text-align: center;
+  vertical-align: middle;
+  font-size: unit(24, rpx);
+  padding: unit(10, rpx) 0;
+  margin: unit(32, rpx) 0 unit(32, rpx) unit(32, rpx);
+}
+
+.settle {
+  padding: 0 unit(30, rpx);
+  &-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: unit(26, rpx);
+    line-height: unit(80, rpx);
+    border-bottom: 1px solid rgba(238, 238, 238, 1);
+    &:last-child {
+      border-bottom:0;
+    }
+    
+    &>view:first-child {
+      color: #666;
+      font-size: unit(28, rpx);
+    }
+  }
+  
+  margin-bottom: unit(20, rpx);
+}
 </style>

package/src/components/JfbBaseSuccess/Mock.js

@@ -10,6 +10,11 @@ module.exports = {
       "comment": "非常感谢您购买我们的产品",
       "loading": false
     },
+    "settle_info":[
+      {"label": "核销门店", "value": "安德鲁森中航城店", "type": "text"},
+      {"label": "核销时间", "value": "2023-09-04 19:09:12", "type": "text"},
+      {"label": "核销金额", "value": 10000, "type": "price"},
+    ],
     "codes": [
       {
         "code": "tp0KPZnFPDJ8Zffw-pY52|323455",

package/src/mixins/colorCardMixins.js

@@ -0,0 +1,60 @@
+'use strict';
+import {mapActions, mapMutations} from 'vuex';
+import storage from "@/common/storage";
+import getServiceUrl from "@/common/getServiceUrl";
+
+export default {
+  data() {
+    return {
+
+    }
+  },
+
+  created(){
+    debugger
+  },
+
+  methods: {
+    stringToNumber(str) {
+      let result = 0;
+      let len = str.length;
+      for (let i = 0; i < len; i++) {
+        result = result + str.charCodeAt(i) + i;
+      }
+      return result;
+    },
+    getCardThemes(name) {
+      let colorLen = this.cardThemesColor.length;
+      let imgLen = this.cardThemesImage.length;
+      let colorIndex = this.stringToNumber(name) % colorLen;
+      let imgIndex = this.stringToNumber(name) % imgLen;
+      return {
+        color: this.cardThemesColor[colorIndex],
+        image: this.cardThemesImage[imgIndex],
+      }
+    },
+    getEntry(codes = [], allEntry = []) {
+      //无支持业务线或者未配置业务入口
+      if (codes.length === 0 || allEntry.length === 0) return [];
+
+      let support = [];
+      codes.map(bus => {
+        allEntry.map(it => {
+          it['image_url'] = getServiceUrl(it['image_url'])
+          if (bus === it['business_code']) {
+            support.push(it);
+          }
+        })
+      });
+      return support
+    },
+    getCardGroupItem(list, allEntry) {
+      list.map(item => {
+        //设置卡片样式
+        item['theme'] = this.getCardThemes(item['card_type_name'] + item['card_type']);
+        item['entries'] = this.getEntry(item['business_codes'], allEntry)
+      });
+      return list
+    },
+  }
+}