sys %!s(int64=2) %!d(string=hai) anos
pai
achega
c2fe344709

+ 3 - 3
components/en-utils/en-nav/en-nav.vue

@@ -2,7 +2,7 @@
   <view class="" :style="[{ 'background':bgckgroundBox}]">
     <view class="header"  :style="[{'height': customBarH + 'px', 'padding-top': statusBarH + 'px'}]">
       <view class="flexbox"  :class="{'flexbox-xcx':(isXcx && rightShow)}"
-        :style="[{'height': customBarH + 'px'}]">
+            :style="[{'height': customBarH + 'px'}]">
         <view class="left-button" @tap="goBack">
           <image class="back-img"  :src="'/static/img/common/back'+(titleColor==='#fff'?'-white':'')+'.png'" mode="aspectFill"></image>
         </view>
@@ -124,7 +124,7 @@
 @import url("../../../static/css/en-common.css") ;
 
   .header {
-    width: 100vw;
+    width: 100%;
     position: fixed;
     left: 0;
     top: 0;
@@ -180,7 +180,7 @@
 
 
   .box-title {
-    width: 100vw;
+
   }
 
 

+ 8 - 0
pages.json

@@ -283,6 +283,14 @@
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }
+    },
+    {
+      "path": "pages/my/set/conversion",
+      "style": {
+        "navigationBarTitleText": "兑换码",
+        "navigationBarTextStyle": "black",
+        "enablePullDownRefresh": false
+      }
     }
   ],
   "globalStyle": {

+ 10 - 4
pages/my/set/blacklist.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="blacklist-box">
     <en-nav title="黑名单" :title-color="'#333'"   @navHeight="setNavHeight"></en-nav>
-    <scroll-view  class="blacklist-list" :scroll-y="true" :style="{'height':'calc(100% - '+navHeight+'rpx)'}">
-      <view class="blacklist-item" v-for="i in 10">
+    <scroll-view  class="blacklist-list" :scroll-y="true"  :scroll-x="true" :style="{'height':'calc(100% - '+navHeight+'rpx)'}">
+      <view class="blacklist-item" v-for="i in 12">
         <view class="blacklist-left">
           <image class="blacklist-img" src="/static/img/temporary/4.png" mode="aspectFill"></image>
         </view>
@@ -20,7 +20,6 @@
         </view>
       </view>
     </scroll-view>
-
   </view>
 </template>
 
@@ -43,9 +42,15 @@ export default {
 
 <style scoped lang="scss">
 .blacklist-box{
-  min-height: 100vh;
+  height: 100vh;
   padding: 0 32rpx;
+  overflow-x: auto;
+  .blacklist-list{
+    width: calc(100vw - 64rpx);
+  }
+
   .blacklist-item{
+    width: calc(100vw - 64rpx);
     display: flex;
     justify-content: space-between;
 
@@ -59,6 +64,7 @@ export default {
       }
     }
     .blacklist-right{
+
       padding: 32rpx 0;
       width: calc(100% - 124rpx);
       border-bottom: 1rpx solid #F2F2F2;

+ 93 - 0
pages/my/set/conversion.vue

@@ -0,0 +1,93 @@
+<template>
+  <view class="form-box">
+    <en-nav title="兑换码" :title-color="'#333'" >
+
+    </en-nav>
+    <view class="from-input" :class="{'apply-shake':codeShake}">
+      <input type="text" class="input-item sys-height-44" v-model="code" placeholder="请输入兑换码"></input>
+    </view>
+    <view class="from-text sys-color-gray-9">
+      在输入框内正确输入兑换码
+    </view>
+    <view class="chang-phone-but sys-color-white sys-background-black sys-selected-but" @click="setPhone" :class="{'sys-unselected-but':!isLogin}">确认</view>
+  </view>
+</template>
+
+<script>
+import EnNav from "@/components/en-utils/en-nav/en-nav";
+import tools from "@/service/tools";
+export default {
+  components: {EnNav},
+  data() {
+    return {
+      code:'',
+      codeShake:false,
+      isLogin:false,
+    }
+  },
+  watch:{
+    'code':function (){
+      this.verifyIsLogin()
+    },
+  },
+  methods: {
+    verifyIsLogin(){
+      this.isLogin =  this.code !== '';
+    },
+    setShake(){
+      this.codeShake=true
+      setTimeout(()=>{
+        this.codeShake=false
+      },500)
+    },
+    setPhone(){
+
+      if(this.code ===''){
+        tools.error('请输入兑换码')
+        this.setShake()
+        tools.vibrate()
+        return false
+      }
+
+      uni.redirectTo({
+        'url':'/pages/my/set'
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.form-box{
+  padding: 0 32rpx;
+  position: relative;
+  min-height: 100vh;
+
+  .from-input{
+    margin-top: 56rpx;
+    background-color: #F2F2F2;
+    border-radius: 16rpx;
+    padding: 32rpx;
+    .input-item{
+      font-size: 28rpx;
+      color: #333;
+    }
+    .input-item::placeholder{
+      color: #999;
+    }
+  }
+  .from-text{
+    margin-top: 24rpx;
+        font-size: 24rpx;
+  }
+
+  .chang-phone-but{
+    position: absolute;
+    bottom:calc(50rpx + env(safe-area-inset-bottom));
+    left: 32rpx;
+    width:calc(100vw - 64rpx);
+  }
+
+}
+
+</style>

+ 1 - 1
pages/my/set/more-set.vue

@@ -29,7 +29,7 @@
           <text class="iconfont sys-height-44 sys-color-gray-9"> &#xe62b;</text>
         </view>
       </view>
-      <view class="set-item"  @click="goToUrl('push-set')">
+      <view class="set-item"  @click="goToUrl('conversion')">
         <view class="item-text sys-height-44 sys-color-black">兑换码</view>
         <view class="item-icon">
           <text class="iconfont sys-height-44 sys-color-gray-9"> &#xe62b;</text>