门店管理新增创建按钮

pages/coupons/add.vue

@@ -232,7 +232,7 @@
 						content		: res,
 						showCancel	: false,
 						confirmText	: '确定',
-						confirmColor: '#e93340',
+						confirmColor: '#8b64fd',
 						success		: modalRes => {
 							this.$store.commit('setCoupongoods', [])
 							this.$Router.back()

pages/found/index.vue

@@ -54,12 +54,14 @@
             <view class="task-liest">
                 能量碎片任务
             </view>
-            <view class="task-item" v-for="(item, index) in task" :key="index" @click="JumpUrl(item.url, item.title)">
+            <block v-for="(item, index) in task" :key="index">
+                <view class="task-item" v-if="item.rule.name != 'sign_crystal'" @click="JumpUrl(item.url, item.title, item.is_finish)">
                     <image class="task-icon" :src="item.ico" mode="aspectFill"></image>
                     <view class="task-title">{{item.title}}</view>
                     <view class="task-subtitle">{{item.remark}}</view>
-                <view class="task-label">{{item.tips}}<image @click.stop="showHelp" class="task-label-icon" src="@/static/imgs/user-crystalMark-grey.png"></image></view>
+                    <view class="task-label" :class="{'active' : item.is_finish}">{{item.is_finish ? '已完成' : item.tips}}<image @click.stop="showHelp" class="task-label-icon" src="@/static/imgs/user-crystalMark-grey.png"></image></view>
                 </view>
+            </block>
         </view>
 	</view>
 </template>
@@ -153,7 +155,14 @@
             },
             
 			// 能量跳转
