jufubao-base 1.0.119-beta2 → 1.0.119-beta20

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -19,104 +19,61 @@
     <view
       class="jfb-base-success__body"
       :style="{ margin: jfbListMarginComputed }"
-      v-if="info !== null"
     >
-      <view
-        class="jfb-base-success__body-icon"
-        :style="{
-          marginBottom: jfbListSpacing + 'rpx',
-          boxShadow: jfbListShadowComputed,
-          border: jfbListBorderComputed,
-          backgroundColor: jfbListBgColor,
-          borderRadius: jfbListRadius + 'rpx',
-        }"
-      >
-        <view class="jfb-base-success__body-icon-item">
-          <view>
-            <xd-font-icon
-              size="80"
-              :icon="info.status.icon"
-              :color="info.status.iconColor"
-            ></xd-font-icon>
-          </view>
-          <view>{{ info.status.status_name }}</view>
-          <view class="jfb-base-success__body-icon-item-tip">{{
-            info.status.comment
-          }}</view>
-        </view>
-        <view class="jfb-base-success__body-icon-btn">
-          <view v-for="(item, index) in info['btn']" :key="index">
-            <xd-button
-              v-if="item['label']"
-              size="small"
-              :type="item['type']"
-              @click="handleOnBtnClick(item)"
-              >{{ item["label"] }}
-            </xd-button>
-          </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 v-if="noUserLoding === true">
+        111
       </view>
-      <!--settle end-->
-      <view class="jfb-base-success__body-other">
+      <template v-if="noUserLoding === false && info !== null">
         <view
-          v-if="info.codes && info.codes.length > 0 && is_show_code === 'Y'"
+          class="jfb-base-success__body-icon"
+          :style="{
+            marginBottom: jfbListSpacing + 'rpx',
+            boxShadow: jfbListShadowComputed,
+            border: jfbListBorderComputed,
+            backgroundColor: jfbListBgColor,
+            borderRadius: jfbListRadius + 'rpx',
+          }"
         >
-          <view
-            :style="{
-              marginBottom: jfbListSpacing + 'rpx',
-              boxShadow: jfbListShadowComputed,
-              border: jfbListBorderComputed,
-              backgroundColor: jfbListBgColor,
-              borderRadius: jfbListRadius + 'rpx',
-            }"
-            v-if="
-              info.codes.length === 1 &&
-              (info.codes[0].show_type === 'qrcode' ||
-                info.codes[0].show_type === 'barcode')
-            "
-            class="jfb-base-success__body-card jfb-base-success__body-cashier"
-          >
-            <view class="jfb-base-success__body-cashier-text"
-              >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-              <view style="position: relative">
-                <image
-                  :style="{
-                    height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                    width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-                  }"
-                  :src="info.codes[0].code_url"
-                ></image>
-                <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
-              </view>
-            <view class="jfb-base-success__body-cashier-text">
-              {{ info.codes[0].can_read_code }}
+          <view class="jfb-base-success__body-icon-item">
+            <view>
+              <xd-font-icon
+                size="80"
+                :icon="info.status.icon"
+                :color="info.status.iconColor"
+              ></xd-font-icon>
             </view>
-            <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
-              {{info.codes[0].refund_tip_text}}
+            <view>{{ info.status.status_name }}</view>
+            <view class="jfb-base-success__body-icon-item-tip">{{
+              info.status.comment
+            }}</view>
+          </view>
+          <view class="jfb-base-success__body-icon-btn">
+            <view v-for="(item, index) in info['btn']" :key="index">
+              <xd-button
+                v-if="item['label']"
+                size="small"
+                :type="item['type']"
+                @click="handleOnBtnClick(item)"
+                >{{ item["label"] }}
+              </xd-button>
             </view>
-            <view
-              v-if="info.codes[0].code_end_time"
-              class="jfb-base-success__body-cashier-code"
-              :style="{
-                borderColor: mainColor,
-                color: mainColor,
-                background: bgColor,
-              }"
-            >
-              {{ info.codes[0].code_end_time }}
+          </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 v-else>
+        </view>
+        <!--settle end-->
+        <view class="jfb-base-success__body-other">
+          <view
+            v-if="info.codes && info.codes.length > 0 && is_show_code === 'Y'"
+          >
             <view
               :style="{
                 marginBottom: jfbListSpacing + 'rpx',
@@ -125,42 +82,60 @@
                 backgroundColor: jfbListBgColor,
                 borderRadius: jfbListRadius + 'rpx',
               }"
