Z: Dot: login api done.redirect has problem.

ybf_admin/src/pages/in/contact/components/counterDetail.vue

@@ -110,6 +110,16 @@ export default {
           id: "2",
           name: "李四"
         }
+      ],
+      counter:[
+        {
+          id: "1",
+          name: "张三"
+        },
+        {
+          id: "2",
+          name: "李四"
+        }
       ]
     };
   },

ybf_wx/src/views/active/couponDetail.vue

@@ -92,6 +92,10 @@ p {
 .container {
   background-color: rgba(248, 248, 248, 1);
   height: 100%;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-direction: column;
 }
 .bt {
   font-size: 16px;
@@ -121,14 +125,10 @@ p {
   margin: 36px 16px 16px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 2px 4px 0px rgba(221, 221, 221, 1);
-  height: 376px;
   position: relative;
   padding: 16px 16px 30px 16px;
 }
 .creat {
-  position: absolute;
-  left: 50%;
-  transform: translate(-50%);
   width: 343px;
   height: 40px;
   line-height: 40px;

ybf_wx/src/views/active/createActive.vue

@@ -24,8 +24,10 @@
       </van-cell>
       <van-cell title="领券条件" style="font-size:14px;">
         <template slot="default">
-          <span class="phone">手机号必填</span>
-          <van-switch v-model="condition" size="20px" />
+          <div class="condition">
+            <span class="phone">手机号必填</span>
+            <van-switch v-model="condition" size="20px" />
+          </div>
         </template>
       </van-cell>
     </van-cell-group>
@@ -185,6 +187,14 @@ export default {
 <style></style>
 
 <style scoped>
+.condition {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.phone {
+    margin-right: 10px;
+}
 .all >>> input {
   text-align: right;
 }
@@ -220,9 +230,6 @@ export default {
   color: #2d476a;
 }
 
-.phone {
-  float: left;
-}
 .title {
   background-color: #f8f8f8;
   height: 36px;

ybf_wx/src/views/active/createBigWheelActive.vue

@@ -158,7 +158,7 @@
           <span class="small">（点击“增加次数”按钮增加几次次数）</span>
         </template>
         <template slot="default">
-          <div class="jpsl"> 
+          <div class="jpsl">
             <van-field
               class="right noborder"
               readonly
@@ -201,15 +201,14 @@
           />
         </template>
       </van-cell>
-      <van-cell title="优惠券类型" style="font-size:14px;" class="type">
+      <!-- <van-cell title="优惠券类型" style="font-size:14px;" class="type">
         <template slot="default">
           <van-radio-group v-model="prizeList[index].type" class="right">
             <van-radio name="1" style="float:left;">代金券</van-radio>
             <van-radio name="2" style="float:right;">折扣券</van-radio>
           </van-radio-group>
         </template>
-      </van-cell>
-      <div class="mj">
+         <div class="mj">
         <div class="je">
           <van-field
             class="tm"
@@ -245,14 +244,55 @@
         </div>
         <span class="word end">元可用</span>
       </div>
-      <van-cell title="券有效期" style="font-size:14px;">
-        <template slot="default">
-          <van-radio-group v-model="prizeList[index].validity" class="right">
-            <van-radio name="1" style="float:left;">指定日期</van-radio>
-            <van-radio name="2" style="float:right;">有效天数</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
+      </van-cell> -->
+      <div class="yhType">
+        <div class="yhbr">
+          <div class="top">
+            <span style="color:#2d476a;">优惠券类型</span>
+            <van-radio-group v-model="prizeList[index].type" class="right">
+              <van-radio name="1" style="float:left;">代金券</van-radio>
+              <van-radio name="2" style="float:right;">折扣券</van-radio>
+            </van-radio-group>
+          </div>
+          <div class="mj">
+            <div class="je">
+              <van-field
+                class="tm"
+                readonly
+                clickable
+                :value="prizeList[index].discountsMoney"
+                @touchstart.native.stop="prizeList[index].discountsShow = true"
+                placeholder="输入金额"
+              />
+              <van-number-keyboard
+                v-model="prizeList[index].discountsMoney"
+                :show="prizeList[index].discountsShow"
+                @blur="prizeList[index].discountsShow = false"
+              />
+            </div>
+            <span class="word">元优惠</span>
+            <van-checkbox v-model="prizeList[index].full"></van-checkbox>
+            <span class="word">满</span>
+            <div class="je">
+              <van-field
+                class="tm"
+                readonly
+                clickable
+                :value="prizeList[index].fullMoney"
+                @touchstart.native.stop="prizeList[index].fullShow = true"
+                placeholder="输入金额"
+              />
+              <van-number-keyboard
+                v-model="prizeList[index].fullMoney"
+                :show="prizeList[index].fullShow"
+                @blur="prizeList[index].fullShow = false"
+              />
+            </div>
+            <span class="word end">元可用</span>
+          </div>
+        </div>
+      </div>
+
       <van-cell title="开始时间" style="font-size:14px;">
         <template slot="default">
           <van-field
@@ -576,7 +616,7 @@ export default {
 }
 
 .phone {
-    margin-right: 10px;
+  margin-right: 10px;
 }
 .title {
   background-color: #f8f8f8;
@@ -616,6 +656,9 @@ export default {
 .task >>> .van-cell__title {
   flex: 7;
 }
+.validity >>> .van-cell__value {
+  flex: 2;
+}
 .container {
   background: rgba(248, 248, 248, 1);
 }
@@ -627,15 +670,11 @@ export default {
   height: 84px;
 }
 .mj {
-  width: 90%;
   height: 40px;
-  position: absolute;
-  top: 86px;
-  left: 50%;
-  transform: translate(-50%);
   display: flex;
   justify-content: flex-end;
   align-items: center;
+  margin: 10px 0;
 }
 .sz {
   position: relative;
@@ -691,4 +730,19 @@ export default {
   justify-content: flex-end;
   align-items: center;
 }
+.van-cell:not(:last-child)::after {
+  right: 14px;
+}
+.yhType {
+  padding: 14px;
+}
+.yhbr {
+  border-bottom: 1px solid #f8f8f8;
+  font-size: 14px;
+}
+.top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center; 
+}
 </style>

ybf_wx/src/views/active/turntableDetail.vue

 <template>
   <div class="container">
     <div class="topb">
-      <img src="../../../public/img/zhuanpanbg.png" alt="" />
+      <img src="../../../public/img/zpbg.png" alt="" />
     </div>
     <div class="title">
       <span class="bt">服装店幸运抽奖</span>
@@ -20,6 +20,8 @@
       </p>
       <p>
         马几一民号传所把半米料己走专管每见严且具还京叫海公好速信调化眼务难心化二响住厂图电没速严义常象关更了低。由压反几风列线法再石究说布通总织第量回儿称从消片度音济学地通斯带老水亲东志报月者进放北传看术走形解林直动效提情影和复色米最只等。济交感去照象强手式性九己值正可心什体收并适部该置可山省十。
+        马几一民号传所把半米料己走专管每见严且具还京叫海公好速信调化眼务难心化二响住厂图电没速严义常象关更了低。由压反几风列线法再石究说布通总织第量回儿称从消片度音济学地通斯带老水亲东志报月者进放北传看术走形解林直动效提情影和复色米最只等。济交感去照象强手式性九己值正可心什体收并适部该置可山省十。
+        马几一民号传所把半米料己走专管每见严且具还京叫海公好速信调化眼务难心化二响住厂图电没速严义常象关更了低。由压反几风列线法再石究说布通总织第量回儿称从消片度音济学地通斯带老水亲东志报月者进放北传看术走形解林直动效提情影和复色米最只等。济交感去照象强手式性九己值正可心什体收并适部该置可山省十。
       </p>
     </div>
     <div class="creat" @click="createActive">创建同款活动</div>
@@ -92,6 +94,10 @@ p {
 .container {
   background-color: rgba(248, 248, 248, 1);
   height: 100%;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-direction: column;
 }
 .bt {
   font-size: 16px;
@@ -123,14 +129,10 @@ p {
   margin: 36px 16px 16px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 2px 4px 0px rgba(221, 221, 221, 1);
-  height: 376px;
   position: relative;
   padding: 16px 16px 30px 16px;
 }
 .creat {
-  position: absolute;
-  left: 50%;
-  transform: translate(-50%);
   width: 343px;
   height: 40px;
   line-height: 40px;