-			JumpUrl(open, title) {
+			JumpUrl(open, title, finish) {
+                if(finish) {
+                    uni.showToast({
+                        title: '您已完成此任务',
+                        icon : 'none'
+                    })
+                    return
+                }
 			    var type = open.openType;
 			    switch(type){
 			        case 'switchTab': 
@@ -371,6 +380,10 @@
                 color: #999;
                 font-size: 26rpx;
                 line-height: 30rpx;
+                text{
+                    font-size: $title-size-sm - 6;
+                    margin-left: $margin/2;
+                }
             }
             .task-label {
                 position: absolute;
@@ -382,6 +395,9 @@
                 display: -webkit-box;
                 display: -webkit-flex;
                 display: flex;
+                &.active {
+                    color: $text-gray-m;
+                }
                 .task-label-icon {
                     width: 34rpx;
                     height: 34rpx;

pages/instrument/Spread.vue

@@ -13,9 +13,9 @@
                 </view>
             </view>
             <view class="codeCode">
-                <!-- <image class="codeImg-code" :src="companyInfo.code" mode="aspectFill"></image> -->
+                <image class="codeImg-code" :src="companyInfo.code" mode="aspectFill"></image>
                 <!-- 先默认死数据 -->
-                <image class="codeImg-code" src="/static/user/wallet-code.png" mode="aspectFill"></image>
+                <!-- <image class="codeImg-code" src="/static/user/wallet-code.png" mode="aspectFill"></image> -->
                 <view class="codeImg-text">
                     长按二维码，进行保存
                 </view>
@@ -204,6 +204,8 @@
                 height: 360rpx;
                 margin: 0 0 20rpx;
                 border: 2px solid #f3f3f3;
+                padding: 30rpx;
+                box-sizing: border-box;
             }
             .codeImg-text {
                 font-size: 32rpx;

pages/shop/create.vue

@@ -36,7 +36,7 @@
 					<label class="inputs-label">门店地址</label>
 					<textarea class="inputs-textarea" v-model="address" placeholder="输入门店地址" auto-height/>
 					<view class="addrss-icon" @click="onLocation">
-						<uni-icons type="location-filled" size="20" color="#c82626"></uni-icons>
+						<uni-icons type="location-filled" size="20" color="#8b64fd"></uni-icons>
 					</view>
 				</view>
 			</view>
@@ -49,7 +49,7 @@
 		</view>
         <view class="basisc-btn">
             <button class="add-modules" type="default" @click="onDeleteShop" v-if="type === 'edit'">删除</button>
-            <button class="btn" type="default" @click="createShop">{{type === 'add' ? '创建': '保存'}}</button>
+            <button class="btn" :class="{'btn-100': type != 'edit'}" type="default" @click="createShop">{{type === 'add' ? '创建': '保存'}}</button>
         </view>
 	</view>
 </template>
@@ -253,7 +253,9 @@
     		&::after {
     			border: none;
     		}
-    	
+			&.btn-100{
+				width: 100%;
+			}
     		&[disabled] {
     			background: rgba($color: $mian-color, $alpha: .6);
     		}

pages/shop/lists.vue

@@ -1,6 +1,10 @@
 <template>
 	<view class="lists">
 		<block v-if="lists.length > 0">
+			<view class="header-flex">
+				门店数量{{total}}
+				<view class="add-btn" @click="$Router.push({name: 'shopCreate'})">添加门店</view>
+			</view>
 			<view class="lists-item" v-for="(item, index) in lists" :key="index" @click="$Router.push({name: 'shopCreate', params: { id: item.store_id }})">
 				<view class="header">
 					<image class="logo" :src="item.cover" mode="aspectFill"></image>
@@ -28,19 +32,37 @@
 	export default {
 		data() {
 			return {
-				lists: []
+				lists: [],
+				total: 0
 			};
 		},
 		onShow(){
 			shops().then(res => {
-				console.log(res)
 				this.lists = res.data
+				this.total = res.page.total
 			})
 		}
 	}
 </script>
 
 <style lang="scss">
+	// 添加员工header
+	.header-flex{
+		background: white;
+		padding: ($padding/2) $padding;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: $margin - 10;
+		line-height: 60rpx;
+		color: $text-gray;
+		.add-btn{
+			background: $mian-color;
+			color: white;
+			width: 150rpx;
+			text-align: center;
+			font-size: $title-size-m;
+		}
+	}
 	// 空提示
 	.list-null{
 		width: 100vw;

pages/user/code.vue

@@ -218,7 +218,7 @@
                         {
                             type: 'text',
                             x: 86,
-                            y: 630,
+                            y: 628,
                             zIndex: 99,
                             w: width - (20 * 2),
                             text: '邀请码：' + invite,
@@ -353,7 +353,7 @@
             }
         }
         .button {
-            background: $mian-color-deep;
+            background: $text-price;
             border-radius: 0;
             height: 90rpx;
             line-height: 90rpx;
@@ -375,7 +375,7 @@
         left: 10rpx;
         bottom: 0;
         width: 100%;
-        padding: 10rpx 30rpx 20rpx;
+        padding: 16rpx 30rpx 20rpx;
         box-sizing: border-box;
         z-index: 9;
         .codeCont-avatar {
@@ -389,7 +389,7 @@
             width: 100%;
             left: 0;
             top: 0;
-            padding: 10rpx 40rpx 0 140rpx;
+            padding: 14rpx 40rpx 0 140rpx;
             box-sizing: border-box;
             .codeCont-name {
                 color: #FFFFFF;

pages/user/index.vue

@@ -729,8 +729,9 @@ export default {
 		            margin: 15px 0 2.5px;
 		            font-size: 36rpx;
 		            .user-name-identity {
+                        vertical-align: top;
 		                width: 90rpx;
-		                height: 15px;
+		                height: 32rpx;
 		                margin: 5px 0 0 5px;
 		            }
 		        }
@@ -932,6 +933,7 @@ export default {
 		    .userNew-icon {
 		        width: 40rpx;
 		        height: 40rpx;
+                vertical-align: top;
 		        margin: 24rpx 20rpx 0 0;
 		    }
 		}