谢杰标 2 лет назад
Родитель
Сommit
3bd17df7b5
7 измененных файлов с 24 добавлено и 20 удалено
  1. 1 1
      common/authorize.js
  2. 6 1
      common/config.js
  3. 0 2
      main.js
  4. 7 4
      pages/actdetail/index.vue
  5. 7 5
      pages/actlist/index.vue
  6. 1 3
      pages/bill/index.vue
  7. 2 4
      pages/cashout/index.vue

+ 1 - 1
common/authorize.js

@@ -18,7 +18,6 @@ export function getQueryString(name) {
 }
 // 授权
 export function authorize(url = window.location.href) {
-
   if (!isWechat()) {
     return;
   }
@@ -44,6 +43,7 @@ export function authorize(url = window.location.href) {
     } else {
       url = url.split("//")[1];
       location.replace("https://www.xyyxt.net/home/index2?ask_type=" + url);
+      // location.replace("https://www.xyyxt.net/?ask_type=" + url);
     }
   });
 }

+ 6 - 1
common/config.js

@@ -15,8 +15,13 @@ const set = [
     BASE_IMG_URL: "https://file-dev.xyyxt.net/",
   },
   {
-    BASE_URL: "https://api.xyyxt.net",
+    BASE_URL: "https://cloud.xyyxt.net",
     BASE_IMG_URL: "https://file.xyyxt.net/",
   },
 ];
 export default set[index];
+
+import vconsole from "vconsole";
+if (index == 0) {
+  new vconsole();
+}

+ 0 - 2
main.js

@@ -25,8 +25,6 @@ uni.$u.setConfig({
 });
 Vue.filter('formate', filters['formDate'])
 Vue.filter('toFixed', filters['toFixed'])
-import vconsole from "vconsole";
-new vconsole();
 // #ifndef VUE3
 import Vue from "vue";
 Vue.config.productionTip = false;

+ 7 - 4
pages/actdetail/index.vue

@@ -13,7 +13,10 @@
         >
       </view>
     </view>
-    <view class="actdetail-ward-main">
+    <view
+      class="actdetail-ward-main"
+      :style="{ 'padding-bottom': detailInfo.status == 1 ? '168rpx' : '24rpx' }"
+    >
       <view class="actdetail-ward-goods detail-box">
         <view class="title">商品及佣金</view>
         <view class="goods-list">
@@ -59,7 +62,7 @@
         <view class="title">活动详情</view>
         <view class="fl_b time u-border-bottom">
           <text>佣金冻结期</text>
-          <text>{{detailInfo.freezingPeriod}}天</text>
+          <text>{{ detailInfo.freezingPeriod }}天</text>
         </view>
         <view class="desc">
           <view class="desc-title">描述</view>
@@ -67,7 +70,7 @@
         </view>
       </view>
     </view>
-    <view class="actdetail-btn">
+    <view class="actdetail-btn" v-if="detailInfo.status == 1">
       <u-button
         class="c_btn"
         text="生成专属海报"
@@ -158,7 +161,7 @@ page {
     }
   }
   .actdetail-ward-main {
-    padding: 24rpx 24rpx 168rpx;
+    padding: 24rpx 24rpx 24rpx;
     position: absolute;
     top: 180rpx;
     width: 100%;

+ 7 - 5
pages/actlist/index.vue

@@ -21,11 +21,13 @@
           <view>{{ item.endTime | formate("yyyy-mm-dd hh:mm") }}</view>
         </view>
       </view>
-      <view class="line"></view>
-      <view class="act-ward-box-btn">
-        <text></text>
-        <view @click.stop="makePoster(item.distributionId)">生成海报</view>
-      </view>
+      <template v-if="item.status == 1">
+        <view class="line"></view>
+        <view class="act-ward-box-btn">
+          <text></text>
+          <view @click.stop="makePoster(item.distributionId)">生成海报</view>
+        </view>
+      </template>
     </view>
     <view class="nomore" v-if="total && list.length == total">
       已显示全部

+ 1 - 3
pages/bill/index.vue

@@ -61,9 +61,7 @@ export default {
   onShow() {
     this.backUrl();
     backOpenId(this.login);
-    if (uni.getSystemInfoSync().platform != "ios") {
-      authorize();
-    }
+    authorize();
     this.getSharePoster();
   },
   components: {

+ 2 - 4
pages/cashout/index.vue

@@ -38,7 +38,7 @@
             inputAlign="center"
             color="#24263D"
             fontSize="36px"
-            @input="changeMoney"
+            @blur="changeMoney"
           ></u--input>
         </view>
         <view class="popup-main-mode fl_b u-border-bottom">
@@ -86,11 +86,9 @@ export default {
   methods: {
     changeMoney(val) {
       val *= 1;
-      console.log(val < 0, val >= this.userInfo.cash, val);
       if (val < 0) {
         this.money = 0;
-      }
-      if (val >= this.userInfo.cash) {
+      } else if (val >= this.userInfo.cash) {
         this.money = this.userInfo.cash;
       }
     },