gxd-uni-library-editx 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/settings.js.tpl

@@ -11,6 +11,34 @@ const settings = {
    */
   title: 'xd-uniapp',
 
+  /**
+   * @type {Boolean}
+   * @description 底部是否使用插槽模式
+   */
+  isFooterUseSlot: true,
+
+
+  /**
+   * @type {boolean|string}
+   * @description
+   * 1、无返回页面是否开启跳转到入口页面（undefined|true|false）使用老项目逻辑
+   * 2、新项目中不需要处理事件 （new）editX项目使用逻辑
+   */
+  noPrevPageToIndex: 'new',
+
+
+  /**
+   * @type {string}
+   * @description 设置小程序默认入口
+   */
+  index: '/dome/dome/index',
+
+  /**
+   * @description 百度AK
+   * @type {String}
+   */
+  baiduAk: 'btKt57MWjMx2P1ds2OjZIttLOOjR2Ndf',
+
   /**
    * @type {string}
    * @description  系统版本
@@ -55,6 +83,12 @@ const settings = {
    */
   isTestData: false,
 
+  /**
+   * @type {boolean} true | false
+   * @description 是否显示console内容
+   */
+  isLogs: false,
+
   /**
    * @type {number}
    * @description  开发环境端口号

package/src/components/XdAddress/XdAddress.vue

@@ -24,7 +24,7 @@
               maxlength="20"
               v-model="receipt_username"/>
           </view>
-          <view class="xd-address__body-item-line" :style="{borderColor: $mainColor}"></view>
+          <view class="xd-address__body-item-line" :style="{borderColor: styleMainColor}"></view>
         </view>
         <view class="xd-address__body-item">
           <view class="xd-address__body-item-label">手机号码</view>
@@ -37,7 +37,7 @@
               :adjust-position="false"
               v-model="receipt_phone"/>
           </view>
-          <view class="xd-address__body-item-line" :style="{borderColor: $mainColor}"></view>
+          <view class="xd-address__body-item-line" :style="{borderColor: styleMainColor}"></view>
         </view>
         <view class="xd-address__body-item">
           <view class="xd-address__body-item-label">所在地区</view>
@@ -48,7 +48,7 @@
           <view @click="toLocation">
             <xd-font-icon size="30" icon="iconshouhuodizhi" color="#999"></xd-font-icon>
           </view>
-          <view class="xd-address__body-item-line" :style="{borderColor: $mainColor, width: '95%'}"></view>
+          <view class="xd-address__body-item-line" :style="{borderColor: styleMainColor, width: '95%'}"></view>
         </view>
         <view class="xd-address__body-item">
           <view class="xd-address__body-item-label">详细地址</view>
@@ -66,7 +66,7 @@
               v-model="receipt_address"></textarea>
             <div class="xd-address__body-item-input-tips" v-if="showTips">记得完善门牌号</div>
           </view>
-          <view class="xd-address__body-item-line" :style="{borderColor: $mainColor}"></view>
+          <view class="xd-address__body-item-line" :style="{borderColor: styleMainColor}"></view>
         </view>
       </view>
       <view class="xd-address__set">
@@ -105,13 +105,13 @@
             <view
               class="xd-select__body-item-icon"
               :style="{
-                borderColor : $mainColor,
-                background: (level < index? '#fff': $mainColor)
+                borderColor : styleMainColor,
+                background: (level < index? '#fff': styleMainColor)
               }"
             ></view>
           </view>
         </view>
-        <view class="xd-select__body-line" :style="{background:$mainColor}"></view>
+        <view class="xd-select__body-line" :style="{background:styleMainColor}"></view>
       </view>
       <view class="xd-select__list" v-if="cityList.length > 0">
         <view
@@ -130,6 +130,9 @@
   import XdSwitch from "@/components/XdSwitch/XdSwitch";
   import XdButton from "@/components/XdButton/XdButton";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import {
+    getParentsStyle, //获取页面风格单个键值值
+  } from '@/utils/xd.base';
 
   export default {
     name: "XdAddress",
@@ -180,6 +183,9 @@
         focusNumber: -1,
         latitude: null,
         longitude: null,
+        
+        //使用全局主样式
+        styleMainColor: '',
       }
     },
     computed: {
@@ -200,10 +206,12 @@
         }
       },
     },
-
-    created() {
+  
+    async created() {
+      this.styleMainColor = await getParentsStyle(this.$parent, '$mainColor')
+      
       this.setValue();
-
+      
       /**监听用户定位成功事件**/
       this.$bus.$on('onUserLocation', (location) => {
         console.log('onUserLocation', location)

package/src/components/XdAddressSelect/XdAddressSelect.vue

@@ -16,13 +16,13 @@
             <view
               class="xd-select__body-item-icon"
               :style="{
-                borderColor : $mainColor,
-                background: (level < index? '#fff': $mainColor)
+                borderColor : styleMainColor,
+                background: (level < index? '#fff': styleMainColor)
               }"
             ></view>
           </view>
         </view>
-        <view class="xd-select__body-line" :style="{background:$mainColor}"></view>
+        <view class="xd-select__body-line" :style="{background:styleMainColor}"></view>
       </view>
       <view class="xd-select__list" v-if="cityList.length > 0">
         <view
@@ -39,6 +39,9 @@
   import XdSwitch from "@/components/XdSwitch/XdSwitch";
   import XdButton from "@/components/XdButton/XdButton";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import {
+    getParentsStyle, //获取页面风格单个键值值
+  } from '@/utils/xd.base';
 
   export default {
     name: "XdAddressSelect",
@@ -63,7 +66,10 @@
         city_name: [], //城市名称
         city_code: [], //城市代码
         city_selected_data: [],  //选择城市详情信息
-        city_title: ['省份/区域','城市','区/县', '街道']
+        city_title: ['省份/区域','城市','区/县', '街道'],
+        
+        //使用全局主样式
+        styleMainColor: '',
       }
     },
 
@@ -72,8 +78,10 @@
         return this.$xdUniHelper.cloneDeep(this.city_title).splice(0, this.maxLevel);
       },
     },
