Browse Source

feat:全局替换批发积分-批发券

DaMoWang 2 năm trước cách đây
mục cha
commit
5dac7b8b43

+ 46 - 46
src/App.vue

@@ -1,51 +1,51 @@
 <script>
-	export default {
-		globalData:{
-		    userInfo: {},
-		    shopInfo: {
-		        shop_name: "数字茶城",
-		        desc: "数字茶城"
-		    },
-		    openId: '',
-		    authorizeWindow: true, //是否可以打开用户信息授权页面,避免重复打开
-		    bindPhoneWindow: true, //是否可以打开绑定手机号码页面,避免重复打开
-		    hasUpdate: false, // 小程序是否有更新版本 默认为没有
-		    newVersionInfo: {
-		        num: "1.0.0",
-		        desc: "数字茶城上线啦!",
-		        updateInfo: [] // 数组形式描述一下具体更新了什么内容
-		    }, // 当前小程序最新版本信息
-		    msgTmp: null ,//订阅消息模板id信息
-			systemUserInfo:''
-		},
-		errTips(msg, duration, open){
-		    uni.showToast({
-		        title: msg,
-		        icon:'none',
-		        duration: duration ? duration : 1200,
-		        mask: true
-		    })
-		},
-		// 接口未传递有效参数值的错误提示
-		parameter(authName) {
-		    throw new Error("'" + authName + "' cat\'t be empty!");
-		},
-		onLaunch() {
-			var logs = uni.getStorageSync('logs') || []
-			logs.unshift(Date.now())
-			uni.setStorageSync('logs', logs);
-			uni.setStorageSync('mallName', "数字茶城");
-		},
-		onShow() {
-			console.log('App Show')
-		},
-		onHide() {
-			console.log('App Hide')
-		}
-	}
+export default {
+  globalData: {
+    userInfo: {},
+    shopInfo: {
+      shop_name: "数字茶城",
+      desc: "数字茶城",
+    },
+    openId: "",
+    authorizeWindow: true, //是否可以打开用户信息授权页面,避免重复打开
+    bindPhoneWindow: true, //是否可以打开绑定手机号码页面,避免重复打开
+    hasUpdate: false, // 小程序是否有更新版本 默认为没有
+    newVersionInfo: {
+      num: "1.0.0",
+      desc: "数字茶城上线啦!",
+      updateInfo: [], // 数组形式描述一下具体更新了什么内容
+    }, // 当前小程序最新版本信息
+    msgTmp: null, //订阅消息模板id信息
+    systemUserInfo: "",
+  },
+  errTips(msg, duration, open) {
+    uni.showToast({
+      title: msg,
+      icon: "none",
+      duration: duration ? duration : 1200,
+      mask: true,
+    });
+  },
+  // 接口未传递有效参数值的错误提示
+  parameter(authName) {
+    throw new Error("'" + authName + "' cat't be empty!");
+  },
+  onLaunch() {
+    var logs = uni.getStorageSync("logs") || [];
+    logs.unshift(Date.now());
+    uni.setStorageSync("logs", logs);
+    uni.setStorageSync("mallName", "数字茶城");
+  },
+  onShow() {
+    console.log("App Show");
+  },
+  onHide() {
+    console.log("App Hide");
+  },
+};
 </script>
 
 <style>
-	/*每个页面公共css */
-	@import "./app.scss";
+/*每个页面公共css */
+@import "./app.scss";
 </style>

+ 1 - 1
src/pages/account/wealth.vue

@@ -7,7 +7,7 @@
         <view class="list_text f_dinB">{{ userinfo.user_money }}</view>
       </view>
       <view class="list flex_c flex_ac" @click="goIntegral">
-        <view class="list_name">批发积分</view>
+        <view class="list_name">批发</view>
         <view class="list_text f_dinB">{{ userinfo.integral }}</view>
       </view>
     </view>

+ 2 - 2
src/pages/index/index.vue

@@ -57,8 +57,8 @@
                             <!-- <text class="product-tip">{{i.tip}}</text> -->
                             <text class="product-text" v-if="[3,4].includes(i.type)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</text>
                         </view>
-                        <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发积分" }}</view>
-                        <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view> -->
+                        <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发" }}</view>
+                        <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发" : i.give_cha_bao + "茶宝" }}</view> -->
                         <view class="product-txt" v-if="[3,4].includes(i.type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                         <view class="product-txt fenxiang" v-if="[3,4].includes(i.type)"> 
                             <text class="iconfont">&#xe604;</text>

+ 3 - 3
src/pages/product/p_details.vue

@@ -28,7 +28,7 @@
       <view v-else class="price" :class="type == 2 ? 'samll' : ''">
         <view>
           <text class="p_favour" v-if="(type == 2)"
