bug修改

.env.development

@@ -10,4 +10,4 @@ VITE_APP_BASE_API = ''
 # 路由懒加载
 VITE_CLI_BABEL_TRANSPILE_MODULES = true
 
-VITE_API_URL=http://192.168.168.104:8090
+VITE_API_URL=https://test-coupon.qiuyutech.com.cn/stage-api

.env.staging

@@ -1,11 +0,0 @@
-
-
-VITE_NODE_ENV = staging
-
-# 测试环境配置
-VITE_ENV = 'staging'
-
-# 若依管理系统/测试环境
-VITE_APP_BASE_API = '/stage-api'
-
-VITE_API_URL=https://test-coupon.qiuyutech.com.cn/stage-api

dist/build/mp-weixin/pages/my/components/nearlyStoreBox.js

@@ -0,0 +1 @@
+"use strict";const e={};const n=require("../../../common/vendor.js")._export_sfc(e,[["render",function(e,n){return{}}],["__scopeId","data-v-26d51410"]]);wx.createComponent(n);

dist/build/mp-weixin/pages/my/components/nearlyStoreBox.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

dist/build/mp-weixin/pages/my/components/nearlyStoreBox.wxml

@@ -0,0 +1 @@
+<view class="nearly-box data-v-26d51410"><view class="title data-v-26d51410"> 离我最近 </view><view class="count data-v-26d51410"><view class="cont-msg data-v-26d51410"><image class="icon-img data-v-26d51410" src="https://xiangli-tesco.oss-cn-hangzhou.aliyuncs.com/qiuyu/static/home/address.png"></image><view class="store-name data-v-26d51410">附近没有门店</view></view></view></view>

dist/build/mp-weixin/pages/my/components/nearlyStoreBox.wxss