-
-    created(){
+  
+    async created() {
+      this.styleMainColor = await getParentsStyle(this.$parent, '$mainColor')
+      
       if(this.level === -1) {
         this.getCity(0);
       }

package/src/components/XdButton/XdButton.vue

@@ -208,7 +208,7 @@
       
       this.uiType  = this.existKey(this.type);
       this.uiSize = this.existKey(this.size, 'btnSizeList');
-      this.$set(this.btnBtnColor, 'primary', style.$subMainColor);
+      this.$set(this.btnBtnColor, 'primary', style.$mainColor);
       this.$set(this.btnBtnColor, 'subPrimary', this.$color(this.btnBtnColor.primary).alpha(0.4).lighten(0.35).hex());
     },
     methods:{

package/src/components/XdEditPwd/XdEditPwd.vue

@@ -1,14 +1,14 @@
 <template>
   <view>
     <xd-dailog
-            :show.sync="uiShow"
-            width="90%"
-            title="设置支付密码"
-            :cancel="false"
-            :confirm="false"
-            :zIndex="1100"
-            :showClose="showClose"
-            @close="handleClose"
+      :show.sync="uiShow"
+      width="90%"
+      title="设置支付密码"
+      :cancel="false"
+      :confirm="false"
+      :zIndex="1100"
+      :showClose="showClose"
+      @close="handleClose"
     >
       <view class="pwd">
         <view class="pwd__title" v-if="title">
@@ -23,12 +23,12 @@
             </view>
             <view>
               <input
-                      :disabled="editPhone!==''"
-                      :style="{width:370+'rpx'}"
-                      type="number"
-                      placeholder="请输入手机号"
-                      :adjust-position="false"
-                      v-model="form.phone"
+                :disabled="editPhone!==''"
+                :style="{width:370+'rpx'}"
+                type="number"
+                placeholder="请输入手机号"
+                :adjust-position="false"
+                v-model="form.phone"
               />
             </view>
           </view>
@@ -39,20 +39,20 @@
               <view>验证码：</view>
               <view>
                 <input
-                        :style="{width:160+'rpx',marginRight:30+'rpx'}"
-                        type="text"
-                        placeholder="请输入验证码"
-                        :adjust-position="false"
-                        v-model="form.sms_code"/>
+                  :style="{width:160+'rpx',marginRight:30+'rpx'}"
+                  type="text"
+                  placeholder="请输入验证码"
+                  :adjust-position="false"
+                  v-model="form.sms_code"/>
               </view>
             </view>
             <view style="flex-shrink: 0;">
               <xd-button
-                      size="mini"
-                      type="default"
-                      @click="getSmsCodeHandle"
-                      :disabled="!form.phone || status"
-                      :style="{width:codeWidth+'rpx'}"
+                size="mini"
+                type="default"
+                @click="getSmsCodeHandle"
+                :disabled="!form.phone || status"
+                :style="{width:codeWidth+'rpx'}"
               >
                 {{statusMsg}}
               </xd-button>
@@ -60,31 +60,27 @@
           </view>
 
           <view class="pwd__form-item">
-            <view>
-              设置支付密码：
-            </view>
+            <view>设置支付密码：</view>
             <view>
               <input
-                      type="password"
-                      placeholder="请输入六位纯数字密码"
-                      :adjust-position="false"
-                      v-model="form.password"
-                      maxlength="6"
+                type="password"
+                placeholder="请输入六位纯数字密码"
+                :adjust-position="false"
+                v-model="form.password"
+                maxlength="6"
               />
             </view>
           </view>
 
           <view class="pwd__form-item">
-            <view>
-              确认支付密码：
-            </view>
+            <view>确认支付密码：</view>
             <view>
               <input
-                      type="password"
-                      placeholder="请输入确认密码"
-                      :adjust-position="false"
-                      v-model="form.confirmPwd"
-                      maxlength="6"
+                type="password"
+                placeholder="请输入确认密码"
+                :adjust-position="false"
+                v-model="form.confirmPwd"
+                maxlength="6"
               />
             </view>
           </view>
@@ -92,13 +88,11 @@
 
         <view>
           <xd-button
-                  type="primary"
-                  size="mini"
-                  :disabled="!form.phone || !form.sms_code || !form.password || !form.confirmPwd"
-                  @click="submit"
-          >
-            确定
-          </xd-button>
+            type="primary"
+            size="mini"
+            :disabled="!form.phone || !form.sms_code || !form.password || !form.confirmPwd"
+            @click="submit"
+          >确定</xd-button>
         </view>
       </view>
     </xd-dailog>