-            >¥{{ detail.trade_price }}  + {{detail.trade_num}}批发积分 + {{detail.treasure_price}}茶宝</text
+            >¥{{ detail.trade_price }}  + {{detail.trade_num}}批发 + {{detail.treasure_price}}茶宝</text
           >
 		  <view v-if="type == 6">
 			  <text class="un_p_favour">¥{{
@@ -48,7 +48,7 @@
             ¥{{detail.cost_price}} + {{detail.treasure_price}}茶宝
           </text>
         </view>
-        <span class="p_trade" v-if="(type == 1)">送 {{detail.trade_give_num}} 批发积分</span>
+        <span class="p_trade" v-if="(type == 1)">送 {{detail.trade_give_num}} 批发</span>
         <span class="p_trade" v-if="(type == 3 || type == 4)">送 {{detail.give_cha_bao}} 茶宝</span>
       </view>
       <view class="price_span flex_r flex_ac flex_je">
@@ -115,7 +115,7 @@
           <view class="goods_con flex_c flex_jb">
             <view class="shop_names">{{ detail.goods_name }}</view>
             <view class="goods_msg" v-if="type == 2"
-              >{{ detail.trade_price }}元+{{ detail.trade_num }}批发积分+{{
+              >{{ detail.trade_price }}元+{{ detail.trade_num }}批发+{{
                 detail.treasure_price
               }}茶宝</view
             >

+ 2 - 2
src/pages/product/productRetail.vue

@@ -14,8 +14,8 @@
                         <!-- <text class="product-tip">{{i.tip}}</text> -->
                             <text class="product-text" v-if="['3','4'].includes(type)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</text>
                     </view>
-                    <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发积分" }}</view>
-                    <!-- <view class="product-txt" v-if="type != 6">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view> -->
+                    <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发" }}</view>
+                    <!-- <view class="product-txt" v-if="type != 6">赠送{{ i.give_integral ? i.give_integral + "批发" : i.give_cha_bao + "茶宝" }}</view> -->
                     <view class="product-txt" v-if="type == 6">每<text class="green">{{i.interval_time}}</text> 分钟降价 <text class="green">{{i.drop_range * 100}}%</text> </view>
                     <view class="product-txt" v-if="['3','4'].includes(type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                     <view class="product-txt fenxiang" v-if="['3','4'].includes(type)">

+ 1 - 1
src/pages/product/productWholesale.vue

@@ -5,7 +5,7 @@
             <image class="list_img" :src="item.original_img"></image>
             <view class="list_info flex_c flex_jb">
                 <view class="info_name">{{item.goods_name}}</view>
-                <view class="info_msg">{{item.price}}元+{{item.trade_num}}批发积分+{{item.cha_bao}}茶宝</view>
+                <view class="info_msg">{{item.price}}元+{{item.trade_num}}批发+{{item.cha_bao}}茶宝</view>
                 <view class="info_btn_con flex_r flex_je">
                     <view class="info_btn flex_r flex_ac flex_jc">购买</view>
                 </view>

+ 2 - 2
src/pages/sign/index.vue

@@ -53,8 +53,8 @@
                 <!-- <text class="product-tip">{{i.tip}}</text> -->
                 <text class="product-text" v-if="['3','4'].includes(i.type)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</text>
             </view>
-            <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发积分" }}</view>
-            <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view> -->
+            <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发" }}</view>
+            <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发" : i.give_cha_bao + "茶宝" }}</view> -->
             <view class="product-txt" v-if="['3','4'].includes(i.type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
             <view class="product-txt fenxiang" v-if="['3','4'].includes(i.type)"> 
                 <text class="iconfont">&#xe604;</text>

+ 1 - 1
src/pages/szw-order-details/index.vue

@@ -61,7 +61,7 @@
                 <view class="li_box" v-if="orderInfo.total_amount">商品合计:
                     <view class="info_data">{{ orderInfo.total_amount }}</view>
                 </view>
-                <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">批发积分
+                <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">批发
                     <view class="info_data">{{ orderInfo.totalPfInt }}</view>
                 </view> -->
                 <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">茶宝:

+ 3 - 3
src/pages/to-pay-list/index.vue

@@ -44,7 +44,7 @@
         <view class="goods_con flex_c flex_jc flex_jb">
           <view class="goods_name ellipsis2">{{ goodsInfo.goods_name }}</view>
           <view class="goods_msg" v-if="Data.type == 2"
-            >{{ goodsInfo.trade_price }}元+{{ goodsInfo.trade_num }}批发积分+{{
+            >{{ goodsInfo.trade_price }}元+{{ goodsInfo.trade_num }}批发+{{
               goodsInfo.treasure_price
             }}茶宝</view
           >
@@ -84,11 +84,11 @@
       </view>
       <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
         <view class="flex_r flex_ac">
-          <view class="list_name">批发积分</view>
+          <view class="list_name">批发</view>
           <view class="list_con p_color">(可用{{ userinfo.integral }})</view>
         </view>
         <view class="list_con"
-          >{{ $h.Mul(goodsInfo.trade_num, Data.num) }} 批发积分</view
+          >{{ $h.Mul(goodsInfo.trade_num, Data.num) }} 批发</view
         >
       </view>
       <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">