@@ -0,0 +1 @@
+.nearly-box.data-v-26d51410{margin-bottom:32rpx}.nearly-box .title.data-v-26d51410{color:#000;font-weight:700;font-size:28rpx;margin-bottom:12rpx}.nearly-box .count.data-v-26d51410{padding:20rpx;border-radius:16rpx;background:#fff}.nearly-box .cont-msg.data-v-26d51410{width:100%;height:108rpx;background:url(https://xiangli-tesco.oss-cn-hangzhou.aliyuncs.com/qiuyu/static/mine/nearly-bg.png) no-repeat;background-size:100% 100%;display:flex;align-items:center;justify-content:flex-start}.nearly-box .cont-msg .icon-img.data-v-26d51410{width:36rpx;height:36rpx}.nearly-box .cont-msg .store-name.data-v-26d51410{color:#0f1828;font-size:28rpx;font-style:normal;font-weight:700;float:left}.nearly-box .cont-msg .store-num.data-v-26d51410{color:#666;font-size:24rpx;font-weight:400;margin-top:10rpx}.nearly-box .cont-msg .daohang.data-v-26d51410{font-size:28rpx;color:#1a65ff;padding-right:24rpx}

dist/build/mp-weixin/pages/my/index.js

@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),n=require("../../utils/system.js");if(require("../../utils/http.js"),!Array){e.resolveComponent("wd-cell")()}Math||((()=>"../../node-modules/wot-design-uni/components/wd-cell/wd-cell.js")+i)();const i=()=>"../../components/userLoginPopup.js",s=e.defineComponent({__name:"index",setup(i){const s="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/user.png",o="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/gift.png",a="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/page.png",t="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/with.png",u=[{label:"可用积分",src:"https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/int.png",num:0},{label:"优惠券",src:"https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/coupon.png",num:0}],l=e.ref(0),c=e.ref(null),r=e.ref(""),p=e.index.getStorageSync("phone"),d=()=>{r.value="/pagesOne/record/winnerList",n.isGetPhone()?e.index.navigateTo({url:"/pagesOne/record/winnerList"}):c.value.show=!0},g=()=>{r.value="/pagesOne/record/uploadList",n.isGetPhone()?e.index.navigateTo({url:"/pagesOne/record/uploadList"}):c.value.show=!0},m=e.ref(""),v=async e=>{r.value="",n.isGetPhone()||(c.value.show=!0)},h=e=>{m.value=e};return e.onLoad((()=>{l.value=n.getNavTop()})),e.onShow((()=>{n.getActivityData()})),(n,i)=>e.e({a:l.value+"rpx",b:s,c:e.t(e.unref(p)||m.value||"用户昵称"),d:!e.unref(p)&&!m.value},e.unref(p)||m.value?{}:{e:e.o(v)},{f:l.value+125+"rpx",g:e.f(u,((n,i,s)=>({a:e.t(n.label),b:n.src,c:i}))),h:l.value+290+"rpx",i:o,j:t,k:e.o(d),l:e.p({"is-link":!0,title:"奖励记录"}),m:a,n:e.o(g),o:e.p({border:!0,"is-link":!0,title:"上传记录"}),p:e.sr(c,"22c2c492-2",{k:"loginRef"}),q:e.o(h),r:e.p({path:r.value})})}}),o=e._export_sfc(s,[["__scopeId","data-v-22c2c492"]]);wx.createPage(o);
+"use strict";const e=require("../../common/vendor.js"),n=require("../../utils/system.js");if(require("../../utils/http.js"),!Array){e.resolveComponent("wd-cell")()}Math||(i+(()=>"../../node-modules/wot-design-uni/components/wd-cell/wd-cell.js")+s)();const s=()=>"../../components/userLoginPopup.js",i=()=>"./components/nearlyStoreBox.js",a=e.defineComponent({__name:"index",setup(s){const i="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/user.png",a="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/gift.png",o="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/page.png",t="https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/with.png",u=[{label:"可用积分",src:"https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/int.png",num:0},{label:"优惠券",src:"https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/coupon.png",num:0}],l=e.ref(0),r=e.ref(null),c=e.ref(""),p=e.index.getStorageSync("phone"),d=()=>{c.value="/pagesOne/record/winnerList",n.isGetPhone()?e.index.navigateTo({url:"/pagesOne/record/winnerList"}):r.value.show=!0},g=()=>{c.value="/pagesOne/record/uploadList",n.isGetPhone()?e.index.navigateTo({url:"/pagesOne/record/uploadList"}):r.value.show=!0},m=e.ref(""),v=async e=>{c.value="",n.isGetPhone()||(r.value.show=!0)},h=e=>{m.value=e};return e.onLoad((()=>{l.value=n.getNavTop()})),e.onShow((()=>{n.getActivityData()})),(n,s)=>e.e({a:l.value+"rpx",b:i,c:e.t(e.unref(p)||m.value||"用户昵称"),d:!e.unref(p)&&!m.value},e.unref(p)||m.value?{}:{e:e.o(v)},{f:l.value+125+"rpx",g:e.f(u,((n,s,i)=>({a:e.t(n.label),b:n.src,c:s}))),h:l.value+290+"rpx",i:a,j:t,k:e.o(d),l:e.p({"is-link":!0,title:"奖励记录"}),m:o,n:e.o(g),o:e.p({border:!0,"is-link":!0,title:"上传记录"}),p:e.sr(r,"9aea9022-3",{k:"loginRef"}),q:e.o(h),r:e.p({path:c.value})})}}),o=e._export_sfc(a,[["__scopeId","data-v-9aea9022"]]);wx.createPage(o);

dist/build/mp-weixin/pages/my/index.json

@@ -2,6 +2,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "wd-cell": "../../node-modules/wot-design-uni/components/wd-cell/wd-cell",
-    "user-login-popup": "../../components/userLoginPopup"
+    "user-login-popup": "../../components/userLoginPopup",
+    "nearly-store-box": "./components/nearlyStoreBox"
   }
 }

dist/build/mp-weixin/pages/my/index.wxml

