姜永辉 пре 1 година
родитељ
комит
ceffe2d30b

+ 1 - 1
app.json

@@ -331,7 +331,7 @@
     },
     "tabBar": {
         "color": "#95A8CB",
-        "selectedColor": "#1B365D",
+        "selectedColor": "#002340",
         "backgroundColor": "#FFFFFF",
         "list": [
             {

+ 6 - 6
app.wxss

@@ -455,7 +455,7 @@ end
   border: none !important;
   font-size: 16px !important;
   font-weight: 500 !important;
-  color: #1B365D !important;
+  color: #002340 !important;
 }
 
 .van-swipe-cell__right {
@@ -592,7 +592,7 @@ end
 .table-content-class{
   font-size: 13px;
   font-weight:500;
-  color: #1B365D;
+  color: #002340;
   word-break: break-all;
 }
 
@@ -695,7 +695,7 @@ end
 .dk-cell-value-class {
   text-align: left !important;
   font-size: 13px !important;
-  color: #1B365D !important;
+  color: #002340 !important;
   font-weight: normal;
 }
 /**cell空值颜色**/
@@ -709,7 +709,7 @@ end
 .dk-cell-value-pop-class {
   text-align: right !important;
   font-size: 13px !important;
-  color: #1B365D !important;
+  color: #002340 !important;
   font-weight: normal;
 }
 
@@ -777,7 +777,7 @@ end
 .function-pop-text-class{
   font-size: 12px !important;
   font-weight: 400 !important;
-  color: #1B365D !important;
+  color: #002340 !important;
 }
 
 /**功能菜单的图标样式*/
@@ -800,7 +800,7 @@ end
   font-style: normal;
   font-weight: 400;
   font-size: 14px;
-  color: #1B365D !important;
+  color: #002340 !important;
 }
 
 .cell-value-class-no-select{

+ 2 - 2
components/dkbase/dk-drag/item/index.wxss

@@ -44,12 +44,12 @@
 }
 
 .info__item .name {
-  color: #1B365D !important;
+  color: #002340 !important;
   font-style: normal;
   font-weight: 400;
   font-size: 12px !important;
   /* line-height: 34px; */
-  color: #1B365D;
+  color: #002340;
   display: flex;
   justify-content: center;
 }

+ 1 - 1
components/dkbase/dk-list/dk-list.wxss

@@ -204,7 +204,7 @@
 
 .bottom-title-class {
   display: block;
-  color: #1B365D;
+  color: #002340;
   margin-left: 30rpx;
   font-size: 13px;
 }

+ 9 - 9
components/dkbase/dk-popup/dk-popup.wxml

@@ -18,7 +18,7 @@
       </view>
       <view style="display: flex;padding-top: 5rpx;">
         <view class="price-pop-class">
-          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="{{priceTitle}}" content="{{form[priceCol]}}"></dk-cell>
+          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="bold" title="{{priceTitle}}" content="{{form[priceCol]}}"></dk-cell>
         </view>
       </view>
       <view style="padding-right: 30rpx;float: right;">
@@ -44,13 +44,13 @@
     <!--内容-->
     <view wx:for="{{contentObj}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
-      <van-field wx:if="{{item.type=='str'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly ||!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='str'}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly ||!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
       </van-field>
       <!--下拉-->
-      <van-field wx:if="{{item.type=='drop'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='drop'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
       </van-field>
       <!--选单-->
-      <van-field wx:if="{{item.type=='choose'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}"  placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='choose'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
       </van-field>
       <!--选择框-->
       <van-field wx:if="{{item.type=='checkbox'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
@@ -59,13 +59,13 @@
         </view>
       </van-field>
       <!--数量step-->
-      <van-cell wx:if="{{item.type=='step'}}" border="{{ false }}" title="数量" title-class="{{item.required?'red-label':'nomal-label' }}">
-        <van-stepper value="{{form[item.code]}}" integer="{{true}}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep"disabled= "{{!!readonly}}" />
+      <van-cell wx:if="{{item.type=='step'}}" border="{{ false }}" title-class="cell_title"  title="数量" required="{{item.required?true:false }}">
+        <van-stepper value="{{form[item.code]}}" integer="{{true}}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
       </van-cell>
       <!--数字类-->
-      <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" contentRight="{{true}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#1B365D" titleFontWeight="bold" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
+      <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" contentRight="{{true}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#002340" titleFontWeight="bold" titleColor="{{item.required?'#DB3333':'#95A8CB'}}" inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
       <!--备注-->
-      <van-field wx:if="{{item.type=='textarea'}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='textarea'}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
       </van-field>
     </view>
   </view>
@@ -73,7 +73,7 @@
   <view style="height: 30rpx;background-color: #FFFFFF;"></view>
 
   <view wx:if="{{!readonly}}" style="text-align: center;background-color: #FFFFFF">
-    <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;margin-bottom:40rpx" type="info" size="small" bindtap="commit">确定</van-button>
+    <van-button round size="large" color="#3E69F6" custom-style="height:88rpx;width:640rpx;margin-bottom:40rpx" type="info" size="small" bindtap="commit">确定</van-button>
   </view>
 </van-popup>
 

+ 17 - 15
components/dkbase/dk-popup/dk-popup.wxss

@@ -14,6 +14,9 @@
   align-items: center;
   background: #F8F9FD;
   border-radius: 30rpx 30rpx 0px 0px !important;
+  background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%), 
+    radial-gradient(58.28% 235.72% at 10.78% 50%, rgba(191, 213, 255, 0.6) 0%, rgba(216, 229, 255, 0) 56.69%);
+
 }
 
 .special-basic-topic {
@@ -28,35 +31,35 @@
   justify-content: space-between;
 }
 
-.special-basic-topic-title{
+.special-basic-topic-title {
   font-size: 16px;
   font-weight: bold;
-  color: #1B365D;
+  color: #002340;
 }
 
-.special-basic-topic-checkbox{
+.special-basic-topic-checkbox {
   margin-right: 50rpx;
 }
 
-.special-basic-topic-checkbox-label{
+.special-basic-topic-checkbox-label {
   font-size: 14px;
-  color: #1B365D !important;
+  color: #002340 !important;
   font-weight: bold;
 }
 
 /**pop弹出框的表头标题样式*/
-.special-topic-title{
+.special-topic-title {
   width: 90%;
   height: 165rpx;
   padding: 10rpx 0 0 10rpx !important;
 }
 
-.price-pop-class{
+.price-pop-class {
   width: 75%;
 }
 
 /**pop弹出框的表头图片样式*/
-.goods-pop-image{
+.goods-pop-image {
   width: 163rpx;
   height: 163rpx;
   display: flex;
@@ -67,7 +70,7 @@
   margin-bottom: 47rpx;
 }
 
-.pop-content-class{
+.pop-content-class {
   background-color: #FFFFFF;
   max-height: 600rpx !important;
   overflow-y: auto;
@@ -78,16 +81,15 @@
 .dk-cell-value-class {
   text-align: right !important;
   font-size: 13px !important;
-  color: #1B365D !important;
+  color: #002340 !important;
   font-weight: normal;
 }
 
-/**红色label**/
-.red-label {
-  color: red;
-  font-size: 14px;
-  font-weight: bold;
+ 
+.cell_title   {
+  color: #95A8CB !important;
 }
+ 
 
 /**红色label**/
 .red-label,

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/stepper/index.wxss


+ 1 - 1
package-basic-data/pages/product-attribute/product-attribute.js

@@ -40,7 +40,7 @@ Page({
       { name: 'brandName', title: mixins.$t('brandName') },
       { name: 'supplierNames', title: mixins.$t('supplier') }
     ],
-    buttonSaveList: [{ code: 'add', title: '新建', width: '120rpx', color: '#CAA977' }],
+    buttonSaveList: [{ code: 'add', title: '新建', width: '120rpx',  }],
     contentSaveList: [],
     formDataName: mixins.$t('goodsBrand'),
     popContent:

Неке датотеке нису приказане због велике количине промена