From e6187bc09436afc087a86398b3162a6fe698f82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 3 Sep 2021 18:04:19 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BC=98=E5=8C=96tabbar?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/styles/iconfont.css              |  72 ++++++-
 components/lf-tabbar/animate.scss       | 149 --------------
 components/lf-tabbar/lf-tabbar-box.vue  | 182 -----------------
 components/lf-tabbar/lf-tabbar-item.vue | 259 ------------------------
 components/lf-tabbar/lf-tabbar.vue      | 128 ++++++++----
 components/lf-tabbar/style.scss         | 121 -----------
 components/lf-tabbar/utils.js           |  10 -
 pages.json                              |  16 +-
 pages/discover/discover.vue             |   5 +
 pages/index/index/index.vue             |   5 +-
 pages/store/cart/cart.vue               |   5 +-
 pages/user/my/center.vue                |   8 +-
 pages/user/my/my.vue                    |   1 +
 pages/user/personal/personal.vue        |   5 +-
 store/index.js                          |  16 +-
 15 files changed, 197 insertions(+), 785 deletions(-)
 delete mode 100644 components/lf-tabbar/animate.scss
 delete mode 100644 components/lf-tabbar/lf-tabbar-box.vue
 delete mode 100644 components/lf-tabbar/lf-tabbar-item.vue
 delete mode 100644 components/lf-tabbar/style.scss
 delete mode 100644 components/lf-tabbar/utils.js

diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css
index 089002b..aa00b0e 100644
--- a/common/styles/iconfont.css
+++ b/common/styles/iconfont.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: "lf-iconfont"; /* Project id 2779107 */
-  src: url('//at.alicdn.com/t/font_2779107_i410qmxy80m.woff2?t=1630489955128') format('woff2'),
-       url('//at.alicdn.com/t/font_2779107_i410qmxy80m.woff?t=1630489955128') format('woff'),
-       url('//at.alicdn.com/t/font_2779107_i410qmxy80m.ttf?t=1630489955128') format('truetype');
+  src: url('//at.alicdn.com/t/font_2779107_qs77qtmfs2o.woff2?t=1630663119031') format('woff2'),
+       url('//at.alicdn.com/t/font_2779107_qs77qtmfs2o.woff?t=1630663119031') format('woff'),
+       url('//at.alicdn.com/t/font_2779107_qs77qtmfs2o.ttf?t=1630663119031') format('truetype');
 }
 
-.iconfont {
+.lf-iconfont {
   font-family: "lf-iconfont" !important;
   font-size: 16px;
   font-style: normal;
@@ -13,6 +13,70 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-huiyuan:before {
+  content: "\e65d";
+}
+
+.icon-Group-:before {
+  content: "\e6ae";
+}
+
+.icon-Member:before {
+  content: "\e613";
+}
+
+.icon-daishouhuo:before {
+  content: "\e651";
+}
+
+.icon-shoucang1:before {
+  content: "\f49a";
+}
+
+.icon-daifukuan:before {
+  content: "\e682";
+}
+
+.icon-tihuo:before {
+  content: "\e62e";
+}
+
+.icon-huiyuan1:before {
+  content: "\f81e";
+}
+
+.icon-icon:before {
+  content: "\e658";
+}
+
+.icon-cuo:before {
+  content: "\e63f";
+}
+
+.icon-cuo1:before {
+  content: "\e635";
+}
+
+.icon-xuanzhong:before {
+  content: "\e600";
+}
+
+.icon-bianji:before {
+  content: "\f021";
+}
+
+.icon-erweima:before {
+  content: "\e634";
+}
+
+.icon-shanchu:before {
+  content: "\f36d";
+}
+
+.icon-tupian:before {
+  content: "\f46e";
+}
+
 .icon-xiangyou:before {
   content: "\e6af";
 }
diff --git a/components/lf-tabbar/animate.scss b/components/lf-tabbar/animate.scss
deleted file mode 100644
index b07e0db..0000000
--- a/components/lf-tabbar/animate.scss
+++ /dev/null
@@ -1,149 +0,0 @@
-.animate__animated {
-  animation-duration: 0.5s;
-  animation-fill-mode: both;
-}
-
-@keyframes zoomIn {
-  from {
-    opacity: 0;
-    -webkit-transform: scale3d(0.3, 0.3, 0.3);
-    transform: scale3d(0.3, 0.3, 0.3);
-  }
-
-  50% {
-    opacity: 1;
-  }
-}
-
-.animate__zoomIn {
-  animation-name: zoomIn;
-}
-
-@keyframes bounce {
-
-  from,
-  20%,
-  53%,
-  to {
-    -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    -webkit-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0);
-  }
-
-  40%,
-  43% {
-    animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
-    transform: translate3d(0, -30px, 0) scaleY(1.1);
-  }
-
-  70% {
-    animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
-    transform: translate3d(0, -15px, 0) scaleY(1.05);
-  }
-
-  80% {
-    transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    transform: translate3d(0, 0, 0) scaleY(0.95);
-  }
-
-  90% {
-    transform: translate3d(0, -4px, 0) scaleY(1.02);
-  }
-}
-
-.animate__bounce {
-  animation-name: bounce;
-  transform-origin: center bottom;
-}
-
-@keyframes rubberBand {
-  from {
-    transform: scale3d(1, 1, 1);
-  }
-
-  30% {
-    transform: scale3d(1.25, 0.75, 1);
-  }
-
-  40% {
-    transform: scale3d(0.75, 1.25, 1);
-  }
-
-  50% {
-    transform: scale3d(1.15, 0.85, 1);
-  }
-
-  65% {
-    transform: scale3d(0.95, 1.05, 1);
-  }
-
-  75% {
-    transform: scale3d(1.05, 0.95, 1);
-  }
-
-  to {
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.animate__rubberBand {
-  animation-name: rubberBand;
-}
-
-@keyframes bounceIn {
-
-  from,
-  20%,
-  40%,
-  60%,
-  80%,
-  to {
-    animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-  }
-
-  0% {
-    opacity: 0;
-    transform: scale3d(0.3, 0.3, 0.3);
-  }
-
-  20% {
-    transform: scale3d(1.1, 1.1, 1.1);
-  }
-
-  40% {
-    transform: scale3d(0.9, 0.9, 0.9);
-  }
-
-  60% {
-    opacity: 1;
-    transform: scale3d(1.03, 1.03, 1.03);
-  }
-
-  80% {
-    transform: scale3d(0.97, 0.97, 0.97);
-  }
-
-  to {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.animate__bounceIn {
-  animation-name: bounceIn;
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-.animate__fadeIn {
-  animation-name: fadeIn;
-}
\ No newline at end of file
diff --git a/components/lf-tabbar/lf-tabbar-box.vue b/components/lf-tabbar/lf-tabbar-box.vue
deleted file mode 100644
index 90f88b3..0000000
--- a/components/lf-tabbar/lf-tabbar-box.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <view class="lb-tabbar">
-    <view :class="[
-        'lb-tabbar-content',
-        fixed ? 'lb-tabbar--fixed' : ''
-      ]"
-      :style="{
-        backgroundColor: bgColor,
-        paddingBottom: `${safeAreaHeight}px`
-      }">
-      <view v-if="border"
-        class="lb-tabbar-border"
-        :style="{
-          backgroundColor: borderColor,
-          top: raisedeHeight + 'px'
-        }">
-      </view>
-      <slot></slot>
-    </view>
-    <view v-if="placeholder"
-      class="lb-tabbar-placeholder"
-      :style="{
-        height: `${tabbarHeight}px`
-      }">
-    </view>
-  </view>
-</template>
-
-<script>
-// git https://github.com/liub1934/uni-lb-tabbar/tree/master/pages/demos
-// demo https://github.liubing.me/uni-lb-tabbar/#/
-// fileDes https://ext.dcloud.net.cn/plugin?id=4124
-
-const SAFE_AREA_INSET_BOTTOM = 34
-import { getPx } from './utils'
-export default {
-  props: {
-    value: [String, Number],
-    height: {
-      type: String,
-      default: '50px'
-    },
-    iconSize: {
-      type: String,
-      default: '22px'
-    },
-    textSize: {
-      type: String,
-      default: '12px'
-    },
-    textTop: {
-      type: String,
-      default: '5px'
-    },
-    dotColor: {
-      type: String,
-      default: '#F56C6C'
-    },
-    fixed: {
-      type: Boolean,
-      default: true
-    },
-    placeholder: {
-      type: Boolean,
-      default: true
-    },
-    animate: {
-		type: String,
-		default: 'rubberBand'
-	},
-    closeAnimateOnRaisede: {
-      type: Boolean,
-      default: true
-    },
-    border: {
-      type: Boolean,
-      default: true
-    },
-    borderColor: {
-      type: String,
-      default: '#DCDFE6'
-    },
-    bgColor: {
-      type: String,
-      default: '#FFF'
-    },
-    inactiveColor: {
-      type: String,
-      default: '#909399'
-    },
-    activeColor: {
-      type: String,
-      default: '#186c6b'
-    },
-    inactiveTextColor: String,
-    activeTextColor: String,
-    safeAreaInsetBottom: {
-      type: Boolean,
-      default: true
-    },
-    hideTabbar: {
-      type: Boolean,
-      default: true
-    },
-    raisedeScale: {
-      type: Number,
-      default: 2
-    }
-  },
-  data () {
-    return {
-      active: this.value,
-      activeItem: {},
-      tabbarItems: [],
-      hasRaisede: false,
-      isIphoneX: false
-    }
-  },
-  computed: {
-    tabbarItemsLength () {
-      return this.tabbarItems.length
-    },
-    safeAreaHeight () {
-      return this.isIphoneX && this.safeAreaInsetBottom ? SAFE_AREA_INSET_BOTTOM : 0 // 苹果X等机型安全区高度
-    },
-    iconHeight () {
-      return getPx(this.iconSize)
-    },
-    raisedeHeight () {
-      return this.hasRaisede ? this.iconHeight * this.raisedeScale / 2 : 0 // 凸起高度
-    },
-    tabbarHeight () {
-      const height = getPx(this.height) // 默认高度
-      const raisedeHeight = this.hasRaisede ? this.iconHeight * this.raisedeScale / 2 : 0 // 凸起高度
-      const tabbarHeight = height + this.safeAreaHeight + raisedeHeight // 整体高度
-      return tabbarHeight
-    }
-  },
-  provide () {
-    return {
-      tabbar: this
-    }
-  },
-  created () {
-    if (this.hideTabbar) {
-      uni.hideTabBar()
-    }
-    const res = uni.getSystemInfoSync()
-    const { model, statusBarHeight } = res
-    if (
-      (model.indexOf('iPhone') > -1 && statusBarHeight > 20) ||
-      model.indexOf('iPhone X') > -1 ||
-      model.indexOf('iPhone 1') > -1
-    ) {
-      this.isIphoneX = true
-    }
-    this.getTabbarHeight()
-  },
-  methods: {
-    getTabbarHeight () {
-      return this.tabbarHeight
-    }
-  },
-  watch: {
-    value (newVal) {
-      this.active = newVal
-    },
-    active (newVal) {
-      this.activeItem = this.tabbarItems.find(item => item.name === newVal)
-      this.$emit('input', newVal)
-      this.$emit('change', this.activeItem)
-    },
-    tabbarItemsLength () {
-      this.hasRaisede = !!this.tabbarItems.find(item => item.raisede)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "./style.scss";
-</style>
diff --git a/components/lf-tabbar/lf-tabbar-item.vue b/components/lf-tabbar/lf-tabbar-item.vue
deleted file mode 100644
index a2380d8..0000000
--- a/components/lf-tabbar/lf-tabbar-item.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
-  <view ref="item"
-    :class="[
-      'lb-tabbar-item',
-      'animate__animated',
-      isActive ? 'lb-tabbar-item--active' : ''
-    ]"
-    :style="{
-      paddingTop: paddingBT + raisedeHeight + 'px',
-      paddingBottom: paddingBT + 'px',
-	  width: '100%'
-    }"
-    @tap="handleTap">
-    <view :class="[
-        'lb-tabbar-item__icon',
-        `lb-tabbar-item__icon--${raisede ? 'raisede' : 'default'}`,
-        isAnimate ? `animate__animated animate__${tabbarInfo.animate}` : '',
-		isActive ? 'lb-my-active' : ''
-      ]"
-      :style="{
-        height: tabbarInfo.iconSize,
-        lineHeight: tabbarInfo.iconSize,
-        transform: raisede ? `translateY(-${ty}px) scale(${tabbarInfo.raisedeScale})` : ''
-      }">
-      <!-- 图片图标 -->
-      <image v-if="isImage"
-        class="lb-tabbar-item__image"
-        :src="icon"
-        :style="{
-          width: tabbarInfo.iconSize,
-          height: tabbarInfo.iconSize
-        }">
-      </image>
-
-      <!-- icon图标 -->
-      <text v-else
-        :class="[
-          'lf-iconfont',
-          iconPrefix,
-          `${iconPrefix}-${icon}`,
-          isActive ? 'lb-tabbar-item__icon--active' : ''
-        ]"
-        :style="{
-          width: tabbarInfo.iconSize,
-          height: tabbarInfo.iconSize,
-          lineHeight: tabbarInfo.iconSize,
-          fontSize: tabbarInfo.iconSize,
-          color: isActive ? tabbarInfo.activeColor : tabbarInfo.inactiveColor
-        }">{{ iconCode }}</text>
-
-      <!-- 非nvue dot info显示 -->
-      <!-- #ifndef APP-NVUE -->
-      <text v-if="dot || hasInfo"
-        :class="[
-          dot && !hasInfo ? 'lb-tabbar-item__dot' : '',
-          hasInfo ? 'lb-tabbar-item__dot--info' : '',
-          'lb-tabbar-item__dot--style'
-        ]"
-        :style="{
-          backgroundColor: tabbarInfo.dotColor
-        }">{{ hasInfo ? info : '' }}</text>
-      <!-- #endif -->
-    </view>
-
-    <!-- nvue dot info 显示 -->
-    <!-- #ifdef APP-NVUE -->
-    <text v-if="dot || hasInfo"
-      :class="[
-        'lb-tabbar-item__dot--nvue',
-        'lb-tabbar-item__dot--style',
-        dot && !hasInfo ? 'lb-tabbar-item__dot' : '',
-        hasInfo ? 'lb-tabbar-item__dot--info' : '',
-        hasInfo ? 'lb-tabbar-item__dot--info' : '',
-        nvueDotShow ? 'lb-tabbar-item__dot--show' : ''
-      ]"
-      :style="{
-        backgroundColor: tabbarInfo.dotColor,
-        top: paddingBT + raisedeHeight + 'px',
-        right: dotLeft + 'px'
-      }">{{ hasInfo ? info : '' }}</text>
-    <!-- #endif -->
-
-    <!-- 非nvue图标文字 -->
-    <!-- #ifndef APP-NVUE -->
-    <view :class="[
-        'lb-tabbar-item__text',
-        isActive ? 'lb-tabbar-item__text--active' : ''
-      ]"
-      :style="{
-        fontSize: tabbarInfo.textSize,
-        lineHeight: tabbarInfo.textSize,
-        maxHeight: tabbarInfo.textSize,
-        marginTop: tabbarInfo.textTop,
-        color: isActive
-          ? tabbarInfo.activeTextColor || tabbarInfo.activeColor
-          : tabbarInfo.inactiveTextColor || tabbarInfo.inactiveColor
-      }">
-      <slot></slot>
-      <view v-if="raisede"
-        class="lb-tabbar-item__text--block"
-        :style="{
-          height: tabbarInfo.textSize
-        }">
-      </view>
-    </view>
-    <!-- #endif -->
-
-    <!-- nvue图标文字 -->
-    <!-- #ifdef APP-NVUE -->
-    <text v-if="text || raisede"
-      :class="[
-        'lb-tabbar-item__text',
-        isActive ? 'lb-tabbar-item__text--active' : ''
-      ]"
-      :style="{
-        fontSize: tabbarInfo.textSize,
-        height: tabbarInfo.textSize,
-        lineHeight: tabbarInfo.textSize,
-        marginTop: tabbarInfo.textTop,
-        color: isActive
-          ? tabbarInfo.activeTextColor || tabbarInfo.activeColor
-          : tabbarInfo.inactiveTextColor || tabbarInfo.inactiveColor
-      }">{{ text || '' }}</text>
-    <!-- #endif -->
-  </view>
-</template>
-
-<script>
-// #ifdef APP-NVUE
-const dom = uni.requireNativePlugin('dom')
-// #endif
-import { getPx } from './utils'
-export default {
-  props: {
-    name: [String, Number],
-    text: [String, Number],
-    icon: String,
-    iconPrefix: String,
-    dot: Boolean,
-    info: [String, Number],
-    raisede: Boolean,
-	path: String
-  },
-  inject: ['tabbar'],
-  data () {
-    return {
-      tabbarInfo: {},
-      itemWidth: 0,
-      dotLeft: 0,
-      nvueDotShow: false
-    }
-  },
-  computed: {
-    isImage () {
-      return this.icon && this.icon.indexOf('/') > -1
-    },
-    isActive () {
-      return this.tabbarInfo.value === this.name
-    },
-    isAnimate () {
-      return (
-        this.isActive &&
-        this.tabbarInfo.animate &&
-        !(this.raisede && this.tabbarInfo.closeAnimateOnRaisede)
-      )
-    },
-    height () {
-      return getPx(this.tabbarInfo.height)
-    },
-    iconHeight () {
-      return getPx(this.tabbarInfo.iconSize)
-    },
-    textSize () {
-      return getPx(this.tabbarInfo.textSize)
-    },
-    textTop () {
-      return getPx(this.tabbarInfo.textTop)
-    },
-    ty () {
-      return this.height / 2 - (this.textSize + this.textTop) / 2
-    },
-    iconCode () {
-      let code = ''
-      // #ifdef APP-NVUE
-      code = this.icon
-      // #endif
-      return code
-    },
-    hasInfo () {
-      return this.info || this.info === 0
-    },
-    paddingBT () {
-      return (this.height - this.iconHeight - this.textSize - this.textTop) / 2
-    },
-    hasRaisede () {
-      return this.tabbar.hasRaisede
-    },
-    raisedeHeight () {
-      return this.hasRaisede ? this.iconHeight * this.tabbarInfo.raisedeScale / 2 : 0 // 凸起高度
-    },
-		infoLength () {
-			return this.hasInfo ? (this.info + '').length : 0
-		}
-  },
-  created () {
-    this.tabbarInfo = this.tabbar._props
-    this.tabbar.tabbarItems.push(this._props)
-  },
-  mounted() {
-		// #ifdef APP-NVUE
-    this.setNvueDot()
-		// #endif
-  },
-  methods: {
-    handleTap () {
-      this.tabbar.active = this.name
-      this.$emit('click', this._props)
-    },
-		// #ifdef APP-NVUE
-    setNvueDot () {
-			if (this.dot || this.hasInfo) {
-				this.$nextTick(() => {
-					const $el = this.$refs.item
-					dom.getComponentRect($el, res => {
-						this.itemWidth = res.size.width
-            const halfWidth = this.itemWidth / 2
-            if (this.dot) {
-              this.dotLeft = halfWidth - 8
-            }
-            if (this.hasInfo) {
-              const length = this.infoLength > 1 ? this.infoLength -1 : this.infoLength
-              this.dotLeft = halfWidth - 8 * length
-            }
-						this.nvueDotShow = true
-					})
-				})
-			}
-    }
-		// #endif
-  },
-	// #ifdef APP-NVUE
-  watch: {
-    dot () {
-      this.setNvueDot()
-    },
-    info () {
-      this.setNvueDot()
-    }
-  }
-	// #endif
-}
-</script>
-
-<style lang="scss" scoped>
-@import "./style.scss";
-/* #ifndef APP-NVUE */
-@import "./animate.scss";
-/* #endif */
-</style>
diff --git a/components/lf-tabbar/lf-tabbar.vue b/components/lf-tabbar/lf-tabbar.vue
index 6f65a60..53a248d 100644
--- a/components/lf-tabbar/lf-tabbar.vue
+++ b/components/lf-tabbar/lf-tabbar.vue
@@ -1,42 +1,37 @@
 <template>
 	<view>
