15102826049 1 месяц назад
Родитель
Сommit
a45e3b2449

+ 1 - 1
dist/build/mp-weixin/pagesOne/record/components/activeBlock.js

@@ -1 +1 @@
-"use strict";const e=require("../../../common/vendor.js"),t=require("../../../utils/common.js");if(!Array){(e.resolveComponent("wd-icon")+e.resolveComponent("wd-tag")+e.resolveComponent("wd-img"))()}Math||((()=>"../../../node-modules/wot-design-uni/components/wd-icon/wd-icon.js")+(()=>"../../../node-modules/wot-design-uni/components/wd-tag/wd-tag.js")+(()=>"../../../node-modules/wot-design-uni/components/wd-img/wd-img.js"))();const i=e.defineComponent({__name:"activeBlock",props:{isShow:{type:Boolean,default:!1},detail:{type:Object,default:()=>{}},index:{type:Number,default:0},isLink:{type:Boolean,default:!1}},setup(i){const o=i;return(a,d)=>e.e({a:0===i.index},(i.index,{}),{b:e.t(i.detail.title),c:i.isLink},i.isLink?{d:e.p({name:"arrow-right",size:"26rpx",color:"#ADB5BD"})}:{},{e:e.t(e.unref(t.formatTagStr)(i.detail.processStatus)),f:e.p({"custom-style":"padding:8rpx 26rpx;border-radius: 8rpx;font-size:22rpx;float: right",color:e.unref(t.formatTagColor)(i.detail.processStatus),"bg-color":e.unref(t.formatTagBgColor)(i.detail.processStatus)})},{g:e.t(i.detail.discountLevel),h:e.t(i.detail.createTime),i:e.t(i.detail.endTime),j:e.t(i.detail.createTime),k:i.isShow},i.isShow?e.e({l:i.detail.receiptImages&&i.detail.receiptImages.length},i.detail.receiptImages&&i.detail.receiptImages.length?{m:e.f(i.detail.receiptImages,((t,i,o)=>({a:i,b:"d6238243-2-"+o,c:e.p({width:50,height:112,src:t,"enable-preview":!0})})))}:{}):{},{n:i.isShow&&i.detail.auditRemark},i.isShow&&i.detail.auditRemark?{o:e.t(i.detail.auditRemark)}:{},{p:e.o((t=>{return a=i.detail.id,void(o.isLink&&e.index.navigateTo({url:`/pagesOne/record/uploadDetail?id=${a}`}));var a}))})}}),o=e._export_sfc(i,[["__scopeId","data-v-d6238243"]]);wx.createComponent(o);
+"use strict";const e=require("../../../common/vendor.js"),t=require("../../../utils/common.js");if(!Array){(e.resolveComponent("wd-icon")+e.resolveComponent("wd-tag")+e.resolveComponent("wd-img"))()}Math||((()=>"../../../node-modules/wot-design-uni/components/wd-icon/wd-icon.js")+(()=>"../../../node-modules/wot-design-uni/components/wd-tag/wd-tag.js")+(()=>"../../../node-modules/wot-design-uni/components/wd-img/wd-img.js"))();const i=e.defineComponent({__name:"activeBlock",props:{isShow:{type:Boolean,default:!1},detail:{type:Object,default:()=>{}},index:{type:Number,default:0},isLink:{type:Boolean,default:!1}},setup(i){const o=i;return(a,d)=>e.e({a:0===i.index},(i.index,{}),{b:e.t(i.detail.title),c:i.isLink},i.isLink?{d:e.p({name:"arrow-right",size:"26rpx",color:"#ADB5BD"})}:{},{e:e.t(e.unref(t.formatTagStr)(i.detail.processStatus)),f:e.p({"custom-style":"padding:8rpx 26rpx;border-radius: 8rpx;font-size:22rpx;float: right",color:e.unref(t.formatTagColor)(i.detail.processStatus),"bg-color":e.unref(t.formatTagBgColor)(i.detail.processStatus)})},{g:e.t(i.detail.discountLevel),h:e.t(i.detail.startTime),i:e.t(i.detail.endTime),j:e.t(i.detail.createTime),k:i.isShow},i.isShow?e.e({l:i.detail.receiptImages&&i.detail.receiptImages.length},i.detail.receiptImages&&i.detail.receiptImages.length?{m:e.f(i.detail.receiptImages,((t,i,o)=>({a:i,b:"bda0f6ab-2-"+o,c:e.p({width:50,height:112,src:t,"enable-preview":!0})})))}:{}):{},{n:i.isShow&&i.detail.auditRemark},i.isShow&&i.detail.auditRemark?{o:e.t(i.detail.auditRemark)}:{},{p:e.o((t=>{return a=i.detail.id,void(o.isLink&&e.index.navigateTo({url:`/pagesOne/record/uploadDetail?id=${a}`}));var a}))})}}),o=e._export_sfc(i,[["__scopeId","data-v-bda0f6ab"]]);wx.createComponent(o);

