gxd-uni-library-editx 1.0.8-beta15 → 1.0.8-beta151

package/README.md

@@ -1,4 +1,4 @@
-# gxd-uni-new 
+# gxd-uni-library-editx
 
 ```text
 1、自定义uni-app组件功能，支持h5,mp-weixin平台已自测（竖屏），（文档尚未完善），

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.8-beta15",
+  "version": "1.0.8-beta151",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",
@@ -33,6 +33,7 @@
     "@dcloudio/uni-quickapp-webview": "^2.0.1-33920220208001",
     "@dcloudio/uni-stat": "^2.0.1-33920220208001",
     "@vue/shared": "^3.0.0",
+    "alife-logger": "^1.8.30",
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "dompurify": "^2.3.4",
@@ -101,4 +102,4 @@
   "uni-app": {
     "scripts": {}
   }
-}
+}

package/src/XdAppClass.js

@@ -41,14 +41,40 @@ class XdAppClass {
     //当前网站配置静态变量对象
     this.brandInfo = {};
 
+    //餐饮模式
+    if ($mv.$configProject.type === 'food') {
+      this.use('all', 'getFoodBrand', (app, next) => {
+        this.$store['dispatch']('getFoodBrand')
+          .then((config) => {
+            this.brandInfo = Object.assign({}, this.brandInfo, config)
+            next();
+          })
+          .catch(res => {
+            console.error(res)
+            throw new Error(`获取（getBrand）配置失败, result:${JSON.stringify(runtime().getErrorInfo(res))}`);
+          })
+      });
+    }
+
     /***
      * @description 设置公共获取brandInfo参数
      */
     this.use('all', 'getBrand', (app, next) => {
       this.$store['dispatch']('getBrand')
         .then((brandInfo) => {
-          console.log('111')
-          this.brandInfo = brandInfo;
+          if ($mv.$configProject.type === 'food' && brandInfo['api_host'] ) {
+            delete brandInfo['api_host'];
+          }
+          this.brandInfo = Object.assign({}, this.brandInfo, brandInfo);
+
+          //#ifdef H5
+          //设置部署目录
+          window['JfbBaseDir'] = '';
+          if(this.$vm.$configProject.NODE_ENV === 'production') {
+            window['JfbBaseDir'] = brandInfo['deploy_dir'] || '';
+          }
+          //#endif
+
           next();
         })
         .catch(res => {
@@ -57,7 +83,6 @@ class XdAppClass {
         })
     });
   }
-
   /**
    * @description 获取加盟上网站风格数据
    */

package/src/components/XdBar/XdBar.vue

@@ -4,7 +4,7 @@
       class="xd-custom-bar__fixed"
       :style="{
         backgroundColor: uiBgImage ? '': uiBgColor,
-        backgroundImage: 'url('+ uiBgImage +')',
+        backgroundImage: getBackgroundImage,
         height: barNavHeight + barStatusHeight  + 'rpx'
       }"
     >
@@ -143,6 +143,20 @@
         uiFontSize: 34,
       };
     },
+    computed:{
+      getBackgroundImage(){
+        let isGradient = this.bgColor.indexOf('linear-gradient') !== -1;
+        let bgc = `url(${this.bgImage})`;
+        // #ifdef H5
+        if ((this.bgImage === 'none'|| this.bgImage === '') && isGradient) {
+          bgc = this.uiBgImage = this.bgColor;
+        }
+        // #endif
+        
+        return bgc;
+ 
+      },
+    },
     created(){
       this.noPrevToIndex = this.$settings['noPrevPageToIndex'] === undefined ?
         false : this.$settings['noPrevPageToIndex'];
@@ -151,7 +165,7 @@
       this.uiBgColor = this.bgColor || this.$mainColor;
       if(this.color) this.uiTextColor = this.color;
       this.uiBgImage = this.bgImage;
-
+      
       /**
        * @description 设置样式
        */

package/src/components/XdButton/XdButton.vue

@@ -1,6 +1,7 @@
 <template>
   <button
     :disabled="disabled"
+    v-if="status"
     @click.stop="handleClick"
     :style="{
       opacity: disabled ? 0.4 : 1,
@@ -12,13 +13,14 @@
       color: getTextColor,
       width: width ? width : 'auto',
       boxShadow: getBoxShadow,
-      border: uiType === 'default'? '2rpx solid #dcdfe6!important': 0,
+      border: uiType === 'default'? '2rpx solid #dcdfe6': 0,
       padding: '0 ' + btnPaddingtList[uiSize] + 'rpx'
     }"
     :class="getClassName"
     type="default"
     plain="true"
-  ><slot>按钮</slot></button>
+  ><slot>按钮</slot>
+  </button>
 </template>
 
 <script>
@@ -54,6 +56,11 @@
         type: String,
         default: ''
       },
+  
+      systemStyle: {
+        type: Object|null,
+        default: null
+      },
 
       color: {
         type: String,
@@ -114,8 +121,13 @@
         //135deg  左上到右下（角度）
         //45deg 左下到右上（角度）
         default: 'to bottom',
-      }
+      },
       /**仅支持线性渐变******/
+  
+      isBoxShadow:{
+        type: Boolean,
+        default: false,
+      }
     },
     data(){
       return {
@@ -123,6 +135,7 @@
         uiSize: 'default',
         btnTypeList: ['primary','default', 'subPrimary', 'danger', 'info', 'warning', 'success', 'text'],
         btnSizeList: ['default', 'large' ,'medium', 'small', 'mini'],
+        status: false,
         btnHeightList: {
           default: 100,
           large: 110,
@@ -186,6 +199,7 @@
       },
 
       getBoxShadow(){
+        if(!this.isBoxShadow) return `0 0 0 rgba(0,0,0,0)`
         if(this.uiType === 'default' || this.uiType === 'text'|| this.boxShadow === null) return `0 0 0 rgba(0,0,0,0)`
         let color = this.$color(this.getColor(this.uiType)).alpha(0.4).toString();
         if(this.boxShadow) return this.boxShadow;
@@ -193,7 +207,10 @@
       },
     },
     async created(){
+      let pageStyle = this.systemStyle || {};
       let style = await getParentsStyles(this.$parent);
+      style = Object.assign({}, JSON.parse(JSON.stringify(style)) , pageStyle);
+      console.log('getPageStyles.created', style, pageStyle)
       this.btnBtnColor = {
         subPrimary: style.$subMainColor,
         primary: style.$mainColor,
@@ -202,21 +219,23 @@
         info: style.$infoColor,
         warning: style.$warningColor,
         success: style.$successColor,
+        mainGradient: style.$mainGradient,
+        subGradient: style.$subGradient,
         text: '#333'
       };
-      
-      
       this.uiType  = this.existKey(this.type);
       this.uiSize = this.existKey(this.size, 'btnSizeList');
       this.$set(this.btnBtnColor, 'primary', style.$mainColor);
       this.$set(this.btnBtnColor, 'subPrimary', this.$color(this.btnBtnColor.primary).alpha(0.4).lighten(0.35).hex());
+      this.status = true;
     },
     methods:{
+      
       handleClick(e){
         this.$emit('click',e);
         this.$emit('tap', e);
       },
-
+      
       getInfo(type, dataKey, list='btnHeightList'){
         if (this[dataKey]) {
           let temp = this[dataKey];
@@ -255,6 +274,13 @@
       },
 
       getBgColor(){
+        if(this.uiType === 'primary') {
+          return this.btnBtnColor.mainGradient || this.getColor();
+        }
+        if (this.uiType === 'subPrimary') {
+          return this.btnBtnColor.subGradient ||  this.getColor();
+        }
+       
         let bgc = this.getColor();
         if (this.isGradual && this.gradualColor && this.gradualType) {
           bgc =`linear-gradient(${this.gradualType}, ${this.gradualColor})`;
@@ -274,7 +300,7 @@
   .xd-button {
     z-index: 0;
     padding: 0 unit(50, rpx);
-    border: 0 !important;
+    border: 0;
     opacity: 1;
     transition: opacity .1s;
     box-sizing: border-box;