@@ -1 +1 @@
-<view class="myContent data-v-22c2c492"><view class="topTitle data-v-22c2c492" style="{{'margin-top:' + a}}">个人中心</view><view class="userBox data-v-22c2c492" style="{{'margin-top:' + f}}"><image class="avatar data-v-22c2c492" src="{{b}}" mode="scaleToFill"/><view class="nickName data-v-22c2c492"><text class="name data-v-22c2c492">{{c}}</text><text wx:if="{{d}}" class="login data-v-22c2c492" bindtap="{{e}}">点击登录</text></view></view><view class="dataBox data-v-22c2c492" style="{{'margin-top:' + h}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="c" class="dataItem data-v-22c2c492"><view class="inside data-v-22c2c492"><text class="label data-v-22c2c492">{{item.a}}</text><view class="data-v-22c2c492"/><text class="data-v-22c2c492">0</text></view><image class="data-v-22c2c492" src="{{item.b}}" mode="scaleToFill"/></view></view><view class="content data-v-22c2c492"><view class="toolBox data-v-22c2c492"><view class="title data-v-22c2c492"> 常用工具 </view><view class="tools data-v-22c2c492"><wd-cell wx:if="{{l}}" class="data-v-22c2c492" u-s="{{['icon','d']}}" bindclick="{{k}}" u-i="22c2c492-0" bind:__l="__l" u-p="{{l}}"><image class="data-v-22c2c492" src="{{i}}" mode="scaleToFill" slot="icon"/><image style="width:128rpx;height:48rpx" src="{{j}}" mode="scaleToFill" class="custom-text data-v-22c2c492"/></wd-cell><wd-cell wx:if="{{o}}" class="data-v-22c2c492" u-s="{{['icon']}}" bindclick="{{n}}" u-i="22c2c492-1" bind:__l="__l" u-p="{{o}}"><image class="data-v-22c2c492" src="{{m}}" mode="scaleToFill" slot="icon"/></wd-cell></view></view></view><user-login-popup wx:if="{{r}}" class="r data-v-22c2c492" u-r="loginRef" bindgetPhone="{{q}}" u-i="22c2c492-2" bind:__l="__l" u-p="{{r}}"></user-login-popup></view>
+<view class="myContent data-v-9aea9022"><view class="topTitle data-v-9aea9022" style="{{'margin-top:' + a}}">个人中心</view><view class="userBox data-v-9aea9022" style="{{'margin-top:' + f}}"><image class="avatar data-v-9aea9022" src="{{b}}" mode="scaleToFill"/><view class="nickName data-v-9aea9022"><text class="name data-v-9aea9022">{{c}}</text><text wx:if="{{d}}" class="login data-v-9aea9022" bindtap="{{e}}">点击登录</text></view></view><view class="dataBox data-v-9aea9022" style="{{'margin-top:' + h}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="c" class="dataItem data-v-9aea9022"><view class="inside data-v-9aea9022"><text class="label data-v-9aea9022">{{item.a}}</text><view class="data-v-9aea9022"/><text class="data-v-9aea9022">0</text></view><image class="data-v-9aea9022" src="{{item.b}}" mode="scaleToFill"/></view></view><view class="content data-v-9aea9022"><view class="data-v-9aea9022" style="margin:26rpx 32rpx 0"><nearly-store-box class="data-v-9aea9022" u-i="9aea9022-0" bind:__l="__l"></nearly-store-box></view><view class="toolBox data-v-9aea9022"><view class="title data-v-9aea9022"> 常用工具 </view><view class="tools data-v-9aea9022"><wd-cell wx:if="{{l}}" class="data-v-9aea9022" u-s="{{['icon','d']}}" bindclick="{{k}}" u-i="9aea9022-1" bind:__l="__l" u-p="{{l}}"><image class="data-v-9aea9022" src="{{i}}" mode="scaleToFill" slot="icon"/><image style="width:128rpx;height:48rpx" src="{{j}}" mode="scaleToFill" class="custom-text data-v-9aea9022"/></wd-cell><wd-cell wx:if="{{o}}" class="data-v-9aea9022" u-s="{{['icon']}}" bindclick="{{n}}" u-i="9aea9022-2" bind:__l="__l" u-p="{{o}}"><image class="data-v-9aea9022" src="{{m}}" mode="scaleToFill" slot="icon"/></wd-cell></view></view></view><user-login-popup wx:if="{{r}}" class="r data-v-9aea9022" u-r="loginRef" bindgetPhone="{{q}}" u-i="9aea9022-3" bind:__l="__l" u-p="{{r}}"></user-login-popup></view>

dist/build/mp-weixin/pagesOne/winner/components/activityDescPopup.js