+ 1 - 1
dist/build/mp-weixin/pagesOne/record/components/activeBlock.wxml

@@ -1 +1 @@
-<view bindtap="{{p}}" class="activityItem data-v-d6238243"><view class="top flex-start-btw data-v-d6238243"><view class="flex-start-center data-v-d6238243"><image wx:if="{{a}}" class="now data-v-d6238243" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-d6238243" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-d6238243">{{b}}</text><wd-icon wx:if="{{c}}" class="data-v-d6238243" u-i="d6238243-0" bind:__l="__l" u-p="{{d}}"></wd-icon></view><wd-tag wx:if="{{true}}" class="data-v-d6238243" u-s="{{['d']}}" u-i="d6238243-1" bind:__l="__l" u-p="{{f}}">{{e}}</wd-tag></view><view class="data-v-d6238243"> 活动力度:{{g}}</view><view class="data-v-d6238243"> 活动时间:{{h}} 至 {{i}}</view><view class="data-v-d6238243"> 上传时间:{{j}}</view><view wx:if="{{k}}" class="data-v-d6238243"><view class="data-v-d6238243">上传图片:</view><view wx:if="{{l}}" class="imgBox flex-start-center data-v-d6238243"><wd-img wx:for="{{m}}" wx:for-item="joy" wx:key="a" class="data-v-d6238243" u-i="{{joy.b}}" bind:__l="__l" u-p="{{joy.c}}"/></view></view><view wx:if="{{n}}" class="remark data-v-d6238243">拒绝原因:{{o}}</view></view>
+<view bindtap="{{p}}" class="activityItem data-v-bda0f6ab"><view class="top flex-start-btw data-v-bda0f6ab"><view class="flex-start-center data-v-bda0f6ab"><image wx:if="{{a}}" class="now data-v-bda0f6ab" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-bda0f6ab" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-bda0f6ab">{{b}}</text><wd-icon wx:if="{{c}}" class="data-v-bda0f6ab" u-i="bda0f6ab-0" bind:__l="__l" u-p="{{d}}"></wd-icon></view><wd-tag wx:if="{{true}}" class="data-v-bda0f6ab" u-s="{{['d']}}" u-i="bda0f6ab-1" bind:__l="__l" u-p="{{f}}">{{e}}</wd-tag></view><view class="data-v-bda0f6ab"> 活动力度:{{g}}</view><view class="data-v-bda0f6ab"> 活动时间:{{h}} 至 {{i}}</view><view class="data-v-bda0f6ab"> 上传时间:{{j}}</view><view wx:if="{{k}}" class="data-v-bda0f6ab"><view class="data-v-bda0f6ab">上传图片:</view><view wx:if="{{l}}" class="imgBox flex-start-center data-v-bda0f6ab"><wd-img wx:for="{{m}}" wx:for-item="joy" wx:key="a" class="data-v-bda0f6ab" u-i="{{joy.b}}" bind:__l="__l" u-p="{{joy.c}}"/></view></view><view wx:if="{{n}}" class="remark data-v-bda0f6ab">拒绝原因:{{o}}</view></view>

