diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index dd26e4d..e381fd2 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -26,7 +26,7 @@
-->
-
+
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index aaabf86..1a502b2 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -201,7 +201,7 @@
-
+
{{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue
index 446739a..93f99ce 100644
--- a/admin-web-master/src/components/chakan/ggsh.vue
+++ b/admin-web-master/src/components/chakan/ggsh.vue
@@ -13,8 +13,8 @@
-
- {{info.adTitle}}
+
+ {{info.redirectUrl}}
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index be369f9..29f9279 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
// baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
- baseURL = 'http://128.10.249.9:9003';
+ baseURL = 'http://192.168.8.103:9003';
} else {
diff --git a/admin-web-master/src/views/aaa/index.vue b/admin-web-master/src/views/aaa/index.vue
index 27c5a6e..1e9b587 100644
--- a/admin-web-master/src/views/aaa/index.vue
+++ b/admin-web-master/src/views/aaa/index.vue
@@ -22,7 +22,8 @@
-->
-
+
+
@@ -33,7 +34,7 @@
- {{ scope.row.type==1?'商城端':'商家端' }}
+ {{ scope.row.type==1?'在线商城端':'商家端小程序' }}
@@ -66,10 +67,10 @@
+ label="在线商城端" :value="1">
+ label="商家端小程序" :value="2">
@@ -105,7 +106,7 @@
data() {
return {
currentPage: 1,
- total: 100,
+ total: 0,
flag: false,
pageSize: 10,
ggXin: false,
diff --git a/ceres-uniapp-master/components/canvasShow/basics/banner.vue b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
index 8ac07e5..3149930 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/banner.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
@@ -44,7 +44,7 @@
NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
res.data.content.map(item=>{
if(item.state ==1){
- item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
+ item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg'
item.jumpUrl = ''
}
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 80628f2..7b93e40 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -4,15 +4,15 @@
// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
// const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003'
// const DOMAIN_PREFIX = 'http://128.10.249.9:9007'
-// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
-// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
+const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
-const host = `${window.location.protocol}//${window.location.host}`
-const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
-const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
-const TIAOZHUAN = `${host}/cdwlMall/`
+// const host = `${window.location.protocol}//${window.location.host}`
+// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
+// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
+// const TIAOZHUAN = `${host}/cdwlMall/`
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index a846f80..fd18f44 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -493,6 +493,13 @@
}
},
{
+ "path": "weball/shopweb",
+ "style": {
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTitleText": ""
+ }
+ },
+ {
"path": "tishi/tishi",
"style": {
"navigationBarBackgroundColor": "#FFFFFF",
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index 03659d9..44311c1 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -192,19 +192,17 @@
-
+
位置信息
-
-
-
+
+ 奖励类型
+
+ *名称
+
+ *奖品数量
+
+ *奖品图片
+
+
+
+ *兑奖方式
+
+
+
+ {{item.name}}
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+ 请填写您的报名信息
+
+
+ 提交
+
+
+
+
@@ -51,19 +154,38 @@
export default {
data() {
return {
+ fist: [],
tableData: {},
list: ['标签', '标签', '标签'],
- participateTimeType: 'sync', // 默认选中同步活动周期
+ participateTimeType: '同步活动周期', // 默认选中同步活动周期
timeOptions: [{
- value: 'sync',
- label: '同步活动周期'
+ disabled: true,
+ name: '同步活动周期'
+ },
+ {
+ disabled: false,
+ name: '自定义时间'
+ }
+ ],
+ fangshi:[
+ {
+ disabled: true,
+ name: '现场兑换'
},
{
- value: 'custom',
- label: '自定义时间'
+ disabled: false,
+ name: '邮寄'
}
],
joinShow: false,
+ establishow:false,
+ addjiangliShow:false,
+ dakaShow:false,
+ params: {
+ year: true,
+ month: true,
+ day: true
+ },
form: {
activityId: '',
userId: '',
@@ -71,6 +193,14 @@
createUser: '',
userName: '',
userPhone: '',
+ canyutiem:''
+ },
+ jlForm:{
+ type:'',
+ name:'',
+ num:'',
+ tu:'',
+ fangshi:'',
},
pagesize: {
id: null,
@@ -156,6 +286,64 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
+ radioChange(val){
+ this.form.canyutiem = ''
+ },
+ establiChange(val){
+ this.form.canyutiem = this.timeChange(val)
+ },
+ timeChange(val) {
+ const {
+ year,
+ month,
+ day,
+ } = val;
+ return `${year}-${month}-${day}`;
+ },
+ addjiangli(){
+ this.addjiangliShow = true
+ },
+ dakaSet(){
+
+ },
+ removeList(e, file, fileList) {
+ this.jlForm.tu.splice(e, 1)
+ this.fist.splice(e, 1)
+ },
+ onsuccess1(e, file, fileList, ziduan) {
+
+ let index = 0
+ if (this.jlForm.tu.length != 0) {
+ index = this.jlForm.tu.length
+ }
+
+ uni.uploadFile({
+ url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
+ filePath: e[index].url,
+ name: 'file', // 后端接收的文件参数名
+ formData: {
+ filePath: 'xcx', // 其他表单数据
+ },
+ success: (uploadFileRes) => {
+
+
+ this.jlForm.tu.push(this.$img + JSON.parse(uploadFileRes.data).data)
+
+ uni.showToast({
+ title: '上传成功',
+ icon: 'success',
+ });
+ },
+ fail: (err) => {
+ console.log('上传失败', this.fist)
+
+ uni.showToast({
+ title: '上传失败',
+ icon: 'none',
+ });
+ },
+ });
+ },
}
};
@@ -264,7 +452,7 @@
margin: 0 40rpx;
.form-box {
- padding: 18rpx 30rpx;
+ padding: 0rpx 0rpx;
}
diff --git a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
index 5d9f941..9c60fb2 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
@@ -162,7 +162,8 @@
pageindex: {
pageNumber: 0,
pageSize: 100,
- contactNumber:''
+ contactNumber:'',
+ dataStatus:"1"
},
ids:'',
showUp:true
diff --git a/lvdao-miniapp/pagesA/weball/shopweb.vue b/lvdao-miniapp/pagesA/weball/shopweb.vue
new file mode 100644
index 0000000..db1c95d
--- /dev/null
+++ b/lvdao-miniapp/pagesA/weball/shopweb.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index e848b48..d0d23db 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -20,7 +20,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
// bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
-
+
// bases = 'http://128.10.249.9:9003'+ url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;