@@ -1 +1 @@
-"use strict";const e=require("../../../common/vendor.js"),o=require("../../../hooks/useDraw.js");if(!Array){e.resolveComponent("wd-popup")()}Math;const t=e.defineComponent({__name:"activityDescPopup",props:{show:{type:Boolean,default:!1},description:{type:String,default:""}},emits:["update:show"],setup(t,{emit:s}){const r=t,p=s,{handleClose:n}=o.useDraw(r,p);return(o,s)=>({a:e.t(t.description),b:e.o(e.unref(n)),c:e.o((e=>r.show=e)),d:e.p({position:"bottom",closable:!0,"custom-style":"height: 600rpx;border-radius:16rpx",modelValue:r.show})})}}),s=e._export_sfc(t,[["__scopeId","data-v-9876310f"]]);wx.createComponent(s);
+"use strict";const e=require("../../../common/vendor.js"),o=require("../../../hooks/useDraw.js");if(!Array){e.resolveComponent("wd-popup")()}Math;const t=e.defineComponent({__name:"activityDescPopup",props:{show:{type:Boolean,default:!1},description:{type:Array,default:()=>[]}},emits:["update:show"],setup(t,{emit:s}){const r=t,p=s,{handleClose:a}=o.useDraw(r,p);return(o,s)=>({a:e.f(t.description,((o,t,s)=>({a:e.t(o),b:t}))),b:e.o(e.unref(a)),c:e.o((e=>r.show=e)),d:e.p({position:"bottom",closable:!0,"custom-style":"height: 600rpx;border-radius:16rpx",modelValue:r.show})})}}),s=e._export_sfc(t,[["__scopeId","data-v-7bceba85"]]);wx.createComponent(s);

dist/build/mp-weixin/pagesOne/winner/components/activityDescPopup.wxml

@@ -1 +1 @@
-<view class="activityDescPopup data-v-9876310f"><wd-popup wx:if="{{d}}" class="data-v-9876310f" u-s="{{['d']}}" bindclose="{{b}}" u-i="9876310f-0" bind:__l="__l" bindupdateModelValue="{{c}}" u-p="{{d}}"><view class="title data-v-9876310f">活动说明</view><view class="content data-v-9876310f">{{a}}</view></wd-popup></view>
+<view class="activityDescPopup data-v-7bceba85"><wd-popup wx:if="{{d}}" class="data-v-7bceba85" u-s="{{['d']}}" bindclose="{{b}}" u-i="7bceba85-0" bind:__l="__l" bindupdateModelValue="{{c}}" u-p="{{d}}"><view class="title data-v-7bceba85">活动说明</view><view class="content data-v-7bceba85"><view wx:for="{{a}}" wx:for-item="item" wx:key="b" class="data-v-7bceba85">{{item.a}}</view></view></wd-popup></view>

dist/build/mp-weixin/pagesOne/winner/components/activityDescPopup.wxss