+ 1 - 1
dist/build/mp-weixin/pagesOne/record/components/activeBlock.wxss

@@ -1 +1 @@
-.activityItem.data-v-d6238243{color:#666;font-size:28rpx;padding:24rpx;box-shadow:0 4rpx 16rpx rgba(207,223,232,.12);background:#fff;margin-top:16rpx;border-radius:16rpx}.activityItem>view.data-v-d6238243{margin-top:16rpx}.activityItem .now.data-v-d6238243{width:110rpx;height:34rpx}.activityItem .old.data-v-d6238243{width:60rpx;height:34rpx}.activityItem .name.data-v-d6238243{font-weight:700;color:#333;margin-left:16rpx}.activityItem .top.data-v-d6238243{margin-top:0}.activityItem .imgBox.data-v-d6238243{margin-top:16rpx}.activityItem .imgBox.data-v-d6238243 .wd-img{margin-right:16rpx}.activityItem .imgBox.data-v-d6238243 .wd-img:last-of-type{margin-left:0}.activityItem .remark.data-v-d6238243{color:#ff3b1d;font-size:28rpx}
+.activityItem.data-v-bda0f6ab{color:#666;font-size:28rpx;padding:24rpx;box-shadow:0 4rpx 16rpx rgba(207,223,232,.12);background:#fff;margin-top:16rpx;border-radius:16rpx}.activityItem>view.data-v-bda0f6ab{margin-top:16rpx}.activityItem .now.data-v-bda0f6ab{width:110rpx;height:34rpx}.activityItem .old.data-v-bda0f6ab{width:60rpx;height:34rpx}.activityItem .name.data-v-bda0f6ab{font-weight:700;color:#333;margin-left:16rpx}.activityItem .top.data-v-bda0f6ab{margin-top:0}.activityItem .imgBox.data-v-bda0f6ab{margin-top:16rpx}.activityItem .imgBox.data-v-bda0f6ab .wd-img{margin-right:16rpx}.activityItem .imgBox.data-v-bda0f6ab .wd-img:last-of-type{margin-left:0}.activityItem .remark.data-v-bda0f6ab{color:#ff3b1d;font-size:28rpx}

+ 1 - 1
dist/build/mp-weixin/pagesOne/record/winnerList.js

@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),t=require("../../services/ams.js"),a=e.defineComponent({__name:"winnerList",setup(a){const s=e.index.getStorageSync("openid"),n=e.index.getStorageSync("appid"),c=e.ref([]),o=()=>{t.auditSuccessList({openid:s}).then((e=>{c.value=e.rows}))};return e.onLoad((()=>{o()})),(a,s)=>({a:e.f(c.value,((a,s,c)=>e.e({a:0===s},{},{b:e.t(a.title),c:e.t(a.discountLevel),d:e.t(a.paymentAmount||0),e:e.t(a.startTime),f:e.t(a.endTime),g:e.n("3"===a.processStatus?"active":"static"),h:e.o((s=>{var c;"3"==(c=a).processStatus&&t.payment(c.id).then((t=>{e.wx$1.canIUse("requestMerchantTransfer")?e.wx$1.requestMerchantTransfer({mchId:t.data.merchantId,appId:n,package:t.data.packageInfo,success:t=>{e.index.showToast({icon:"success",title:"请求成功"}),o()},fail:e=>{console.log("fail:",e)}}):e.wx$1.showModal({content:"你的微信版本过低,请更新至最新版本。",showCancel:!1})})).catch((t=>{e.index.showToast({icon:"none",title:t.msg})}))}),a.id),i:a.id})))})}}),s=e._export_sfc(a,[["__scopeId","data-v-17c98bf6"]]);wx.createPage(s);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../services/ams.js"),s=e.defineComponent({__name:"winnerList",setup(s){const a=e.index.getStorageSync("openid"),n=e.index.getStorageSync("appid"),o=e.ref([]),c=()=>{t.auditSuccessList({openid:a}).then((e=>{o.value=e.rows}))};return e.onLoad((()=>{c()})),(s,a)=>({a:e.f(o.value,((s,a,o)=>e.e({a:0===a},{},{b:e.t(s.title),c:e.t(s.discountLevel),d:e.t(s.paymentAmount||0),e:e.t(s.startTime),f:e.t(s.endTime),g:e.n("3"===s.processStatus||"5"===s.processStatus||"6"===s.processStatus?"active":"static"),h:e.o((a=>{var o;("3"===(o=s).processStatus||"5"===o.processStatus||"6"===o.processStatus)&&t.payment(o.id).then((t=>{500!==t.code?e.wx$1.canIUse("requestMerchantTransfer")?e.wx$1.requestMerchantTransfer({mchId:t.data.merchantId,appId:n,package:t.data.packageInfo,success:t=>{e.index.showToast({icon:"success",title:"请求成功"}),c()},fail:t=>{e.index.showToast({icon:"none",title:"提现申请失败"})}}):e.wx$1.showModal({content:"你的微信版本过低,请更新至最新版本。",showCancel:!1}):e.index.showToast({icon:"none",title:"提现申请失败"})})).catch((t=>{e.index.showToast({icon:"none",title:t.msg})}))}),s.id),i:s.id})))})}}),a=e._export_sfc(s,[["__scopeId","data-v-b61631a5"]]);wx.createPage(a);

+ 1 - 1
dist/build/mp-weixin/pagesOne/record/winnerList.wxml

@@ -1 +1 @@
-<view class="winnerListContent data-v-17c98bf6"><view class="title data-v-17c98bf6">奖励记录</view><view class="content data-v-17c98bf6"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="activityItem data-v-17c98bf6"><view class="top flex-start-center data-v-17c98bf6"><image wx:if="{{item.a}}" class="now data-v-17c98bf6" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-17c98bf6" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-17c98bf6">{{item.b}}</text></view><view class="data-v-17c98bf6"><text class="data-v-17c98bf6">活动力度:{{item.c}}</text><text class="data-v-17c98bf6">奖励金额:{{item.d}}元</text></view><view class="data-v-17c98bf6"> 活动时间:{{item.e}}至{{item.f}}</view><view class="{{['widthBtn', 'data-v-17c98bf6', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view>
+<view class="winnerListContent data-v-b61631a5"><view class="title data-v-b61631a5">奖励记录</view><view class="content data-v-b61631a5"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="activityItem data-v-b61631a5"><view class="top flex-start-center data-v-b61631a5"><image wx:if="{{item.a}}" class="now data-v-b61631a5" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-b61631a5" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-b61631a5">{{item.b}}</text></view><view class="data-v-b61631a5"><text class="data-v-b61631a5">活动力度:{{item.c}}</text><text class="data-v-b61631a5">奖励金额:{{item.d}}元</text></view><view class="data-v-b61631a5"> 活动时间:{{item.e}}至{{item.f}}</view><view class="{{['widthBtn', 'data-v-b61631a5', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view>

+ 1 - 1
dist/build/mp-weixin/pagesOne/record/winnerList.wxss

@@ -1 +1 @@
-.winnerListContent.data-v-17c98bf6{padding:32rpx;box-sizing:border-box;background:#f7f8f9;min-height:100vh}.winnerListContent .title.data-v-17c98bf6{color:#000;font-weight:700;font-size:32rpx;position:relative;margin-left:16rpx}.winnerListContent .title.data-v-17c98bf6:before{content:" ";display:inline-block;width:6rpx;height:30rpx;background-color:#296041;margin-right:16rpx;position:absolute;border-radius:200rpx;left:-16rpx;top:0;bottom:0;margin:auto}.winnerListContent .content .activityItem.data-v-17c98bf6{height:250rpx;color:#666;font-size:28rpx;padding:24rpx;box-shadow:0 4rpx 16rpx rgba(207,223,232,.12);background:#fff;margin-top:16rpx;border-radius:16rpx}.winnerListContent .content .activityItem.data-v-17c98bf6:first-of-type{position:relative}.winnerListContent .content .activityItem.data-v-17c98bf6:first-of-type:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border:2rpx solid;border-radius:inherit;padding:2rpx;box-sizing:border-box;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);-webkit-mask-composite:destination-out;mask-composite:exclude}.winnerListContent .content .activityItem>view.data-v-17c98bf6{margin-top:16rpx}.winnerListContent .content .activityItem .now.data-v-17c98bf6{width:110rpx;height:34rpx}.winnerListContent .content .activityItem .old.data-v-17c98bf6{width:60rpx;height:34rpx}.winnerListContent .content .activityItem .name.data-v-17c98bf6{font-weight:700;color:#333;margin-left:16rpx}.winnerListContent .content .activityItem .top.data-v-17c98bf6{margin-top:0}.winnerListContent .widthBtn.data-v-17c98bf6{float:right;width:128rpx;border-radius:82rpx;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);color:#fff;line-height:48rpx;text-align:center;position:relative;z-index:999}.winnerListContent .widthBtn.static.data-v-17c98bf6{background:#d1d1d6}
+.winnerListContent.data-v-b61631a5{padding:32rpx;box-sizing:border-box;background:#f7f8f9;min-height:100vh}.winnerListContent .title.data-v-b61631a5{color:#000;font-weight:700;font-size:32rpx;position:relative;margin-left:16rpx}.winnerListContent .title.data-v-b61631a5:before{content:" ";display:inline-block;width:6rpx;height:30rpx;background-color:#296041;margin-right:16rpx;position:absolute;border-radius:200rpx;left:-16rpx;top:0;bottom:0;margin:auto}.winnerListContent .content .activityItem.data-v-b61631a5{height:250rpx;color:#666;font-size:28rpx;padding:24rpx;box-shadow:0 4rpx 16rpx rgba(207,223,232,.12);background:#fff;margin-top:16rpx;border-radius:16rpx}.winnerListContent .content .activityItem.data-v-b61631a5:first-of-type{position:relative}.winnerListContent .content .activityItem.data-v-b61631a5:first-of-type:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border:2rpx solid;border-radius:inherit;padding:2rpx;box-sizing:border-box;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);-webkit-mask-composite:destination-out;mask-composite:exclude}.winnerListContent .content .activityItem>view.data-v-b61631a5{margin-top:16rpx}.winnerListContent .content .activityItem .now.data-v-b61631a5{width:110rpx;height:34rpx}.winnerListContent .content .activityItem .old.data-v-b61631a5{width:60rpx;height:34rpx}.winnerListContent .content .activityItem .name.data-v-b61631a5{font-weight:700;color:#333;margin-left:16rpx}.winnerListContent .content .activityItem .top.data-v-b61631a5{margin-top:0}.winnerListContent .widthBtn.data-v-b61631a5{float:right;width:128rpx;border-radius:82rpx;background:linear-gradient(90deg,#225036,#3b8e5e 45.92%,#3d8f5f);color:#fff;line-height:48rpx;text-align:center;position:relative;z-index:999}.winnerListContent .widthBtn.static.data-v-b61631a5{background:#d1d1d6}

+ 1 - 1
dist/build/mp-weixin/pagesOne/winner/uploadImage.js

@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),o=require("../../services/ams.js");if(!Array){e.resolveComponent("wd-upload")()}Math;const t=e.defineComponent({__name:"uploadImage",setup(t){const n=e.ref([]),i=e.ref([]),a=JSON.parse(e.index.getStorageSync("activityData")),s=e.index.getStorageSync("openid"),d=e.index.getStorageSync("phone"),r=e.reactive({discountId:"",discountLevel:""}),l="https://coupon.qiuyutech.com.cn/prod-api/miniApp/oss/upload/"+a.brandId,u=(o,t,n)=>{e.index.uploadFile({url:l,header:n.header,name:n.name,fileName:n.name,fileType:n.fileType,formData:t,filePath:o.url,success(e){if(e.statusCode===n.statusCode){n.onSuccess(e,o,t);const a=JSON.parse(e.data);i.value.push(a.url)}else n.onError({...e,errMsg:e.errMsg||""},o,t)},fail(e){n.onError(e,o,t)}})},c=e=>{const o=JSON.parse(e.file.response);i.value=i.value.filter((e=>e!==o.url))},p=()=>{const t={openid:s,mobile:d,latitude:"",longitude:"",discountId:r.discountId,discountLevel:r.discountLevel,receiptImages:i.value.join(","),marketingActivityId:a.id};o.addCustomer(t).then((o=>{e.index.navigateBack(),console.log("---------------------",o)}))};return e.onLoad((e=>{r.discountId=e.discountId,r.discountLevel=e.discountLevel,console.log("---------------------",r)})),(o,t)=>({a:e.o(c),b:e.p({"file-list":n.value,multiple:!0,limit:5,"upload-method":u}),c:e.o(p)})}});wx.createPage(t);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../services/ams.js");if(!Array){e.resolveComponent("wd-upload")()}Math;const o=e.defineComponent({__name:"uploadImage",setup(o){const n=e.ref([]),i=e.ref([]),a=JSON.parse(e.index.getStorageSync("activityData")),s=e.index.getStorageSync("openid"),r=e.index.getStorageSync("phone"),d=e.reactive({discountId:"",discountLevel:""}),u="https://coupon.qiuyutech.com.cn/prod-api/miniApp/oss/upload/"+a.brandId,l=(t,o,n)=>{e.index.uploadFile({url:u,header:n.header,name:n.name,fileName:n.name,fileType:n.fileType,formData:o,filePath:t.url,success(e){if(e.statusCode===n.statusCode){n.onSuccess(e,t,o);const a=JSON.parse(e.data);i.value.push(a.url)}else n.onError({...e,errMsg:e.errMsg||""},t,o)},fail(e){n.onError(e,t,o)}})},c=e=>{const t=JSON.parse(e.file.response);i.value=i.value.filter((e=>e!==t.url))},p=()=>{if(0===i.value.length)return e.index.showToast({title:"请上传图片",icon:"none"});const o={openid:s,mobile:r,latitude:"",longitude:"",discountId:d.discountId,discountLevel:d.discountLevel,receiptImages:i.value.join(","),marketingActivityId:a.id};t.addCustomer(o).then((t=>{e.index.navigateBack()}))};return e.onLoad((e=>{d.discountId=e.discountId,d.discountLevel=e.discountLevel})),(t,o)=>({a:e.o(c),b:e.p({"file-list":n.value,multiple:!0,limit:5,"upload-method":l}),c:e.o(p)})}});wx.createPage(o);

+ 5 - 0
dist/dev/mp-weixin/app.wxss

@@ -73,4 +73,9 @@ view {
   display: flex;
   align-items: center;
   justify-content: space-between;
+}
+
+.flex-end {
+  display: flex;
+  justify-content: flex-end;
 }page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}[data-c-h="true"]{display: none !important;}

+ 1 - 1
dist/dev/mp-weixin/pagesOne/record/winnerList.wxml

@@ -1 +1 @@
-<view class="winnerListContent data-v-1f9f7d73"><view class="title data-v-1f9f7d73">奖励记录</view><view class="content data-v-1f9f7d73"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="activityItem data-v-1f9f7d73"><view class="top flex-start-center data-v-1f9f7d73"><image wx:if="{{item.a}}" class="now data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-1f9f7d73">{{item.b}}</text></view><view class="data-v-1f9f7d73"><text class="data-v-1f9f7d73">活动力度:{{item.c}}</text><text class="data-v-1f9f7d73">奖励金额:{{item.d}}元</text></view><view class="data-v-1f9f7d73"> 活动时间:{{item.e}}至{{item.f}}</view><view class="{{['widthBtn', 'data-v-1f9f7d73', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view>
+<view class="winnerListContent data-v-1f9f7d73"><view class="title data-v-1f9f7d73">奖励记录</view><view class="content data-v-1f9f7d73"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="activityItem data-v-1f9f7d73"><view class="top flex-start-center data-v-1f9f7d73"><image wx:if="{{item.a}}" class="now data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/nowAct.png" mode="scaleToFill"/><image wx:else class="old data-v-1f9f7d73" src="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/act.png" mode="scaleToFill"/><text class="name data-v-1f9f7d73">{{item.b}}</text></view><view class="data-v-1f9f7d73"><text class="data-v-1f9f7d73">活动力度:{{item.c}}</text><text class="data-v-1f9f7d73" style="margin-left:44rpx"> 奖励金额:{{item.d}}元 </text></view><view class="data-v-1f9f7d73"> 活动时间:{{item.e}}至{{item.f}}</view><view class="flex-end data-v-1f9f7d73"><view class="{{['widthBtn', 'data-v-1f9f7d73', item.g]}}" bindtap="{{item.h}}">提现</view></view></view></view></view>

+ 0 - 2
dist/dev/mp-weixin/pagesOne/record/winnerList.wxss

@@ -51,7 +51,6 @@
   margin: auto;
 }
 .winnerListContent .content .activityItem.data-v-1f9f7d73 {
-  height: 250rpx;
   color: #666666;
   font-size: 28rpx;
   padding: 24rpx;
@@ -99,7 +98,6 @@
   margin-top: 0;
 }
 .winnerListContent .widthBtn.data-v-1f9f7d73 {
-  float: right;
   width: 128rpx;
   border-radius: 82rpx;
   background: linear-gradient(90deg, #225036 0%, #3b8e5e 45.92%, #3d8f5f 100%);

+ 3 - 2
dist/dev/mp-weixin/pagesOne/winner/components/uploadRecordPopup.js

@@ -44,8 +44,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               color: common_vendor.unref(utils_common.formatTagColor)(item.processStatus),
               ["bg-color"]: common_vendor.unref(utils_common.formatTagBgColor)(item.processStatus)
             }),