-		<lf-tabbar-box :value="currentTabBar" 
-		  v-if="isShowTabBar" 
-		  :close-animate-on-raisede="false">
-		  <lf-tabbar-item v-for="item in tabbars"
-			  :key="item.name"
-			  :name="item.name"
-			  :icon="item.icon"
-			  :dot="item.dot"
-			  :info="item.info"
-			  :path="item.path"
-			  :raisede="item.raisede"
-			  :style="{'width': 100 / tabbars.length +'%'}"
-			  @click="handleClick"
-			  icon-prefix="icon">
-			  {{ item.text }}
-			</lf-tabbar-item>
-		</lf-tabbar-box>
+		<view class="occupy-position"></view>
+		<view class="content">
+			<view class="tabbar-box">
+				<view class="tab-item" 
+					:class="{'tab-active': currentTabBar == index}"
+					:style="{'width': 100 / tabbars.length +'%'}" 
+					@click="clickTab(item, index)"
+					v-for="(item, index) in tabbars" :key="index">
+					<view class="tab-icon">
+						<text class="lf-font-40 lf-iconfont" :class="item.icon"></text>
+					</view>
+					<view class="tab-name">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	import lfTabbarBox from "./lf-tabbar-box.vue"
-	import lfTabbarItem from "./lf-tabbar-item.vue"
 	import { mapGetters } from "vuex";