@@ -1 +1 @@
-.activityDescPopup .title.data-v-9876310f{font-size:32rpx;color:#333;font-weight:700;text-align:center;margin-top:32rpx}.activityDescPopup .content.data-v-9876310f{font-size:24rpx;color:#666;width:90%;margin:50rpx auto;line-height:34rpx}
+.activityDescPopup .title.data-v-7bceba85{font-size:32rpx;color:#333;font-weight:700;text-align:center;margin-top:32rpx}.activityDescPopup .content.data-v-7bceba85{font-size:24rpx;color:#666;width:90%;margin:50rpx auto;line-height:34rpx}

dist/build/mp-weixin/utils/http.js

@@ -1 +1 @@
-"use strict";const e=require("../common/vendor.js"),t={invoke(e){e.url.startsWith("http")||(e.url="https://coupon.qiuyutech.com.cn/prod-api"+e.url),e.timeout=3e4,e.header={...e.header,"source-client":"miniapp"}}};e.index.addInterceptor("request",t);exports.http=t=>new Promise(((o,s)=>{e.index.request({...t,success(t){t.statusCode>=200&&t.statusCode<300?401==t.data.code?e.index.redirectTo({url:"/"}):o(t.data):401===t.statusCode?(e.index.redirectTo({url:"/"}),s(t)):(e.index.showToast({icon:"none",title:t.data.msg||"请求错误"}),s(t))},fail(t){e.index.showToast({icon:"none",title:"网络错误，换个网络试试"}),s(t)}})}));
+"use strict";const e=require("../common/vendor.js");console.log("--------------------------","https://coupon.qiuyutech.com.cn/prod-api");const t={invoke(e){e.url.startsWith("http")||(e.url="https://coupon.qiuyutech.com.cn/prod-api"+e.url),e.timeout=3e4,e.header={...e.header,"source-client":"miniapp"}}};e.index.addInterceptor("request",t);exports.http=t=>new Promise(((o,s)=>{e.index.request({...t,success(t){t.statusCode>=200&&t.statusCode<300?401==t.data.code?e.index.redirectTo({url:"/"}):o(t.data):401===t.statusCode?(e.index.redirectTo({url:"/"}),s(t)):(e.index.showToast({icon:"none",title:t.data.msg||"请求错误"}),s(t))},fail(t){e.index.showToast({icon:"none",title:"网络错误，换个网络试试"}),s(t)}})}));

dist/dev/mp-weixin/pages/my/components/nearlyStoreBox.js

@@ -0,0 +1,8 @@
+"use strict";
+const common_vendor = require("../../../common/vendor.js");
+const _sfc_main = {};
+function _sfc_render(_ctx, _cache) {
+  return {};
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a58df8f5"]]);
+wx.createComponent(Component);

dist/dev/mp-weixin/pages/my/components/nearlyStoreBox.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

dist/dev/mp-weixin/pages/my/components/nearlyStoreBox.wxml

@@ -0,0 +1 @@
+<view class="nearly-box data-v-a58df8f5"><view class="title data-v-a58df8f5"> 离我最近 </view><view class="count data-v-a58df8f5"><view class="cont-msg data-v-a58df8f5"><image class="icon-img data-v-a58df8f5" src="https://xiangli-tesco.oss-cn-hangzhou.aliyuncs.com/qiuyu/static/home/address.png"></image><view class="store-name data-v-a58df8f5">附近没有门店</view></view></view></view>

dist/dev/mp-weixin/pages/my/components/nearlyStoreBox.wxss

@@ -0,0 +1,70 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.nearly-box.data-v-a58df8f5 {
+  margin-bottom: 32rpx;
+}
+.nearly-box .title.data-v-a58df8f5 {
+  color: #000;
+  font-weight: bold;
+  font-size: 28rpx;
+  margin-bottom: 12rpx;
+}
+.nearly-box .count.data-v-a58df8f5 {
+  padding: 20rpx;
+  border-radius: 16rpx;
+  background: #fff;
+}
+.nearly-box .cont-msg.data-v-a58df8f5 {
+  width: 100%;
+  height: 108rpx;
+  background: url("https://xiangli-tesco.oss-cn-hangzhou.aliyuncs.com/qiuyu/static/mine/nearly-bg.png") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.nearly-box .cont-msg .icon-img.data-v-a58df8f5 {
+  width: 36rpx;
+  height: 36rpx;
+}
+.nearly-box .cont-msg .store-name.data-v-a58df8f5 {
+  color: #0f1828;
+  font-size: 28rpx;
+  font-style: normal;
+  font-weight: bold;
+  float: left;
+}
+.nearly-box .cont-msg .store-num.data-v-a58df8f5 {
+  color: #666;
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
+}
+.nearly-box .cont-msg .daohang.data-v-a58df8f5 {
+  font-size: 28rpx;
+  color: #1a65ff;
+  padding-right: 24rpx;
+}

dist/dev/mp-weixin/pages/my/index.js

@@ -8,9 +8,10 @@ if (!Array) {
 }
 const _easycom_wd_cell = () => "../../node-modules/wot-design-uni/components/wd-cell/wd-cell.js";
 if (!Math) {
-  (_easycom_wd_cell + UserLoginPopup)();
+  (NearlyStoreBox + _easycom_wd_cell + UserLoginPopup)();
 }
 const UserLoginPopup = () => "../../components/userLoginPopup.js";
+const NearlyStoreBox = () => "./components/nearlyStoreBox.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
@@ -104,7 +105,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           ["is-link"]: true,
           title: "上传记录"
         }),
-        p: common_vendor.sr(loginRef, "276ac604-2", {
+        p: common_vendor.sr(loginRef, "276ac604-3", {
           "k": "loginRef"
         }),
         q: common_vendor.o(getPhone),

dist/dev/mp-weixin/pages/my/index.json

@@ -2,6 +2,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "wd-cell": "../../node-modules/wot-design-uni/components/wd-cell/wd-cell",
-    "user-login-popup": "../../components/userLoginPopup"
+    "user-login-popup": "../../components/userLoginPopup",
+    "nearly-store-box": "./components/nearlyStoreBox"
   }
 }

dist/dev/mp-weixin/pages/my/index.wxml

@@ -1 +1 @@
-<view class="myContent data-v-276ac604"><view class="topTitle data-v-276ac604" style="{{'margin-top:' + a}}">个人中心</view><view class="userBox data-v-276ac604" style="{{'margin-top:' + f}}"><image class="avatar data-v-276ac604" src="{{b}}" mode="scaleToFill"/><view class="nickName data-v-276ac604"><text class="name data-v-276ac604">{{c}}</text><text wx:if="{{d}}" class="login data-v-276ac604" bindtap="{{e}}">点击登录</text></view></view><view class="dataBox data-v-276ac604" style="{{'margin-top:' + h}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="c" class="dataItem data-v-276ac604"><view class="inside data-v-276ac604"><text class="label data-v-276ac604">{{item.a}}</text><view class="data-v-276ac604"/><text class="data-v-276ac604">0</text></view><image class="data-v-276ac604" src="{{item.b}}" mode="scaleToFill"/></view></view><view class="content data-v-276ac604"><view class="toolBox data-v-276ac604"><view class="title data-v-276ac604"> 常用工具 </view><view class="tools data-v-276ac604"><wd-cell wx:if="{{l}}" class="data-v-276ac604" u-s="{{['icon','d']}}" bindclick="{{k}}" u-i="276ac604-0" bind:__l="__l" u-p="{{l}}"><image class="data-v-276ac604" src="{{i}}" mode="scaleToFill" slot="icon"/><image style="width:128rpx;height:48rpx" src="{{j}}" mode="scaleToFill" class="custom-text data-v-276ac604"/></wd-cell><wd-cell wx:if="{{o}}" class="data-v-276ac604" u-s="{{['icon']}}" bindclick="{{n}}" u-i="276ac604-1" bind:__l="__l" u-p="{{o}}"><image class="data-v-276ac604" src="{{m}}" mode="scaleToFill" slot="icon"/></wd-cell></view></view></view><user-login-popup wx:if="{{r}}" class="r data-v-276ac604" u-r="loginRef" bindgetPhone="{{q}}" u-i="276ac604-2" bind:__l="__l" u-p="{{r}}"></user-login-popup></view>
+<view class="myContent data-v-276ac604"><view class="topTitle data-v-276ac604" style="{{'margin-top:' + a}}">个人中心</view><view class="userBox data-v-276ac604" style="{{'margin-top:' + f}}"><image class="avatar data-v-276ac604" src="{{b}}" mode="scaleToFill"/><view class="nickName data-v-276ac604"><text class="name data-v-276ac604">{{c}}</text><text wx:if="{{d}}" class="login data-v-276ac604" bindtap="{{e}}">点击登录</text></view></view><view class="dataBox data-v-276ac604" style="{{'margin-top:' + h}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="c" class="dataItem data-v-276ac604"><view class="inside data-v-276ac604"><text class="label data-v-276ac604">{{item.a}}</text><view class="data-v-276ac604"/><text class="data-v-276ac604">0</text></view><image class="data-v-276ac604" src="{{item.b}}" mode="scaleToFill"/></view></view><view class="content data-v-276ac604"><view class="data-v-276ac604" style="margin:26rpx 32rpx 0"><nearly-store-box class="data-v-276ac604" u-i="276ac604-0" bind:__l="__l"></nearly-store-box></view><view class="toolBox data-v-276ac604"><view class="title data-v-276ac604"> 常用工具 </view><view class="tools data-v-276ac604"><wd-cell wx:if="{{l}}" class="data-v-276ac604" u-s="{{['icon','d']}}" bindclick="{{k}}" u-i="276ac604-1" bind:__l="__l" u-p="{{l}}"><image class="data-v-276ac604" src="{{i}}" mode="scaleToFill" slot="icon"/><image style="width:128rpx;height:48rpx" src="{{j}}" mode="scaleToFill" class="custom-text data-v-276ac604"/></wd-cell><wd-cell wx:if="{{o}}" class="data-v-276ac604" u-s="{{['icon']}}" bindclick="{{n}}" u-i="276ac604-2" bind:__l="__l" u-p="{{o}}"><image class="data-v-276ac604" src="{{m}}" mode="scaleToFill" slot="icon"/></wd-cell></view></view></view><user-login-popup wx:if="{{r}}" class="r data-v-276ac604" u-r="loginRef" bindgetPhone="{{q}}" u-i="276ac604-3" bind:__l="__l" u-p="{{r}}"></user-login-popup></view>

dist/dev/mp-weixin/pagesOne/winner/components/activityDescPopup.js

@@ -17,8 +17,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       default: false
     },
     description: {
-      type: String,
-      default: ""
+      type: Array,
+      default: () => []
     }
   },
   emits: ["update:show"],
