提交

config/routes.js

@@ -318,6 +318,12 @@ export default [
         icon: 'smile',
         path: '/shopmanage/coupon/paperCoupon',
         component: './shopmanage/coupon/paperCoupon',
+      },
+      {
+        name: '商品优惠券管理',
+        icon: 'smile',
+        path: '/shopmanage/coupon/goodsCoupon',
+        component: './shopmanage/coupon/goodsCoupon',
       }
     ],
   },

src/pages/push/batchingpush/index.jsx

@@ -272,7 +272,9 @@ const HandleOk= async(values)=>{
           <ProDescriptions.Item label="topic" copyable valueType="text">
           {currentRow?.topic}
           </ProDescriptions.Item>
-        
+          <ProDescriptions.Item label="下发状态" valueType="text">
+          {currentRow?.description}
+          </ProDescriptions.Item>
           <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据">
           <a
               onClick={() => {

src/pages/push/goodspush/index.jsx

@@ -271,6 +271,9 @@ const HandleOk= async(values)=>{
           <ProDescriptions.Item label="topic" copyable valueType="text">
           {currentRow?.topic}
           </ProDescriptions.Item>
+          <ProDescriptions.Item label="下发状态" valueType="text">
+          {currentRow?.description}
+          </ProDescriptions.Item>
           <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据">
           <a
               onClick={() => {

src/pages/push/technologypush/index.jsx

@@ -271,6 +271,9 @@ const HandleOk= async(values)=>{
           <ProDescriptions.Item label="topic" copyable valueType="text">
           {currentRow?.topic}
           </ProDescriptions.Item>
+          <ProDescriptions.Item label="下发状态" valueType="text">
+          {currentRow?.description}
+          </ProDescriptions.Item>
           <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据">
           <a
               onClick={() => {

src/pages/shopmanage/coupon/goodsCoupon/service.js

@@ -1,8 +1,9 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 /** 获取优惠卷  sdsa GET /kitchen/api/coupon/couponpgage */
 export async function GetGoodsCouponPgage(data) {
-  return request(`/kitchen/api/goodscoupon/getGoodsCouponPgage`, {
+  return request(getStoremanagement()+`/api/goodscoupon/getGoodsCouponPgage`, {
     method: 'POST',
     data: data,
     // params: { ...params },
@@ -13,7 +14,7 @@ export async function GetGoodsCouponPgage(data) {
 
 export async function AddGoodsCoupon(data) {
   // http://localhost:7002
-  return request('/kitchen/api/goodscoupon/addGoodsCoupon', {
+  return request(getStoremanagement()+'/api/goodscoupon/addGoodsCoupon', {
     method: 'POST',
     // type:'json',
     data: data,
@@ -25,7 +26,7 @@ export async function AddGoodsCoupon(data) {
 
 export async function DeleteGoodsCoupon(data) {
   // http://localhost:7002
-  return request('/kitchen/api/goodscoupon/updateGoodsCouponEnable?Ids='+data, {
+  return request(getStoremanagement()+'/api/goodscoupon/updateGoodsCouponEnable?Ids='+data, {
     method: 'GET',
     // type:'json',
     //data: data,
@@ -37,7 +38,7 @@ export async function DeleteGoodsCoupon(data) {
 
 export async function UpdateGoodsCoupon(data) {
   // http://localhost:7002
-  return request('/kitchen/api/goodscoupon/updateGoodsCoupon', {
+  return request(getStoremanagement()+'/api/goodscoupon/updateGoodsCoupon', {
     method: 'POST',
     // type:'json',
     data: data,
@@ -47,7 +48,7 @@ export async function UpdateGoodsCoupon(data) {
 }
 /** 获取优惠卷类型  sdsa GET //kitchen/api/coupon/coupon-status-or-type/{type} */
 export async function GetPaperCouponType() {
-    return request(`/kitchen/api/papercoupon/getPaperCouponType`, {
+    return request(getStoremanagement()+`/api/papercoupon/getPaperCouponType`, {
       method: 'GET',
       //data: null,
       // params: { ...params },
@@ -57,7 +58,7 @@ export async function GetPaperCouponType() {
   /** 添加优惠卷类型 */
   export async function AddPaperCouponType(data) {
     // http://localhost:7002
-    return request('/kitchen/api/papercoupon/addPaperCouponType', {
+    return request(getStoremanagement()+'/api/papercoupon/addPaperCouponType', {
       method: 'POST',
       // type:'json',
       data: data,
@@ -66,7 +67,7 @@ export async function GetPaperCouponType() {
   }
 /** 获取店铺上架商品  */
 export async function GetStoreGoods(data) {
-  return request(`​​/kitchen/api/Store/GetStoreGoods`, {
+  return request(getStoremanagement()+`​​/api/Store/GetStoreGoods`, {
     method: 'POST',
     data: data,
     // params: { ...params },
@@ -76,7 +77,7 @@ export async function GetStoreGoods(data) {
 }
 /** 获取  */
 export async function GetStoreInfoPage(data) {
-  return request(`/kitchen/api/Store/GetStoreList`, {
+  return request(getStoremanagement()+`/api/Store/GetStoreList`, {
    method: 'POST',
    data: data,
    // params: { ...params },