Skip to content

严立 / mini-shimao

Go to a project
Commit 70336ca8 by 严立
Options

component 样式引用调整

parent 55020b93
Inline Side-by-side
Showing with 51 additions and 61 deletions
app.js
...@@ -36,6 +36,7 @@ App({ ...@@ -36,6 +36,7 @@ App({
iMui(this) // m-ui 相关函数引入 iMui(this) // m-ui 相关函数引入
iLogin(this) // 全局登录，根据 token 的情况执行相关操作 iLogin(this) // 全局登录，根据 token 的情况执行相关操作
this.setUnitProportion() this.setUnitProportion()
console.log('wx.env', wx.env)
}, },
onShow: function () { onShow: function () {
......
component/coupon-code/coupon-code.js
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
couponCodeSelectionIndex: { couponCodeSelectionIndex: {
type: Number, type: Number,
......
component/coupon-code/coupon-code.wxml
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<view class="coupon_code_indicator row ac"> <view class="coupon_code_indicator row ac">
<text class="font_normal_34 color_submit">{{couponCodeActiveIndex}}</text> <text class="font_normal_34 color_submit">{{couponCodeActiveIndex}}</text>
<text class="font_normal_26 color_secondary" space="nbsp"> / </text> <text class="font_normal_26 color_secondary" space="nbsp"> / </text>
<text class="font_normal_26 color_secondary">{{couponCodeList.length}}</text> <text class="coupon_code_indicator_child3 font_normal_26 color_secondary">{{couponCodeList.length}}</text>
</view> </view>
<image class="coupon_code_close" src="./image/close.png" bindtap="onCouponCodeClose"></image> <image class="coupon_code_close" src="./image/close.png" bindtap="onCouponCodeClose"></image>
</view> </view>
\ No newline at end of file
component/coupon-code/coupon-code.wxss
@import '../m-main.wxss';
/* 券码弹窗 */ /* 券码弹窗 */
.coupon_code_container { .coupon_code_container {
z-index: 7; z-index: 7;
...@@ -70,7 +72,7 @@ ...@@ -70,7 +72,7 @@
margin: 24rpx 0 0 0; margin: 24rpx 0 0 0;
} }
.coupon_code_indicator > text:nth-child(3) { .coupon_code_indicator_child3 {
margin: 2rpx 0 0 0; margin: 2rpx 0 0 0;
} }
......
component/m-button-bottom/m-button-bottom.js
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
text: { text: {
type: String, type: String,
......
component/m-button-bottom/m-button-bottom.wxss
@import '../m-main.wxss';
.m-button-bottom-content { .m-button-bottom-content {
z-index: 4; z-index: 4;
position: fixed; position: fixed;
...@@ -13,10 +15,11 @@ ...@@ -13,10 +15,11 @@
background: #FFFFFF; background: #FFFFFF;
} }
.m-button-bottom-content > button { .m-button-bottom-enable {
width: 670rpx; width: 670rpx;
height: 96rpx; height: 96rpx;
border-radius: 4px; border-radius: 4px;
background: #86C5E1;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
...@@ -24,12 +27,16 @@ ...@@ -24,12 +27,16 @@
color: #FFFFFF; color: #FFFFFF;
} }
.m-button-bottom-enable {
background: #86C5E1;
}
.m-button-bottom-disable { .m-button-bottom-disable {
width: 670rpx;
height: 96rpx;
border-radius: 4px;
background: #C8E1EC; background: #C8E1EC;
font-size: 30rpx;
font-weight: 500;
line-height: 42rpx;
color: #FFFFFF;
} }
.m-button-bottom-occupy { .m-button-bottom-occupy {
......
component/m-checkbox/m-checkbox.js
let App = getApp() let App = getApp()
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
// valid - 有效状态，neutral - 中立状态，仅在 type 为 group 时生效，invalid - 无效状态 // valid - 有效状态，neutral - 中立状态，仅在 type 为 group 时生效，invalid - 无效状态
icon: { icon: {
......
component/m-checkbox/m-checkbox.wxml
<view class="m_checkbox"> <view class="m-checkbox">
<image src="{{currentIcon}}" bindtap="onSelection"></image> <image class="m-checkbox-element" src="{{currentIcon}}" bindtap="onSelection"></image>
</view> </view>
\ No newline at end of file
component/m-checkbox/m-checkbox.wxss
.m_checkbox { @import '../m-main.wxss';
.m-checkbox {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
.m_checkbox > image { .m-checkbox-element {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
......
component/m-dialog/m-dialog.js
let App = getApp() let App = getApp()
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
}, },
......
component/m-dialog/m-dialog.wxml
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<text class="secondary">{{content}}</text> <text class="secondary">{{content}}</text>
</view> </view>
<view class="dialog-input row cc"> <view class="dialog-input row cc">
<input auto-focus placeholder="{{placeholder}}" placeholder-class="dialog-input-placeholder" value="{{inputContent}}" bindinput="onInput"></input> <input class="dialog-input-element" auto-focus placeholder="{{placeholder}}" placeholder-class="dialog-input-placeholder" value="{{inputContent}}" bindinput="onInput"></input>
</view> </view>
<view class="dialog-operation row cb ac border-base"> <view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button> <button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
......
component/m-dialog/m-dialog.wxss
@import '../m-main.wxss';
.m-dialog { .m-dialog {
z-index: 9; z-index: 9;
position: fixed; position: fixed;
...@@ -37,7 +39,7 @@ ...@@ -37,7 +39,7 @@
margin-top: 24rpx; margin-top: 24rpx;
} }
.dialog-input > input { .dialog-input-element {
width: 510rpx; width: 510rpx;
height: 72rpx; height: 72rpx;
margin: 0 0 42rpx 0; margin: 0 0 42rpx 0;
......
component/m-image-picker/m-image-picker.js
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
}, },
......
component/m-image-picker/m-image-picker.wxml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="image-picker-selected-item"> <view class="image-picker-selected-item">
<image class="image-picker-selected-image" src="{{item.path}}"></image> <image class="image-picker-selected-image" src="{{item.path}}"></image>
<view class="image-picker-remove row cc ac" data-item="{{item}}" bindtap="onRemoveSelectedImage"> <view class="image-picker-remove row cc ac" data-item="{{item}}" bindtap="onRemoveSelectedImage">
<image src="./image/remove.png" mode="{{imageMode}}"></image> <image class="image-picker-remove-icon" src="./image/remove.png" mode="{{imageMode}}"></image>
</view> </view>
</view> </view>
</block> </block>
......
component/m-image-picker/m-image-picker.wxss
@import '../m-main.wxss';
.m-image-picker { .m-image-picker {
width: 504; width: 504;
min-height: 168rpx; min-height: 168rpx;
...@@ -24,7 +26,7 @@ ...@@ -24,7 +26,7 @@
height: 64rpx; height: 64rpx;
} }
.image-picker-remove > image { .image-picker-remove-icon {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
......
component/m-input/m-input.js
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
// 组件独立标识，此参数会在 event 中返回 // 组件独立标识，此参数会在 event 中返回
inputId: { inputId: {
......
component/m-input/m-input.wxss
@import '../m-main.wxss';
.m-input-boundary { .m-input-boundary {
position: relative; position: relative;
overflow-x: scroll; overflow-x: scroll;
......
component/m-main.wxss 0 → 100644
@import './theme/layout.wxss';
@import './theme/theme.wxss';
\ No newline at end of file
component/m-nav/m-nav.js
import iOption from './option.js' import iOption from './option.js'
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
// 组件外部属性
properties: { properties: {
// 导航栏是否固定在视图顶部 // 导航栏是否固定在视图顶部
isFixed: { isFixed: {
......
component/m-nav/m-nav.wxss
@import '../m-main.wxss';
.m-nav { .m-nav {
z-index: 6; z-index: 6;
width: 750rpx; width: 750rpx;
......
component/m-popup/m-popup.js
...@@ -2,7 +2,6 @@ let App = getApp() ...@@ -2,7 +2,6 @@ let App = getApp()
Component({ Component({
options: { options: {
multipleSlots: true, multipleSlots: true,
styleIsolation: 'apply-shared'
}, },
properties: { properties: {
......
component/m-popup/m-popup.wxss
@import '../m-main.wxss';
.m-popup { .m-popup {
z-index: 7; z-index: 7;
position: fixed; position: fixed;
......
component/m-segment/m-segment.js
Component({ Component({
options: { options: {
multipleSlots: true, multipleSlots: true,
styleIsolation: 'apply-shared'
}, },
properties: { properties: {
......
component/m-segment/m-segment.wxss
@import '../m-main.wxss';
.m-segment-list { .m-segment-list {
overflow-x: scroll; overflow-x: scroll;
border-bottom: 1px #E2E7EF solid; border-bottom: 1px #E2E7EF solid;
......
component/m-tab/m-tab.js
...@@ -3,10 +3,6 @@ Component({ ...@@ -3,10 +3,6 @@ Component({
scrollTimer: 0, scrollTimer: 0,
scrollLock: false, scrollLock: false,
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
// tab 整体样式 // tab 整体样式
classTab: { classTab: {
......
component/m-tab/m-tab.wxss
@import '../m-main.wxss';
.m-tab-container { .m-tab-container {
z-index: 4; z-index: 4;
width: 750rpx; width: 750rpx;
......
component/m-textarea/m-textarea.js
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
inputId: { type: String, value: '' }, inputId: { type: String, value: '' },
className: { type: String, value: '' }, className: { type: String, value: '' },
......
component/m-textarea/m-textarea.wxss
@import '../m-main.wxss';
.m_textarea_container { .m_textarea_container {
position: relative; position: relative;
} }
......
component/m-toast/m-toast.js
let App = getApp() let App = getApp()
Component({ Component({
options: {
styleIsolation: 'apply-shared'
},
properties: { properties: {
}, },
......
component/m-toast/m-toast.wxss
@import '../m-main.wxss';
.toast { .toast {
z-index: 9; z-index: 9;
position: fixed; position: fixed;
......
pages/commodity/project/project.js
...@@ -280,9 +280,6 @@ Page({ ...@@ -280,9 +280,6 @@ Page({
'commodityId': funcItme.targetId 'commodityId': funcItme.targetId
}, },
success: (response) => { success: (response) => {
console.log(response)
console.log(App.setCommodityInfo(response.data))
let funcCommodityInfo = App.setCommodityInfo(response.data) let funcCommodityInfo = App.setCommodityInfo(response.data)
let funcShopInfo = App.globalData.shopId let funcShopInfo = App.globalData.shopId
......
project.config.json
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"scopeDataCheck": false, "scopeDataCheck": false,
"uglifyFileName": false, "uglifyFileName": false,
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": true, "checkSiteMap": false,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"useMultiFrameRuntime": false, "useMultiFrameRuntime": false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment