修复图片中文名错误

src/components/hs-material-thumbnail/hs-material-thumbnail.vue

+<template>
+  <view class="home_con_content_order u-m-t-30" >
+    <image style="width: 100%;height: 160rpx;" src="@/static/images/home/1@2x.png" mode=""></image>
+    <view class="order_tit">
+      <view class="u-flex justify-between u-font-32">
+        <span class="color_DDA973 u-line-1">加厚荷兰绒绒布布料备份加厚荷兰绒绒布布料备份</span>
+        <span><u-icon size="24" color="#fff" name="arrow-right"></u-icon></span>
+      </view>
+      <view class="u-font-24 u-m-t-20 color_6F6F72">
+        <span class="u-m-r-10">针织</span>
+        |
+        <span class="u-m-l-10 u-m-r-10">180cm</span>
+        |
+        <span class="u-m-l-10">100%面备份面备份面备份面备份面备份面备份面备份面备份</span>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "hs-material-thumbnail",
+  props: {
+    item: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {};
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.home_con_content_order {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 160rpx;
+  border-radius: 8rpx;
+  overflow: hidden;
+  width: 100%;
+  .order_tit {
+    position: absolute;
+    width: 75%;
+    right: 0;
+    flex-direction: column;
+    display: flex;
+    justify-content: center;
+    padding: 20rpx;
+    flex: 1;
+    height: 100%;
+    background: rgba(17, 21, 30, 0.5);
+  }
+}
+.width_30 {
+  width: 30%;
+}
+
+.ht_136 {
+  height: 136rpx;
+}
+
+.ft-size-24 {
+  font-size: 24rpx;
+}
+
+.ft-size-28 {
+  font-size: 28rpx;
+}
+
+.ft-size-32 {
+  font-size: 32rpx;
+}
+
+.color_DDA973 {
+  color: #dda973;
+}
+
+.color_6F6F72 {
+  color: #6f6f72;
+}
+
+.color_fff08 {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.color_00004 {
+  color: rgba(0, 0, 0, 0.4);
+}
+
+.ft-wt-700 {
+  font-weight: 700;
+}
+
+.bg_fff {
+  background: #fff;
+}
+
+.ds_flex {
+  display: flex;
+}
+
+.fx_wrap {
+  flex-wrap: wrap;
+}
+
+.fx_dir_column {
+  flex-direction: column;
+}
+
+.jt_con_center {
+  justify-content: center;
+}
+
+.jt_con_sp_between {
+  justify-content: space-between;
+}
+
+.bd_rad_8 {
+  border-radius: 8rpx !important;
+}
+
+.txt_center {
+  text-align: center;
+}
+
+.ps_relative {
+  position: relative;
+}
+
+.ps_absolute {
+  position: absolute;
+}
+
+.bd_dashed {
+  position: relative;
+}
+
+.bd_dashed:after {
+  border-width: 1px;
+}
+
+.bd_dashed-bottom:after,
+.bd_dashed-left:after,
+.bd_dashed-right:after,
+.bd_dashed-top-bottom:after,
+.bd_dashed-top:after,
+.bd_dashed:after {
+  content: ' ';
+  position: absolute;
+  left: 0;
+  top: 0;
+  pointer-events: none;
+  box-sizing: border-box;
+  transform-origin: 0 0;
+  width: 199.8%;
+  height: 199.7%;
+  transform: scale(0.5, 0.5);
+  border: 1px dashed #e4e7ed;
+  z-index: 2;
+}
+
+.ov_hiden {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+</style>

src/components/hs-tip-title/hs-tip-title.vue

@@ -24,7 +24,6 @@ export default {
 .title {
   font-size: 28rpx;
   font-weight: 600;
-  display: inline-block;
   position: relative;
   padding-left: 20rpx;
   .line{

src/pages/designCommissioned/addItem.vue

@@ -10,7 +10,9 @@
       <!--所选面料-->
       <view class="u-p-30 bg-fff u-m-b-20">
         <hs-tip-title title="所选面料"></hs-tip-title>
-        <view ></view>
+        <view >
+          <hs-material-thumbnail></hs-material-thumbnail>
+        </view>
       </view>
       <!--面料颜色要求-->
       <view class="u-p-30 u-m-b-20 bg-fff">
@@ -157,9 +159,10 @@
 
 <script>
 import HsTipTitle from "../../components/hs-tip-title/hs-tip-title";
+import HsMaterialThumbnail from "../../components/hs-material-thumbnail/hs-material-thumbnail";
 export default {
   name: "index",
-  components: {HsTipTitle},
+  components: {HsMaterialThumbnail, HsTipTitle},
   data(){
     return{
       timePickerShow: false,

src/pages/designCommissioned/list.vue

+<template>
+  <view>
+    <view id="header">
+      <!--导航栏 navbar-->
+      <u-navbar title="选款"
+                :border-bottom="false"
+                :background="{backgroundColor: 'whitesmoke'}">
+      </u-navbar>
+      <!--状态栏 tab-->
+      <view>
+        <u-tabs-swiper ref="uTabs" :list="status" :current="current" @change="tabsChange" :is-scroll="false"
+                       name="label"
+                       :bar-style="{display: 'none'}"
+                       :active-item-style="{
+                        fontSize: '32rpx',
+                        color: '#AF8D66'
+                      }"
+                       swiperWidth="750"></u-tabs-swiper>
+      </view>
+      <!--状态栏 tab-->
+      <view v-if="!status[current].status">
+        <view class="list-tip u-flex u-p-r-30 u-p-l-30" >
+          <text class="u-flex-1">
+            全部总共 {{totalNum}}款
+          </text>
+          <text class="u-flex-1" v-if="current === 3">
+            已选中{{ selectedLength}} 款
+          </text>
+          <u-icon name="close"></u-icon>
+        </view>
+      </view>
+    </view>
+    <!-- 列表内容 -->
+    <view class="u-p-r-30 u-p-l-30 body" :style="{ bottom: footerHeight+ 'px', top: headerHeight + 'px' }">
+       <view v-for="(item,index) in data">
+         <view class="u-flex u-p-t-12 u-p-b-12">
+           <text class="u-flex-1">
+             {{ item.label }}(20 款)
+<!--             {{item.children.length}}-->
+<!--             款)-->
+           </text>
+           <text class="" @click="collapse(index)">
+             {{ activeIndex === index ? '收起': '展开' }}
+           </text>
+         </view>
+         <view v-if="activeIndex === index">
+           <view class="item bg-fff u-p-30" v-for="(children) in item.children">
+             <view class="item-header u-m-b-22">
+               <hs-tip-title title="夹克"></hs-tip-title>
+             </view>
+             <view class="item-body">
+               <view>
+                 风格 男装｜上装｜25～35岁｜时尚休闲
+               </view>
+               <view class="u-flex u-m-t-24 u-m-b-30 ">
+                 <view class="item-img">
+                   <u-image class="item-img" src="https://cdn.uviewui.com/uview/example/fade.jpg" width="100%" height="100%"></u-image>
+                 </view>
+                 <view class="item-img">
+                   <u-image class="item-img" src="https://cdn.uviewui.com/uview/example/fade.jpg" width="100%" height="100%"></u-image>
+                 </view>
+               </view>
+               <view class="bd_split_line"></view>
+             </view>
+             <view class="item-footer text-right" v-if="children.status !== 3">
+               <view class="item-footer-button">
+                 <u-button plain shape="circle">放弃</u-button>
+               </view>
+               <view class="item-footer-button">
+                 <u-button type="primary" shape="circle" >选中</u-button>
+               </view>
+             </view>
+           </view>
+         </view>
+
+       </view>
+    </view>
+
+    <!--底部按钮-->
+    <view class="footer" id="footer" v-if="current === 3">
+      <view class="footer-btn">
+        <view class="custom-style-round-circle custom-style-btn custom-style">
+          <view class="custom-style-right submit">
+            <view class="title">提交选中</view>
+            <view class="desc">提交数量:<text class="color">2款</text></view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import status from './mixins/status'
+import HsTipTitle from "../../components/hs-tip-title/hs-tip-title";
+export default {
+  name: "list",
+  components: {HsTipTitle},
+  mixins: [status],
+  data() {
+    return {
+      current: 0, // tabs组件的current值，表示当前活动的tab选项
+      activeIndex: 0,
+      // data: ,
+      res: [] , //列表数据源
+      headerHeight: 0,
+      footerHeight: 0
+    };
+  },
+  computed:{
+    data(){
+      return [
+        {
+          children: [
+            {
+              title: '立领夹克',
+              status: 1
+            },
+            {
+              title: '立领夹克',
+              status: 1
+            },
+            {
+              title: '立领夹克',
+              status: 1
+            },
+            {
+              title: '立领夹克',
+              status: 1
+            },
+            {
+              title: '立领夹克',
+              status: 1
+            },
+          ],
+          label: '12月11日'
+        },
+        {
+          children: [
+            {
+              title: '立领夹克',
+              status: 1
+            },
+          ],
+          label: '12月10日'
+        }
+      ]
+    },
+    totalNum(){
+      let res = this.data.reduce((total,item) =>{
+        return total.concat(item.children)
+      },[]);
+      console.log(res)
+      return 0;
+    },
+    selectedLength(){
+      return this.data.filter
+    }
+  },
+  watch:{
+    current(){
+      this.getFooterHeight();
+    }
+  },
+  mounted() {
+
+    this.uGetRect("#header").then(res =>{
+      this.headerHeight = res.height;
+    })
+  },
+  methods: {
+    getFooterHeight(){
+      this.$nextTick(() =>{
+        this.uGetRect("#footer").then(res =>{
+          this.footerHeight = res.height || 0;
+        })
+      })
+    },
+    uGetRect(selector, all) {
+      return new Promise((resolve) => {
+        uni.createSelectorQuery()
+            .in(this)[all ? 'selectAll' : 'select'](selector)
+            .boundingClientRect((rect) => {
+              if (all && Array.isArray(rect) && rect.length) {
+                resolve(rect)
+              }
+              if (!all && rect) {
+                resolve(rect)
+              }
+              if(rect === null){
+                resolve({})
+              }
+            })
+            .exec()
+      })
+    },
+    collapse(index){
+      this.activeIndex = this.activeIndex === index ? null : index;
+    },
+    getList(){
+
+    },
+    // tabs通知swiper切换
+    tabsChange(index) {
+      this.current = index;
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.list-tip{
+  background: #AF8D66;
+  line-height: 72rpx;
+  color: rgba(0,0,0,0.60);
+}
+.item{
+  background: #fff;
+  border-radius: 8rpx;
+  margin-bottom: 20rpx;
+  &-img{
+    width: 160rpx;
+    height: 160rpx;
+    margin-right: 20rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+  }
+
+  &-footer{
+    &-button{
+      width: 160rpx;
+      height: 64rpx;
+      margin-left: 20rpx;
+      display: inline-block;
+    }
+  }
+}
+.bd_split_line {
+  width: 100%;
+  border-top: 1px solid #f6f6f6;
+  margin: auto;
+  position: relative;
+  height: 30rpx;
+  &::before {
+    content: ' ';
+    position: absolute;
+    left: -45rpx;
+    top: -15rpx;
+    display: block;
+    width: 30rpx;
+    height: 30rpx;
+    background: #f6f6f6;
+    border-radius: 100rpx;
+  }
+  &::after {
+    content: ' ';
+    position: absolute;
+    right: -45rpx;
+    top: -15rpx;
+    display: block;
+    width: 30rpx;
+    height: 30rpx;
+    background: #f6f6f6;
+    border-radius: 100rpx;
+  }
+}
+@mixin vue-flex($direction: row) {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  flex-direction: $direction;
+  /* #endif */
+}
+.custom-style{
+  color: #fff; height: 88rpx; line-height: 88rpx;
+  @include vue-flex;
+  &-btn{
+    overflow: hidden;
+  }
+  &-round-circle{
+    border-radius: 100rpx;
+  }
+  /*background: #000;*/
+  .custom-style-left{ width: 240rpx; background: #d6d6d6; text-align: center }
+  .custom-style-right{ flex: 1; background: rgba(0,0,0,0.80);text-align: center}
+  .save{
+    font-size: 34rpx;
+    color: #000000;
+  }
+  .submit{
+    font-weight: 500;
+    font-size: 34rpx;
+    line-height: 100%;
+    .title{
+      margin: 8rpx 0;
+    }
+    .desc{
+
+      font-size: 20rpx;
+      .color{
+        color: #DDA973;
+      }
+    }
+  }
+}
+.body{
+  position: absolute;
+  width: 100%;
+  height: auto;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  overflow-y: auto;
+
+}
+.footer {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+
+  z-index: 998;
+  background: #fff;
+  box-shadow: 0px -4rpx 6rpx 0px rgba(178,182,214,0.10);
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+  .footer-btn{
+    padding: 20rpx 60rpx;
+  }
+}
+</style>

src/pages/designCommissioned/listSelectToAdd.vue

@@ -23,15 +23,7 @@
           <view>
             <radio :value="item.value" :checked="index === selectedIndex" />
           </view>
-          <view class="item"
-                style="background-image: url('https://www.baidu.com/img/PCtm_d9c8750bed0b3c7d089fa7d55720d6cf.png')"
-                :class="[index === selectedIndex ? 'active': '']">
-            <view class="item-text">
-               {{
-                  item.title
-               }}
-            </view>
-          </view>
+          <hs-material-thumbnail :item="item"></hs-material-thumbnail>
         </view>
       </radio-group>
     </view>
@@ -49,9 +41,10 @@
 
 <script>
 import HsSelectItem from "../../components/hs-select-item/hs-select-item";
+import HsMaterialThumbnail from "../../components/hs-material-thumbnail/hs-material-thumbnail";
 export default {
   name: "listSelectToAdd",
-  components: {HsSelectItem},
+  components: {HsMaterialThumbnail, HsSelectItem},
   data(){
     return {
       keyword: "",

src/pages/designCommissioned/mixins/status.js

+
+let statusList = [
+    {label:"全部",value: null ,close: false},
+    {label:"备选",value: 1,close: false},
+    {label:"待定",value: 2,close: false},
+    {label:"选中",value: 3,close: false},
+    {label:"放弃",value: 4,close: false},
+    {label:"已提交",value: 5,close: false}
+]
+export default {
+    data(){
+        return {
+            status: statusList
+        }
+    },
+    filters:{
+        filterStatus(value){
+            switch (value) {
+
+            }
+        }
+    },
+    methods:{
+        getStatus(){
+
+        },
+        changeStatus(status){
+            switch (status) {
+                case (1):
+                    return 0;
+                case (2):
+                    return 4;
+                case (3):
+                    return 5;
+                case (4):
+                    return 2;
+                case (5):
+                    return 3;
+                default:
+                    return 1;
+            }
+        },
+    }
+}

src/pages/user/tenanList/index.vue

@@ -7,6 +7,7 @@
      </view>
 <!--     <button @click="getTenanList">getTenanList</button>-->
      <button @click="next" :disabled="active === -1">下一步</button>
+     <button @click="login">下一步</button>
 <!--     <view>encryptToken结果:{{token}}</view>-->
   </view>
 </template>
@@ -83,6 +84,7 @@ export default {
       uni.setStorageSync('encryptToken',"")
     },
     login(){
+      uni.setStorageSync('encryptToken',"MBN9Om00MUE9CEcnizCOwinwRe5NJNdZb4JyDT3/ze+vyyv5QNXVoo0Sb65Gptgdy9BZZFX36tEge08iDEzLHIYsLS95bnrcwUOh1tp9pMiJ0XYNBFnFcHFXP9AgeAmYe9EXW+akUkx4Zr7PGiG7eqhuabLlPisHhoQOBfFFTwQ=")
       // 核对
       this.$http(
           "auth.checkSecretKey",

src/static/style/index.scss

@@ -11,7 +11,7 @@
 page {
 	-webkit-overflow-scrolling: touch; // ios滑动不流畅
 	height: 100%;
-	background: #f6f6f6;
+	background: whitesmoke;
 	width: 100%;
 	font-size: 30rpx;
 	font-family: OPPOSANS;