@@ -28,7 +28,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const { handleClose } = hooks_useDraw.useDraw(props, emit);
     return (_ctx, _cache) => {
       return {
-        a: common_vendor.t(__props.description),
+        a: common_vendor.f(__props.description, (item, index, i0) => {
+          return {
+            a: common_vendor.t(item),
+            b: index
+          };
+        }),
         b: common_vendor.o(common_vendor.unref(handleClose)),
         c: common_vendor.o(($event) => props.show = $event),
         d: common_vendor.p({

dist/dev/mp-weixin/pagesOne/winner/components/activityDescPopup.wxml

@@ -1 +1 @@
-<view class="activityDescPopup data-v-84dcedc1"><wd-popup wx:if="{{d}}" class="data-v-84dcedc1" u-s="{{['d']}}" bindclose="{{b}}" u-i="84dcedc1-0" bind:__l="__l" bindupdateModelValue="{{c}}" u-p="{{d}}"><view class="title data-v-84dcedc1">活动说明</view><view class="content data-v-84dcedc1">{{a}}</view></wd-popup></view>
+<view class="activityDescPopup data-v-84dcedc1"><wd-popup wx:if="{{d}}" class="data-v-84dcedc1" u-s="{{['d']}}" bindclose="{{b}}" u-i="84dcedc1-0" bind:__l="__l" bindupdateModelValue="{{c}}" u-p="{{d}}"><view class="title data-v-84dcedc1">活动说明</view><view class="content data-v-84dcedc1"><view wx:for="{{a}}" wx:for-item="item" wx:key="b" class="data-v-84dcedc1">{{item.a}}</view></view></wd-popup></view>

dist/dev/mp-weixin/pagesOne/winner/index.js

@@ -46,6 +46,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         });
         common_vendor.index.setStorageSync("activityData", JSON.stringify(aData));
         backImage.value = res.data[0].activityImage;
+        aData.description = aData.description.split("\n");
       }).catch((err) => {
         console.log(err);
       });