-              v-for="(item, index) in info.codes"
-              :key="index"
+              v-if="
+                info.codes.length === 1 &&
+                (info.codes[0].show_type === 'qrcode' ||
+                  info.codes[0].show_type === 'barcode')
+              "
+              class="jfb-base-success__body-card jfb-base-success__body-cashier"
             >
-              <view class="codes-index">{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view>
-              <!--codes-->
+              <view class="jfb-base-success__body-cashier-text"
+                >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
+                <view style="position: relative">
+                  <image
+                    :style="{
+                      height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                      width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                    }"
+                    :src="info.codes[0].code_url"
+                  ></image>
+                  <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+                </view>
+              <view class="jfb-base-success__body-cashier-text">
+                {{ info.codes[0].can_read_code }}
+              </view>
+              <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
+                {{info.codes[0].refund_tip_text}}
+              </view>
               <view
-                class="jfb-base-success__body-card jfb-base-success__body-num"
-                v-if="item.show_type === 'text' && !item.password"
+                v-if="info.codes[0].code_end_time"
+                class="jfb-base-success__body-cashier-code"
+                :style="{
+                  borderColor: mainColor,
+                  color: mainColor,
+                  background: bgColor,
+                }"
               >
-                <view class="jfb-base-success__body-num-info">
-                  <view>{{ item.can_read_code }}</view>
-                </view>
-                <view
-                  class="jfb-base-success__body-num-info-copy"
-                  @click="copy(item.code)"
-                >复制</view>
-                <view
-                  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>
+                {{ info.codes[0].code_end_time }}
               </view>
+            </view>
+            <view v-else>
               <view
-                class="jfb-base-success__body-card"
-                v-if="item.show_type === 'text' && item.password"
+                :style="{
+                  marginBottom: jfbListSpacing + 'rpx',
+                  boxShadow: jfbListShadowComputed,
+                  border: jfbListBorderComputed,
+                  backgroundColor: jfbListBgColor,
+                  borderRadius: jfbListRadius + 'rpx',
+                }"
+                v-for="(item, index) in info.codes"
+                :key="index"
               >
+                <view class="codes-index">{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view>
+                <!--codes-->
                 <view
-                  class="jfb-base-success__body-num"
-                  :style="{
-                    'borderBottom': '1px solid #f2f2f2',
-                    'paddingBottom': '48rpx'
-                  }"
+                  class="jfb-base-success__body-card jfb-base-success__body-num"
+                  v-if="item.show_type === 'text' && !item.password"
                 >
                   <view class="jfb-base-success__body-num-info">
                     <view>{{ item.can_read_code }}</view>
@@ -169,18 +144,6 @@
                     class="jfb-base-success__body-num-info-copy"
                     @click="copy(item.code)"
                   >复制</view>
-                </view>
-                <view
-                  class="jfb-base-success__body-num"
-                  :style="{paddingTop: '48rpx'}"
-                >
-                  <view class="jfb-base-success__body-num-info">
-                    <view>{{ item.can_read_password }}</view>
-                  </view>
-                  <view
-                    class="jfb-base-success__body-num-info-copy"
-                    @click="copy(item.password)"
-                  >复制</view>
                   <view
                     v-if="item['code_end_time']"
                     class="jfb-base-success__body-cashier-code"
@@ -189,48 +152,118 @@
                       color: mainColor,
                       background: bgColor,
                     }"
-                  >
-                    {{ item['code_end_time'] }}
-                  </view>
+                  >{{ item['code_end_time'] }}</view>
                 </view>
-              </view>
-              <view
-                class="jfb-base-success__body-card"
-                v-if="item.show_type === 'qrcode'"
-              >
-                <view class="jfb-base-success__body-num">
-                  <view class="jfb-base-success__body-num-info">
-                    <view>{{ item.can_read_code }}</view>
-                  </view>
-                  <view
-                    class="jfb-base-success__body-num-info-copy"
-                    @click="handleShowCode(item)"
-                  >查看二维码</view>
+                <view
+                  class="jfb-base-success__body-card"
+                  v-if="item.show_type === 'text' && item.password"
+                >
                   <view
-                    v-if="item['code_end_time']"
-                    class="jfb-base-success__body-cashier-code"
+                    class="jfb-base-success__body-num"
                     :style="{
-                      borderColor: mainColor,
-                      color: mainColor,
-                      background: bgColor,
+                      'borderBottom': '1px solid #f2f2f2',
+                      'paddingBottom': '48rpx'
                     }"
                   >