-            e: common_vendor.o(($event) => toDetail(item.id), item.id),
-            f: item.id
+            e: common_vendor.t(item.createTime),
+            f: common_vendor.o(($event) => toDetail(item.id), item.id),
+            g: item.id
           };
         }),
         b: common_vendor.o(

+ 1 - 1
dist/dev/mp-weixin/pagesOne/winner/components/uploadRecordPopup.wxml

@@ -1 +1 @@
-<view class="uploadRecordPopup data-v-5a089942"><wd-popup wx:if="{{e}}" class="data-v-5a089942" u-s="{{['d']}}" u-i="5a089942-0" bind:__l="__l" bindupdateModelValue="{{d}}" u-p="{{e}}"><view class="content data-v-5a089942"><view class="list data-v-5a089942"><view wx:for="{{a}}" wx:for-item="item" wx:key="f" class="record data-v-5a089942"><view class="left data-v-5a089942"><text class="data-v-5a089942">活动力度:{{item.a}}</text><wd-tag wx:if="{{item.d}}" class="data-v-5a089942" u-s="{{['d']}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}">{{item.b}} </wd-tag></view><view class="time data-v-5a089942"><text class="data-v-5a089942">上传时间:2021-11-21 06:12:31</text><text class="detailBtn data-v-5a089942" bindtap="{{item.e}}">查看详情</text></view></view></view></view><image class="closed data-v-5a089942" bindtap="{{b}}" src="{{c}}" mode="scaleToFill"/></wd-popup></view>
+<view class="uploadRecordPopup data-v-5a089942"><wd-popup wx:if="{{e}}" class="data-v-5a089942" u-s="{{['d']}}" u-i="5a089942-0" bind:__l="__l" bindupdateModelValue="{{d}}" u-p="{{e}}"><view class="content data-v-5a089942"><view class="list data-v-5a089942"><view wx:for="{{a}}" wx:for-item="item" wx:key="g" class="record data-v-5a089942"><view class="left data-v-5a089942"><text class="data-v-5a089942">活动力度:{{item.a}}</text><wd-tag wx:if="{{item.d}}" class="data-v-5a089942" u-s="{{['d']}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}">{{item.b}} </wd-tag></view><view class="time data-v-5a089942"><text class="data-v-5a089942">上传时间:{{item.e}}</text><text class="detailBtn data-v-5a089942" bindtap="{{item.f}}">查看详情</text></view></view></view></view><image class="closed data-v-5a089942" bindtap="{{b}}" src="{{c}}" mode="scaleToFill"/></wd-popup></view>

+ 5 - 0
dist/dev/mp-weixin/static/normal.scss

@@ -21,3 +21,8 @@
   align-items: center;
   justify-content: space-between;
 }