-	
 	export default {
-		name: 'lf-tabbar',
-		components: {
-			lfTabbarBox,
-			lfTabbarItem
-		},
 		props: {
 			type: {
 				type: String, // 默认跳转方式redirect，可选switch
 				default: 'redirect'
 			}
 		},
+		data(){
+			return {
+				
+			}
+		},
 		computed: {
 			...mapGetters(['currentTabBar', 'tabbars', 'isShowTabBar'])
 		},
@@ -44,24 +39,89 @@
 			// 组件被创建时检查当前在哪个页面，然后校验currentTabBar是否与之匹配
 			let pages = getCurrentPages();
 			let page = pages[pages.length - 1].route;
-			let tabbar_name = '';
-			this.tabbars.map(item => {
+			let tabbars = this.tabbars;
+			let tabbar_name = tabbars[this.currentTabBar].path;
+			let current = 0;
+			tabbars.map((item, index) => {
 				if(item.path == '/'+ page){
-					tabbar_name = item.name;
+					current = index;
 				}
 			})
-			if(tabbar_name != this.currentTabBar){
-				this.$store.commit('setCurrentTabBar', tabbar_name);
+			if(tabbar_name != '/'+ page){
+				this.$store.commit('setCurrentTabBar', current);
 			}
 		},
 		methods: {
-			handleClick (options) {
-			  this.$store.commit('setCurrentTabBar', options.name);
-			  this.$url(options.path, {type: this.type});
+			clickTab(item, index){
+				if(this.currentTabBar == index) return;
+				this.$store.commit('setCurrentTabBar', index);
+				this.$url(item.path, {type: this.type});
 			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped="scoped">
+	.lf-font-40{
+		font-size: 40rpx;
+	}
+	.occupy-position{
+		width: 750rpx;
+		height: 120rpx;
+		box-sizing: content-box;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	.content{
+		width: 750rpx;
+		height: 120rpx;
+		background-color: #FFFFFF;
+		border-radius: 60rpx 60rpx 0 0;
+		box-shadow: 0rpx -2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 99999;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		display: flex;
+		align-items: center;
+		box-sizing: content-box;
+		.tabbar-box{
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			.tab-item{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				.tab-name{
+					font-size: 24rpx;
+					color: #777777;
+				}
+				&.tab-active{
+					.tab-icon{
+						background-color: #15716E;
+						width: 60rpx;
+						height: 60rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						transform: translateY(-20rpx) scale(1.4);
+						border-radius: 50%;
+						color: #FFFFFF;
+						overflow: hidden;
+						text{
+							transform: scale(0.6);
+						}
+					}
+					.tab-name{
+						color: #15716E;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/components/lf-tabbar/style.scss b/components/lf-tabbar/style.scss
deleted file mode 100644
index 2123402..0000000
--- a/components/lf-tabbar/style.scss
+++ /dev/null
@@ -1,121 +0,0 @@
-.lb-tabbar-content {
-  /* #ifndef APP-NVUE */
-  display: flex;
-  /* #endif */
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-}
-
-.lb-tabbar--fixed {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.lb-tabbar-border {
-  height: 1px;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  transform: scaleY(0.5);
-}
-
-/* #ifndef APP-NVUE */
-lb-tabbar-item {
-  flex: 1;
-}
-
-/* #endif */
-
-.lb-tabbar-item {
-  flex: 1;
-  /* #ifndef APP-NVUE */
-  display: flex;
-  /* #endif */
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  // justify-content: flex-end;
-}
-
-.lb-tabbar-item__text {
-  overflow: hidden;
-}
-
-.lb-tabbar-item__text--active {
-  transition-property: color;
-  transition-duration: 0.3s;
-}
-
-.lb-tabbar-item__icon {
-  position: relative;
-}
-
-.lb-tabbar-icon {
-  position: relative;
-  /* #ifndef APP-NVUE */
-  line-height: 1;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  /* #endif */
-}
-
-.lb-tabbar-item__icon--active {
-  transition-property: color;
-  transition-duration: 0.3s;
-}
-
-.lb-my-active{
-	transform: translateY(-16.5px) scale(2) !important;
-	color: yellow;
-}
-.lb-tabbar-item__icon--raisede {
-  background-color: #fff;
-  border-radius: 9999px;
-  position: relative;
-  /* #ifndef APP-NVUE */
-  z-index: 1;
-  /* #endif */
-}
-
-.lb-tabbar-item__dot--style {
-  border-radius: 9999px;
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-.lb-tabbar-item__dot {
-  width: 8px;
-  height: 8px;
-}
-
-.lb-tabbar-item__dot--nvue {
-  opacity: 0;
-  transition-property: opacity;
-  transition-duration: 0.1s;
-}
-
-.lb-tabbar-item__dot--show {
-  opacity: 1;
-}
-
-.lb-tabbar-item__dot--info {
-  height: 14px;
-  line-height: 14px;
-  /* #ifdef APP-NVUE */
-  flex: 1;
-  /* #endif */
-  margin-top: 5px;
-  font-size: 12px;
-  padding-left: 4px;
-  padding-right: 4px;
-  text-align: center;
-  color: #fff;
-  transform: translate(50%, -50%);
-}
\ No newline at end of file
diff --git a/components/lf-tabbar/utils.js b/components/lf-tabbar/utils.js
deleted file mode 100644
index faf27b6..0000000
--- a/components/lf-tabbar/utils.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export function getPx (val) {
-  if (!val) return 0
-  if (val.indexOf('rpx') > -1) {
-    val = +val.replace('rpx', '')
-    val = uni.upx2px(val)
-  } else {
-    val = +val.replace('px', '')
-  }
-  return val
-}
diff --git a/pages.json b/pages.json
index 63f69b3..ae95b8e 100644
--- a/pages.json
+++ b/pages.json
@@ -3,6 +3,14 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh":true,
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/user/my/setting",
 			"style": {
@@ -45,14 +53,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/index/index/index",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh":true,
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/index/microPages/microPages",
 			"style": {
diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue
index ea00fec..f58939e 100644
--- a/pages/discover/discover.vue
+++ b/pages/discover/discover.vue
@@ -39,11 +39,16 @@
 			</view>
 			<self-line/>
 		</view>
+		<lf-tabbar></lf-tabbar>
 	</view>
 </template>
 
 <script>
+	import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue';
 	export default {
+		components: {
+			lfTabbar
+		},
 		data() {
 			return {
 				tab_list: [
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index ec5bd98..ba9bbf1 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -9,7 +9,7 @@
 				<text class="lf-iconfont icon-nv"></text>
 				<text class="lf-m-l-4">停车</text>
 			</view>
-			<view class="lf-nav-capsule lf-bg-gray">
+			<view class="lf-nav-capsule lf-bg-search">
 				<text class="lf-iconfont icon-nv"></text>
 				<text class="lf-m-l-4">搜索</text>
 			</view>
@@ -1115,6 +1115,9 @@
 
 <style rel="stylesheet/less" lang="less">
     /*@import "index.less";*/
+	.lf-bg-search{
+		background-color: rgba(0,0,0,0.5) !important;
+	}
 	.lf-nav-capsule{
 		width: 120rpx;
 		height: 50rpx;
diff --git a/pages/store/cart/cart.vue b/pages/store/cart/cart.vue
index cb731b4..84c9eb5 100644
--- a/pages/store/cart/cart.vue
+++ b/pages/store/cart/cart.vue
@@ -229,7 +229,6 @@
 
         </view>
     </view>
-	<lf-tabbar></lf-tabbar>
 </view>
 
 
@@ -237,7 +236,6 @@
 <script>
 import {pageLogin, getUrl,config} from '@/common/js/utils.js';
 import lfNav from '@/components/lf-nav/lf-nav.vue';
-import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue';
 
 export default {
   data() {
@@ -298,8 +296,7 @@ export default {
   },
 
   components: {
-	  lfNav,
-	  lfTabbar
+	  lfNav
   },
   props: {},
   methods: {
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 93a627e..8c79353 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -82,11 +82,17 @@
 				</view>
 			</view>
 		</view>
-		
+		<lf-tabbar></lf-tabbar>
 	</view>
 </template>
 
 <script>
+	import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue'
+	export default {
+		components: {
+			lfTabbar
+		},
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/user/my/my.vue b/pages/user/my/my.vue
index 0849ac9..511502b 100644
--- a/pages/user/my/my.vue
+++ b/pages/user/my/my.vue
@@ -72,6 +72,7 @@
 </template>
 
 <script>
+	
 </script>
 
 <style>
diff --git a/pages/user/personal/personal.vue b/pages/user/personal/personal.vue
index f8648e3..2144044 100644
--- a/pages/user/personal/personal.vue
+++ b/pages/user/personal/personal.vue
@@ -489,7 +489,6 @@
 			<!-- 生日有礼 -->
 			<birthday :gift-data="giftData" @close="changeBirthday"></birthday>
 		</view>
-		<lf-tabbar></lf-tabbar>
 	</view>
 </template>
 <script>
@@ -503,7 +502,6 @@
 	} from '@/common/js/utils.js';
 	import  birthday  from '@/components/birthday/birthday.vue';
 	import lfNav from '@/components/lf-nav/lf-nav.vue';
-	import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue';
 	var app = getApp();
 
 	export default {
@@ -536,8 +534,7 @@
 		},
 		components:{
 			birthday,
-			lfNav,
-			lfTabbar
+			lfNav
 		},
 
 		onLoad(e) {
diff --git a/store/index.js b/store/index.js
index f955666..cab1970 100644
--- a/store/index.js
+++ b/store/index.js
@@ -3,31 +3,31 @@ import Vuex from 'vuex'
 Vue.use(Vuex)
 
 let state = {
-	currentTabBar: 'home',
+	currentTabBar: 0,
 	tabbars: [
 		{
 		  name: 'home',
 		  text: '首页',
-		  icon: 'dingzhi',
+		  icon: 'icon-Group-',
 		  path: '/pages/index/index/index'
 		},
 		{
 		  name: 'brand',
 		  text: '品牌',
-		  icon: 'weirenzheng',
+		  icon: 'icon-tihuo',
 		  path: '/pages/index/category/category'
 		},
 		{
 		  name: 'find',
 		  text: '发现',
-		  icon: 'nv',
-		  path: '/pages/store/cart/cart'
+		  icon: 'icon-fabu',
+		  path: '/pages/discover/discover'
 		},
 		{
 		  name: 'my',
-		  text: '我的',
-		  icon: 'contact-person',
-		  path: '/pages/user/personal/personal'
+		  text: '会员中心',
+		  icon: 'icon-icon',
+		  path: '/pages/user/my/center'
 		}
 	],
 	isShowTabBar: true

From 359881c14b4e91b00f944c61f0bb9ac8d389580f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 3 Sep 2021 18:08:01 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5nav?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages.json b/pages.json
index bd60a03..df7556b 100644
--- a/pages.json
+++ b/pages.json
@@ -7,7 +7,8 @@
 			"path": "pages/index/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh":true,
+				"navigationStyle": "custom"
 			}
 		},
 		{

From a287a181a1296497e1e1976143eb4d7eb01b007e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 6 Sep 2021 10:00:10 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=83=AD=E9=97=A8?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/config.js                           |   2 +-
 pages.json                                    |   7 +
 pages/index/category/category.vue             |   5 +-
 .../eventRegistration/eventRegistration.vue   | 142 ++++++++++++++++++
 pages/user/my/center.vue                      |   1 +
 pages/user/my/myEventRegistrationList.vue     |   2 +-
 6 files changed, 155 insertions(+), 4 deletions(-)
 create mode 100644 pages/index/eventRegistration/eventRegistration.vue

diff --git a/common/js/config.js b/common/js/config.js
index cdaaad3..8c40c53 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -16,7 +16,7 @@ export default  {
 		//https://demo-guojiang-ec-api.guojiang.club/
 		
 		baseUrl: process.env.NODE_ENV === 'development' ? 
-		'http://192.168.2.221/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
+		'http://192.168.3.29/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
     },
 	 PACKAGES: {
         activity: false,
diff --git a/pages.json b/pages.json
index df7556b..698c9b1 100644
--- a/pages.json
+++ b/pages.json
@@ -783,6 +783,13 @@
 				"navigationBarTitleText": "我的报名",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/index/eventRegistration/eventRegistration",
+			"style" : {
+				"navigationBarTitleText": "热门活动",
+				"navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue
index c6ea0e2..690d255 100644
--- a/pages/index/category/category.vue
+++ b/pages/index/category/category.vue
@@ -101,10 +101,11 @@
 		},
 		computed: {
 			autoHeight(){
-				return `calc(${this.scrollH}px - 50px - ${this.nav_height}px - 90rpx)`;
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx - 120rpx)`;
 			},
 			otherHeight(){
-				return `calc(${this.scrollH}px - 50px - ${this.nav_height}px - 90rpx - 105rpx)`;
+				// 屏幕可用总高度 - 导航条高度 - tabs高度 - tabbar高度 - 筛选高度
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx - 120rpx - 105rpx)`;
 			}
 		},
 		components: {
diff --git a/pages/index/eventRegistration/eventRegistration.vue b/pages/index/eventRegistration/eventRegistration.vue
new file mode 100644
index 0000000..fc84776
--- /dev/null
+++ b/pages/index/eventRegistration/eventRegistration.vue
@@ -0,0 +1,142 @@
+<template>
+	<view>
+		<lf-nav title="热门活动" :showIcon="true" bgColor="#fff" @changeHeight="e => nav_height = e"></lf-nav>
+		<view v-if="tab_list.length">
+			<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="tab_current" @change="tabChange"></u-tabs>
+		</view>
+		<swiper :style="{height: autoHeight}" :current="tab_current" @change="swiperChange">
+			<swiper-item v-for="(item, index) in tab_list" :key="index">
+				<scroll-view :style="{height: autoHeight}" :scroll-y="true">
+					<view class="scroll-content">
+						<view class="card" v-for="(item, index) in 3" :key="index">
+							<view class="cover">
+								<image class="img"></image>
+							</view>
+							<view class="info">
+								<view class="title">海蓝之谜美颜会 9月15日场10:30场</view>
+								<view class="date">2021.09.01-2021.09.15</view>
+							</view>
+						</view>
+					</view>
+					<view style="height: 30rpx;"></view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			let _public = {
+				page: 1,
+				isPage: true,
+				loadingClass: true,
+				loadingText: '正在加载中'
+			}
+			return {
+				tab_current: 0,
+				tab_list: [{
+					name: '正在进行',
+					list: [],
+					..._public
+				},{
+					name: '往期回顾',
+					list: [],
+					..._public
+				}],
+				scrollH: 0,
+				nav_height: 0
+			}
+		},
+		computed: {
+			autoHeight(){
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx)`;
+			}
+		},
+		onLoad(){
+			let info = uni.getSystemInfoSync();
+			this.scrollH = info.screenHeight;
+		},
+		methods: {
+			tabChange(event){
+				this.tab_current = event;
+			},
+			swiperChange(event){
+				this.tab_current = event.detail.current;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	.scroll-content{
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: center;
+		.card{
+			width: 686rpx;
+			height: max-content;
+			background-color: #FFFFFF;
+			box-shadow: 1rpx 1rpx 6rpx 3rpx #e5e5e5;
+			margin-top: 30rpx;
+			border-radius: 20rpx;
+			overflow: hidden;
+			.cover{
+				width: 686rpx;
+				height: 300rpx;
+				position: relative;
+				.img{
+					width: 100%;
+					height: 100%;
+					background-color: #EEEEEE;
+				}
+			}
+			.info{
+				width: 686rpx;
+				height: max-content;
+				padding: 20rpx 30rpx;
+				box-sizing: border-box;
+				.title{
+					font-size: 28rpx;
+					color: #222222;
+					font-weight: bold;
+				}
+				.date{
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					color: #555555;
+				}
+			}
+		}
+	}
+	
+	// tabs 样式修改
+	/deep/.u-scroll-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+	}
+	/deep/.u-scroll-box .u-tab-bar {
+		background-color: #15716E!important;
+		width: 80rpx!important;
+		position: absolute;
+		left: 0;
+		bottom: -12rpx;
+	}
+	
+	/deep/.special_tab .u-tabs .u-scroll-box .u-tab-bar {
+		background-color: #15716E!important;
+		width: 56rpx!important;
+		position: absolute;
+		height: 5rpx!important;
+		left: 8rpx;
+		bottom: -4rpx;
+	}
+	
+	/deep/ .u-tab-item {
+		font-size: 28rpx!important;
+	}
+</style>
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 8c79353..564ab3b 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -141,6 +141,7 @@
 		background: #FFFFFF;
 		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
 		border-radius: 20rpx;
+		margin-bottom: 30rpx;
 	}
 	.card-tag {
 		width: 144rpx;
diff --git a/pages/user/my/myEventRegistrationList.vue b/pages/user/my/myEventRegistrationList.vue
index 1afb8d2..1352715 100644
--- a/pages/user/my/myEventRegistrationList.vue
+++ b/pages/user/my/myEventRegistrationList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<lf-nav title="我的报名" :showIcon="true" @changeHeight="e => nav_height = e"></lf-nav>
+		<lf-nav title="我的报名" :showIcon="true" bgColor="#fff" @changeHeight="e => nav_height = e"></lf-nav>
 		<view v-if="tab_list.length">
 			<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="tab_current" @change="tabChange"></u-tabs>
 		</view>

From e8353b1423ea5da0c5482574115e42ed33f53954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 6 Sep 2021 11:36:11 +0800
Subject: [PATCH 4/7] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A0=81=E9=A1=B5=E9=9D=A2UI=20[=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E]=20=E7=94=9F=E6=88=90=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E3=80=81=E6=9D=A1=E5=BD=A2=E7=A0=81=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-code/helper.js      |  54 ++++++++
 components/lf-code/index.js       |   2 +
 components/lf-code/lf-barcode.vue |  87 +++++++++++++
 components/lf-code/lf-qrcode.vue  |  84 +++++++++++++
 pages.json                        |   7 ++
 pages/user/member/code.vue        | 199 ++++++++++++++++++++++++++++++
 6 files changed, 433 insertions(+)
 create mode 100644 components/lf-code/helper.js
 create mode 100644 components/lf-code/index.js
 create mode 100644 components/lf-code/lf-barcode.vue
 create mode 100644 components/lf-code/lf-qrcode.vue
 create mode 100644 pages/user/member/code.vue

diff --git a/components/lf-code/helper.js b/components/lf-code/helper.js
new file mode 100644
index 0000000..9d7ba6e
--- /dev/null
+++ b/components/lf-code/helper.js
@@ -0,0 +1,54 @@
+// 判断arr是否为一个数组，返回一个bool值
+function isArray(arr) {
+	return Object.prototype.toString.call(arr) === '[object Array]';
+}
+// 深度克隆
+function deepClone(obj) {
+	// 对常见的“非”值，直接返回原来值
+	if ([null, undefined, NaN, false].includes(obj)) return obj;
+	if (typeof obj !== "object" && typeof obj !== 'function') {
+		//原始类型直接返回
+		return obj;
+	}
+	var o = isArray(obj) ? [] : {};
+	for (let i in obj) {
+		if (obj.hasOwnProperty(i)) {
+			o[i] = typeof obj[i] === "object" ? deepClone(obj[i]) : obj[i];
+		}
+	}
+	return o;
+}
+
+function getUUid(len = 32, firstU = true, radix = null) {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let uuid = [];
+	radix = radix || chars.length;
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+	} else {
+		let r;
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+		uuid[14] = '4';
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16;
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift();
+		return 'u' + uuid.join('');
+	} else {
+		return uuid.join('');
+	}
+}
+export {
+	deepClone,
+	getUUid
+};
diff --git a/components/lf-code/index.js b/components/lf-code/index.js
new file mode 100644
index 0000000..ad38059
--- /dev/null
+++ b/components/lf-code/index.js
@@ -0,0 +1,2 @@
+let $jscomp=$jscomp||{};let regUtf=new RegExp("[\\u4E00-\\u9FFF]+","g");$jscomp.scope={};$jscomp.arrayIteratorImpl=function(k){let l=0;return function(){return l<k.length?{done:!1,value:k[l++]}:{done:!0}}};$jscomp.arrayIterator=function(k){return{next:$jscomp.arrayIteratorImpl(k)}};$jscomp.makeIterator=function(k){let l="undefined"!=typeof Symbol&&Symbol.iterator&&k[Symbol.iterator];return l?l.call(k):$jscomp.arrayIterator(k)};let $jscomp$destructuring$var0=$jscomp.makeIterator([126,102,103,104,105,98,101,100,106]),CHAR_TILDE=$jscomp$destructuring$var0.next().value,CODE_FNC1=$jscomp$destructuring$var0.next().value,SET_STARTA=$jscomp$destructuring$var0.next().value,SET_STARTB=$jscomp$destructuring$var0.next().value,SET_STARTC=$jscomp$destructuring$var0.next().value,SET_SHIFT=$jscomp$destructuring$var0.next().value,SET_CODEA=$jscomp$destructuring$var0.next().value,SET_CODEB=$jscomp$destructuring$var0.next().value,SET_STOP=$jscomp$destructuring$var0.next().value,REPLACE_CODES={CHAR_TILDE:CODE_FNC1},PATTERNS=[[2,1,2,2,2,2,0,0],[2,2,2,1,2,2,0,0],[2,2,2,2,2,1,0,0],[1,2,1,2,2,3,0,0],[1,2,1,3,2,2,0,0],[1,3,1,2,2,2,0,0],[1,2,2,2,1,3,0,0],[1,2,2,3,1,2,0,0],[1,3,2,2,1,2,0,0],[2,2,1,2,1,3,0,0],[2,2,1,3,1,2,0,0],[2,3,1,2,1,2,0,0],[1,1,2,2,3,2,0,0],[1,2,2,1,3,2,0,0],[1,2,2,2,3,1,0,0],[1,1,3,2,2,2,0,0],[1,2,3,1,2,2,0,0],[1,2,3,2,2,1,0,0],[2,2,3,2,1,1,0,0],[2,2,1,1,3,2,0,0],[2,2,1,2,3,1,0,0],[2,1,3,2,1,2,0,0],[2,2,3,1,1,2,0,0],[3,1,2,1,3,1,0,0],[3,1,1,2,2,2,0,0],[3,2,1,1,2,2,0,0],[3,2,1,2,2,1,0,0],[3,1,2,2,1,2,0,0],[3,2,2,1,1,2,0,0],[3,2,2,2,1,1,0,0],[2,1,2,1,2,3,0,0],[2,1,2,3,2,1,0,0],[2,3,2,1,2,1,0,0],[1,1,1,3,2,3,0,0],[1,3,1,1,2,3,0,0],[1,3,1,3,2,1,0,0],[1,1,2,3,1,3,0,0],[1,3,2,1,1,3,0,0],[1,3,2,3,1,1,0,0],[2,1,1,3,1,3,0,0],[2,3,1,1,1,3,0,0],[2,3,1,3,1,1,0,0],[1,1,2,1,3,3,0,0],[1,1,2,3,3,1,0,0],[1,3,2,1,3,1,0,0],[1,1,3,1,2,3,0,0],[1,1,3,3,2,1,0,0],[1,3,3,1,2,1,0,0],[3,1,3,1,2,1,0,0],[2,1,1,3,3,1,0,0],[2,3,1,1,3,1,0,0],[2,1,3,1,1,3,0,0],[2,1,3,3,1,1,0,0],[2,1,3,1,3,1,0,0],[3,1,1,1,2,3,0,0],[3,1,1,3,2,1,0,0],[3,3,1,1,2,1,0,0],[3,1,2,1,1,3,0,0],[3,1,2,3,1,1,0,0],[3,3,2,1,1,1,0,0],[3,1,4,1,1,1,0,0],[2,2,1,4,1,1,0,0],[4,3,1,1,1,1,0,0],[1,1,1,2,2,4,0,0],[1,1,1,4,2,2,0,0],[1,2,1,1,2,4,0,0],[1,2,1,4,2,1,0,0],[1,4,1,1,2,2,0,0],[1,4,1,2,2,1,0,0],[1,1,2,2,1,4,0,0],[1,1,2,4,1,2,0,0],[1,2,2,1,1,4,0,0],[1,2,2,4,1,1,0,0],[1,4,2,1,1,2,0,0],[1,4,2,2,1,1,0,0],[2,4,1,2,1,1,0,0],[2,2,1,1,1,4,0,0],[4,1,3,1,1,1,0,0],[2,4,1,1,1,2,0,0],[1,3,4,1,1,1,0,0],[1,1,1,2,4,2,0,0],[1,2,1,1,4,2,0,0],[1,2,1,2,4,1,0,0],[1,1,4,2,1,2,0,0],[1,2,4,1,1,2,0,0],[1,2,4,2,1,1,0,0],[4,1,1,2,1,2,0,0],[4,2,1,1,1,2,0,0],[4,2,1,2,1,1,0,0],[2,1,2,1,4,1,0,0],[2,1,4,1,2,1,0,0],[4,1,2,1,2,1,0,0],[1,1,1,1,4,3,0,0],[1,1,1,3,4,1,0,0],[1,3,1,1,4,1,0,0],[1,1,4,1,1,3,0,0],[1,1,4,3,1,1,0,0],[4,1,1,1,1,3,0,0],[4,1,1,3,1,1,0,0],[1,1,3,1,4,1,0,0],[1,1,4,1,3,1,0,0],[3,1,1,1,4,1,0,0],[4,1,1,1,3,1,0,0],[2,1,1,4,1,2,0,0],[2,1,1,2,1,4,0,0],[2,1,1,2,3,2,0,0],[2,3,3,1,1,1,2,0]],CODESET={ANY:1,AB:2,A:3,B:4,C:5};module.exports={UtF16to8(code){let out,i,len,c;out="";len=code.length;for(i=0;i<len;i++){c=code.charCodeAt(i);if((c>=0x0001)&&(c<=0x007F)){out+=code.charAt(i);}else if(c>0x07FF){out+=String.fromCharCode(0xE0|((c>>12)&0x0F));out+=String.fromCharCode(0x80|((c>>6)&0x3F));out+=String.fromCharCode(0x80|((c>>0)&0x3F));}else{out+=String.fromCharCode(0xC0|((c>>6)&0x1F));out+=String.fromCharCode(0x80|((c>>0)&0x3F));}}return out;},SaveImg:function(k){const width=uni.upx2px(Number(k.width));const height=uni.upx2px(Number(k.height));return new Promise(function(z,H){if(Object.prototype.toString.call(k.id)=='[object String]'){uni.canvasToTempFilePath({canvasId:k.id,width:width,height:height,destWidth:width,destHeight:height,fileType:k.type||'png',complete:function(B){z(B)}},k.ctx)}else if(Object.prototype.toString.call(k.id)=='[object Object]'){const ctx=k.id;ctx.toTempFilePath(0,0,width,height,width,height,k.type||'png',1,function(B){z(B)})}})},BarCode:function(k,callback){function l(e,C){return"undefined"==typeof C?32<=e?e-32:e+64:parseInt(String.fromCharCode(e)+String.fromCharCode(C))}function v(e,C){e=z(e);return e==CODESET.ANY||e==CODESET.AB||e==CODESET.A&&C==CODESET.A||e==CODESET.B&&C==CODESET.B?!0:!1}function z(e){return 48<=e&&57>=e?CODESET.ANY:32<=e&&95>=e?CODESET.AB:32>e?CODESET.A:CODESET.B}function H(e){for(var C=[],n=0;n<e.length;n++)C.push(e.charCodeAt(n));return C}var B=null;if(Object.prototype.toString.call(k.id)=='[object String]'){B=uni.createCanvasContext(k.id,k.ctx||null);}else if(Object.prototype.toString.call(k.id)=='[object Object]'){B=k.id;}else{console.warn("没有找到canvas id或者实列!");return}if(!k.code){console.warn("没有找到code");return}var L=uni.upx2px(Number(k.width)),N=uni.upx2px(Number(k.height)),O=function(e){function C(u,r,p){var D=[],w=-1;if(v(u,p))p==CODESET.C&&(-1==r?(w=SET_CODEB,p=CODESET.B):-1==r||v(r,p)||(v(r,CODESET.A)?(w=SET_CODEA,p=CODESET.A):(w=SET_CODEB,p=CODESET.B)));else if(-1==r||v(r,p))w=SET_SHIFT;else switch(p){case CODESET.A:w=SET_CODEB;p=CODESET.B;break;case CODESET.B:w=SET_CODEA,p=CODESET.A}-1!=w?(D.push(w),D.push(l(u))):p==CODESET.C?D.push(l(u,r)):D.push(l(u));n=p;return D}var n=CODESET.C;e=H(e);var q=e[0]==CHAR_TILDE?1:0,d=0<e.length?z(e[q++]):CODESET.AB;q=0<e.length?z(e[q++]):CODESET.AB;n=function(u,r){var p=u==CODESET.A?1:0;p+=u==CODESET.B?-1:0;p+=r==CODESET.A?1:0;p+=r==CODESET.B?-1:0;return 0<p?CODESET.A:CODESET.B}(d,q);n=function(u,r){for(var p=0;p<u.length;p++){var D=u[p];if((48>D||57<D)&&D!=CHAR_TILDE)return r}return CODESET.C}(e,n);d=[];switch(n){case CODESET.A:d.push(SET_STARTA);break;case CODESET.B:d.push(SET_STARTB);break;default:d.push(SET_STARTC)}for(q=0;q<e.length;q++){var A=e[q];A in REPLACE_CODES&&(d.push(REPLACE_CODES[A]),q++,A=e[q]);d=d.concat(C(A,e.length>q+1?e[q+1]:-1,n));n==CODESET.C&&q++}e=d[0];for(q=1;q<d.length;q++)e+=q*d[q];d.push(e%103);d.push(SET_STOP);return d}(k.code);k=new Graphics(B,L,N,k.color||"#000000",k.bgColor||"#FFFFFF");L=k.area.width/(11*(O.length-3)+35);for(var T=k.area.left,U=k.area.top,P=0;P<O.length;P++)for(var M=O[P],I=0;8>I;I+=2){var J=PATTERNS[M][I]*L,m=N-U,E=PATTERNS[M][I+1]*L;0<J&&k.fillFgRect(T,U,J,m);T+=J+E}B.draw(false,(res)=>{if(callback&&typeof callback==="function"&&typeof callback.nodeType!=="number"){callback({...res,id:k.id})}});},QRCode:function(k,callback){function l(b,a){if(b>a){var c=b;b=a;a=c}c=(a*a+a>>1)+b;C[c]=1}function v(b,a){var c;e[b+d*a]=1;for(c=-2;2>c;c++)e[b+c+d*(a-2)]=1,e[b-2+d*(a+c+1)]=1,e[b+2+d*(a+c)]=1,e[b+c+1+d*(a+2)]=1;for(c=0;2>c;c++)l(b-1,a+c),l(b+1,a-c),l(b-c,a-1),l(b+c,a+1)}function z(b){for(;255<=b;)b-=255,b=(b>>8)+(b&255);return b}function H(b,a,c,g){var h,f;for(h=0;h<g;h++)m[c+h]=0;for(h=0;h<a;h++){var t=I[m[b+h]^m[c]];if(255!=t)for(f=1;f<g;f++)m[c+f-1]=m[c+f]^J[z(t+w[g-f])];else
+for(f=c;f<c+g;f++)m[f]=m[f+1];m[c+g-1]=255==t?0:J[z(t+w[0])]}}function B(b,a){if(b>a){var c=b;b=a;a=c}c=(a+a*a>>1)+b;return C[c]}function L(b){var a,c,g;switch(b){case 0:for(a=0;a<d;a++)for(b=0;b<d;b++)b+a&1||B(b,a)||(e[b+a*d]^=1);break;case 1:for(a=0;a<d;a++)for(b=0;b<d;b++)a&1||B(b,a)||(e[b+a*d]^=1);break;case 2:for(a=0;a<d;a++)for(b=c=0;b<d;b++,c++)3==c&&(c=0),c||B(b,a)||(e[b+a*d]^=1);break;case 3:for(a=g=0;a<d;a++,g++)for(3==g&&(g=0),c=g,b=0;b<d;b++,c++)3==c&&(c=0),c||B(b,a)||(e[b+a*d]^=1);break;case 4:for(a=0;a<d;a++)for(c=0,g=a>>1&1,b=0;b<d;b++,c++)3==c&&(c=0,g=!g),g||B(b,a)||(e[b+a*d]^=1);break;case 5:for(a=g=0;a<d;a++,g++)for(3==g&&(g=0),b=c=0;b<d;b++,c++)3==c&&(c=0),(b&a&1)+!(!c|!g)||B(b,a)||(e[b+a*d]^=1);break;case 6:for(a=g=0;a<d;a++,g++)for(3==g&&(g=0),b=c=0;b<d;b++,c++)3==c&&(c=0),(b&a&1)+(c&&c==g)&1||B(b,a)||(e[b+a*d]^=1);break;case 7:for(a=g=0;a<d;a++,g++)for(3==g&&(g=0),b=c=0;b<d;b++,c++)3==c&&(c=0),(c&&c==g)+(b+a&1)&1||B(b,a)||(e[b+a*d]^=1)}}function N(b){var a,c=0;for(a=0;a<=b;a++)5<=n[a]&&(c+=3+n[a]-5);for(a=3;a<b-1;a+=2)n[a-2]==n[a+2]&&n[a+2]==n[a-1]&&n[a-1]==n[a+1]&&3*n[a-1]==n[a]&&(0==n[a-3]||a+3>b||3*n[a-3]>=4*n[a]||3*n[a+3]>=4*n[a])&&(c+=40);return c}function O(b){var a,c,g;var h=b.length;q=0;do{q++;var f=4*(D-1)+16*(q-1);A=M[f++];u=M[f++];r=M[f++];p=M[f];f=r*(A+u)+u-3+(9>=q);if(h<=f)break}while(40>q);d=17+4*q;var t=r+(r+p)*(A+u)+u;for(h=0;h<t;h++)E[h]=0;m=b.slice(0);for(h=0;h<d*d;h++)e[h]=0;for(h=0;h<(d*(d+1)+1)/2;h++)C[h]=0;for(h=0;3>h;h++){b=f=0;1==h&&(f=d-7);2==h&&(b=d-7);e[b+3+d*(f+3)]=1;for(a=0;6>a;a++)e[b+a+d*f]=1,e[b+d*(f+a+1)]=1,e[b+6+d*(f+a)]=1,e[b+a+1+d*(f+6)]=1;for(a=1;5>a;a++)l(b+a,f+1),l(b+1,f+a+1),l(b+5,f+a),l(b+a+1,f+5);for(a=2;4>a;a++)e[b+a+d*(f+2)]=1,e[b+2+d*(f+a+1)]=1,e[b+4+d*(f+a)]=1,e[b+a+1+d*(f+4)]=1}if(1<q)for(h=T[q],b=d-7;;){for(a=d-7;a>h-3;){v(a,b);if(a<h)break;a-=h}if(b<=h+9)break;b-=h;v(6,b);v(b,6)}e[8+d*(d-8)]=1;for(b=0;7>b;b++)l(7,b),l(d-8,b),l(7,b+d-7);for(a=0;8>a;a++)l(a,7),l(a+d-8,7),l(a,d-8);for(a=0;9>a;a++)l(a,8);for(a=0;8>a;a++)l(a+d-8,8),l(8,a);for(b=0;7>b;b++)l(8,b+d-7);for(a=0;a<d-14;a++)a&1?(l(8+a,6),l(6,8+a)):(e[8+a+6*d]=1,e[6+d*(8+a)]=1);if(6<q)for(h=U[q-7],f=17,a=0;6>a;a++)for(b=0;3>b;b++,f--)1&(11<f?q>>f-12:h>>f)?(e[5-a+d*(2-b+d-11)]=1,e[2-b+d-11+d*(5-a)]=1):(l(5-a,2-b+d-11),l(2-b+d-11,5-a));for(b=0;b<d;b++)for(a=0;a<=b;a++)e[a+d*b]&&l(a,b);t=m.length;for(c=0;c<t;c++)E[c]=m.charCodeAt(c);m=E.slice(0);a=r*(A+u)+u;t>=a-2&&(t=a-2,9<q&&t--);c=t;if(9<q){m[c+2]=0;for(m[c+3]=0;c--;)h=m[c],m[c+3]|=255&h<<4,m[c+2]=h>>4;m[2]|=255&t<<4;m[1]=t>>4;m[0]=64|t>>12}else{m[c+1]=0;for(m[c+2]=0;c--;)h=m[c],m[c+2]|=255&h<<4,m[c+1]=h>>4;m[1]|=255&t<<4;m[0]=64|t>>4}for(c=t+3-(10>q);c<a;)m[c++]=236,m[c++]=17;w[0]=1;for(c=0;c<p;c++){w[c+1]=1;for(g=c;0<g;g--)w[g]=w[g]?w[g-1]^J[z(I[w[g]]+c)]:w[g-1];w[0]=J[z(I[w[0]]+c)]}for(c=0;c<=p;c++)w[c]=I[w[c]];f=a;for(c=b=0;c<A;c++)H(b,r,f,p),b+=r,f+=p;for(c=0;c<u;c++)H(b,r+1,f,p),b+=r+1,f+=p;for(c=b=0;c<r;c++){for(g=0;g<A;g++)E[b++]=m[c+g*r];for(g=0;g<u;g++)E[b++]=m[A*r+c+g*(r+1)]}for(g=0;g<u;g++)E[b++]=m[A*r+c+g*(r+1)];for(c=0;c<p;c++)for(g=0;g<A+u;g++)E[b++]=m[a+c+g*p];m=E;a=b=d-1;f=t=1;var x=(r+p)*(A+u)+u;for(c=0;c<x;c++)for(h=m[c],g=0;8>g;g++,h<<=1){128&h&&(e[a+d*b]=1);do t?a--:(a++,f?0!=b?b--:(a-=2,f=!f,6==a&&(a--,b=9)):b!=d-1?b++:(a-=2,f=!f,6==a&&(a--,b-=8))),t=!t;while(B(a,b))}m=e.slice(0);h=0;b=3E4;for(f=0;8>f;f++){L(f);var y,Q=t=0;for(x=0;x<d-1;x++)for(y=0;y<d-1;y++)if(e[y+d*x]&&e[y+1+d*x]&&e[y+d*(x+1)]&&e[y+1+d*(x+1)]||!(e[y+d*x]||e[y+1+d*x]||e[y+d*(x+1)]||e[y+1+d*(x+1)]))t+=3;for(x=0;x<d;x++){for(g=c=y=n[0]=0;y<d;y++)(a=e[y+d*x])==c?n[g]++:n[++g]=1,c=a,Q+=c?1:-1;t+=N(g)}0>Q&&(Q=-Q);a=Q;c=0;for(a=a+(a<<2)<<1;a>d*d;)a-=d*d,c++;t+=10*c;for(y=0;y<d;y++){for(g=c=x=n[0]=0;x<d;x++)(a=e[y+d*x])==c?n[g]++:n[++g]=1,c=a;t+=N(g)}a=t;a<b&&(b=a,h=f);if(7==h)break;e=m.slice(0)}h!=f&&L(h);b=P[h+(D-1<<3)];for(f=0;8>f;f++,b>>=1)b&1&&(e[d-1-f+8*d]=1,6>f?e[8+d*f]=1:e[8+d*(f+1)]=1);for(f=0;7>f;f++,b>>=1)b&1&&(e[8+d*(d-7+f)]=1,f?e[6-f+8*d]=1:e[7+8*d]=1);return e}var T=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],U=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],P=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],M=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],I=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],J=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],m=[],E=[],e=[],C=[],n=[],q,d,A,u,r,p,D=2,w=[];D=k.level||D;var F=k.id||null;if(!k.code){console.warn("没有找到code");return}if(regUtf.test(k.code)){k.code=this.UtF16to8(k.code)}if(F){const size=uni.upx2px(Number(k.size));var K=size||Math.min(F.width,F.height),ca=O(k.code),R=Math.round(K/(d+8)),W=R*(d+8),X=Math.floor((K-W)/2);K=W;var G=null;if(Object.prototype.toString.call(k.id)=='[object String]'){G=uni.createCanvasContext(k.id,k.ctx||null);}else if(Object.prototype.toString.call(k.id)=='[object Object]'){G=k.id;}else{console.warn("没有找到canvas id或者实列d!");return}G.clearRect(0,0,size,size);G.setFillStyle(k.bgColor||'#FFFFFF');G.fillRect(0,0,size,size);if(k.color){let S=k.color;let V=G.createLinearGradient(0,0,size,0);if(Object.prototype.toString.call(S)=='[object String]'){G.setFillStyle(S)}else if(Object.prototype.toString.call(S)=='[object Array]'){V.addColorStop(0,S[0]);V.addColorStop(1,S[1]);G.setFillStyle(V)}else{G.setFillStyle("#000000");console.warn("没有找到canvas id或者实列!")}}else{G.setFillStyle("#000000");}for(F=0;F<d;F++)for(K=0;K<d;K++)ca[K*d+F]&&G.fillRect(R*(4+F)+X,R*(4+K)+X,R,R);if(k.img)try{var Y=Number(((size-(k.iconSize||30))/2).toFixed(2)),Z=$jscomp.makeIterator([Y,Y]),da=Z.next().value,ea=Z.next().value,aa=$jscomp.makeIterator([k.iconSize||30,k.iconSize||30]),ba=aa.next().value;aa.next();G.drawImage(k.img,da,ea,ba,ba)}catch(b){console.warn(b)}if(k.border)try{let S=k.border.color;let lineWidth=k.border.lineWidth||4;let V=G.createLinearGradient(0,0,size,0);if(Object.prototype.toString.call(S)=='[object String]'){G.setStrokeStyle(S)}else if(Object.prototype.toString.call(S)=='[object Array]'){V.addColorStop(0,S[0]);V.addColorStop(1,S[1]);G.setStrokeStyle(V)}else{G.setStrokeStyle("#000000");console.warn("没有找到canvas id或者实列d!")}G.setLineWidth(lineWidth);G.strokeRect(0,0,size,size)}catch(b){console.log(b)}G.draw(false,async(res)=>{if(callback&&typeof callback==="function"&&typeof callback.nodeType!=="number"){callback({...res,id:k.id})}});}else console.warn("No canvas provided to draw QR code in!")}};class Graphics{constructor(k,l,v,z,H){this.width=l;this.height=v;this.quiet=Math.round(this.width/40);this.padding_width=this.border_size=0;this.area={width:l-2*this.padding_width-2*this.quiet,height:v-2*this.border_size,top:this.border_size-4,left:this.padding_width+this.quiet};this.ctx=k;this.fg=z;this.bg=H;};fillFgRect(k,l,v,z){this.FILLRECT(k,l,v,z,this.fg);};fillBgRect(k,l,v,z){this.FILLRECT(k,l,v,z,this.bg);};FILLRECT(k,l,v,z,H){this.ctx.setFillStyle(H);this.ctx.fillRect(k,l,v,z);}}
\ No newline at end of file
diff --git a/components/lf-code/lf-barcode.vue b/components/lf-code/lf-barcode.vue
new file mode 100644
index 0000000..3b68bd9
--- /dev/null
+++ b/components/lf-code/lf-barcode.vue
@@ -0,0 +1,87 @@
+<template>
+    <view>
+		<!-- #ifdef MP-WEIXIN  -->
+		<canvas :canvas-id="item.id" :id="item.id" :style="{width:width,height: height}" v-for="(item,index) in listCode" :key="item.id" />
+		<!-- #endif -->
+		
+		<!-- #ifndef MP-WEIXIN -->
+		<canvas :canvas-id="id" :id="id" :style="{width:width,height: height}" />
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+	import QRCODE from './index.js';
+	import { getUUid, deepClone } from './helper.js'
+	export default {
+		name: 'WBarcode',
+		props:{
+			options:{
+				type: Object,
+				required: true,
+				default: () =>{
+					return {
+						
+					}
+				}
+			}
+		},
+		data () {
+			return {
+				listCode: [],
+				id: getUUid(),
+				height: null,
+				width: null,
+			}
+		},
+		created() {
+			this.height = this.options.height + 'rpx';
+			this.width = this.options.width + 'rpx';
+			this.SpecialTreatment(this.options)
+			this.$nextTick(()=>{
+				this.generateCode();
+			})
+		},
+		watch: {
+			options:{
+				deep: true,
+				handler (val) {
+					this.height = val.height + 'rpx';
+					this.width = val.width + 'rpx';
+					this.SpecialTreatment(val)
+					// #ifdef H5
+					setTimeout(()=>{// h5平台动态改变canvas大小
+						this.generateCode();
+					},50)
+					// #endif
+					
+					// #ifdef APP-NVUE || APP-PLUS || MP || QUICKAPP-WEBVIEW || QUICKAPP-WEBVIEW-HUAWEI || QUICKAPP-WEBVIEW-UNION
+					this.generateCode();
+					// #endif
+				}
+			}
+		},
+		methods: {
+			SpecialTreatment (val) {//微信小程序渲染多个canvas特殊处理
+				// #ifdef MP-WEIXIN
+					let obj = deepClone(val);
+					this.id = obj.id = getUUid();
+					this.listCode = [obj]
+				// #endif
+			},
+			generateCode () {
+				try{
+					const parameter = {...this.options,id: this.id,ctx: this};
+					QRCODE.BarCode(parameter,(res)=>{
+						this.$emit('generate',res)
+					})
+				}catch(err){}
+			},
+			async saveImg (){
+				try{
+					const res = await QRCODE.SaveImg({id: this.id,width: this.width,height: this.width,ctx: this});
+					return res
+				}catch(e){}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/components/lf-code/lf-qrcode.vue b/components/lf-code/lf-qrcode.vue
new file mode 100644
index 0000000..f5ec7c7
--- /dev/null
+++ b/components/lf-code/lf-qrcode.vue
@@ -0,0 +1,84 @@
+<template>
+    <view>
+		<!-- #ifdef MP-WEIXIN  -->
+		<canvas :canvas-id="item.id" :id="item.id" :style="{width:size,height: size}" v-for="(item,index) in listCode" :key="item.id" />
+		<!-- #endif -->
+		
+		<!-- #ifndef MP-WEIXIN -->
+		<canvas :canvas-id="id" :id="id" :style="{width:size,height: size}" />
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+	import QRCODE from './index.js';
+	import { getUUid, deepClone } from './helper.js'
+	export default {
+		name: 'WQrcode',
+		props:{
+			options:{
+				type: Object,
+				required: true,
+				default: () =>{
+					return {
+						
+					}
+				}
+			}
+		},
+		data () {
+			return {
+				listCode:[],
+				id: getUUid(),
+				size: null,
+			}
+		},
+		created() {
+			this.size = this.options.size + 'rpx';
+			this.SpecialTreatment(this.options)
+			this.$nextTick(()=>{
+				this.generateCode();
+			})
+		},
+		watch: {
+			options:{
+				deep: true,
+				handler (val) {
+					this.size = val.size +'rpx';
+					this.SpecialTreatment(val)
+					// #ifdef H5
+					setTimeout(()=>{// h5平台动态改变canvas大小
+						this.generateCode();
+					},50)
+					// #endif
+					
+					// #ifdef APP-NVUE || APP-PLUS || MP || QUICKAPP-WEBVIEW || QUICKAPP-WEBVIEW-HUAWEI || QUICKAPP-WEBVIEW-UNION
+					this.generateCode();
+					// #endif
+				}
+			}
+		},
+		methods: {
+			SpecialTreatment (val) {//微信小程序渲染多个canvas特殊处理
+				// #ifdef MP-WEIXIN
+					let obj = deepClone(val);
+					this.id = obj.id = getUUid();
+					this.listCode = [obj]
+				// #endif
+			},
+			generateCode () {
+				try{
+					const parameter = {...this.options,id: this.id,ctx: this};
+					QRCODE.QRCode(parameter,(res)=>{
+						this.$emit('generate',res)
+					})
+				}catch(err){}
+			},
+			async saveImg (){
+				try{
+					const res = await QRCODE.SaveImg({id: this.id,width: this.size,height: this.size,ctx: this});
+					return res
+				}catch(e){}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 698c9b1..48797d8 100644
--- a/pages.json
+++ b/pages.json
@@ -790,6 +790,13 @@
 				"navigationBarTitleText": "热门活动",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/user/member/code",
+			"style" : {
+				"navigationBarTitleText": "会员码",
+				"navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/user/member/code.vue b/pages/user/member/code.vue
new file mode 100644
index 0000000..b5365ab
--- /dev/null
+++ b/pages/user/member/code.vue
@@ -0,0 +1,199 @@
+<template>
+	<view class="page">
+		<lf-nav title="会员码" bgColor="transparent" :spreadOut="false" titleColor="#fff" :showIcon="true"></lf-nav>
+		<view class="bg-viewleft"></view>
+		<view class="bg-viewright"></view>
+		<view class="content">
+			<view class="top">
+				<view class="lf-flex">
+					<view class="avatar">
+						<image src="https://picsum.photos/200"></image>
+					</view>
+					<view class="phone">182****5380</view>
+				</view>
+				<view class="card">
+					<text class="lf-iconfont icon--1"></text>
+				</view>
+			</view>
+			<view class="balance">余额 ¥1829.83</view>
+			<view class="barcode">
+				<lf-barcode :options="config.bar"></lf-barcode>
+			</view>
+			<view class="qrcode">
+				<lf-qrcode :options="config.qrc"></lf-qrcode>
+			</view>
+			<view class="tips">{{ num }}s后自动刷新</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import lfBarcode from '@/components/lf-code/lf-barcode.vue';
+	import lfQrcode from '@/components/lf-code/lf-qrcode.vue';
+	export default {
+		components: {
+			lfBarcode,
+			lfQrcode
+		},
+		data(){
+			return {
+				config: {
+					bar: {
+						code: 'E01181016286106',
+						color: '#000', // 条形码的颜色
+						bgColor: '#FFFFFF', // 背景色
+						width: 586, // 宽度
+						height: 210 // 高度
+					},
+					qrc: {
+						code: "https://weixin.qq.com/g/AwYAAHO3aO4zlasEij6bLsk4hlZd5XNFkkBmqyS55mLPFxmn5c9PaI1omqLhd24fABCD23333",
+						size: 352, // 二维码大小
+						level: 4, //等级 0～4
+						bgColor: '#FFFFFF', //二维码背景色 默认白色
+						// border: {
+						// 	color: ['#8A2387', '#F27121'], //边框颜色支持渐变色
+						// 	lineWidth: 3, //边框宽度
+						// },
+						// img: '/static/logo.png', //图片
+						// iconSize: 40, //二维码图标的大小
+						color: '#000000', //边框颜色支持渐变色
+					}
+				},
+				timer: null,
+				num: 90
+			}
+		},
+		onLoad(){
+			this.refreshCode();
+		},
+		onUnload(){
+			if(this.timer){
+				clearInterval(this.timer);
+				this.timer = null;
+			}
+		},
+		methods: {
+			// rpx 转 px
+			rpxTransformPx(num){
+				let systemInfo = uni.getSystemInfoSync();
+				let pxWidth = num / 750 * systemInfo.windowWidth;
+				return pxWidth;
+			},
+			// 刷新code
+			refreshCode(){
+				if(this.timer){
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+				this.timer = setInterval(() => {
+					this.num--;
+					if(this.num <= 0){
+						clearInterval(this.timer);
+						this.timer = null;
+						this.num = 90;
+						this.refreshCode(); // 重新执行
+					}
+				}, 1000);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		overflow: hidden;
+	}
+</style>
+<style lang="scss" scoped="scoped">
+	.page{
+		width: 100vw;
+		height: 100vh;
+		background: linear-gradient(270deg, #187B7A 0%, #2FAAA7 100%, #22A2A0 100%);
+		position: relative;
+		overflow: hidden;
+		.bg-viewleft{
+			position: absolute;
+			left: -100rpx;
+			top: 59rpx;
+			width: 585rpx;
+			height: 585rpx;
+			border-radius: 50%;
+			background-color: rgba(255,255,255,0.04);
+		}
+		.bg-viewright{
+			position: absolute;
+			right: -38rpx;
+			top: 102rpx;
+			width: 127rpx;
+			height: 127rpx;
+			border-radius: 50%;
+			background-color: rgba(255,255,255,0.04);
+		}
+		.content{
+			position: absolute;
+			top: 260rpx;
+			left: calc(50% - 343rpx);
+			width: 686rpx;
+			height: 986rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			.top{
+				display: flex;
+				justify-content: space-between;
+				padding: 0 40rpx;
+				width: 100%;
+				box-sizing: border-box;
+				align-items: center;
+				margin-top: -20rpx;
+				.avatar{
+					width: 160rpx;
+					height: 160rpx;
+					border-radius: 50%;
+					background-color: #FFFFFF;
+					box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(21, 113, 110, 0.2);
+					border: 5rpx solid #FFFFFF;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-right: 20rpx;
+					&>image{
+						width: 148rpx;
+						height: 148rpx;
+						border-radius: 50%;
+					}
+				}
+				.phone{
+					font-size: 36rpx;
+					font-weight: bold;
+					color: #15716E;
+				}
+				.card{
+					padding: 10rpx 20rpx;
+					&>text{
+						font-size: 40rpx;
+						color: #15716E;
+					}
+				}
+			}
+			.balance{
+				font-size: 32rpx;
+				color: #555555;
+				text-align: center;
+				font-weight: bold;
+				margin-top: 60rpx;
+				line-height: 1;
+			}
+			.barcode, .qrcode{
+				display: flex;
+				justify-content: center;
+				margin-top: 30rpx;
+			}
+			.tips{
+				font-size: 24rpx;
+				color: #777777;
+				text-align: center;
+				margin-top: 30rpx;
+			}
+		}
+	}
+</style>

From 110e5d4f3db7c1e67d20065e2cb743ac2b42b3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 6 Sep 2021 14:25:41 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index-banner/index-banner.vue      |   1 -
 components/lf-indexFind/lf-indexFind.vue      |  31 ++++--
 .../lf-indexShopMatrix/lf-indexShopMatrix.vue | 104 ++++++++++--------
 .../lf-multiColumnAd/lf-multiColumnAd.vue     |  11 +-
 components/lf-seckill/lf-seckill.vue          |   8 ++
 pages/index/index/index.vue                   |  29 ++++-
 6 files changed, 122 insertions(+), 62 deletions(-)

diff --git a/components/index-banner/index-banner.vue b/components/index-banner/index-banner.vue
index 301d41f..4b1e8fa 100644
--- a/components/index-banner/index-banner.vue
+++ b/components/index-banner/index-banner.vue
@@ -143,7 +143,6 @@ export default {
 	  height: 100% !important;
       object-fit: cover;
 	  vertical-align: middle !important;
-	  border-radius: 0 0 30rpx 30rpx;
     }
   }
 
diff --git a/components/lf-indexFind/lf-indexFind.vue b/components/lf-indexFind/lf-indexFind.vue
index 96ce7ca..1b0e0ee 100644
--- a/components/lf-indexFind/lf-indexFind.vue
+++ b/components/lf-indexFind/lf-indexFind.vue
@@ -1,13 +1,16 @@
 <template>
-	<scroll-view class="find-scroll" :scroll-x="true">
-		<view class="find-content">
-			<view class="find-item" :class="{'max-item': index == 0}" v-for="(item, index) in 5" :key="index">
-				<image class="img" src="https://picsum.photos/200/300"></image>
-				<view class="lf-line-2 info">南边开，风儿吹，北边放，花儿开，西边来，春归去，东边来，北边跑</view>
+	<view class="centent">
+		<view class="title">精选发现好物</view>
+		<scroll-view class="find-scroll" :scroll-x="true">
+			<view class="find-content">
+				<view class="find-item" :class="{'max-item': index == 0}" v-for="(item, index) in 5" :key="index">
+					<image class="img" src="https://picsum.photos/200/300"></image>
+					<view class="lf-line-2 info">南边开，风儿吹，北边放，花儿开，西边来，春归去，东边来，北边跑</view>
+				</view>
 			</view>
-		</view>
-		<view style="height: 10rpx;"></view>
-	</scroll-view>
+			<view style="height: 10rpx;"></view>
+		</scroll-view>
+	</view>
 </template>
 
 <script>
@@ -27,8 +30,18 @@
 </script>
 
 <style lang="scss" scoped="scoped">
+	.centent{
+		padding-top: 60rpx;
+	}
+	.title{
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		color: #222222;
+		margin-bottom: 30rpx;
+	}
 	.find-scroll{
-		padding: 30rpx 32rpx;
+		padding: 0rpx 32rpx;
 		width: 750rpx;
 		height: max-content;
 		box-sizing: border-box;
diff --git a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
index bc72b59..da9d822 100644
--- a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
+++ b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
@@ -1,10 +1,13 @@
 <template>
 	<view class="content">
-		<view class="item" v-for="(item, index) in 16" :key="index">
-			<image class="bg-img" src="https://picsum.photos/200/300"></image>
-			<view class="shop">
-				<image src="../../static/recommend-r.png"></image>
-				<view class="lf-line-1">DIOR迪奥</view>
+		<view class="title">大牌不停推</view>
+		<view class="flex-box">
+			<view class="item" v-for="(item, index) in 16" :key="index">
+				<image class="bg-img" src="https://picsum.photos/200/300"></image>
+				<view class="shop">
+					<image src="../../static/recommend-r.png"></image>
+					<view class="lf-line-1">DIOR迪奥</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -31,50 +34,59 @@
 		width: 750rpx;
 		height: max-content;
 		box-sizing: border-box;
-		padding: 30rpx 32rpx;
-		display: flex;
-		flex-wrap: wrap;
-		.item{
-			width: 165rpx;
-			height: 165rpx;
-			border: 1rpx solid #979797;
-			margin-right: 9rpx;
-			position: relative;
-			&:nth-child(4n){
-				margin-right: 0rpx;
-			}
-			&:nth-child(n+5){
-				margin-top: 8rpx;
-			}
-			.bg-img{
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 100%;
-				height: 100%;
-			}
-			.shop{
-				width: 100%;
-				height: 100%;
-				background-color: rgba(0,0,0,0.1);
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
+		padding: 60rpx 32rpx 0;
+		.title{
+			font-size: 36rpx;
+			font-weight: bold;
+			text-align: center;
+			color: #222222;
+			margin-bottom: 30rpx;
+		}
+		.flex-box{
+			display: flex;
+			flex-wrap: wrap;
+			.item{
+				width: 165rpx;
+				height: 165rpx;
+				border: 1rpx solid #979797;
+				margin-right: 9rpx;
 				position: relative;
-				z-index: 2;
-				&>image{
-					width: 70rpx;
-					height: 70rpx;
-					border-radius: 50%;
-					background-color: #FFFFFF;
+				&:nth-child(4n){
+					margin-right: 0rpx;
+				}
+				&:nth-child(n+5){
+					margin-top: 8rpx;
+				}
+				.bg-img{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
 				}
-				&>view{
-					font-size: 24rpx;
-					color: #FFFFFF;
-					margin-top: 4rpx;
+				.shop{
 					width: 100%;
-					text-align: center;
+					height: 100%;
+					background-color: rgba(0,0,0,0.1);
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					position: relative;
+					z-index: 2;
+					&>image{
+						width: 70rpx;
+						height: 70rpx;
+						border-radius: 50%;
+						background-color: #FFFFFF;
+					}
+					&>view{
+						font-size: 24rpx;
+						color: #FFFFFF;
+						margin-top: 4rpx;
+						width: 100%;
+						text-align: center;
+					}
 				}
 			}
 		}
diff --git a/components/lf-multiColumnAd/lf-multiColumnAd.vue b/components/lf-multiColumnAd/lf-multiColumnAd.vue
index 14b9668..46b2386 100644
--- a/components/lf-multiColumnAd/lf-multiColumnAd.vue
+++ b/components/lf-multiColumnAd/lf-multiColumnAd.vue
@@ -35,7 +35,7 @@
 		width: 750rpx;
 		height: max-content;
 		box-sizing: border-box;
-		padding: 30rpx 32rpx;
+		padding: 60rpx 32rpx 0rpx;
 		display: flex;
 		justify-content: space-between;
 		.left{
@@ -45,6 +45,7 @@
 				width: 100%;
 				height: 100%;
 				background: #D8D8D8;
+				border-radius: 20rpx 0rpx 0rpx 20rpx;
 			}
 		}
 		.right{
@@ -54,8 +55,16 @@
 				width: 228rpx;
 				height: 208rpx;
 				background: #D8D8D8;
+				&:nth-child(1n){
+					border-radius: 0rpx 20rpx 0rpx 0rpx;
+				}
 				&:nth-child(2n){
 					margin-top: 20rpx;
+					border-radius: 0rpx 0rpx 20rpx 0rpx;
+				}
+				&>image{
+					width: 100%;
+					height: 100%;
 				}
 			}
 		}
diff --git a/components/lf-seckill/lf-seckill.vue b/components/lf-seckill/lf-seckill.vue
index d4c90fd..5969a55 100644
--- a/components/lf-seckill/lf-seckill.vue
+++ b/components/lf-seckill/lf-seckill.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		<view class="title">剁手不心疼</view>
 		<view class="card">
 			<view class="title">秒杀购</view>
 			<view class="desc">低价不等人，快来秒杀啦～</view>
@@ -41,6 +42,13 @@
 		width: 750rpx;
 		height: max-content;
 		box-sizing: border-box;
+		.title{
+			font-size: 36rpx;
+			font-weight: bold;
+			text-align: center;
+			color: #222222;
+			margin-bottom: 30rpx;
+		}
 		.card{
 			width: 686rpx;
 			height: 471rpx;
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index ba9bbf1..01e5d65 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -78,12 +78,13 @@
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
 						<indexNav :nav-data="item.value" :meta="item.meta"></indexNav>
 					</view>
-					<!-- 服务升级 TODO 暂时借用快捷导航字段判断 -->
+					<!-- 今日头条 TODO 暂时借用快捷导航字段判断 -->
 					<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
-						<view class="fuwu-tips-title">服务升级</view>
+						<view class="fuwu-tips-title">今日头条</view>
 						<view>
-							<text class="fuwu-tips-desc1">线上商城全场限时包邮</text>
-							<text class="fuwu-tips-desc2">(部分品牌满额包邮)</text>
+							<text class="fuwu-tips-desc1">来自太阳的宝石-8月生辰石</text>
+							<!-- <text class="fuwu-tips-desc1">线上商城全场限时包邮</text>
+							<text class="fuwu-tips-desc2">(部分品牌满额包邮)</text> -->
 						</view>
 					</view>
 					<!-- 活动页入口 TODO -->
@@ -108,6 +109,7 @@
 					</view>
 					<!-- TODO 店铺商品展示模块 -->
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
+						<view class="lf-module-title">好物种草间</view>
 						<lf-shop-goods-card v-for="(d_item,d_index) in 2" :key="d_index"></lf-shop-goods-card>
 					</view>
 					 <!--图片魔方-->
@@ -124,6 +126,7 @@
 					</view>
 					<!-- TODO 为你推荐模块 -->
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
+						<view class="lf-module-title">为你推荐</view>
 						<lf-waterfall :list="recommend_list"></lf-waterfall>
 					</view>
 		        </view>
@@ -368,6 +371,8 @@
 		</view>
 		<!-- ad广告弹出组件 TODO 暂时先注释 -->
 		<!-- <lf-ad-modal :value.sync="show_ad"></lf-ad-modal> -->
+		<!-- 回到顶部组件 -->
+		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
 		<!-- tabbar组件 -->
 		<lf-tabbar />
 	</block>
@@ -1139,7 +1144,7 @@
 		background-color: #eff6f7;
 		margin: 60rpx auto 0;
 		display: flex;
-		justify-content: space-between;
+		// justify-content: space-between;
 		box-sizing: border-box;
 		align-items: center;
 		padding: 0 30rpx;
@@ -1147,9 +1152,13 @@
 		.fuwu-tips-title{
 			font-size: 36rpx;
 			color: #186c6b;
+			margin-right: 15rpx;
+			font-weight: bold;
+			font-family: '华文行楷';
 		}
 		.fuwu-tips-desc1{
 			font-size: 28rpx;
+			color: #222222;
 		}
 		.fuwu-tips-desc2{
 			font-size: 22rpx;
@@ -1160,9 +1169,19 @@
 		width: 686rpx;
 		height: 350rpx;
 		margin: 60rpx auto 0;
+		border-radius: 10rpx;
+		overflow: hidden;
 		&>image{
 			width: 100%;
 			height: 100%;
 		}
 	}
+	.lf-module-title{
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		color: #222222;
+		margin-bottom: 30rpx;
+		margin-top: 60rpx;
+	}
 </style>

From 832569c7d5fd7660161c9801bb59950186ed0858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 6 Sep 2021 17:26:20 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E9=A1=B5=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-code/lf-barcode.vue         |   1 +
 components/lf-code/lf-qrcode.vue          |   1 +
 pages.json                                |   7 +
 pages/point/shoppingMall/shoppingMall.vue | 279 ++++++++++++++++++++++
 4 files changed, 288 insertions(+)
 create mode 100644 pages/point/shoppingMall/shoppingMall.vue

diff --git a/components/lf-code/lf-barcode.vue b/components/lf-code/lf-barcode.vue
index 3b68bd9..3552469 100644
--- a/components/lf-code/lf-barcode.vue
+++ b/components/lf-code/lf-barcode.vue
@@ -34,6 +34,7 @@
 			}
 		},
 		created() {
+			// https://ext.dcloud.net.cn/plugin?id=4662
 			this.height = this.options.height + 'rpx';
 			this.width = this.options.width + 'rpx';
 			this.SpecialTreatment(this.options)
diff --git a/components/lf-code/lf-qrcode.vue b/components/lf-code/lf-qrcode.vue
index f5ec7c7..621163d 100644
--- a/components/lf-code/lf-qrcode.vue
+++ b/components/lf-code/lf-qrcode.vue
@@ -33,6 +33,7 @@
 			}
 		},
 		created() {
+			// https://ext.dcloud.net.cn/plugin?id=4662
 			this.size = this.options.size + 'rpx';
 			this.SpecialTreatment(this.options)
 			this.$nextTick(()=>{
diff --git a/pages.json b/pages.json
index 48797d8..3725ee9 100644
--- a/pages.json
+++ b/pages.json
@@ -797,6 +797,13 @@
 				"navigationBarTitleText": "会员码",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/point/shoppingMall/shoppingMall",
+			"style" : {
+				"navigationBarTitleText": "积分商城",
+				"navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/point/shoppingMall/shoppingMall.vue b/pages/point/shoppingMall/shoppingMall.vue
new file mode 100644
index 0000000..8cd0333
--- /dev/null
+++ b/pages/point/shoppingMall/shoppingMall.vue
@@ -0,0 +1,279 @@
+<template>
+	<view>
+		<lf-nav title="积分商城" titleColor="#fff" bgColor="transparent" :showIcon="true" :spreadOut="false"></lf-nav>
+		<view class="head">
+			<view class="bg-view"></view>
+		</view>
+		<view class="menu">
+			<view class="left">
+				<view>
+					<text class="lf-iconfont icon--"></text>
+					<text class="point-num">783</text>
+					<text class="lf-iconfont icon--"></text>
+				</view>
+				<view class="lf-font-24">当前积分</view>
+			</view>
+			<view class="lf-flex">
+				<view class="item">
+					<text class="lf-iconfont icon-- lf-font-50"></text>
+					<text>兑换记录</text>
+				</view>
+				<view class="item">
+					<text class="lf-iconfont icon-- lf-font-50"></text>
+					<text>购物车</text>
+					<view class="angle-mark">99+</view>
+				</view>
+			</view>
+		</view>
+		<view class="lf-m-t-30" v-if="tab_list.length">
+			<u-tabs :list="tab_list" 
+				active-color="#15716E" 
+				inactive-color='#777777' 
+				:is-scroll="true" 
+				:current="tab_current" 
+				@change="tabChange">
+			</u-tabs>
+		</view>
+		<view class="page-item">
+			<view class="filter">
+				<view :class="{'filter-item': true, 'filter-active': index == filter_current}" 
+					v-for="(item, index) in filter_list" :key="index"
+					@click="filter_current = index">{{ item }}
+				</view>
+			</view>
+			<view class="goods">
+				<lf-waterfall :list="goods_list"></lf-waterfall>
+			</view>
+		</view>
+		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
+	</view>
+</template>
+
+<script>
+	import lfWaterfall from '@/components/lf-waterfall-shopdetails/lf-waterfall.vue';
+	export default {
+		components: {
+			lfWaterfall
+		},
+		data(){
+			let _public = {
+				page: 1,
+				isPage: true,
+				loadingClass: true,
+				loadingText: '正在加载中'
+			}
+			return {
+				tab_current: 0,
+				tab_list: [{
+					name: '全部',
+					list: [],
+					..._public
+				},{
+					name: '时尚尖货',
+					list: [],
+					..._public
+				},{
+					name: '美容美妆',
+					list: [],
+					..._public
+				},{
+					name: '家具用品',
+					list: [],
+					..._public
+				},{
+					name: '儿童玩具',
+					list: [],
+					..._public
+				}],
+				filter_list: ['1～100','100～1万','1万～2万','2万～5万','>5万'],
+				filter_current: null,
+				goods_list: [
+					{
+						id: 10,
+						original_price: "4111.00",
+						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+						price: "2412.00",
+						product_id: 1008,
+						sale: 0,
+						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+					},
+					{
+						id: 10,
+						original_price: "4111.00",
+						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+						price: "2412.00",
+						product_id: 1008,
+						sale: 0,
+						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+					},
+					{
+						id: 10,
+						original_price: "4111.00",
+						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+						price: "2412.00",
+						product_id: 1008,
+						sale: 0,
+						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+					},
+					{
+						id: 10,
+						original_price: "4111.00",
+						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+						price: "2412.00",
+						product_id: 1008,
+						sale: 0,
+						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+					}
+				]
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			tabChange(event){
+				this.tab_current = event;
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		overflow-x: hidden;
+	}
+</style>
+<style lang="scss" scoped="scoped">
+	.head{
+		width: 750rpx;
+		height: 283rpx;
+		background: linear-gradient(90deg, #22A2A0 0%, #187B7A 100%);
+		position: relative;
+		overflow: hidden;
+		.bg-view{
+			position: absolute;
+			right: -100rpx;
+			top: -200rpx;
+			width: 400rpx;
+			height: 400rpx;
+			border-radius: 50%;
+			background-color: rgba(255,255,255,0.04);
+		}
+	}
+	.menu{
+		width: 686rpx;
+		height: 170rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		color: #15716E;
+		margin: -80rpx auto 0;
+		position: relative;
+		z-index: 2;
+		.left{
+			width: 340rpx;
+			.point-num{
+				font-size: 48rpx;
+				font-weight: bold;
+				margin: 0 10rpx;
+			}
+		}
+		.item{
+			width: 100rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			font-size: 24rpx;
+			position: relative;
+			&:nth-child(2n){
+				margin-left: 40rpx;
+			}
+			.angle-mark{
+				width: 30rpx;
+				height: 30rpx;
+				background-color: #FF9D9D;
+				color: #FFFFFF;
+				border-radius: 50%;
+				position: absolute;
+				right: 10rpx;
+				top: 10rpx;
+				font-size: 18rpx;
+				text-align: center;
+				line-height: 30rpx;
+			}
+		}
+	}
+	
+	.page-item{
+		width: 750rpx;
+		height: max-content;
+		.filter{
+			width: 100%;
+			height: 83rpx;
+			border: 1rpx solid #e5e5e5;
+			box-sizing: border-box;
+			padding: 0 32rpx;
+			display: flex;
+			align-items: center;
+			.filter-item{
+				width: 123rpx;
+				height: 43rpx;
+				font-size: 24rpx;
+				color: #777777;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 26rpx;
+				&:nth-child(n+2){
+					margin-left: 28rpx;
+				}
+				&.filter-active{
+					background-color: #15716E;
+					color: #FFFFFF;
+				}
+			}
+		}
+		.goods{
+			padding: 30rpx 32rpx;
+		}
+	}
+	
+	// tabs 样式修改
+	/deep/.u-scroll-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+		width: max-content;
+	}
+	/deep/.u-scroll-box .u-tab-bar {
+		background-color: #15716E!important;
+		width: 80rpx!important;
+		position: absolute;
+		left: 0;
+		bottom: -12rpx;
+	}
+	
+	/deep/.special_tab .u-tabs .u-scroll-box .u-tab-bar {
+		background-color: #15716E!important;
+		width: 56rpx!important;
+		position: absolute;
+		height: 5rpx!important;
+		left: 8rpx;
+		bottom: -4rpx;
+	}
+	
+	/deep/ .u-tab-item {
+		font-size: 28rpx!important;
+	}
+</style>

From 18d2b21273a0a95068e1a0aba497fd4eae0227b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 6 Sep 2021 17:32:07 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnav=E8=B7=B3=E8=BD=ACBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-nav/lf-nav.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index b444854..eecd0ed 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -9,8 +9,8 @@
 			 </block>
 			 <block v-else>
 				 <view class="head-nav" :style="{'top': headHeight - 40 + 'px'}" v-if="showIcon">
-					<text class="le lf-icon-jiantouzuo font-40size" @click="clickDropOut"></text>
-					<text class="le lf-icon-home font-40size" @click="clickHome"></text>
+					<text class="lf-iconfont icon-daifukuan font-40size" @click="clickDropOut"></text>
+					<text class="lf-iconfont icon-sousuo font-40size" @click="clickHome"></text>
 				  </view>
 				  <view class="title-box" :style="{'margin': headHeight - 36 + 'px auto 0'}">
 					<input class="search" placeholder="搜你想要的" confirm-type="search" v-model="value" @confirm="onSearch" v-if="search" />
@@ -99,7 +99,7 @@
 				let pages = getCurrentPages();
 				if(pages.length <= 1){
 					uni.redirectTo({
-						url: '/pages/index/index'
+						url: '/pages/index/index/index'
 					})
 					return;
 				}
@@ -109,7 +109,7 @@
 			// 监听回到首页
 			clickHome(){
 				uni.reLaunch({
-					url: '/pages/index/index'
+					url: '/pages/index/index/index'
 				})
 			},
 			// 搜索