dist/dev/mp-weixin/pagesOne/winner/uploadImage.js

@@ -18,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const openid = common_vendor.index.getStorageSync("openid");
     const phone = common_vendor.index.getStorageSync("phone");
     const routerInfo = common_vendor.reactive({ discountId: "", discountLevel: "" });
-    const action = "http://192.168.168.104:8090/miniApp/oss/upload/" + aData.brandId;
+    const action = "https://test-coupon.qiuyutech.com.cn/stage-api/miniApp/oss/upload/" + aData.brandId;
     const customUpload = (file, formData, options) => {
       common_vendor.index.uploadFile({
         url: action,

dist/dev/mp-weixin/project.private.config.json

@@ -64,7 +64,7 @@
     }
   },
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "coverView": false,
     "lazyloadPlaceholderEnable": false,
     "skylineRenderEnable": false,

dist/dev/mp-weixin/utils/http.js

@@ -1,6 +1,7 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
-const baseURL = "http://192.168.168.104:8090";
+const baseURL = "https://test-coupon.qiuyutech.com.cn/stage-api";
+console.log("--------------------------", "https://test-coupon.qiuyutech.com.cn/stage-api");
 const httpInterceptor = {
   // 拦截前触发
   invoke(options) {

src/pages/my/components/nearlyStoreBox.vue

@@ -0,0 +1,67 @@
+<template>
+  <view class="nearly-box">
+    <view class="title"> 离我最近 </view>
+    <view class="count">
+      <view class="cont-msg">
+        <image
+          class="icon-img"
+          src="https://xiangli-tesco.oss-cn-hangzhou.aliyuncs.com/qiuyu/static/home/address.png"
+        ></image>
+        <view class="store-name">附近没有门店</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup></script>
+
+<style lang="scss" scoped>
+.nearly-box {
+  margin-bottom: 32rpx;
+  .title {
+    color: #000;
+    font-weight: bold;
+    font-size: 28rpx;
+    margin-bottom: 12rpx;
+  }
+  .count {
+    padding: 20rpx;
+    border-radius: 16rpx;
+    background: #fff;
+  }
+  .cont-msg {
+    width: 100%;
+    height: 108rpx;
+    background: url("https://xiangli-tesco.oss-cn-hangzhou.aliyuncs.com/qiuyu/static/mine/nearly-bg.png")
+      no-repeat;
+    background-size: 100% 100%;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    .icon-img {
+      width: 36rpx;
+      height: 36rpx;
+    }
+
+    .store-name {
+      color: #0f1828;
+      font-size: 28rpx;
+      font-style: normal;
+      font-weight: bold;
+      float: left;
+    }
+    .store-num {
+      color: #666;
+      font-size: 24rpx;
+      font-weight: 400;
+      margin-top: 10rpx;
+    }
+
+    .daohang {
+      font-size: 28rpx;
+      color: #1a65ff;
+      padding-right: 24rpx;
+    }
+  }
+}
+</style>

src/pages/my/index.vue

@@ -24,6 +24,9 @@
       </view>
     </view>
     <view class="content">
+      <view style="margin: 26rpx 32rpx 0">
+        <nearly-store-box></nearly-store-box>
+      </view>
       <view class="toolBox">
         <view class="title"> 常用工具 </view>
 
@@ -47,6 +50,7 @@
         </view>
       </view>
     </view>
+
     <user-login-popup
       ref="loginRef"
       :path="path"
@@ -63,7 +67,7 @@ import { getNavTop } from "@/utils/system";
 import { paymentAPI } from "@/services/ams";
 import { getActivityData, isGetPhone, getMobile } from "@/utils/system";
 import UserLoginPopup from "@/components/userLoginPopup.vue";
-
+import NearlyStoreBox from "./components/nearlyStoreBox.vue";
 const imgObj = {
   user: "https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/user.png",
   int: "https://qiuyu-daodian.oss-cn-beijing.aliyuncs.com/images/int.png",

src/pagesOne/winner/components/activityDescPopup.vue

@@ -9,13 +9,19 @@
     >
       <view class="title">活动说明</view>
       <view class="content">
-        {{ description }}
+        <view v-for="(item, index) in description" :key="index">{{
+          item
+        }}</view>
+
+        <!-- {{ description }} -->
       </view>
     </wd-popup>
   </view>
 </template>
 
 <script lang="ts" setup>
+import { computed } from "vue";
+
 import { useDraw } from "@/hooks/useDraw";
 
 const props = defineProps({
@@ -24,11 +30,17 @@ const props = defineProps({
     default: false,
   },
   description: {
-    type: String,
-    default: "",
+    type: Array,
+    default: () => [],
   },
 });
 
+// const descStr = computed(() => {
+//   console.log("-----------------------", props.description.split("\n"));
+
+//   return props.description.split("\n");
+// });
+
 const emit = defineEmits(["update:show"]);
 
 const { handleClose } = useDraw(props, emit);

src/pagesOne/winner/index.vue

@@ -133,6 +133,8 @@ const getList = () => {
 
       uni.setStorageSync("activityData", JSON.stringify(aData));
       backImage.value = res.data[0].activityImage;
+      aData.description = aData.description.split("\n");
+      // console.log("----------------------", aData.description);
     })
     .catch((err) => {
       console.log(err);

src/utils/http.ts

@@ -9,8 +9,11 @@
  */
 
 // import { useInfoStore } from "@/stores";
+// import { loadEnv } from "vite";
+// const env: Record<string, string> = loadEnv();
+const baseURL = import.meta.env.VITE_API_URL; //process.env.VITE_API_URL;
+console.log("--------------------------", import.meta.env.VITE_API_URL);
 
-const baseURL = import.meta.env.VITE_API_URL;
 // const baseURL = import.meta.env.MODE === 'production' ? import.meta.env.VITE_API_URL + '/prod-api' : import.meta.env.VITE_API_URL
 // const baseURL = import.meta.env.VITE_API_URL + '/prod-api'
 // 添加拦截器

vite.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from "vite";
 import uni from "@dcloudio/vite-plugin-uni";
 import { resolve } from "path";
-
+console.log("222222222222222222", process.env.VITE_API_URL);
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [uni()],