Browse Source

添加条件隐私金额

xiaohaizhao 2 năm trước cách đây
mục cha
commit
bc6c88d4e3

+ 1 - 0
packageA/activity/detail.js

@@ -6,6 +6,7 @@ import {
 
 Page({
 	data: {
+		hidePrice: wx.getStorageSync('hidePrice'),
 		loading: true,
 		active: "",
 		list: [],

+ 5 - 3
packageA/activity/detail.wxml

@@ -1,4 +1,4 @@
-<import src="detail.skeleton.wxml"/>
+<import src="detail.skeleton.wxml" />
 <template is="skeleton" wx:if="{{loading}}" />
 
 <!-- 轮播图 -->
@@ -54,7 +54,7 @@
 					<text>规格:{{item.spec||' --'}}</text>
 				</view>
 				<view class="price line-1">
-					价格:<text class="num">¥{{item.gradeprice || item.price}}元</text><text wx:if="{{item.gradeprice<item.oldprice ||item.price<item.oldprice}}" style="text-decoration:line-through; color:#999;">/{{item.oldprice}}元</text>
+					价格:<text class="num">¥{{handleHide.query(item.gradeprice || item.price,hidePrice)}}元</text><text wx:if="{{item.gradeprice<item.oldprice ||item.price<item.oldprice}}" style="text-decoration:line-through; color:#999;">/{{handleHide.query(item.oldprice,hidePrice)}}元</text>
 				</view>
 			</view>
 		</view>
@@ -68,4 +68,6 @@
 <view style="height: 150rpx;" />
 <view class="footer">
 	<van-button custom-class='but' bindtap="clickBut">去下单</van-button>
-</view>
+</view>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 4 - 1
packageA/dispatchBill/detail.js

@@ -65,7 +65,10 @@ Page({
         value: data.qty
       }, {
         label: "发货金额",
-        value: currency(data.sumamount, {
+        value: wx.getStorageSync('hidePrice') ? currency(data.sumamount, {
+          symbol: "¥",
+          precision: 2
+        }).format().toString().replace(/([0-9])/g, '*') : currency(data.sumamount, {
           symbol: "¥",
           precision: 2
         }).format()

+ 1 - 0
packageA/market/detail.js

@@ -8,6 +8,7 @@ import currency from "../../utils/currency";
 
 Page({
 	data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
 		badge: getApp().globalData.collectCount,
 		loading: true,
 		content: {

+ 4 - 13
packageA/market/detail.wxml

@@ -21,13 +21,12 @@
 	</view>
 	<view class="offer">
 		<view>
-			<text class="price">{{detail.gradeprice}}</text>
+			<text class="price">{{handleHide.query(detail.gradeprice,hidePrice)}}</text>
 		</view>
 		<text class="unit">单位/{{detail.unitname}}</text>
 	</view>
 	<view class="else">
 		<text>起订量:{{detail.orderminqty}}({{detail.unitname}})</text>
-		<text>库存:{{userrole=='经销商'?detail.stockstatus:detail.cansaleqty}}</text>
 	</view>
 </view>
 <!-- 选择规格 -->
@@ -86,16 +85,7 @@
 		</view>
 	</van-tab>
 </van-tabs>
-<!-- 底部 -->
-<!-- <view style=" height: 150rpx;" />
-<view class="footer">
-  <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' range-key='tradefield' bindchange='storage'>
-    <van-button custom-class='but' bindtap="clickBut">加入购物车</van-button>
-  </picker>
-  <van-button wx:else custom-class='but' bindtap="clickBut">加入购物车
-  </van-button>
-</view> -->
-
+<view style="height: 200rpx;" />
 <view class="cu-bar bg-white tabbar border shop footer">
 	<navigator url="#" class="action" style="height: 100%;display: flex; flex-direction: column; align-items: center;" bindtap="toCollect">
 		<view class="cuIcon-cart">
@@ -108,4 +98,5 @@
 		<view class="bg-orange submit" bindtap="clickBut">加入购物车</view>
 	</picker>
 	<view wx:else class="bg-orange submit" bindtap="clickBut">加入购物车</view>
-</view>
+</view>
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 1 - 0
packageA/orderForm/detail.js

@@ -3,6 +3,7 @@ let figure = null; //免运费额度
 import currency from "../../utils/currency";
 Page({
     data: {
+        hidePrice: wx.getStorageSync('hidePrice'),
         loading: true,
         sa_orderid: null,
         tabsActive: 0,

+ 4 - 2
packageA/orderForm/detail.wxml

@@ -97,7 +97,7 @@
 <view class="footer">
 	<view class="price">
 		<view class="count">
-			{{defaultamount}}元
+			{{handleHide.query(defaultamount,hidePrice)}}元
 		</view>
 		<view>
 			{{logistics}}
@@ -107,4 +107,6 @@
 		<van-button custom-class='but delete' wx:if="{{detail.status=='新建'&&detail.type!='特殊订单'}}" bind:click="deleteItem">删除订单</van-button>
 		<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="submit">提交订单</van-button>
 	</view>
-</view>
+</view>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 1 - 0
packageA/orderForm/index.js

@@ -4,6 +4,7 @@ let content = null,
   downCount = null;
 Page({
   data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
     CustomBar: getApp().globalData.CustomBar,
     filtratelist: [{
       label: "品牌",

+ 5 - 3
packageA/orderForm/index.wxml

@@ -12,10 +12,10 @@
         <van-tab title="关闭" />
     </van-tabs>
     <view class="tips">
-        共计{{total}}单,合计{{amount}}元
+        共计{{total}}单,合计{{handleHide.query(amount,hidePrice)}}元
     </view>
     <Yl_ListBox id='ListBox' bind:getlist='getList'>
-        <List list="{{list}}" />
+        <List list="{{list}}" hidePrice='{{hidePrice}}' />
         <view style="height:150rpx;" />
     </Yl_ListBox>
     <Float />
@@ -29,4 +29,6 @@
         <Filtrate list='{{filtratelist}}' bindhandle='handleFiltrate' />
     </view>
     <view style="height: 200rpx;" />
-</scroll-view>
+</scroll-view>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 2 - 1
packageA/orderForm/modules/list/index.js

@@ -1,6 +1,7 @@
 Component({
     properties: {
         list: Array,
-        userrole: String
+        userrole: String,
+        hidePrice: Number
     },
 })

+ 2 - 1
packageA/orderForm/modules/list/index.wxml

@@ -26,7 +26,7 @@
             共计{{item.qty}}件商品
         </view>
         <view class="amount">
-            合计:{{item.defaultamount}}元
+            合计:{{handleHide.query(item.defaultamount,hidePrice)}}元
         </view>
     </view>
     <view wx:if="{{item.contacts.length||item.name}}" class="bottom line-1">
@@ -41,6 +41,7 @@
 </navigator>
 
 <Yl_Empty wx:if="{{list.length==0}}" />
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />
 <wxs module="set">
     module.exports = {
         color: function (statu) {

+ 3 - 0
packageA/orderForm/modules/product/list/index.js

@@ -8,6 +8,9 @@ Component({
 	options: {
 		addGlobalClass: true
 	},
+	data: {
+		hidePrice: wx.getStorageSync('hidePrice'),
+	},
 	methods: {
 		onBlur(e) {
 			let {

+ 5 - 19
packageA/orderForm/modules/product/list/index.wxml

@@ -28,8 +28,8 @@
                     <text class="line-1" style="margin-right: 6rpx;">可退数量:{{item.returnqty||' --'}}</text>
                 </view>
                 <view style="margin-top: 8rpx;">
-                    <text class="price">{{item.defaultprice}}</text>
-                    <text class="old-price">{{item.marketprice}}</text>
+                    <text class="price">{{handleHide.query(item.defaultprice,hidePrice)}}</text>
+                    <!-- <text class="old-price">{{handleHide.query(item.marketprice,hidePrice)}}</text> -->
                 </view>
             </view>
             <view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">
@@ -44,7 +44,7 @@
                 <input disabled='{{disabled}}' bindtap="isEdit" class="input" style="width: 180rpx;" type="digit" value="{{item.qty}}" data-name="qty" data-data="{{item}}" bindblur="onBlur" />
             </view>
             <view class="money">
-                金额:<text>{{item.defaultamount}}元</text>
+                金额:<text>{{handleHide.query(item.defaultamount,hidePrice)}}元</text>
             </view>
         </view>
 
@@ -54,24 +54,10 @@
                 <input disabled='{{disabled}}' bindtap="isEdit" class="input" style="flex: 1; text-align: left;padding-left: 10rpx;" type="text" placeholder="备注" value="{{item.remarks}}" data-name="remarks" data-data="{{item}}" bindblur="onBlur" />
             </view>
         </view>
-
-        <view wx:if="{{item.delivery!=0}}" class="row">
-            <view>
-                <view class="label">期望交期:</view>
-                <picker disabled='{{disabled}}' bindtap="isEdit" mode="date" data-data="{{item}}" bindchange='changeDate'>
-                    <view class="input" style="width: 240rpx;display: flex;justify-content: center;">
-                        <text wx:if="{{item.needdate }}">{{item.needdate}}</text>
-                        <text wx:else style="color: #999;">期望交期</text>
-                    </view>
-                </picker>
-            </view>
-            <view class="money">
-                回复交期:{{item.deliverydate || ' --'}}
-            </view>
-        </view>
     </view>
 </view>
 <block wx:if="{{list.length==0}}">
     <Yl_Empty />
     <view style="height: 150rpx;" />
-</block>
+</block>
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 1 - 0
packageA/returnOne/detail.js

@@ -2,6 +2,7 @@ const _Http = getApp().globalData.http;
 let sa_aftersalesmagid = null;
 Page({
   data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
     tabsList: [{
       label: "详细信息",
       icon: "icon-tabchanpin"

+ 4 - 2
packageA/returnOne/detail.wxml

@@ -24,7 +24,7 @@
 <view class="footer">
 	<view class="price">
 		<view class="count">
-			¥{{detail.returnamount||'0'}}元
+			¥{{handleHide.query(detail.returnamount||0,hidePrice)}}元
 		</view>
 	</view>
 	<view class="but-box">
@@ -32,4 +32,6 @@
 		<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="submit">提交申请</van-button>
 		<van-button custom-class='but' wx:if="{{detail.status=='提交'}}" bind:click="notarize">取消申请</van-button>
 	</view>
-</view>
+</view>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 3 - 0
packageA/returnOne/modules/list/index.js

@@ -3,4 +3,7 @@ Component({
     list: Array,
     userrole: String
   },
+  data: {
+    hidePrice: wx.getStorageSync('hidePrice')
+  }
 })

+ 3 - 2
packageA/returnOne/modules/list/index.wxml

@@ -19,7 +19,7 @@
 			是否实物退回:{{item.isitemreturn==1?'是':'否'}}
 		</view>
 		<view class="amount">
-			退款额:¥{{item.returnamount||0}}元
+			退款额:¥{{handleHide.query(item.returnamount||0,hidePrice)}}元
 		</view>
 	</view>
 	<view class="bottom line-1">
@@ -47,4 +47,5 @@
 			return color;
 		}
 	}
-</wxs>
+</wxs>
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 2 - 1
packageA/returnOne/modules/product/index.js

@@ -120,7 +120,8 @@ Component({
 					"content": {
 						nocache:true,
 						"sa_orderid": detail.sa_orderid, //订单ID
-						"sa_aftersalesmagid": detail.sa_aftersalesmagid, //订单ID
+            "sa_aftersalesmagid": detail.sa_aftersalesmagid, //订单ID
+            sys_enterpriseid:"",
 						"pageNumber": 1,
 						"pageTotal": 1,
 						"total": 0,

+ 4 - 1
packageA/toolBill/modules/toolDetail/list/index.js

@@ -8,6 +8,9 @@ Component({
 	options: {
 		addGlobalClass: true
 	},
+	data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
+	},
 	methods: {
 		toProductDetail(e) {
 			const {
@@ -20,7 +23,7 @@ Component({
 				name
 			} = e.currentTarget.dataset;
 			this.triggerEvent("changeProduct", {
-				"sa_aftersalesmag_itemsid":data.sa_aftersalesmag_itemsid,
+				"sa_aftersalesmag_itemsid": data.sa_aftersalesmag_itemsid,
 				"sa_orderitemsid": data.sa_orderitemsid,
 				"itemid": data.itemid,
 				"qty": name == 'qty' ? e.detail.value : data.qty,

+ 5 - 3
packageA/toolBill/modules/toolDetail/list/index.wxml

@@ -40,7 +40,7 @@
 	<view class="bot">
 		<view class="row">
 			<view>
-				<view class="label" style="width: 200px;">单价:{{item.price}}元</view>
+				<view class="label" style="width: 200px;">单价:{{handleHide.query(detail.price||0,hidePrice)}}元</view>
 			</view>
 		</view>
 		<view class="row">
@@ -49,7 +49,7 @@
 				<input disabled='{{disabled}}' bindtap="isEdit" class="input" style="width: 240rpx;" type="digit" value="{{item.qty}}" data-name="qty" data-data="{{item}}" bindblur="onBlur" />
 			</view>
 			<view class="money">
-				金额:<text>¥{{item.amount}}元</text>
+				金额:<text>¥{{handleHide.query(detail.amount||0,hidePrice)}}元</text>
 			</view>
 		</view>
 
@@ -64,4 +64,6 @@
 <block wx:if="{{list.length==0}}">
 	<Yl_Empty />
 	<view style="height: 150rpx;" />
-</block>
+</block>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 1 - 0
pages/index/collect/index.js

@@ -12,6 +12,7 @@ Component({
 	},
 	properties: {},
 	data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
 		list: [],
 		results: [], //选中结果
 		sa_brandid: null, //当前选中品牌id

+ 5 - 3
pages/index/collect/index.wxml

@@ -19,7 +19,7 @@
 					<view class="exp">型号:{{item.model ||" --"}}</view>
 					<view class="exp">品牌:{{item.brandname ||" --"}}</view>
 					<view class="exp">领域:{{item.tradefield_shoppingcart ||" --"}}</view>
-					<view class="price">{{item.showPrice}}/{{item.unitname}}</view>
+					<view class="price"> {{handleHide.query(item.showPrice,hidePrice)}}/{{item.unitname}}</view>
 				</view>
 			</view>
 			<view class="bottom">
@@ -41,7 +41,7 @@
 				<van-checkbox icon-size="26rpx" shape='square' value="{{ isAll }}" bind:change="setIsAll">全选 <text class="selected">已选{{results.length}}件</text></van-checkbox>
 			</view>
 			<view class="sum">
-				合计:<text>{{sum}}</text>
+				合计:<text>{{handleHide.query(sum,hidePrice)}}</text>
 			</view>
 			<view class="transport">
 				{{logistics}}
@@ -61,4 +61,6 @@
 			});
 		}
 	}
-</wxs>
+</wxs>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 1 - 0
pages/index/market/index.js

@@ -15,6 +15,7 @@ Component({
     addGlobalClass: true
   },
   data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
     CustomBar: getApp().globalData.CustomBar,
     typeList: [],
     list: [],

+ 1 - 1
pages/index/market/index.wxml

@@ -6,7 +6,7 @@
 	</van-search>
 	<view class="division" style="height: 20rpx;" />
 	<Yl_ListBox id='ListBox' bind:getlist='getList'>
-		<List list="{{list}}" />
+		<List list="{{list}}" hidePrice='{{hidePrice}}' />
 		<view style="height: 200rpx;" />
 	</Yl_ListBox>
 </view>

+ 2 - 1
pages/index/market/modules/list/index.js

@@ -1,6 +1,7 @@
 Component({
   properties: {
-    list: Array
+    list: Array,
+    hidePrice: Number
   },
   methods: {
     toDetail(e) {

+ 5 - 2
pages/index/market/modules/list/index.wxml

@@ -22,10 +22,13 @@
 		</view>
 		<view class="price">
 			<view>
-				¥ {{item.minprice}}~{{item.maxprice}}
+				¥ {{handleHide.query((item.minprice+'~'+item.maxprice),hidePrice)}}
 			</view>
 			<text>× {{item.unitname}}</text>
 		</view>
 	</view>
 </navigator>
-<Yl_Empty wx:if="{{list.length === 0}}" />
+<Yl_Empty wx:if="{{list.length === 0}}" />
+
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 23 - 0
pages/login/modules/login.js

@@ -35,6 +35,27 @@ function query_userauth() {
         count += 1;
         toHome();
     });
+
+    let {
+        siteid,
+        userid
+    } = wx.getStorageSync('userMsg');
+    _Http.basic({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "typename": "shieldrole",
+            "parameter": {
+                siteid,
+                userid
+            }
+        }
+    }).then(res => {
+        console.log("查询是否隐私金额", res)
+        if (res.msg == '成功') wx.setStorageSync('hidePrice', res.data.length == 0 ? 0 : 1);
+    })
 }
 /* 查询站点数据 */
 function querySite_Parameter() {
@@ -75,6 +96,8 @@ function toHome() {
         url: '/pages/index/index'
     })
     getApp().initSocket();
+
+
 }
 /* 站点数据查询 */
 module.exports = {

+ 2 - 1
select/product/index.js

@@ -3,6 +3,7 @@ const _Http = getApp().globalData.http,
 import currency from "../../utils/currency";
 Page({
 	data: {
+    hidePrice: wx.getStorageSync('hidePrice'),
 		loading: true,
 		params: {}, //请求体
 		result: [], //返回结果
@@ -30,7 +31,6 @@ Page({
 		this.getList()
 	},
 	getList(init = false) {
-		console.log('发送')
 		//init 用于初始化分页
 		if (init.detail != undefined) init = init.detail;
 		let params = this.data.params;
@@ -47,6 +47,7 @@ Page({
 				symbol: "¥",
 				precision: 2
 			}).format();
+			
 			let newPrice = this.data.newPrice;
 			res.data = res.data.map(value => {
 				if (value.attinfos.length != 0) {

+ 4 - 2
select/product/index.wxml

@@ -27,7 +27,7 @@
                     领域:{{item.tradefields}}
                 </view>
                 <view class="price line-1">
-                    价格:<text class="num">{{item.newPrice}}元</text><text wx:if="{{item.oldPrice}}" style="text-decoration:line-through; color:#999;">/{{item.oldPrice}}</text>
+                    价格:<text class="num">{{handleHide.query(item.newPrice,hidePrice)}}元</text>
                 </view>
             </view>
         </view>
@@ -56,4 +56,6 @@
             },
         }
     </wxs>
-</block>
+</block>
+
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 4 - 0
utils/hidePrice.wxs

@@ -0,0 +1,4 @@
+module.exports.query = function query(price, hide) {
+    if (!price && price != 0) return;
+    return hide == "1" ? price.toString().replace(getRegExp('([0-9])', 'g'), '*') : price
+};