-                    {{ item['code_end_time'] }}
+                    <view class="jfb-base-success__body-num-info">
+                      <view>{{ item.can_read_code }}</view>
+                    </view>
+                    <view
+                      class="jfb-base-success__body-num-info-copy"
+                      @click="copy(item.code)"
+                    >复制</view>
+                  </view>
+                  <view
+                    class="jfb-base-success__body-num"
+                    :style="{paddingTop: '48rpx'}"
+                  >
+                    <view class="jfb-base-success__body-num-info">
+                      <view>{{ item.can_read_password }}</view>
+                    </view>
+                    <view
+                      class="jfb-base-success__body-num-info-copy"
+                      @click="copy(item.password)"
+                    >复制</view>
+                    <view
+                      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>
                   </view>
                 </view>
-              </view>
-              <view
-                class="jfb-base-success__body-card"
-                v-if="item.show_type === 'barcode'"
-              >
-                <view class="jfb-base-success__body-num">
-                  <view class="jfb-base-success__body-num-info">
-                    <view>{{ item.can_read_code }}</view>
+                <view
+                  class="jfb-base-success__body-card"
+                  v-if="item.show_type === 'qrcode'"
+                >
+                  <view class="jfb-base-success__body-num">
+                    <view class="jfb-base-success__body-num-info">
+                      <view>{{ item.can_read_code }}</view>
+                    </view>
+                    <view
+                      class="jfb-base-success__body-num-info-copy"
+                      @click="handleShowCode(item)"
+                    >查看二维码</view>
+                    <view
+                      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>
+                  </view>
+                </view>
+                <view
+                  class="jfb-base-success__body-card"
+                  v-if="item.show_type === 'barcode'"
+                >
+                  <view class="jfb-base-success__body-num">
+                    <view class="jfb-base-success__body-num-info">
+                      <view>{{ item.can_read_code }}</view>
+                    </view>
+                    <view
+                      class="jfb-base-success__body-num-info-copy"
+                      @click="handleShowCode(item)"
+                      >查看一维码</view>
+                    <view
+                      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>
+                  </view>
+                </view>
+                <view
+                  class="jfb-base-success__body-card jfb-base-success__body-num"
+                  v-if="item.show_type === 'url'"
+                >
+                  <view class="code-url">
+                    <view class="jfb-base-success__body-num-info">
+                      <view>{{ item.can_read_code }}</view>
+                    </view>
+                    <view
+                      class="jfb-base-success__body-num-info-copy"
+                      @click="handleToLink(item.code)"
+                    >访问</view>
                   </view>
                   <view
                     class="jfb-base-success__body-num-info-copy"
-                    @click="handleShowCode(item)"
-                    >查看一维码</view>
+                    @click="copy(item.code)"
+                  >复制</view>
                   <view
                     v-if="item['code_end_time']"
                     class="jfb-base-success__body-cashier-code"
@@ -243,64 +276,35 @@
                     {{ item['code_end_time'] }}
                   </view>
                 </view>
+                <!--codes end-->
               </view>
-              <view
-                class="jfb-base-success__body-card jfb-base-success__body-num"
-                v-if="item.show_type === 'url'"
-              >
-                <view class="code-url">
-                  <view class="jfb-base-success__body-num-info">
-                    <view>{{ item.can_read_code }}</view>
-                  </view>
-                  <view
-                    class="jfb-base-success__body-num-info-copy"
-                    @click="handleToLink(item.code)"
-                  >访问</view>
-                </view>
-                <view
-                  class="jfb-base-success__body-num-info-copy"
-                  @click="copy(item.code)"
-                >复制</view>
-                <view
-                  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>
-              </view>
-              <!--codes end-->
             </view>
           </view>
-        </view>
-        <view class="jfb-base-success__body-detail" v-if="info.custom_content">
-          <view class="jfb-base-success__body-detail-title">
-            <view :style="{ background: mainColor }"></view>
-            <view>{{ info.custom_content.title }}</view>
-          </view>
-          <view class="jfb-base-success__body-detail-html">
-            <xd-content-xss
-              v-html="info.custom_content.content"
-            ></xd-content-xss>
-          </view>
-        </view>
-        <view
-          class="jfb-base-success__body-detail"
-          v-if="is_show_product === 'Y' && info.productDetail"
-        >
-          <view class="jfb-base-success__body-detail-title">
-            <view :style="{ background: mainColor }"></view>
-            <view>商品详情</view>
+          <view class="jfb-base-success__body-detail" v-if="info.custom_content">
+            <view class="jfb-base-success__body-detail-title">
+              <view :style="{ background: mainColor }"></view>
+              <view>{{ info.custom_content.title }}</view>
+            </view>
+            <view class="jfb-base-success__body-detail-html">
+              <xd-content-xss
+                v-html="info.custom_content.content"
+              ></xd-content-xss>
+            </view>
           </view>
