段倩文 1 жил өмнө
parent
commit
e8e03f4c7c

+ 18 - 14
src/components/service/serviceItem.vue

@@ -3,12 +3,12 @@
 <!--    <u-swipe-action>
       <u-swipe-action-item :options="options1"
         @click="handlerClearItem(itm,index)"> -->
-        <view class="" :key="index" v-for="(itm, index) of item">
+        <view class="list_item" :key="index" v-for="(itm, index) of item">
           <view class="list" @click="handlerRouterSkip(itm, index)">
             <view class="list-img">
               <!-- <image class="img" :src="error || !loaded ? 'https://cdn.uviewui.com/uview/album/10.jpg' : itm.logo"
                 mode="scaleToFill"></image> -->
-                <image class="img" :src="itm.logo"  mode="scaleToFill"></image>
+                <image class="img" :src="itm.logo"  mode="aspectFill"></image>
             </view>
 
             <view class="list-main">
@@ -99,32 +99,35 @@
 
   .sort {
     min-height: 100vh;
-
+    .list_item{
+      // height: 200rpx;
+    }
     .list {
-      height: 250rpx;
+      // height: 200rpx;
       background-color: #fff;
-      padding: 20rpx;
-      margin-bottom: 20rpx;
+      padding:10rpx 20rpx;
+      margin-bottom: 3rpx;
       display: flex;
 
       .list-img {
-        width: 260rpx;
-        height: 100%;
-        background-color: #ec5729;
+
+        // background-color: #ec5729;
         margin-right: 20rpx;
 
         image {
-          width: 100%;
-          height: 100%;
+          width: 150rpx;
+          height:150rpx;
+          margin-top: 10rpx;
         }
       }
 
       .list-main {
-        width: calc(100% - 280rpx);
+        width: calc(100% - 180rpx);
       }
 
       .item-text {
         font-weight: bold;
+        font-size: 32rpx;
         margin: 10rpx 0 10rpx;
         color: #333;
       }
@@ -157,10 +160,11 @@
       .list-item {
         display: flex;
         justify-content: space-between;
-        margin-top: 40rpx;
-
+        margin-top: 30rpx;
+        flex:1;
         .item-l {
           color: #cfcfcf;
+          font-size: 28rpx;
         }
 
         .item-r {

+ 3 - 2
src/pages/tabbar/components/communityPop.vue

@@ -14,7 +14,8 @@
         <view class="item-top">
           <view class="top-left">
             <view class="top-img">
-              <image :src="item.userDTO.avatar" class="img" mode=""></image>
+              <!-- <image :src="item.userDTO.avatar" class="img" mode=""></image> -->
+              <u-avatar :src="item.userDTO.avatar" size="45" />
             </view>
             <view class="top-text">
               <view class="text-title">{{ item.userDTO.nickname }}</view>
@@ -207,7 +208,7 @@ export default {
             display: flex;
             flex-direction: column;
             justify-content: space-around;
-            margin-left: 10rpx;
+            margin-left: 20rpx;
 
             .text-title {
               font-weight: bold;

+ 3 - 3
src/pages/tabbar/home.vue

@@ -5,10 +5,10 @@
 			<view class="nav-bar">
 				<u-navbar :bgColor="'#ffffff'" :placeholder="true">
 					<view slot="left" @click.stop="manualGetLocation">
-						<p class="address-text">{{ nowAddress }}</p>
+						<view class="address-text">{{ nowAddress }}</view>
 						<text class="iconfont icon-chevron-down" />
 					</view>
-					<view slot="center">
+					<view slot="center" style="width: 350rpx">
 						<u-search placeholder="请输入搜索内容" :showAction="false" v-model="keyword"
 							@click="$Router.push('/pagesHome/homeSearch')" :disabled="true" />
 					</view>
@@ -254,7 +254,7 @@
 				background-color: #ffffff;
 			}
       .address-text{
-        max-width: 130rpx;
+        min-width: 120rpx;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;

+ 129 - 115
src/pages/tabbar/promotionCode.vue

@@ -10,14 +10,7 @@
 
     <view class="qrcode-box">
       <view class="qrcode">
-        <uQrcode
-          ref="qr"
-          canvas-id="qr"
-          :value="text"
-          :size="size"
-          @click="remake"
-          @complete="complete($event)"
-        >
+        <uQrcode ref="qr" canvas-id="qr" :value="text" :size="size" @click="remake" @complete="complete($event)">
         </uQrcode>
       </view>
     </view>
@@ -27,121 +20,142 @@
 </template>
 
 <script>
-import uQrcode from '@/uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue';
-import { mapGetters } from 'vuex';
-export default {
-  data() {
-    return {
-      text: 'https://image.baidu.com/search/index?tn=baiduimage&ps=1&ct=201326592&lm=-1&cl=2&nc=1&ie=utf-8&dyTabStr=MCwxLDMsMiw2LDQsNSw3LDgsOQ%3D%3D&word=giao',
-      size: 200,
-    };
-  },
-  components: {
-    uQrcode,
-  },
-  computed: {
-    ...mapGetters(['location', 'avatar', 'nickname']),
-  },
-  methods: {
-    complete(e) {
-      if (e.success) {
-        console.log('生成成功');
-      } else {
-        console.log('生成失败');
-      }
+  import uQrcode from '@/uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue';
+  import {
+    mapGetters
+  } from 'vuex';
+  export default {
+    data() {
+      return {
+        text: 'https://image.baidu.com/search/index?tn=baiduimage&ps=1&ct=201326592&lm=-1&cl=2&nc=1&ie=utf-8&dyTabStr=MCwxLDMsMiw2LDQsNSw3LDgsOQ%3D%3D&word=giao',
+        size: 200,
+      };
     },
-    remake() {
-      // const ref = this.$refs['qr'];
-      // ref.remake();
+    components: {
+      uQrcode,
     },
-    save() {
-      uni.showLoading({
-        title: '保存中',
-        mask: true,
-      });
-      const ref = this.$refs['qr'];
-      ref.save({
-        success: res => {
-          uni.hideLoading();
-          uni.showToast({
-            icon: 'success',
-            title: '保存成功',
-          });
-        },
-        fail: err => {
-          uni.showToast({
-            icon: 'none',
-            title: JSON.stringify(err),
-          });
-        },
-      });
+    computed: {
+      ...mapGetters(['location', 'avatar', 'nickname']),
     },
-  },
-};
+    methods: {
+      complete(e) {
+        if (e.success) {
+          console.log('生成成功');
+        } else {
+          console.log('生成失败');
+        }
+      },
+      remake() {
+        // const ref = this.$refs['qr'];
+        // ref.remake();
+      },
+      save() {
+        uni.showLoading({
+          title: '保存中',
+          mask: true,
+        });
+        const ref = this.$refs['qr'];
+        ref.save({
+          success: res => {
+            uni.hideLoading();
+            uni.showToast({
+              icon: 'success',
+              title: '保存成功',
+            });
+          },
+          fail: err => {
+            uni.showToast({
+              icon: 'none',
+              title: JSON.stringify(err),
+            });
+          },
+        });
+      },
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-.img-box {
-  display: flex;
-  align-items: center;
-  margin: 280rpx auto 0;
-  padding: 20rpx;
-  border-radius: 20rpx;
-  width: 90%;
-  background: linear-gradient(to right, #f3904f, #3b4371);
-  .img {
-    width: 160rpx;
-    height: 160rpx;
+  .page {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: #fff;
+    z-index: -1;
+
+  }
+
+
+
+  .img-box {
+    display: flex;
+    align-items: center;
+    margin: 280rpx auto 0;
+    padding: 20rpx;
     border-radius: 20rpx;
-    margin-left: 12%;
+    width: 90%;
+    background: linear-gradient(to right, #f3904f, #3b4371);
+
+    .img {
+      width: 160rpx;
+      height: 160rpx;
+      border-radius: 20rpx;
+      margin-left: 12%;
+    }
   }
-}
-.img-text {
-  font-size: 28rpx;
-  font-weight: bold;
-  margin-left: 20rpx;
-  display: flex;
-  flex-direction: column;
-  align-content: space-evenly;
-  .name {
-    font-size: 36rpx;
-    color: #fff;
+
+  .img-text {
+    font-size: 28rpx;
+    font-weight: bold;
+    margin-left: 20rpx;
+    display: flex;
+    flex-direction: column;
+    align-content: space-evenly;
+
+    .name {
+      font-size: 36rpx;
+      color: #fff;
+    }
+
+    .address {
+      // color: #B5B5B5;
+      color: #fff;
+      margin-top: 24rpx;
+    }
   }
-  .address {
-    // color: #B5B5B5;
-    color: #fff;
-    margin-top: 24rpx;
+
+  .qrcode-box {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 0 30px;
+    margin-top: 100rpx;
+  }
+
+  .scan-text {
+    text-align: center;
+    font-size: 28rpx;
+    color: #b7b7b7;
+    margin-top: 40rpx;
+  }
+
+  .qrcode {
+    padding: 16px;
+    background-color: #ffffff;
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1);
+    border-radius: 2px;
+    overflow: hidden;
+  }
+
+  .msg {
+    margin-top: 15px;
+    font-size: 14px;
+    color: #9a9b9c;
+  }
+
+  .save {
+    margin-top: 10px;
   }
-}
-.qrcode-box {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 0 30px;
-  margin-top: 100rpx;
-}
-.scan-text {
-  text-align: center;
-  font-size: 28rpx;
-  color: #b7b7b7;
-  margin-top: 40rpx;
-}
-
-.qrcode {
-  padding: 16px;
-  background-color: #ffffff;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1);
-  border-radius: 2px;
-  overflow: hidden;
-}
-
-.msg {
-  margin-top: 15px;
-  font-size: 14px;
-  color: #9a9b9c;
-}
-
-.save {
-  margin-top: 10px;
-}
 </style>

+ 11 - 11
src/pagesHome/marketer/productDetail.vue

@@ -314,7 +314,7 @@
     min-height: 100vh;
     background-color: #fff;
     padding: 0 20rpx;
-  
+
     .service-content {
       .service-title {
         font-size: 36rpx;
@@ -345,7 +345,7 @@
         padding-bottom: 10rpx;
       }
     }
-  
+
     /* 占位 */
     .placeholder {
       height: 30rpx;
@@ -357,16 +357,16 @@
     justify-content: space-between;
     align-items: center;
   }
-  
+
   .text_title {
     font-size: 24rpx;
     color: #999;
   }
-  
+
   // 底部
   .service-footer {
-    height: 60px;
-    padding: 10rpx 20rpx;
+
+    padding: 20rpx 40rpx 80rpx 60rpx;
     position: fixed;
     left: 0;
     bottom: 0;
@@ -377,25 +377,25 @@
     background-color: #fff;
     border-top: 1px solid #eb8b8b;
     box-sizing: border-box;
-  
+
     .u-icon {
       justify-content: center !important;
     }
-  
+
     .user-operate {
       text-align: center;
     }
-  
+
     .user-operate-text {
       font-size: 24rpx;
       font-weight: 600;
     }
-  
+
     .buyNow {
       width: 200px;
       height: 40px;
       display: flex;
-      justify-content: center;
+      justify-content: flex-end;
       font-size: 26rpx;
       color: #fff;
       text-align: center;