lilei пре 9 месеци
родитељ
комит
240ad7d8b2
5 измењених фајлова са 187 додато и 153 уклоњено
  1. 94 94
      components/uni-icons/uni-icons.vue
  2. 2 1
      manifest.json
  3. 2 1
      pages/index/index.vue
  4. 37 5
      pagesB/cart/productitem.vue
  5. 52 52
      static/iconfont/iconfont.css

+ 94 - 94
components/uni-icons/uni-icons.vue

@@ -59,367 +59,367 @@ export default {
 	color: #007aff;
 }
 
-.uni-icon-contact:before {
+.uni-icon-contact::before {
 	content: '\e100';
 }
 
-.uni-icon-person:before {
+.uni-icon-person::before {
 	content: '\e101';
 }
 
-.uni-icon-personadd:before {
+.uni-icon-personadd::before {
 	content: '\e102';
 }
 
-.uni-icon-contact-filled:before {
+.uni-icon-contact-filled::before {
 	content: '\e130';
 }
 
-.uni-icon-person-filled:before {
+.uni-icon-person-filled::before {
 	content: '\e131';
 }
 
-.uni-icon-personadd-filled:before {
+.uni-icon-personadd-filled::before {
 	content: '\e132';
 }
 
-.uni-icon-phone:before {
+.uni-icon-phone::before {
 	content: '\e200';
 }
 
-.uni-icon-email:before {
+.uni-icon-email::before {
 	content: '\e201';
 }
 
-.uni-icon-chatbubble:before {
+.uni-icon-chatbubble::before {
 	content: '\e202';
 }
 
-.uni-icon-chatboxes:before {
+.uni-icon-chatboxes::before {
 	content: '\e203';
 }
 
-.uni-icon-phone-filled:before {
+.uni-icon-phone-filled::before {
 	content: '\e230';
 }
 
-.uni-icon-email-filled:before {
+.uni-icon-email-filled::before {
 	content: '\e231';
 }
 
-.uni-icon-chatbubble-filled:before {
+.uni-icon-chatbubble-filled::before {
 	content: '\e232';
 }
 
-.uni-icon-chatboxes-filled:before {
+.uni-icon-chatboxes-filled::before {
 	content: '\e233';
 }
 
-.uni-icon-weibo:before {
+.uni-icon-weibo::before {
 	content: '\e260';
 }
 
-.uni-icon-weixin:before {
+.uni-icon-weixin::before {
 	content: '\e261';
 }
 
-.uni-icon-pengyouquan:before {
+.uni-icon-pengyouquan::before {
 	content: '\e262';
 }
 
-.uni-icon-chat:before {
+.uni-icon-chat::before {
 	content: '\e263';
 }
 
-.uni-icon-qq:before {
+.uni-icon-qq::before {
 	content: '\e264';
 }
 
-.uni-icon-videocam:before {
+.uni-icon-videocam::before {
 	content: '\e300';
 }
 
-.uni-icon-camera:before {
+.uni-icon-camera::before {
 	content: '\e301';
 }
 
-.uni-icon-mic:before {
+.uni-icon-mic::before {
 	content: '\e302';
 }
 
-.uni-icon-location:before {
+.uni-icon-location::before {
 	content: '\e303';
 }
 
-.uni-icon-mic-filled:before,
-.uni-icon-speech:before {
+.uni-icon-mic-filled::before,
+.uni-icon-speech::before {
 	content: '\e332';
 }
 
-.uni-icon-location-filled:before {
+.uni-icon-location-filled::before {
 	content: '\e333';
 }
 
-.uni-icon-micoff:before {
+.uni-icon-micoff::before {
 	content: '\e360';
 }
 
-.uni-icon-image:before {
+.uni-icon-image::before {
 	content: '\e363';
 }
 
-.uni-icon-map:before {
+.uni-icon-map::before {
 	content: '\e364';
 }
 
-.uni-icon-compose:before {
+.uni-icon-compose::before {
 	content: '\e400';
 }
 
-.uni-icon-trash:before {
+.uni-icon-trash::before {
 	content: '\e401';
 }
 
-.uni-icon-upload:before {
+.uni-icon-upload::before {
 	content: '\e402';
 }
 
-.uni-icon-download:before {
+.uni-icon-download::before {
 	content: '\e403';
 }
 
-.uni-icon-close:before {
+.uni-icon-close::before {
 	content: '\e404';
 }
 
-.uni-icon-redo:before {
+.uni-icon-redo::before {
 	content: '\e405';
 }
 
-.uni-icon-undo:before {
+.uni-icon-undo::before {
 	content: '\e406';
 }
 
-.uni-icon-refresh:before {
+.uni-icon-refresh::before {
 	content: '\e407';
 }
 
-.uni-icon-star:before {
+.uni-icon-star::before {
 	content: '\e408';
 }
 
-.uni-icon-plus:before {
+.uni-icon-plus::before {
 	content: '\e409';
 }
 
-.uni-icon-minus:before {
+.uni-icon-minus::before {
 	content: '\e410';
 }
 
-.uni-icon-circle:before,
-.uni-icon-checkbox:before {
+.uni-icon-circle::before,
+.uni-icon-checkbox::before {
 	content: '\e411';
 }
 
-.uni-icon-close-filled:before,
-.uni-icon-clear:before {
+.uni-icon-close-filled::before,
+.uni-icon-clear::before {
 	content: '\e434';
 }
 
-.uni-icon-refresh-filled:before {
+.uni-icon-refresh-filled::before {
 	content: '\e437';
 }
 
-.uni-icon-star-filled:before {
+.uni-icon-star-filled::before {
 	content: '\e438';
 }
 
-.uni-icon-plus-filled:before {
+.uni-icon-plus-filled::before {
 	content: '\e439';
 }
 
-.uni-icon-minus-filled:before {
+.uni-icon-minus-filled::before {
 	content: '\e440';
 }
 
-.uni-icon-circle-filled:before {
+.uni-icon-circle-filled::before {
 	content: '\e441';
 }
 
-.uni-icon-checkbox-filled:before {
+.uni-icon-checkbox-filled::before {
 	content: '\e442';
 }
 
-.uni-icon-closeempty:before {
+.uni-icon-closeempty::before {
 	content: '\e460';
 }
 
-.uni-icon-refreshempty:before {
+.uni-icon-refreshempty::before {
 	content: '\e461';
 }
 
-.uni-icon-reload:before {
+.uni-icon-reload::before {
 	content: '\e462';
 }
 
-.uni-icon-starhalf:before {
+.uni-icon-starhalf::before {
 	content: '\e463';
 }
 
-.uni-icon-spinner:before {
+.uni-icon-spinner::before {
 	content: '\e464';
 }
 
-.uni-icon-spinner-cycle:before {
+.uni-icon-spinner-cycle::before {
 	content: '\e465';
 }
 
-.uni-icon-search:before {
+.uni-icon-search::before {
 	content: '\e466';
 }
 
-.uni-icon-plusempty:before {
+.uni-icon-plusempty::before {
 	content: '\e468';
 }
 
-.uni-icon-forward:before {
+.uni-icon-forward::before {
 	content: '\e470';
 }
 
-.uni-icon-back:before,
-.uni-icon-left-nav:before {
+.uni-icon-back::before,
+.uni-icon-left-nav::before {
 	content: '\e471';
 }
 
-.uni-icon-checkmarkempty:before {
+.uni-icon-checkmarkempty::before {
 	content: '\e472';
 }
 
-.uni-icon-home:before {
+.uni-icon-home::before {
 	content: '\e500';
 }
 
-.uni-icon-navigate:before {
+.uni-icon-navigate::before {
 	content: '\e501';
 }
 
-.uni-icon-gear:before {
+.uni-icon-gear::before {
 	content: '\e502';
 }
 
-.uni-icon-paperplane:before {
+.uni-icon-paperplane::before {
 	content: '\e503';
 }
 
-.uni-icon-info:before {
+.uni-icon-info::before {
 	content: '\e504';
 }
 
-.uni-icon-help:before {
+.uni-icon-help::before {
 	content: '\e505';
 }
 
-.uni-icon-locked:before {
+.uni-icon-locked::before {
 	content: '\e506';
 }
 
-.uni-icon-more:before {
+.uni-icon-more::before {
 	content: '\e507';
 }
 
-.uni-icon-flag:before {
+.uni-icon-flag::before {
 	content: '\e508';
 }
 
-.uni-icon-home-filled:before {
+.uni-icon-home-filled::before {
 	content: '\e530';
 }
 
-.uni-icon-gear-filled:before {
+.uni-icon-gear-filled::before {
 	content: '\e532';
 }
 
-.uni-icon-info-filled:before {
+.uni-icon-info-filled::before {
 	content: '\e534';
 }
 
-.uni-icon-help-filled:before {
+.uni-icon-help-filled::before {
 	content: '\e535';
 }
 
-.uni-icon-more-filled:before {
+.uni-icon-more-filled::before {
 	content: '\e537';
 }
 
-.uni-icon-settings:before {
+.uni-icon-settings::before {
 	content: '\e560';
 }
 
-.uni-icon-list:before {
+.uni-icon-list::before {
 	content: '\e562';
 }
 
-.uni-icon-bars:before {
+.uni-icon-bars::before {
 	content: '\e563';
 }
 
-.uni-icon-loop:before {
+.uni-icon-loop::before {
 	content: '\e565';
 }
 
-.uni-icon-paperclip:before {
+.uni-icon-paperclip::before {
 	content: '\e567';
 }
 
-.uni-icon-eye:before {
+.uni-icon-eye::before {
 	content: '\e568';
 }
 
-.uni-icon-arrowup:before {
+.uni-icon-arrowup::before {
 	content: '\e580';
 }
 
-.uni-icon-arrowdown:before {
+.uni-icon-arrowdown::before {
 	content: '\e581';
 }
 
-.uni-icon-arrowleft:before {
+.uni-icon-arrowleft::before {
 	content: '\e582';
 }
 
-.uni-icon-arrowright:before {
+.uni-icon-arrowright::before {
 	content: '\e583';
 }
 
-.uni-icon-arrowthinup:before {
+.uni-icon-arrowthinup::before {
 	content: '\e584';
 }
 
-.uni-icon-arrowthindown:before {
+.uni-icon-arrowthindown::before {
 	content: '\e585';
 }
 
-.uni-icon-arrowthinleft:before {
+.uni-icon-arrowthinleft::before {
 	content: '\e586';
 }
 
-.uni-icon-arrowthinright:before {
+.uni-icon-arrowthinright::before {
 	content: '\e587';
 }
 
-.uni-icon-pulldown:before {
+.uni-icon-pulldown::before {
 	content: '\e588';
 }
 
-.uni-icon-closefill:before {
+.uni-icon-closefill::before {
 	content: '\e589';
 }
 
-.uni-icon-sound:before {
+.uni-icon-sound::before {
 	content: '\e590';
 }
 
-.uni-icon-scan:before {
+.uni-icon-scan::before {
 	content: '\e612';
 }
 </style>

+ 2 - 1
manifest.json

@@ -67,7 +67,8 @@
 				"sdkVersionBegin":"3.0.1",
 				"sdkVersionEnd": "15.255.255"
 			}
-		}
+		},
+		"styleIsolation" : "apply-shared"
     },
     "mp-alipay" : {
         "usingComponents" : true

+ 2 - 1
pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="content" :class="hasShopiing?'bg-1':'bg-0'">
+		<view class="content" :class="hasShopiing?'bg-0':'bg-0'">
 			<!-- 头部栏 -->
 			<view class="header-box">
 				<UniStatusBar></UniStatusBar>
@@ -963,6 +963,7 @@
 				background: #fff;
 				border-radius: 6px;
 				margin: 10px 0;
+				box-shadow: 1px 1px 3px #eee;
 			}
 			.product-box{
 				margin: 10px 0;

+ 37 - 5
pagesB/cart/productitem.vue

@@ -22,7 +22,12 @@
 						<view class="price-txt">¥<text>{{item.cost}}</text></view>
 						<view>
 							<view :style="{opacity:!item.edit?1:0,width:!item.edit?'auto':0}">
-								<uni-number-box v-show="!item.edit" v-model="item.qty" :min="1" :max="999999" @change="v=>{changeQty(v,item.id)}"></uni-number-box>
+								<!-- <uni-number-box v-model="item.qty" :min="1" :max="999999" @change="v=>{changeQty(v,item.id)}"></uni-number-box> -->
+								<view class="flex align_center qty-box">
+									<view class="qty-btn" @click="changeQty(item.qty-1,item.id)" :class="(item.qty <= 1)?'qty-disabled':''">-</view>
+									<view class="qty-num"><input v-model="item.qty"/></view>
+									<view class="qty-btn" @click="changeQty(item.qty+1,item.id)" :class="(item.qty >= 999999)?'qty-disabled':''">+</view>
+								</view>
 							</view>
 							<view v-if="item.edit" class="edit-qty">
 								X <text>{{item.qty}}</text>
@@ -37,12 +42,8 @@
 </template>
 
 <script>
-	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue'
 	export default {
 		name: 'productItem',
-		components: {
-			uniNumberBox
-		},
 		props: {
 			index: {
 				type: Number,
@@ -59,6 +60,9 @@
 		},
 		methods: {
 			changeQty(e, id) {
+				if(e<=0 || e>=999999){
+					return
+				}
 				this.$emit('changeQty', e, id)
 			},
 			remove(id){
@@ -72,6 +76,34 @@
 </script>
 
 <style lang="less" scoped>
+	.qty-box{
+		display: flex;
+		.qty-btn{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 22px;
+			height: 22px;
+			border-radius: 50px;
+			font-size: 14px;
+			background-color: #066cff;
+			color: #fff;
+			&.qty-disabled{
+				background-color: #c0c0c0;
+			}
+		}
+		.qty-num{
+			width: 30px;
+			height: 22px;
+			line-height: 22px;
+			padding:0 3px;
+			input{
+				width: 100%;
+				height: 100%;
+				text-align: center;
+			}
+		}
+	}
 	.choose-product-item{
 		display: flex;
 		align-items: center;

+ 52 - 52
static/iconfont/iconfont.css

@@ -12,210 +12,210 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.custom-icon-lianxidianhua:before {
+.custom-icon-lianxidianhua::before {
   content: "\e6e1";
 }
 
-.custom-icon-shipin1:before {
+.custom-icon-shipin1::before {
   content: "\e61a";
 }
 
-.custom-icon-chaxunjilu:before {
+.custom-icon-chaxunjilu::before {
   content: "\e6a1";
 }
 
-.custom-icon-shipin:before {
+.custom-icon-shipin::before {
   content: "\e61c";
 }
 
-.custom-icon-lishijilu:before {
+.custom-icon-lishijilu::before {
   content: "\e615";
 }
 
-.custom-icon-saoma1:before {
+.custom-icon-saoma1::before {
   content: "\100dd";
 }
 
-.custom-icon-ziyuanxhdpi:before {
+.custom-icon-ziyuanxhdpi::before {
   content: "\e631";
 }
 
-.custom-icon-huojiaguanli:before {
+.custom-icon-huojiaguanli::before {
   content: "\e62f";
 }
 
-.custom-icon-shangchengzhongxin:before {
+.custom-icon-shangchengzhongxin::before {
   content: "\e619";
 }
 
-.custom-icon-hongbao1:before {
+.custom-icon-hongbao1::before {
   content: "\e601";
 }
 
-.custom-icon-weixingongzhonghao:before {
+.custom-icon-weixingongzhonghao::before {
   content: "\e60d";
 }
 
-.custom-icon-icon-test:before {
+.custom-icon-icon-test::before {
   content: "\e63d";
 }
 
-.custom-icon-icon-test1:before {
+.custom-icon-icon-test1::before {
   content: "\e63e";
 }
 
-.custom-icon-icon-test2:before {
+.custom-icon-icon-test2::before {
   content: "\e63f";
 }
 
-.custom-icon-icon-test3:before {
+.custom-icon-icon-test3::before {
   content: "\e640";
 }
 
-.custom-icon-icon-test4:before {
+.custom-icon-icon-test4::before {
   content: "\e641";
 }
 
-.custom-icon-shoucang:before {
+.custom-icon-shoucang::before {
   content: "\e8b9";
 }
 
-.custom-icon-xiaoxi:before {
+.custom-icon-xiaoxi::before {
   content: "\e8bd";
 }
 
-.custom-icon-coupon1:before {
+.custom-icon-coupon1::before {
   content: "\e84f";
 }
 
-.custom-icon-credit-level:before {
+.custom-icon-credit-level::before {
   content: "\e850";
 }
 
-.custom-icon-phone:before {
+.custom-icon-phone::before {
   content: "\e860";
 }
 
-.custom-icon-add:before {
+.custom-icon-add::before {
   content: "\e664";
 }
 
-.custom-icon-arrow-down:before {
+.custom-icon-arrow-down::before {
   content: "\e665";
 }
 
-.custom-icon-ashbin:before {
+.custom-icon-ashbin::before {
   content: "\e666";
 }
 
-.custom-icon-arrow-right:before {
+.custom-icon-arrow-right::before {
   content: "\e667";
 }
 
-.custom-icon-browse:before {
+.custom-icon-browse::before {
   content: "\e668";
 }
 
-.custom-icon-close:before {
+.custom-icon-close::before {
   content: "\e669";
 }
 
-.custom-icon-edit:before {
+.custom-icon-edit::before {
   content: "\e66e";
 }
 
-.custom-icon-link:before {
+.custom-icon-link::before {
   content: "\e676";
 }
 
-.custom-icon-lock:before {
+.custom-icon-lock::before {
   content: "\e677";
 }
 
-.custom-icon-help:before {
+.custom-icon-help::before {
   content: "\e678";
 }
 
-.custom-icon-print:before {
+.custom-icon-print::before {
   content: "\e67a";
 }
 
-.custom-icon-minus:before {
+.custom-icon-minus::before {
   content: "\e67b";
 }
 
-.custom-icon-navigation:before {
+.custom-icon-navigation::before {
   content: "\e67c";
 }
 
-.custom-icon-prompt:before {
+.custom-icon-prompt::before {
   content: "\e67d";
 }
 
-.custom-icon-warning:before {
+.custom-icon-warning::before {
   content: "\e682";
 }
 
-.custom-icon-anquanbaozhang:before {
+.custom-icon-anquanbaozhang::before {
   content: "\e61d";
 }
 
-.custom-icon-roundcheckfill:before {
+.custom-icon-roundcheckfill::before {
   content: "\e656";
 }
 
-.custom-icon-round:before {
+.custom-icon-round::before {
   content: "\e6d7";
 }
 
-.custom-icon-payrecord:before {
+.custom-icon-payrecord::before {
   content: "\e6eb";
 }
 
-.custom-icon-ordersearch:before {
+.custom-icon-ordersearch::before {
   content: "\e76f";
 }
 
-.custom-icon-replenishment:before {
+.custom-icon-replenishment::before {
   content: "\e783";
 }
 
-.custom-icon-yijianshansong:before {
+.custom-icon-yijianshansong::before {
   content: "\e649";
 }
 
-.custom-icon-zhibaodan:before {
+.custom-icon-zhibaodan::before {
   content: "\e84b";
 }
 
-.custom-icon-employee:before {
+.custom-icon-employee::before {
   content: "\e63c";
 }
 
-.custom-icon-purchaseorder:before {
+.custom-icon-purchaseorder::before {
   content: "\e602";
 }
 
-.custom-icon-job:before {
+.custom-icon-job::before {
   content: "\e651";
 }
 
-.custom-icon-settlement:before {
+.custom-icon-settlement::before {
   content: "\e65f";
 }
 
-.custom-icon-stockquery:before {
+.custom-icon-stockquery::before {
   content: "\e695";
 }
 
-.custom-icon-permission:before {
+.custom-icon-permission::before {
   content: "\e93d";
 }
 
-.custom-icon-saoma:before {
+.custom-icon-saoma::before {
   content: "\e61e";
 }
 
-.custom-icon-bianmachaxun:before {
+.custom-icon-bianmachaxun::before {
   content: "\e629";
 }