+
+.flex-end {
+  display: flex;
+  justify-content: flex-end;
+}

+ 21 - 15
src/pagesOne/record/winnerList.vue

@@ -20,21 +20,26 @@
         </view>
         <view>
           <text>活动力度:{{ item.discountLevel }}</text>
-          <text>奖励金额:{{ item.paymentAmount || 0 }}元</text>
+          <text style="margin-left: 44rpx">
+            奖励金额:{{ item.paymentAmount || 0 }}元
+          </text>
         </view>
+
         <view> 活动时间:{{ item.startTime }}至{{ item.endTime }} </view>
-        <view
-          class="widthBtn"
-          :class="
-            item.processStatus === '3' ||
-            item.processStatus === '5' ||
-            item.processStatus === '6'
-              ? 'active'
-              : 'static'
-          "
-          @click="onPayment(item)"
-          >提现</view
-        >
+        <view class="flex-end">
+          <view
+            class="widthBtn"
+            :class="
+              item.processStatus === '3' ||
+              item.processStatus === '5' ||
+              item.processStatus === '6'
+                ? 'active'
+                : 'static'
+            "
+            @click="onPayment(item)"
+            >提现</view
+          >
+        </view>
       </view>
     </view>
   </view>
@@ -127,7 +132,7 @@ onLoad(() => {
   }
   .content {
     .activityItem {
-      height: 250rpx;
+      // min-height: 250rpx;
       //   width: 100%;
       color: #666666;
       font-size: 28rpx;
@@ -192,8 +197,9 @@ onLoad(() => {
       }
     }
   }
+
   .widthBtn {
-    float: right;
+    // float: right;
     width: 128rpx;
     border-radius: 82rpx;
     background: linear-gradient(

+ 1 - 1
src/pagesOne/winner/components/uploadRecordPopup.vue

@@ -28,7 +28,7 @@
               </wd-tag> -->
             </view>
             <view class="time">
-              <text>上传时间:2021-11-21 06:12:31</text>
+              <text>上传时间:{{ item.createTime }}</text>
               <text class="detailBtn" @click="toDetail(item.id)">查看详情</text>
             </view>
           </view>

+ 5 - 0
src/static/normal.scss

@@ -21,3 +21,8 @@
   align-items: center;
   justify-content: space-between;
 }
+
+.flex-end {
+  display: flex;
+  justify-content: flex-end;
+}