-          <view class="jfb-base-success__body-detail-html">
-            <xd-content-xss v-html="info.productDetail"></xd-content-xss>
+          <view
+            class="jfb-base-success__body-detail"
+            v-if="is_show_product === 'Y' && info.productDetail"
+          >
+            <view class="jfb-base-success__body-detail-title">
+              <view :style="{ background: mainColor }"></view>
+              <view>商品详情</view>
+            </view>
+            <view class="jfb-base-success__body-detail-html">
+              <xd-content-xss v-html="info.productDetail"></xd-content-xss>
+            </view>
           </view>
         </view>
-      </view>
+      </template>
     </view>
     <xd-dailog
       :show.sync="showCode"
@@ -390,10 +394,9 @@ export default {
       is_show_product: "",
       webViewPath: "/pages/webview/webview", //容器路径
       isPreview: false,
-
       info: null,
-
       timeer: null,
+      noUserLoding:null,
 
       //请求参数
       params: null,
@@ -405,8 +408,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oloValue) {
+      if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {
@@ -414,9 +418,10 @@ export default {
     ...styleForm.getComputedItem(),
   },
   created() {
-    console.log(this.$configProject, "$configProject");
     this.isPreview = this.$configProject.isPreview;
+    this.noUserLoding = !this.$root['isLogined']; //判断是否需要已登陆
     this.init(this.container);
+
   },
   destroyed() {
     if (this.timeer) {
@@ -428,7 +433,15 @@ export default {
     onJfbLoad(options) {
       this.params = options;
       this.order_id = options.order_id;
+
+      //已登陆
+      if(this.noUserLoding === false || this.isPreview ) {
+        setTimeout(()=>{
+          this.getStatus();
+        },1000)
+      }
     },
+
     handleShowCode(item) {
       this.codeSrc = item.code_url;
       this.showType = item.show_type;
@@ -494,9 +507,6 @@ export default {
       this.index = this.settings.index;
       this.packageData = true;
       styleForm.getInitItem(this, value);
-      setTimeout(()=>{
-        this.getStatus();
-      },1000)
     },
 
     getStatus() {

package/src/components/{JfbBaseConFlashHome → JfbBaseWallet}/Api.js

@@ -9,7 +9,7 @@
  * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
  * 更新列表记录(updateFfffXxxxx)
  * @type {*[]}
- */
+ */ 
 module.exports = [
   {
     mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）

package/src/components/JfbBaseWallet/Attr.js

@@ -0,0 +1,101 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '更改分类label(可排序):',
+        ele: 'xd-set-sort-label',
+        valueKey: 'newLabel',
+        value: data['newLabel'] || null,
+        disabled: false,
+        defaultValue: data['newLabel'],
+        list: [
+          {
+            icon: "iconpiao",
+            label: "票券",
+            value: 'card',
+            sort: 1
+          }, 
+          {
+            icon: "iconyuanbao",
+            label: "元宝",
+            value: 'wallet',
+            sort: 2
+          },
+          {
+            icon: "iconjifenjilu",
+            label: "积分",
+            value: 'score',
+            sort: 3
+          },
+        ]
+      },
+      {
+        label: '是否展示票券入口:',
+        ele: 'xd-radio',
+        valueKey: 'isCard',
+        value: data['isCard'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
+      },
+      {
+        label: '票券跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardPath',
+        value: data['cardPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+      {
+        label: '是否展示元宝入口:',
+        ele: 'xd-radio',
+        valueKey: 'isYuanbao',
+        value: data['isYuanbao'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
+      },
+      {
+        label: '元宝跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'yuanbaoPath',
+        value: data['yuanbaoPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+      {
+        label: '是否展示积分入口:',
+        ele: 'xd-radio',
+        valueKey: 'isIntegral',
+        value: data['isIntegral'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
+      },
+      {
+        label: '积分跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'integralPath',
+        value: data['integralPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+    ].filter(i => i)
+  },
+  advanced: [],
+};