From 7f8c59db594c0f1f7c03922b5826c89a8be0b247 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Mon, 18 Mar 2024 09:36:29 +0800
Subject: [PATCH] oa单
---
components/diy_pingd_buy/diy_pingd_buy.js | 28 +++++++++++++++++++++-------
components/diy_pregoods/diy_pregoods.js | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------
components/diy_public/diy_public.js | 30 ++++++++++++++++++++++++------
packageA/pages/checkin/checkin.js | 3 ++-
packageB/pages/evaluate/evaluate.js | 34 +++++++++++++++++++++++++++++-----
packageB/pages/evaluate/evaluate.wxml | 8 ++++----
packageB/pages/evaluate/evaluate.wxss | 5 +++++
7 files changed, 253 insertions(+), 179 deletions(-)
diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js
index ad2c1be..419e579 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.js
+++ b/components/diy_pingd_buy/diy_pingd_buy.js
@@ -85,22 +85,36 @@ Component({
var app = getApp(), all_array = [],
index = 0,
- goodsidlist="";
-
+ goodsidlist="",new_idlist="";
+
//-- 当是默认的调用的时候 --
if(!g_id || g_id.length<=0 ){
th.no_gid_set();
}else{
//--先把商品ID串起来--
g_id.forEach(function(val, ind) {
- var item = {};
- goodsidlist+=val.goodsid+",";
+ var item = {};
+ goodsidlist+=val.goodsid+",";
+ if (val.idlist) {
+ new_idlist += val.idlist + ",";
+ }
+ // new_idlist += val.idlist + ",";
})
- goodsidlist= goodsidlist.substr(0,goodsidlist.length-1);
+ goodsidlist= goodsidlist.substr(0,goodsidlist.length-1);
+ if (new_idlist) {
+ new_idlist= new_idlist.substr(0,new_idlist.length-1);
+ }
+
+
+ let url=""
+ if (new_idlist) {
+ url="/api/weshop/teamlist/getGoodsList?store_id=" +os.stoid+"&isnew=1&idlist="+new_idlist
+ }else{
+ url="/api/weshop/teamlist/getGoodsList?store_id=" +os.stoid+"&goodsidlist="+goodsidlist
+ }
//--调用接口,读取拼单--
- app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id="
- +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
+ app.request.promiseGet(url, {}).then(res => {
//如果拼单的数组为空的时候
var goodslist=res.data.data;
if(goodslist && goodslist.length>0){
diff --git a/components/diy_pregoods/diy_pregoods.js b/components/diy_pregoods/diy_pregoods.js
index adb00cb..70da909 100644
--- a/components/diy_pregoods/diy_pregoods.js
+++ b/components/diy_pregoods/diy_pregoods.js
@@ -1,4 +1,4 @@
-var t = getApp(), os = t.globalData.setting,ut = require("../../utils/util.js");
+var t = getApp(), os = t.globalData.setting, ut = require("../../utils/util.js");
var regeneratorRuntime = require('../../utils/runtime.js');
Component({
properties: {
@@ -15,124 +15,136 @@ Component({
someData: null,
imghost: os.imghost,
},
-
- ready: function() {
+
+ ready: function () {
var g_id = this.data.object.data;
- this.data.g_id=g_id;
+ this.data.g_id = g_id;
this.init(g_id);
},
- pageLifetimes: {
- //游客登录后，只要更新卡的情况
- show: function () {
- //--初始化卡类--
- this.init(this.data.g_id);
- },
+ pageLifetimes: {
+ //游客登录后，只要更新卡的情况
+ show: function () {
+ //--初始化卡类--
+ this.init(this.data.g_id);
},
+ },
methods: {
// 这里是一个自定义方法
- init: function(g_id) {
+ init: function (g_id) {
var th = this;
- getApp().getConfig2(function (e) {
- var swithc_list = e.switch_list;
- var sw_arr = JSON.parse(swithc_list);
+ getApp().getConfig2(function (e) {
+ var swithc_list = e.switch_list;
+ var sw_arr = JSON.parse(swithc_list);
- if(sw_arr.is_retail_price){
- th.setData({is_retail_price:1});
- }
+ if (sw_arr.is_retail_price) {
+ th.setData({ is_retail_price: 1 });
+ }
+ })
+
+
+ var app = getApp(), goodsidlist = "",new_idlist="";
+ if (g_id && g_id.length > 0) {
+ //--先把商品ID串起来--
+ g_id.forEach(function (val, ind) {
+ var item = {};
+ goodsidlist += val.goodsid + ",";
+ if (val.idlist) {
+ new_idlist += val.idlist + ",";
+ }
})
+ goodsidlist = ut.sub_last(goodsidlist);
+
+ if (new_idlist) {
+ new_idlist = ut.sub_last(new_idlist);
+ }
+ var user_id = getApp().globalData.user_id;
+ var pre_data = { store_id: os.stoid, is_end: 0, timetype: 3, isuse: 1 };
+ if (user_id) {
+ pre_data.user_id = user_id;
+ }
+ let url=''
+ if (new_idlist) {
+ url="/api/weshop/marketing/marketingPresellList/page?isnew=1&idlist="+new_idlist
+ }else{
+ url="/api/weshop/marketing/marketingPresellList/page?goodsidlist=" + goodsidlist
+ }
+ //--调用接口,读取秒杀--
+ app.request.promiseGet(url, {
+ data: pre_data
+ }).then(res => {
+
+ if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+ //如果数组为空的时候
+ var goodslist = res.data.data.pageData;
+ //就算是添加的活动已经过期，就要用最新的进行中活动
+ if (goodslist && goodslist.length > 0) {
+ th.set_goods_list(g_id, goodslist);
+ }
+
+ th.data.timer = setInterval(function () {
+ th.countDown2(th);
+ }, 1000);
+ }
- var app = getApp(), goodsidlist="";
- if(g_id && g_id.length>0){
- //--先把商品ID串起来--
- g_id.forEach(function(val, ind) {
- var item = {};
- goodsidlist+=val.goodsid+",";
- })
- goodsidlist=ut.sub_last(goodsidlist);
-
- var user_id=getApp().globalData.user_id;
- var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1};
- if(user_id){
- pre_data.user_id=user_id;
- }
-
- //--调用接口,读取秒杀--
- app.request.promiseGet("/api/weshop/marketing/marketingPresellList/page?goodsidlist="+goodsidlist, {
- data:pre_data
- }).then(res => {
-
- if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) {
- //如果数组为空的时候
- var goodslist = res.data.data.pageData;
- //就算是添加的活动已经过期，就要用最新的进行中活动
- if (goodslist && goodslist.length > 0) {
- th.set_goods_list(g_id, goodslist);
- }
-
- th.data.timer = setInterval(function () {
- th.countDown2(th);
- }, 1000);
- }
-
-
- });
- }else{
- th.no_gid_set();
- }
+
+ });
+ } else {
+ th.no_gid_set();
+ }
},
-
- //当是默认的情况
- no_gid_set(){
- var th=this;
- var user_id=getApp().globalData.user_id;
- var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1,page:1,pageSize:9};
- if(user_id){
- pre_data.user_id=user_id;
+
+ //当是默认的情况
+ no_gid_set() {
+ var th = this;
+ var user_id = getApp().globalData.user_id;
+ var pre_data = { store_id: os.stoid, is_end: 0, timetype: 3, isuse: 1, page: 1, pageSize: 9 };
+ if (user_id) {
+ pre_data.user_id = user_id;
+ }
+ getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", { data: pre_data }
+ ).then(res => {
+ if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+ var goodsidlist = res.data.data.pageData;
+ this.set_goods_list(null, goodsidlist);
+
+ th.data.timer = setInterval(function () {
+ th.countDown2(th);
+ }, 1000);
}
- getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page",{data:pre_data}
- ).then(res=>{
- if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) {
- var goodsidlist=res.data.data.pageData;
- this.set_goods_list(null,goodsidlist);
-
- th.data.timer = setInterval(function () {
- th.countDown2(th);
- }, 1000);
- }
- });
- },
-
- //就算是添加的活动已经过期，就要用最新的活动
- set_goods_list(g_id,goodslist){
- // 判断火热，预热
- var newTime = ut.gettimestamp(),all_array = [],th=this;
- th.setData({newTime:newTime});
- if(g_id){
- /*--商品队列按照添加的顺序排列--*/
- goodslist.forEach(function (vy,indy) {
- all_array.push(vy);
- })
-
- }else{
- all_array=goodslist;
- }
-
- if(all_array.length==0){ all_array=goodslist;}
-
- var arr = new Array();
- //--三个三个一组---
- for(var i=0;i< all_array.length;i+=3){
- arr.push(all_array.slice(i,i+3));
- }
- /*--熏染到前台--*/
- th.setData({goods_array:arr});
- },
-
- //图片失败，默认图片
+ });
+ },
+
+ //就算是添加的活动已经过期，就要用最新的活动
+ set_goods_list(g_id, goodslist) {
+ // 判断火热，预热
+ var newTime = ut.gettimestamp(), all_array = [], th = this;
+ th.setData({ newTime: newTime });
+ if (g_id) {
+ /*--商品队列按照添加的顺序排列--*/
+ goodslist.forEach(function (vy, indy) {
+ all_array.push(vy);
+ })
+
+ } else {
+ all_array = goodslist;
+ }
+
+ if (all_array.length == 0) { all_array = goodslist; }
+
+ var arr = new Array();
+ //--三个三个一组---
+ for (var i = 0; i < all_array.length; i += 3) {
+ arr.push(all_array.slice(i, i + 3));
+ }
+ /*--熏染到前台--*/
+ th.setData({ goods_array: arr });
+ },
+
+ //图片失败，默认图片
bind_bnerr3: function (e) {
var _errImg = e.target.dataset.errorimg;
var _errObj = {};
@@ -140,64 +152,64 @@ Component({
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
},
- go_to_skill:function () {
+ go_to_skill: function () {
wx.navigateTo({
- url:"/packageC/pages/presell/list/list"
+ url: "/packageC/pages/presell/list/list"
});
},
- //----秒杀倒计时函数-----
- countDown2: function (ob) {
- if (ob == undefined) return false;
- var ee = ob;
- // 获取当前时间，同时得到活动结束时间数组
- var newTime = ut.gettimestamp();
- this.setData({ newTime: newTime });
-
- var List = ee.data.goods_array;
- if (List.length == 0) return false;
- for (var j = 0; j < List.length; j++) {
- // 对结束时间进行处理渲染到页面
- var endTimeList = List[j];
- for (var i = 0; i < endTimeList.length; i++) {
- var o = endTimeList[i];
- var endTime = o.end_time;
- if (newTime < o.start_time) endTime = o.start_time;
- let obj = null;
- // 如果活动未结束，对时间进行处理
- if (endTime - newTime > 0) {
- let time = (endTime - newTime);
- // 获取天、时、分、秒
- let day = parseInt(time / (60 * 60 * 24));
- let hou = parseInt(time % (60 * 60 * 24) / 3600);
- let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
- let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
- obj = {
- day: this.timeFormat(day),
- hou: this.timeFormat(hou),
- min: this.timeFormat(min),
- sec: this.timeFormat(sec)
- }
- } else {
- //活动已结束，全部设置为'00'
- obj = {
- day: '00',
- hou: '00',
- min: '00',
- sec: '00'
- }
- }
- var txt = "goods_array[" + j + "][" + i + "].djs";
- ee.setData({
- [txt]: obj
- });
- }
+ //----秒杀倒计时函数-----
+ countDown2: function (ob) {
+ if (ob == undefined) return false;
+ var ee = ob;
+ // 获取当前时间，同时得到活动结束时间数组
+ var newTime = ut.gettimestamp();
+ this.setData({ newTime: newTime });
+
+ var List = ee.data.goods_array;
+ if (List.length == 0) return false;
+ for (var j = 0; j < List.length; j++) {
+ // 对结束时间进行处理渲染到页面
+ var endTimeList = List[j];
+ for (var i = 0; i < endTimeList.length; i++) {
+ var o = endTimeList[i];
+ var endTime = o.end_time;
+ if (newTime < o.start_time) endTime = o.start_time;
+ let obj = null;
+ // 如果活动未结束，对时间进行处理
+ if (endTime - newTime > 0) {
+ let time = (endTime - newTime);
+ // 获取天、时、分、秒
+ let day = parseInt(time / (60 * 60 * 24));
+ let hou = parseInt(time % (60 * 60 * 24) / 3600);
+ let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+ let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+ obj = {
+ day: this.timeFormat(day),
+ hou: this.timeFormat(hou),
+ min: this.timeFormat(min),
+ sec: this.timeFormat(sec)
+ }
+ } else {
+ //活动已结束，全部设置为'00'
+ obj = {
+ day: '00',
+ hou: '00',
+ min: '00',
+ sec: '00'
+ }
}
- },
- //---小于10的格式化函数----
- timeFormat: function (param) {
- return param < 10 ? '0' + param : param;
- },
+ var txt = "goods_array[" + j + "][" + i + "].djs";
+ ee.setData({
+ [txt]: obj
+ });
+ }
+ }
+ },
+ //---小于10的格式化函数----
+ timeFormat: function (param) {
+ return param < 10 ? '0' + param : param;
+ },
},
diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js
index 40aa366..1c616a5 100644
--- a/components/diy_public/diy_public.js
+++ b/components/diy_public/diy_public.js
@@ -143,7 +143,7 @@ Component({
})
- var app = getApp(), goodsidlist = "", idlist = "";
+ var app = getApp(), goodsidlist = "", idlist = "",new_idlist="";
if (g_id.data_type == 2) {
if (g_id.data && g_id.data.length > 0) {
//--先把商品ID串起来--
@@ -151,9 +151,16 @@ Component({
var item = {};
goodsidlist += val.goodsid + ",";
idlist += val.flashid + ",";
+ if (val.idlist) {
+ new_idlist += val.idlist + ",";
+ }
+
})
goodsidlist = ut.sub_last(goodsidlist);
idlist = ut.sub_last(idlist);
+ if (new_idlist) {
+ new_idlist = ut.sub_last(new_idlist);
+ }
var user_id=getApp().globalData.user_id;
if(!user_id){ user_id=0;}
@@ -162,9 +169,14 @@ Component({
// var gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1";
let gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&idlist=" + idlist + "&user_id="+user_id+"&type=1";
- if (th.data.prom_type==6) { //天天拼单
- gUrl="/api/weshop/teamlist/getGoodsList?store_id="
- +os.stoid+"&goodsidlist="+goodsidlist;
+ if (th.data.prom_type==6) { //天天拼单
+ if (new_idlist) {
+ gUrl="/api/weshop/teamlist/getGoodsList?store_id="
+ +os.stoid+"&isnew=1&idlist="+new_idlist;
+ }else{
+ gUrl="/api/weshop/teamlist/getGoodsList?store_id="
+ +os.stoid+"&goodsidlist="+goodsidlist;
+ }
}
if (th.data.prom_type==2) { //团购
@@ -173,8 +185,14 @@ Component({
}
if (th.data.prom_type==8) { //预售
- gUrl="/api/weshop/marketing/marketingPresellList/page?store_id="
- +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1';
+ if (new_idlist) {
+ gUrl="/api/weshop/marketing/marketingPresellList/page?store_id="
+ +os.stoid+"&isnew=1&idlist="+new_idlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1';
+ // gUrl+="&isnew=1&idlist="+new_idlist
+ }else{
+ gUrl="/api/weshop/marketing/marketingPresellList/page?store_id="
+ +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1';
+ }
}
if (th.data.prom_type==9) { //幸运购
gUrl="/api/weshop/prom/luckyActivity/getGoodsList?store_id="
diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 27795b3..00f503e 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -482,6 +482,7 @@ Page({
- }
+ },
+ onShareAppMessage: function (e) {}
})
diff --git a/packageB/pages/evaluate/evaluate.js b/packageB/pages/evaluate/evaluate.js
index 21b48b8..da743d4 100644
--- a/packageB/pages/evaluate/evaluate.js
+++ b/packageB/pages/evaluate/evaluate.js
@@ -102,13 +102,16 @@ Page({
query_bea: function() {
var th = this;
var url = "/api/weshop/order/pagePosOrder";
-
+ //ftype =5 退款
switch (this.data.ftype){
case 3:
break;
case 4:
url = "/api/weshop/serviceCard/pagePos";
- break;
+ break;
+ case 5:
+ url = "/api/weshop/serviceCard/pageCardOut";
+ break;
default:
break
}
@@ -124,6 +127,15 @@ Page({
if (res.data.code == 0) {
var data = res.data.data.pageData;
var arrangeTime = data[0].ArrangeTime;
+ if (this.data.ftype==5 && data && data.length >0) { //退款是项目名称赋值到list里
+ data.map((item,i)=>{
+ if (item.list && item.list.length>0) {
+ item.list.map((ite,j)=>{
+ data[j].list[j].ItemName = item.ItemName
+ })
+ }
+ })
+ }
th.setData({
beautician: data,
arrangeTime: arrangeTime
@@ -147,8 +159,20 @@ Page({
}).then(res => {
if (res.data.code == 0) {
var list=[];
- res.data.data.BillDate=res.data.data.BillDate.replace(".0",'');
- list.push(res.data.data);
+ res.data.data.BillDate=res.data.data.BillDate.substring(0, 19);
+
+
+ list.push(res.data.data);
+
+ if (th.data.ftype==5 && list && list.length>0) { //退款时赋值项目名称到list
+ list.map((item,i)=>{
+ if (item.list && item.list.length>0) {
+ item.list.map((ite,j)=>{
+ list[j].list[j].ItemName = item.ItemName
+ })
+ }
+ })
+ }
th.setData({
stars_index: res.data.data.Star-1,
@@ -213,7 +237,7 @@ Page({
var namber=th.data.number;
var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1";
- if(th.data.ftype==4){
+ if(th.data.ftype==4 || th.data.ftype==5){
url="/pages/user/index/index";
}
diff --git a/packageB/pages/evaluate/evaluate.wxml b/packageB/pages/evaluate/evaluate.wxml
index 8cc0d3d..c1c1f18 100644
--- a/packageB/pages/evaluate/evaluate.wxml
+++ b/packageB/pages/evaluate/evaluate.wxml
@@ -17,7 +17,7 @@
购买商品：
- {{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}
+ {{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}
@@ -94,7 +94,7 @@
-
+
评价其他
@@ -137,8 +137,8 @@
商品详情
- {{item.WareName?item.WareName:item.ItemName}}
- {{item.Qty}}
+ {{item.WareName?item.WareName:item.ItemName}}
+
diff --git a/packageB/pages/evaluate/evaluate.wxss b/packageB/pages/evaluate/evaluate.wxss
index a48f95a..220e774 100644
--- a/packageB/pages/evaluate/evaluate.wxss
+++ b/packageB/pages/evaluate/evaluate.wxss
@@ -155,6 +155,11 @@
}
.go_right::after{
+ position: absolute;
+ right: 5px;
+ top: 0;
+ bottom: 0;
+ margin: auto;
content: '';
display: inline-block;
width: 20rpx;
--
libgit2 0.21.4